[project] Small fixes

backend/main.py

@@ -8,7 +8,7 @@
 from flask_limiter import Limiter
 from flask_limiter.util import get_remote_address
 from utility.database import db
-from utility.authorization import jwt, oauth
+from utility.authorization import jwt, oauth, oidc
 from utility.csrf import csrf
 from routes import register_routes
 import secrets
@@ -65,6 +65,8 @@
     },
 )
 
+oidc.init_app(app)
+
 # Register routes (blueprints)
 register_routes(app)
 

backend/requirements.txt

@@ -4,6 +4,7 @@ Flask
 Flask-SQLAlchemy
 Flask-CORS
 Flask-Limiter
+Flask-OIDC
 Flask-WTF
 Flask-JWT-Extended
 authlib

backend/routes/__init__.py

@@ -4,6 +4,7 @@
 All routes are registered here via the `register_routes` function.
 """
 
+from http import HTTPStatus
 import os
 import secrets
 from datetime import datetime, timedelta
@@ -257,7 +258,10 @@ def oidc_auth():
         """
         OIDC route.
         """
-        token = oauth.kth.authorize_access_token()
+        try:
+            token = oauth.kth.authorize_access_token()
+        except Exception as e:
+            return jsonify({"error": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
 
         if not token:
             return jsonify({"error": "Invalid credentials"}), 401
@@ -288,26 +292,14 @@ def oidc_auth():
             db.session.add(student)
             db.session.commit()
 
-        permissions_and_role, additional_claims, committees, committee_positions = (
-            retrieve_extra_claims(student=student)
-        )
-        response = make_response(
-            {
-                "student": student.to_dict(is_public_route=False),
-                "committees": committees,
-                "committee_positions": committee_positions,
-                "permissions": permissions_and_role.get("permissions"),
-                "role": permissions_and_role.get("role"),
-            }
-        )
+        response = make_response({"student": student.to_dict(is_public_route=False)})
 
         response.status_code = 302
         set_access_cookies(
             response=response,
             encoded_access_token=create_access_token(
                 identity=student,
                 fresh=timedelta(minutes=20),
-                additional_claims=additional_claims,
             ),
             max_age=timedelta(hours=1),
         )

backend/services/core/student.py

@@ -107,17 +107,23 @@ def retrieve_extra_claims(
     ).all()
 
     for membership in student_memberships:
-        position: CommitteePosition = CommitteePosition.query.get_or_404(
+        position: CommitteePosition = CommitteePosition.query.get(
             membership.committee_position_id
         )
 
+        if not position:
+            continue
+
         committee_positions.append(
             position.to_dict(
                 provided_languages=provided_languages, is_public_route=False
             )
         )
 
-        committee: Committee = Committee.query.get_or_404(position.committee_id)
+        committee: Committee = Committee.query.get(position.committee_id)
+
+        if not committee:
+            continue
 
         committee_dict = committee.to_dict(provided_languages=provided_languages)
 

backend/utility/__init__.py

@@ -2,7 +2,7 @@
 The utility package. Imports all the utility modules.
 """
 
-from .authorization import jwt, oauth
+from .authorization import jwt, oauth, oidc
 from .csrf import csrf, validate_csrf
 
 from .constants import API_VERSION
@@ -24,6 +24,7 @@
 __all__ = [
     "jwt",
     "oauth",
+    "oidc",
     "csrf",
     "validate_csrf",
     "API_VERSION",

backend/utility/authorization.py

@@ -2,8 +2,10 @@
 Utility for authorization variables.
 """
 
+from flask_oidc import OpenIDConnect
 from authlib.integrations.flask_client import OAuth
 from flask_jwt_extended import JWTManager
 
+oidc = OpenIDConnect()
 oauth = OAuth()
 jwt = JWTManager()

frontend/src/providers/AuthenticationProvider.tsx

@@ -276,10 +276,6 @@ const createAuthFunctions = (
       if (response.ok) {
         const json = (await response.json()) as AuthenticationResponse
         dispatch({ type: 'SET_STUDENT', payload: json.student })
-        dispatch({ type: 'SET_ROLE', payload: json.role })
-        dispatch({ type: 'SET_PERMISSIONS', payload: json.permissions })
-        dispatch({ type: 'SET_COMMITTEES', payload: json.committees })
-        dispatch({ type: 'SET_POSITIONS', payload: json.positions })
         dispatch({ type: 'LOGIN' })
         success = true
       } else {

frontend/vercel.json

@@ -0,0 +1,3 @@
+{
+    "installCommand": "npm install --force --include=optional sharp"
+}