Merge pull request #3681 from webkom/fix-abakus-verification

Author: eikhr

lego/apps/users/models.py

@@ -467,6 +467,10 @@ def verify_student(self, feide_groups) -> bool:
                 grade_group.add_user(self)
                 self.student_verification_status = True
                 self.save()
+                try:
+                    AbakusGroup.objects.get(name="Abakus").add_user(self)
+                except AbakusGroup.DoesNotExist:
+                    pass
                 return True
 
         # Student has no allowed groups

lego/apps/users/tests/test_student_confirmation_api.py

@@ -199,6 +199,7 @@ class ValidateOIDCAPITestCase(BaseAPITestCase):
     }
 
     def setUp(self):
+        self.abakus_group = AbakusGroup.objects.get(name="Abakus")
         self.grade_data_1 = AbakusGroup.objects.create(
             name=constants.FIRST_GRADE_DATA, type=constants.GROUP_GRADE
         )
@@ -214,6 +215,7 @@ def setUp(self):
 
         self.user_with_student_confirmation = User.objects.get(username="test1")
         self.grade_data_4.add_user(self.user_with_student_confirmation)
+        self.abakus_group.add_user(self.user_with_student_confirmation)
         self.user_without_student_confirmation = User.objects.get(username="test2")
 
         self.client.force_authenticate(self.user_without_student_confirmation)
@@ -234,6 +236,11 @@ def test_data_1st(self, *args):
         self.assertEqual(
             self.user_without_student_confirmation.grade.id, self.grade_data_1.id
         )
+        self.assertTrue(
+            self.user_without_student_confirmation.abakus_groups.filter(
+                pk=self.abakus_group.pk
+            ).exists()
+        )
 
     @mock.patch("lego.apps.users.views.oidc.oauth.feide", MockFeideOAUTH(Token.KOMTEK))
     def test_komtek_1st(self, *args):
@@ -245,6 +252,11 @@ def test_komtek_1st(self, *args):
         self.assertEqual(
             self.user_without_student_confirmation.grade.id, self.grade_komtek_1.id
         )
+        self.assertTrue(
+            self.user_without_student_confirmation.abakus_groups.filter(
+                pk=self.abakus_group.pk
+            ).exists()
+        )
 
     @mock.patch(
         "lego.apps.users.views.oidc.oauth.feide", MockFeideOAUTH(Token.DATA_MASTER)
@@ -260,6 +272,11 @@ def test_data_4th(self, *args):
         self.assertEqual(
             self.user_without_student_confirmation.grade.id, self.grade_data_4.id
         )
+        self.assertTrue(
+            self.user_without_student_confirmation.abakus_groups.filter(
+                pk=self.abakus_group.pk
+            ).exists()
+        )
 
     @mock.patch(
         "lego.apps.users.views.oidc.oauth.feide", MockFeideOAUTH(Token.KOMTEK_MASTER)
@@ -275,6 +292,11 @@ def test_komtek_4th(self, *args):
         self.assertEqual(
             self.user_without_student_confirmation.grade.id, self.grade_komtek_4.id
         )
+        self.assertTrue(
+            self.user_without_student_confirmation.abakus_groups.filter(
+                pk=self.abakus_group.pk
+            ).exists()
+        )
 
     @mock.patch(
         "lego.apps.users.views.oidc.oauth.feide", MockFeideOAUTH(Token.SECCLO_MASTER)
@@ -290,6 +312,12 @@ def test_secclo_master(self, *args):
         self.assertEqual(
             self.user_without_student_confirmation.grade.id, self.grade_komtek_4.id
         )
+        print(self.user_without_student_confirmation.abakus_groups.all())
+        self.assertTrue(
+            self.user_without_student_confirmation.abakus_groups.filter(
+                pk=self.abakus_group.pk
+            ).exists()
+        )
 
     @mock.patch(
         "lego.apps.users.views.oidc.oauth.feide", MockFeideOAUTH(Token.MULTI_OTHER)
@@ -304,6 +332,11 @@ def test_with_other_study_informatics(self, *args):
         )
         self.assertEqual(len(json.get("studyProgrammes")), len(multi_other_resp))
         self.assertIsNone(self.user_without_student_confirmation.grade)
+        self.assertFalse(
+            self.user_without_student_confirmation.abakus_groups.filter(
+                pk=self.abakus_group.pk
+            ).exists()
+        )
 
     @mock.patch("lego.apps.users.views.oidc.oauth.feide", MockFeideOAUTH(Token.DATA))
     def test_valid_study_existing_grade(self, *args):
@@ -322,6 +355,11 @@ def test_valid_study_existing_grade(self, *args):
         self.assertEqual(
             self.user_with_student_confirmation.grade.id, self.grade_data_4.id
         )
+        self.assertTrue(
+            self.user_with_student_confirmation.abakus_groups.filter(
+                pk=self.abakus_group.pk
+            ).exists()
+        )
 
     @mock.patch("lego.apps.users.views.oidc.oauth.feide", MockFeideOAUTH(Token.INDOK))
     def test_switch_to_indok(self, *args):
@@ -340,6 +378,11 @@ def test_switch_to_indok(self, *args):
             self.user_with_student_confirmation.grade.id, self.grade_data_4.id
         )
         self.assertTrue(self.user_with_student_confirmation.is_verified_student())
+        self.assertTrue(
+            self.user_with_student_confirmation.abakus_groups.filter(
+                pk=self.abakus_group.pk
+            ).exists()
+        )
 
     @mock.patch("lego.apps.users.views.oidc.oauth.feide", MockFeideOAUTH(Token.DATA))
     def test_multiple_users_one_feide(self, *args):
@@ -365,3 +408,8 @@ def test_multiple_users_one_feide(self, *args):
             self.user_with_student_confirmation.student_username,
             user_without_student_confirmation.student_username,
         )
+        self.assertFalse(
+            self.user_without_student_confirmation.abakus_groups.filter(
+                pk=self.abakus_group.pk
+            ).exists()
+        )

lego/apps/users/views/oidc.py

@@ -16,7 +16,7 @@
 from requests import Response
 from structlog import get_logger
 
-from lego.apps.users.models import AbakusGroup, User
+from lego.apps.users.models import User
 from lego.apps.users.serializers.student_confirmation import FeideAuthorizeSerializer
 from lego.apps.users.validators import STUDENT_USERNAME_REGEX
 
@@ -86,11 +86,6 @@ def validate(self, request: Request) -> HttpResponse:
             else:
                 try:
                     validation_status = "success"
-                    try:
-                        with transaction.atomic():
-                            AbakusGroup.objects.get(name="Abakus").add_user(user)
-                    except AbakusGroup.DoesNotExist:
-                        pass
                     with transaction.atomic():
                         user.student_username = uid
                         user.save()