Fix rest of linting

Issue: GREG-36

gregsite/settings/base.py

@@ -77,12 +77,12 @@ SESSION_COOKIE_AGE = 1800  # lifetime of session in seconds
 
 CSRF_COOKIE_SAMESITE = "Strict"
 SESSION_COOKIE_SAMESITE = "Strict"
-#CSRF_COOKIE_HTTPONLY = True
-#SESSION_COOKIE_HTTPONLY = True
+# CSRF_COOKIE_HTTPONLY = True
+# SESSION_COOKIE_HTTPONLY = True
 
 # Enable these in production
-#CSRF_COOKIE_SECURE = True
-#SESSION_COOKIE_SECURE = True
+# CSRF_COOKIE_SECURE = True
+# SESSION_COOKIE_SECURE = True
 
 REST_FRAMEWORK = {
     "DEFAULT_VERSIONING_CLASS": "rest_framework.versioning.NamespaceVersioning",

gregsite/settings/dev.py

@@ -15,7 +15,7 @@ ORGREG_CLIENT = {
 }
 
 AUTHENTICATION_BACKENDS = [
-    "gregui.authentication.auth_backends.DevBackend", # Fake dev backend
+    "gregui.authentication.auth_backends.DevBackend",  # Fake dev backend
     "django.contrib.auth.backends.ModelBackend",  # default
     "gregui.authentication.auth_backends.GregOIDCBackend",
     "sesame.backends.ModelBackend",  # link login
@@ -26,5 +26,5 @@ LOGOUT_REDIRECT_URL = "http://localhost:3000/"
 
 CSRF_COOKIE_SAMESITE = "Strict"
 SESSION_COOKIE_SAMESITE = "Lax"
-#CSRF_COOKIE_HTTPONLY = True
-#SESSION_COOKIE_HTTPONLY = True
+# CSRF_COOKIE_HTTPONLY = True
+# SESSION_COOKIE_HTTPONLY = True

gregui/admin.py

@@ -3,6 +3,7 @@ from reversion.admin import VersionAdmin
 
 from gregui.models import GregUserProfile
 
+
 class GregUserProfileAdmin(VersionAdmin):
     pass
 

gregui/api/views/guest.py

@@ -4,7 +4,8 @@ from rest_framework.generics import CreateAPIView
 from greg.models import Person
 from gregui.api.serializers.guest import GuestRegisterSerializer
 
+
 class GuestRegisterView(CreateAPIView):
     queryset = Person.objects.all()
     permission_classes = [permissions.AllowAny]
-    serializer_class = GuestRegisterSerializer
+    serializer_class = GuestRegisterSerializer
\ No newline at end of file

gregui/api/views/userinfo.py

@@ -11,8 +11,9 @@ from rest_framework.response import Response
 
 from gregui.models import GregUserProfile
 
+
 class UserInfoView(APIView):
-    """ 
+    """
     User info view.
 
     Return info about the logged inn user.
@@ -36,10 +37,10 @@ class UserInfoView(APIView):
             person_id = user_profile.person.id
 
         content = {
-            'feide_id': user_profile.userid_feide,
-            'name': f'{user.first_name} {user.last_name}',
-            'sponsor_id': sponsor_id,
-            'person_id': person_id,
+            "feide_id": user_profile.userid_feide,
+            "name": f"{user.first_name} {user.last_name}",
+            "sponsor_id": sponsor_id,
+            "person_id": person_id,
         }
 
-        return Response(content)
+        return Response(content)
\ No newline at end of file

gregui/authentication/auth_backends.py

@@ -194,16 +194,19 @@ class GregOIDCBackend(ValidatingOIDCBackend):
         user = super().get_or_create_user(access_token, id_token, payload)
         if user:
             # Update or create a user_profile
-            userinfo = extract_userinfo(self.get_userinfo(access_token, id_token, payload))
+            userinfo = extract_userinfo(
+                self.get_userinfo(access_token, id_token, payload)
+            )
             self._get_or_create_greg_user_profile(userinfo, user)
         return user
 
     def _get_or_create_person(self, userinfo):
         # Update any new person info
         person, _ = Person.objects.update_or_create(
-            first_name=userinfo['first_name'],
-            last_name=userinfo['last_name'],
-            email=userinfo['email'])
+            first_name=userinfo["first_name"],
+            last_name=userinfo["last_name"],
+            email=userinfo["email"],
+        )
         person.save()
         return person
 
@@ -221,25 +224,29 @@ class GregOIDCBackend(ValidatingOIDCBackend):
 
             # Check if user is a sponsor
             try:
-                sponsor = Sponsor.objects.get(feide_id=userinfo['userid_feide'])
+                sponsor = Sponsor.objects.get(feide_id=userinfo["userid_feide"])
             except Sponsor.DoesNotExist:
                 sponsor = None
 
             try:
                 # TODO, match against fnr if using id-porten.
-                identity = Identity.objects.get(type='feide_id', value=userinfo['userid_feide'])
+                identity = Identity.objects.get(
+                    type="feide_id", value=userinfo["userid_feide"]
+                )
                 person = identity.person
             except Identity.DoesNotExist:
                 # Find or create person, and add identity
                 person = self._get_or_create_person(userinfo)
-                identity = Identity(type='feide_id', value=userinfo['userid_feide'], person=person)
+                identity = Identity(
+                    type="feide_id", value=userinfo["userid_feide"], person=person
+                )
                 identity.save()
 
             user_profile = GregUserProfile(
                 user=user,
                 person=person,
                 sponsor=sponsor,
-                userid_feide=userinfo['userid_feide']
+                userid_feide=userinfo["userid_feide"],
             )
             user_profile.save()
 
@@ -250,10 +257,10 @@ class GregOIDCBackend(ValidatingOIDCBackend):
         username = self.get_username(claims["sub"])
         user = self.UserModel(
             username=username,
-            first_name=userinfo['first_name'],
-            last_name=userinfo['last_name'],
-            email=userinfo['email']
-            )
+            first_name=userinfo["first_name"],
+            last_name=userinfo["last_name"],
+            email=userinfo["email"],
+        )
         user.save()
 
         # Create a user_profile if missing

