feat: Adding constraints for multiple auth methods (#531)

backend/alembic/versions/6f14afa8ea47_update_auth_models.py

@@ -0,0 +1,58 @@
+"""Update User and OAuthAccount models
+
+Revision ID: 6f14afa8ea47
+Revises: 397feb4e1315
+Create Date: 2024-02-19 17:43:45.473226+01:00
+
+"""
+import fastapi_users_db_sqlalchemy.generics  # noqa
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "6f14afa8ea47"
+down_revision = "397feb4e1315"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "caseinfo",
+        "diseases",
+        existing_type=postgresql.JSONB(astext_type=sa.Text()),
+        type_=sa.JSON(),
+        existing_nullable=True,
+    )
+    op.alter_column(
+        "caseinfo",
+        "hpo_terms",
+        existing_type=postgresql.JSONB(astext_type=sa.Text()),
+        type_=sa.JSON(),
+        existing_nullable=True,
+    )
+    op.create_unique_constraint(None, "oauth_account", ["oauth_name", "user_id"])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, "oauth_account", type_="unique")
+    op.alter_column(
+        "caseinfo",
+        "hpo_terms",
+        existing_type=sa.JSON(),
+        type_=postgresql.JSONB(astext_type=sa.Text()),
+        existing_nullable=True,
+    )
+    op.alter_column(
+        "caseinfo",
+        "diseases",
+        existing_type=sa.JSON(),
+        type_=postgresql.JSONB(astext_type=sa.Text()),
+        existing_nullable=True,
+    )
+    # ### end Alembic commands ###

backend/app/models/user.py

@@ -4,7 +4,7 @@
     SQLAlchemyBaseOAuthAccountTableUUID,
     SQLAlchemyBaseUserTableUUID,
 )
-from sqlalchemy import BigInteger, String
+from sqlalchemy import BigInteger, String, UniqueConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from app.db.base import Base
@@ -14,6 +14,12 @@
 
 
 class OAuthAccount(SQLAlchemyBaseOAuthAccountTableUUID, Base):
+    """Base OAuth account table definition."""
+
+    __tablename__ = "oauth_account"
+
+    __table_args__ = (UniqueConstraint("oauth_name", "user_id"),)
+
     if TYPE_CHECKING:  # pragma: no cover
         access_token: str
         refresh_token: Optional[str]

backend/app/schemas/user.py

@@ -30,4 +30,9 @@ class UserCreate(schemas.BaseUserCreate):
 
 
 class UserUpdate(schemas.BaseUserUpdate):
-    pass
+    """Model to use for updateing users.
+
+    We expose the public OAuth account information.
+    """
+
+    oauth_accounts: typing.List[PublicOAuthAccount] = []