Merge branch 'master' of https://github.com/pennlabs/platform into sr…

…itan/health
pennlabs · Feb 13, 2025 · 4f06e73 · 4f06e73
2 parents 579bf29 + d11857a
commit 4f06e73
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/cdkactions_build-and-deploy.yaml b/.github/workflows/cdkactions_build-and-deploy.yaml
@@ -180,7 +180,6 @@ jobs:
           RELEASE_NAME=${{ steps.synth.outputs.RELEASE_NAME }}
 
           # Deploy
-          kubectl apply -f k8s/dist/ -l app.kubernetes.io/component=certificate
           kubectl apply -f k8s/dist/ --prune -l app.kubernetes.io/part-of=$RELEASE_NAME
         env:
           AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}

diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock
diff --git a/backend/Platform/settings/base.py b/backend/Platform/settings/base.py
@@ -205,7 +205,7 @@
         "write": "Write scope",
         "introspection": "Introspect token scope",
     },
-    "ALLOWED_REDIRECT_URI_SCHEMES": ["http", "https"],
+    "ALLOWED_REDIRECT_URI_SCHEMES": ["http", "https", "pennmobile"],
     "PKCE_REQUIRED": False,
     "OIDC_ENABLED": True,
     "OIDC_RSA_PRIVATE_KEY": OIDC_RSA_PRIVATE_KEY,

diff --git a/backend/accounts/views.py b/backend/accounts/views.py
@@ -518,9 +518,10 @@ def post(self, request, format=None):
         )
         for perm in perms:
             perm.user_set.clear()
-        User.objects.filter(Q(is_superuser=True) | Q(is_staff=True)).update(
-            is_superuser=False, is_staff=False
-        )
+        users_to_reset = User.objects.filter(Q(is_staff=True)).exclude(
+            Q(is_superuser=True)
+        )  # Superusers retain permissions across time
+        users_to_reset.update(is_superuser=False, is_staff=False)
 
         try:
             body = json.loads(request.body)

diff --git a/backend/tests/accounts/test_views.py b/backend/tests/accounts/test_views.py
@@ -892,7 +892,7 @@ def test_remove_product_admin(self):
 
     def test_remove_platform_admin(self):
         self.user.is_staff = True
-        self.user.is_superuser = True
+        self.user.is_superuser = False
         self.user.save()
         response = self.client.post(
             reverse("accounts:productadmin"),