kallithea Changeset - 41fc338a810f

Changeset - 41fc338a810f

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 1 0

Mads Kiilerich - 10 years ago 2016-01-20 01:41:02
madski@unity3d.com

Merge stable

1 file changed with 3 insertions and 3 deletions:

kallithea/lib/auth_modules/auth_crowd.py

0 comments (0 inline, 0 general)

kallithea/lib/auth_modules/auth_crowd.py

➞

Show inline comments

@@ @@ -119,14 +119,14 @@ class CrowdServer(object): @@
         """Authenticate a user against crowd. Returns brief information about
         the user."""
         url = ("%s/rest/usermanagement/%s/authentication?username=%s"
                % (self._uri, self._version, username))
+               % (self._uri, self._version, urllib2.quote(username)))
         body = json.dumps({"value": password})
         return self._request(url, body)
     def user_groups(self, username):
         """Retrieve a list of groups to which this user belongs."""
         url = ("%s/rest/usermanagement/%s/user/group/nested?username=%s"
                % (self._uri, self._version, username))
+               % (self._uri, self._version, urllib2.quote(username)))
         return self._request(url)
@@ @@ -222,7 +222,7 @@ class KallitheaAuthPlugin(auth_modules.K @@
         lastname = getattr(userobj, 'lastname', '')
         user_data = {
             'username': username,
+            'username': crowd_user["name"] or username,
             'firstname': crowd_user["first-name"] or firstname,
             'lastname': crowd_user["last-name"] or lastname,
             'groups': crowd_user["groups"],

0 comments (0 inline, 0 general)