Merge branch '111-oauth' into 'master'

Fetch and set samaccountname

See merge request !56

iric_data/settings.py

@@ -153,6 +153,7 @@ SOCIAL_AUTH_PIPELINE = (
     'social_core.pipeline.social_auth.associate_user',
     'social_core.pipeline.social_auth.load_extra_data',
     'social_core.pipeline.user.user_details',
+    # 'social_core.pipeline.debug.debug'
 )
 
 SOCIAL_AUTH_URL_NAMESPACE = 'social'

portal/views/secure/login_success.py

@@ -14,11 +14,16 @@ class LoginSuccess(View):
         """
         user = self.request.user
 
-        azuread_groups = None
+        azuread_data = {}
         try:
-            azuread_groups = user.social_auth.get(provider='azuread-tenant-oauth2').extra_data['groups']
+            azuread_data = user.social_auth.get(provider='azuread-tenant-oauth2').extra_data
         except:
             pass
+        azuread_groups = azuread_data['groups'] if 'groups' in azuread_data else None
+        azuread_samaccountname = azuread_data['onPremisesSamAccountName'] if 'onPremisesSamAccountName' in azuread_data else None
+
+        if azuread_samaccountname and not user.profile.accountname:
+            user.profile.accountname = azuread_samaccountname
 
         if hasattr(user, 'ldapuser') or azuread_groups:
             user.profile.labs.remove(*Lab.objects.filter(ldap__startswith='iric-'))
@@ -42,4 +47,6 @@ class LoginSuccess(View):
                 request.session['active_lab_id'] = user.profile.labs.first().id
             # return redirect('dashboard')
 
+        user.profile.save()
+
         return redirect('dashboard')