remove null constraint on username

distributed-system-analysis · Feb 28, 2023 · d57075a · d57075a
1 parent 6c49612
commit d57075a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/pbench/server/auth/auth.py b/lib/pbench/server/auth/auth.py
@@ -204,7 +204,7 @@ def verify_auth_oidc(auth_token: str) -> Optional[User]:
     else:
         # Extract what we want to cache from the access token
         user_id = token_payload["sub"]
-        username = token_payload.get("preferred_username")
+        username = token_payload.get("preferred_username", user_id)
         audiences = token_payload.get("resource_access", {})
         pb_aud = audiences.get(oidc_client.client_id, {})
         roles = pb_aud.get("roles", [])

diff --git a/lib/pbench/server/database/models/users.py b/lib/pbench/server/database/models/users.py
@@ -64,7 +64,7 @@ class User(Database.Base):
     __tablename__ = "users"
 
     id = Column(String(255), primary_key=True)
-    username = Column(String(255), unique=True, nullable=True)
+    username = Column(String(255), unique=True, nullable=False)
     dataset_metadata = relationship(
         "Metadata", back_populates="user", cascade="all, delete-orphan"
     )