update username logic

Author: felixevers

backend/api/context.py

@@ -48,18 +48,18 @@ async def get_context(
             if not db_user:
                 db_user = User(
                     id=user_id,
-                    name=username,
+                    username=username,
                     firstname=firstname,
                     lastname=lastname,
                     title="User",
                 )
                 session.add(db_user)
             elif (
-                db_user.name != username
+                db_user.username != username
                 or db_user.firstname != firstname
                 or db_user.lastname != lastname
             ):
-                db_user.name = username
+                db_user.username = username
                 db_user.firstname = firstname
                 db_user.lastname = lastname
 

backend/api/types/user.py

@@ -11,12 +11,18 @@
 @strawberry.type
 class UserType:
     id: strawberry.ID
-    name: str
+    username: str
     firstname: str | None
     lastname: str | None
     title: str | None
     avatar_url: str | None
 
+    @strawberry.field
+    def name(self) -> str:
+        if self.firstname and self.lastname:
+            return f"{self.firstname} {self.lastname}"
+        return self.username
+
     @strawberry.field
     async def tasks(
         self,

backend/auth.py

@@ -2,7 +2,13 @@
 from typing import Any, Optional
 
 import requests
-from config import CLIENT_ID, FRONTEND_CLIENT_ID, ISSUER_URI, LOGGER, PUBLIC_ISSUER_URI
+from config import (
+    CLIENT_ID,
+    FRONTEND_CLIENT_ID,
+    ISSUER_URI,
+    LOGGER,
+    PUBLIC_ISSUER_URI,
+)
 from fastapi import Request
 from fastapi.responses import RedirectResponse
 from jose import jwk, jwt
@@ -95,7 +101,7 @@ def verify_token(token: str) -> dict:
         elif aud is None:
             aud = []
 
-        if azp and azp == CLIENT_ID or azp == FRONTEND_CLIENT_ID:
+        if (azp and azp == CLIENT_ID) or azp == FRONTEND_CLIENT_ID:
             return payload
 
         if CLIENT_ID in aud or FRONTEND_CLIENT_ID in aud:

…/versions/92aad7cc3186_initial_models.py …ase/migrations/versions/ac24ef41bd41_.pybackend/database/migrations/versions/92aad7cc3186_initial_models.py renamed to backend/database/migrations/versions/ac24ef41bd41_.py backend/database/migrations/versions/92aad7cc3186_initial_models.py renamed to backend/database/migrations/versions/ac24ef41bd41_.py

@@ -1,8 +1,8 @@
-"""Initial models
+"""empty message
 
-Revision ID: 92aad7cc3186
+Revision ID: ac24ef41bd41
 Revises: 
-Create Date: 2025-12-01 02:36:26.250686
+Create Date: 2025-12-12 19:00:58.216109
 
 """
 from typing import Sequence, Union
@@ -12,7 +12,7 @@
 
 
 # revision identifiers, used by Alembic.
-revision: str = '92aad7cc3186'
+revision: str = 'ac24ef41bd41'
 down_revision: Union[str, Sequence[str], None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
@@ -41,7 +41,7 @@ def upgrade() -> None:
     )
     op.create_table('users',
     sa.Column('id', sa.String(), nullable=False),
-    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('username', sa.String(), nullable=False),
     sa.Column('firstname', sa.String(), nullable=True),
     sa.Column('lastname', sa.String(), nullable=True),
     sa.Column('title', sa.String(), nullable=True),

backend/database/models/user.py

@@ -19,7 +19,7 @@ class User(Base):
         primary_key=True,
         default=lambda: str(uuid.uuid4()),
     )
-    name: Mapped[str] = mapped_column(String)
+    username: Mapped[str] = mapped_column(String, nullable=False)
     firstname: Mapped[str | None] = mapped_column(String, nullable=True)
     lastname: Mapped[str | None] = mapped_column(String, nullable=True)
     title: Mapped[str | None] = mapped_column(String, nullable=True)