Merge pull request #12 from TheJacksonLaboratory/G3-109-implement-the…

…-register-sso-user-in-the-geneweaver-db-package

G3 109 implement the register sso user in the geneweaver db package

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geneweaver-api"
-version = "0.0.1a5"
+version = "0.0.1a6"
 description = "description"
 authors = ["Jax Computational Sciences <cssc@jax.org>"]
 packages = [
@@ -10,10 +10,10 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.9"
 
-geneweaver-core = "^0.8.0a0"
+geneweaver-core = "^0.8.0a1"
 fastapi = {extras = ["all"], version = "^0.99.1"}
 uvicorn = {extras = ["standard"], version = "^0.24.0"}
-geneweaver-db = "^0.2.0a0"
+geneweaver-db = "^0.2.1a2"
 psycopg-pool = "^3.1.7"
 requests = "^2.31.0"
 python-jose = {extras = ["cryptography"], version = "^3.3.0"}

src/geneweaver/api/core/exceptions.py

@@ -10,6 +10,14 @@ def __init__(self, **kwargs) -> None:  # noqa: ANN003
         super().__init__(401, **kwargs)
 
 
+class AuthenticationMismatch(HTTPException):
+    """Exception for mismatched authentication."""
+
+    def __init__(self, **kwargs) -> None:  # noqa: ANN003
+        """Initialize the exception."""
+        super().__init__(401, **kwargs)
+
+
 class Auth0UnauthorizedException(HTTPException):
     """Exception for unauthorized requests."""
 

src/geneweaver/api/dependencies.py

@@ -5,8 +5,9 @@
 import psycopg
 from fastapi import Depends
 from geneweaver.api.core.config import settings
+from geneweaver.api.core.exceptions import AuthenticationMismatch
 from geneweaver.api.core.security import Auth0, UserInternal
-from geneweaver.db.user import by_sso_id
+from geneweaver.db import user as db_user
 from psycopg.rows import dict_row
 
 auth = Auth0(
@@ -30,6 +31,21 @@ def full_user(
     cursor: Cursor = Depends(cursor),
     user: UserInternal = Depends(auth.get_user_strict),
 ) -> UserInternal:
-    """Get the full user object."""
-    user.id = by_sso_id(cursor, user.sso_id)[0]["usr_id"]
+    """Get the full user object.""" ""
+    try:
+        user.id = db_user.by_sso_id_and_email(cursor, user.sso_id, user.email)[0][
+            "usr_id"
+        ]
+    except IndexError as e:
+        if db_user.sso_id_exists(cursor, user.sso_id):
+            raise AuthenticationMismatch(
+                detail="Email and SSO ID Mismatch. Please contact and administrator."
+            ) from e
+        elif db_user.email_exists(cursor, user.email):
+            user.id = db_user.link_user_id_with_sso_id(cursor, user.id, user.sso_id)
+        else:
+            user.id = db_user.create_sso_user(
+                cursor, user.name, user.email, user.sso_id
+            )
+
     yield user