gregui/migrations/0001_initial.py

@@ -11,24 +11,59 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('greg', '0004_ou_deleted_active'),
+        ("greg", "0004_ou_deleted_active"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='GregUserProfile',
+            name="GregUserProfile",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created', models.DateTimeField(auto_now_add=True)),
-                ('updated', models.DateTimeField(auto_now=True)),
-                ('userid_feide', models.CharField(max_length=150, verbose_name='userid-feide')),
-                ('person', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user_profiles', to='greg.person')),
-                ('sponsor', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user_profiles', to='greg.sponsor')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created", models.DateTimeField(auto_now_add=True)),
+                ("updated", models.DateTimeField(auto_now=True)),
+                (
+                    "userid_feide",
+                    models.CharField(max_length=150, verbose_name="userid-feide"),
+                ),
+                (
+                    "person",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="user_profiles",
+                        to="greg.person",
+                    ),
+                ),
+                (
+                    "sponsor",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="user_profiles",
+                        to="greg.sponsor",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
             bases=(dirtyfields.dirtyfields.DirtyFieldsMixin, models.Model),
         ),

gregui/models.py

@@ -4,6 +4,7 @@ from django.utils.translation import gettext_lazy
 
 from greg.models import BaseModel, Person, Sponsor
 
+
 class GregUserProfile(BaseModel):
     """Link the django user to a Person or Sponsor."""
 
@@ -11,15 +12,15 @@ class GregUserProfile(BaseModel):
     person = models.ForeignKey(
         Person,
         on_delete=models.CASCADE,
-        related_name='user_profiles',
+        related_name="user_profiles",
         blank=True,
-        null=True
-        )
+        null=True,
+    )
     sponsor = models.ForeignKey(
         Sponsor,
         on_delete=models.CASCADE,
-        related_name='user_profiles',
+        related_name="user_profiles",
         blank=True,
-        null=True
-        )
+        null=True,
+    )
     userid_feide = models.CharField(gettext_lazy("userid-feide"), max_length=150)

gregui/tests/conftest.py

@@ -16,6 +16,7 @@ from greg.models import (
     ConsentType,
 )
 
+
 @pytest.fixture
 def client() -> APIClient:
     client = APIClient()