# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1438350247 -7200
# Node ID c9fcb3b04d4a4658fa62bd63b8e239b4ebaf6043
# Parent  03afa7766ac751ed618b68f5ebe754dbe0d2a9a4
auth: don't return extern_type from auth modules - it is not used anyway

diff -r 03afa7766ac7 -r c9fcb3b04d4a kallithea/lib/auth_modules/__init__.py
--- a/kallithea/lib/auth_modules/__init__.py	Fri Jul 31 15:44:07 2015 +0200
+++ b/kallithea/lib/auth_modules/__init__.py	Fri Jul 31 15:44:07 2015 +0200
@@ -54,7 +54,6 @@
         "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, "
diff -r 03afa7766ac7 -r c9fcb3b04d4a kallithea/lib/auth_modules/auth_container.py
--- a/kallithea/lib/auth_modules/auth_container.py	Fri Jul 31 15:44:07 2015 +0200
+++ b/kallithea/lib/auth_modules/auth_container.py	Fri Jul 31 15:44:07 2015 +0200
@@ -175,7 +175,6 @@
         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 @@
             'active': active,
             'active_from_extern': True,
             'extern_name': username,
-            'extern_type': extern_type,
         }
 
         log.info('user `%s` authenticated correctly' % user_data['username'])
diff -r 03afa7766ac7 -r c9fcb3b04d4a kallithea/lib/auth_modules/auth_crowd.py
--- a/kallithea/lib/auth_modules/auth_crowd.py	Fri Jul 31 15:44:07 2015 +0200
+++ b/kallithea/lib/auth_modules/auth_crowd.py	Fri Jul 31 15:44:07 2015 +0200
@@ -220,7 +220,6 @@
         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 @@
             '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
diff -r 03afa7766ac7 -r c9fcb3b04d4a kallithea/lib/auth_modules/auth_internal.py
--- a/kallithea/lib/auth_modules/auth_internal.py	Fri Jul 31 15:44:07 2015 +0200
+++ b/kallithea/lib/auth_modules/auth_internal.py	Fri Jul 31 15:44:07 2015 +0200
@@ -78,7 +78,6 @@
             "active": userobj.active,
             "active_from_extern": userobj.active,
             "extern_name": userobj.user_id,
-            'extern_type': userobj.extern_type,
         }
 
         log.debug(formatted_json(user_data))
diff -r 03afa7766ac7 -r c9fcb3b04d4a kallithea/lib/auth_modules/auth_ldap.py
--- a/kallithea/lib/auth_modules/auth_ldap.py	Fri Jul 31 15:44:07 2015 +0200
+++ b/kallithea/lib/auth_modules/auth_ldap.py	Fri Jul 31 15:44:07 2015 +0200
@@ -338,7 +338,6 @@
             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 @@
                 '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
diff -r 03afa7766ac7 -r c9fcb3b04d4a kallithea/lib/auth_modules/auth_pam.py
--- a/kallithea/lib/auth_modules/auth_pam.py	Fri Jul 31 15:44:07 2015 +0200
+++ b/kallithea/lib/auth_modules/auth_pam.py	Fri Jul 31 15:44:07 2015 +0200
@@ -109,7 +109,6 @@
         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 @@
             'active': active,
             "active_from_extern": None,
             'extern_name': username,
-            'extern_type': extern_type,
         }
 
         try: