Merge pull request #53 from galaxy-genome-annotation/fix-username-scr…

…ubbing returning username should not scrub out the username
galaxy-genome-annotation · Apr 23, 2021 · 49a8c1d · 49a8c1d
2 parents 5ab3fd7 + 37c841d
commit 49a8c1d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/apollo/client.py b/apollo/client.py
@@ -103,8 +103,9 @@ def get(self, client_method, get_params, is_json=True):
     @classmethod
     def _scrub_data(cls, data):
         """Remove sensitive attributes from response data"""
-        if 'username' in data:
-            del data['username']
+        # the username can be returned in the operation
+        # if 'username' in data:
+        #     del data['username']
         if 'password' in data:
             del data['password']
         return data
diff --git a/arrow/__init__.py b/arrow/__init__.py
@@ -1 +1 @@
-__version__ = '4.2.11'
+__version__ = '4.2.12'
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name="apollo",
-    version='4.2.11',
+    version='4.2.12',
     description="Apollo API library",
     long_description=readme,
     author="Helena Rasche;Anthony Bretaudeau;Nathan Dunn",

diff --git a/test/user_test.py b/test/user_test.py
@@ -44,6 +44,7 @@ def test_create_user(self):
 
         meta = {"bla": "bli"}
         res = wa.users.create_user("[email protected]", 'Poutrelle', 'Lapinou', 'superpassword', role="user", metadata=meta)
+        assert res['username'] == '[email protected]'
         self.waitUserCreated(res['userId'])
 
         res = wa.users.show_user('[email protected]')