Fix oidc auth, remove email from person object

gregui/authentication/auth_backends.py

@@ -205,7 +205,6 @@ class GregOIDCBackend(ValidatingOIDCBackend):
         person, _ = Person.objects.update_or_create(
             first_name=userinfo["first_name"],
             last_name=userinfo["last_name"],
-            email=userinfo["email"],
         )
         person.save()
         return person
@@ -242,6 +241,17 @@ class GregOIDCBackend(ValidatingOIDCBackend):
                 )
                 identity.save()
 
+            try:
+                email_identity = Identity.objects.get(
+                    type="private_email", value=userinfo["email"]
+                )
+            except Identity.DoesNotExist:
+                # Add email if missing
+                email_identity = Identity(
+                    type="private_email", value=userinfo["email"], person=person
+                )
+                email_identity.save()
+
             user_profile = GregUserProfile(
                 user=user,
                 person=person,

gregui/tests/conftest.py

@@ -76,14 +76,13 @@ def data():
             "person1": {
                 "type": "feide_id",
                 "value": "foo@example.com",
-                "person": {"email": "foo@example.com"},
+                "person": {"last_name": "Baresen"},
             },
         },
         "Person": {
             "person1": {
                 "first_name": "Foo",
                 "last_name": "Baresen",
-                "email": "foo@example.com",
             },
         },
         "Sponsor": {
@@ -231,6 +230,7 @@ def invitation_link_expired(invitation, invitation_expired_date) -> InvitationLi
     return InvitationLink.objects.get(id=il.id)
 
 
+@pytest.fixture
 def greg_users(data):
     return create_objects(get_user_model(), data["User"])
 
@@ -257,4 +257,3 @@ def log_in(client, greg_users):
         return client
 
     return _log_in
-

gregui/tests/test_oidc.py

@@ -60,7 +60,7 @@ def test_create_user(claims):
     person = userProfile.person
     assert person.first_name == user.first_name
     assert person.last_name == user.last_name
-    assert person.email == user.email
+    assert person.identities.filter(type="private_email").first().value == user.email
 
     ids = Identity.objects.get(person=person, type="feide_id")
     assert ids.value == "frank_foreleser@spusers.feide.no"