kallithea Changeset - c9fcb3b04d4a

Changeset - c9fcb3b04d4a

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 10 years ago 2015-07-31 15:44:07
madski@unity3d.com

auth: don't return extern_type from auth modules - it is not used anyway

6 files changed with 0 insertions and 10 deletions:

kallithea/lib/auth_modules/__init__.py

kallithea/lib/auth_modules/auth_container.py

kallithea/lib/auth_modules/auth_crowd.py

kallithea/lib/auth_modules/auth_internal.py

kallithea/lib/auth_modules/auth_ldap.py

kallithea/lib/auth_modules/auth_pam.py

0 comments (0 inline, 0 general)

kallithea/lib/auth_modules/__init__.py

➞

Show inline comments

@@ @@ -54,7 +54,6 @@ class KallitheaAuthPluginBase(object): @@
         "email": "email address",
         "groups": '["list", "of", "groups"]',
         "extern_name": "name in external source of record",
         "extern_type": "type of external source of record",
         "admin": 'True|False defines if user should be Kallithea admin',
         "active": 'True|False defines active state of user in Kallithea',
         "active_from_extern": "True|False|None, active state from the external auth, "

kallithea/lib/auth_modules/auth_container.py

➞

Show inline comments

@@ @@ -175,7 +175,6 @@ class KallitheaAuthPlugin(auth_modules.K @@
         email = getattr(userobj, 'email', '')
         firstname = getattr(userobj, 'firstname', '')
         lastname = getattr(userobj, 'lastname', '')
         extern_type = getattr(userobj, 'extern_type', '')
         user_data = {
             'username': username,
@@ @@ -187,7 +186,6 @@ class KallitheaAuthPlugin(auth_modules.K @@
             'active': active,
             'active_from_extern': True,
             'extern_name': username,
             'extern_type': extern_type,
+        }
         log.info('user `%s` authenticated correctly' % user_data['username'])

kallithea/lib/auth_modules/auth_crowd.py

➞

Show inline comments

@@ @@ -220,7 +220,6 @@ class KallitheaAuthPlugin(auth_modules.K @@
         email = getattr(userobj, 'email', '')
         firstname = getattr(userobj, 'firstname', '')
         lastname = getattr(userobj, 'lastname', '')
         extern_type = getattr(userobj, 'extern_type', '')
         user_data = {
             'username': username,
@@ @@ -232,7 +231,6 @@ class KallitheaAuthPlugin(auth_modules.K @@
             'active': active,
             'active_from_extern': crowd_user.get('active'),
             'extern_name': crowd_user["name"],
             'extern_type': extern_type,
+        }
         # set an admin if we're in admin_groups of crowd

kallithea/lib/auth_modules/auth_internal.py

➞

Show inline comments

@@ @@ -78,7 +78,6 @@ class KallitheaAuthPlugin(auth_modules.K @@
             "active": userobj.active,
             "active_from_extern": userobj.active,
             "extern_name": userobj.user_id,
             'extern_type': userobj.extern_type,
+        }
         log.debug(formatted_json(user_data))

kallithea/lib/auth_modules/auth_ldap.py

➞

Show inline comments

@@ @@ -338,7 +338,6 @@ class KallitheaAuthPlugin(auth_modules.K @@
             email = getattr(userobj, 'email', '')
             firstname = getattr(userobj, 'firstname', '')
             lastname = getattr(userobj, 'lastname', '')
             extern_type = getattr(userobj, 'extern_type', '')
             user_data = {
                 'username': username,
@@ @@ -350,7 +349,6 @@ class KallitheaAuthPlugin(auth_modules.K @@
                 'active': active,
                 "active_from_extern": None,
                 'extern_name': user_dn,
                 'extern_type': extern_type,
+            }
             log.info('user %s authenticated correctly' % user_data['username'])
             return user_data

kallithea/lib/auth_modules/auth_pam.py

➞

Show inline comments

@@ @@ -109,7 +109,6 @@ class KallitheaAuthPlugin(auth_modules.K @@
         email = getattr(userobj, 'email', '') or "%s@%s" % (username, socket.gethostname())
         firstname = getattr(userobj, 'firstname', '')
         lastname = getattr(userobj, 'lastname', '')
         extern_type = getattr(userobj, 'extern_type', '')
         user_data = {
             'username': username,
@@ @@ -121,7 +120,6 @@ class KallitheaAuthPlugin(auth_modules.K @@
             'active': active,
             "active_from_extern": None,
             'extern_name': username,
             'extern_type': extern_type,
+        }
         try:

0 comments (0 inline, 0 general)