Merge branch 'fix-org_id' into 'master'

Convert orgid to upper ✅ #401

See merge request !319

circle/dashboard/models.py

@@ -309,7 +309,7 @@ if hasattr(settings, 'SAML_ORG_ID_ATTRIBUTE'):
         attributes = kwargs.pop('attributes')
         attributes = kwargs.pop('attributes')
         atr = settings.SAML_ORG_ID_ATTRIBUTE
         atr = settings.SAML_ORG_ID_ATTRIBUTE
         try:
         try:
-            value = attributes[atr][0]
+            value = attributes[atr][0].upper()
         except Exception as e:
         except Exception as e:
             value = None
             value = None
             logger.info("save_org_id couldn't find attribute. %s", unicode(e))
             logger.info("save_org_id couldn't find attribute. %s", unicode(e))
@@ -339,7 +339,7 @@ if hasattr(settings, 'SAML_ORG_ID_ATTRIBUTE'):
                              group, unicode(g))
                              group, unicode(g))
                 g.user_set.add(sender)
                 g.user_set.add(sender)
 
 
-        for i in FutureMember.objects.filter(org_id=value):
+        for i in FutureMember.objects.filter(org_id__iexact=value):
             i.group.user_set.add(sender)
             i.group.user_set.add(sender)
             i.delete()
             i.delete()
 
 

circle/dashboard/views/group.py

@@ -146,7 +146,7 @@ class GroupDetailView(CheckedDetailView):
             self.object.user_set.add(entity)
             self.object.user_set.add(entity)
         except User.DoesNotExist:
         except User.DoesNotExist:
             if saml_available:
             if saml_available:
-                FutureMember.objects.get_or_create(org_id=name,
+                FutureMember.objects.get_or_create(org_id=name.upper(),
                                                    group=self.object)
                                                    group=self.object)
             else:
             else:
                 messages.warning(request, _('User "%s" not found.') % name)
                 messages.warning(request, _('User "%s" not found.') % name)

circle/dashboard/views/util.py

@@ -70,7 +70,7 @@ def search_user(keyword):
         return User.objects.get(username=keyword)
         return User.objects.get(username=keyword)
     except User.DoesNotExist:
     except User.DoesNotExist:
         try:
         try:
-            return User.objects.get(profile__org_id=keyword)
+            return User.objects.get(profile__org_id__iexact=keyword)
         except User.DoesNotExist:
         except User.DoesNotExist:
             return User.objects.get(email=keyword)
             return User.objects.get(email=keyword)