Skip to content

Commit 49a8c1d

Browse files
authored
Merge pull request #53 from galaxy-genome-annotation/fix-username-scrubbing
returning username should not scrub out the username
2 parents 5ab3fd7 + 37c841d commit 49a8c1d

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

apollo/client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ def get(self, client_method, get_params, is_json=True):
103103
@classmethod
104104
def _scrub_data(cls, data):
105105
"""Remove sensitive attributes from response data"""
106-
if 'username' in data:
107-
del data['username']
106+
# the username can be returned in the operation
107+
# if 'username' in data:
108+
# del data['username']
108109
if 'password' in data:
109110
del data['password']
110111
return data

arrow/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '4.2.11'
1+
__version__ = '4.2.12'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
setup(
1818
name="apollo",
19-
version='4.2.11',
19+
version='4.2.12',
2020
description="Apollo API library",
2121
long_description=readme,
2222
author="Helena Rasche;Anthony Bretaudeau;Nathan Dunn",

test/user_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def test_create_user(self):
4444

4545
meta = {"bla": "bli"}
4646
res = wa.users.create_user("trash@bx.psu.edu", 'Poutrelle', 'Lapinou', 'superpassword', role="user", metadata=meta)
47+
assert res['username'] == 'trash@bx.psu.edu'
4748
self.waitUserCreated(res['userId'])
4849

4950
res = wa.users.show_user('trash@bx.psu.edu')

0 commit comments

Comments
 (0)