Merge pull request #35 from Sheldenburg/bug/fix-names-in-settings

fix the var names in settings

Author: Sheldenburg

.github/workflows/db-migration.yml

@@ -24,6 +24,7 @@ jobs:
       GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }}
       GH_CLIENT_ID: ${{ secrets.GH_CLIENT_ID }}
       GH_CLIENT_SECRET: ${{ secrets.GH_CLIENT_SECRET }}
+      OAUTH_REDIRECT_URI: ${{ secrets.OAUTH_REDIRECT_URI }}
 
     steps:
       - name: Checkout code

.github/workflows/fastapi-to-gcr.yml

@@ -43,6 +43,6 @@ jobs:
           gcloud run deploy $SERVICE_NAME \
             --image ${{ env.DOCKER_IMAGE_URL }}:latest \
             --platform managed \
-            --set-env-vars POSTGRES_SERVER=${{ secrets.POSTGRES_SERVER }},POSTGRES_PORT=${{ secrets.POSTGRES_PORT }},POSTGRES_DB=${{ secrets.POSTGRES_DB }},POSTGRES_USER=${{ secrets.POSTGRES_USER }},POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }},ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }},PROJECT_NAME=${{ env.PROJECT_ID }},FIRST_SUPERUSER=${{ secrets.FIRST_SUPERUSER }},FIRST_SUPERUSER_PASSWORD=${{ secrets.FIRST_SUPERUSER_PASSWORD }},USERS_OPEN_REGISTRATION=${{ env.USERS_OPEN_REGISTRATION }},GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }},GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }},GOOGLE_REDIRECT_URI=${{ secrets.GOOGLE_REDIRECT_URI }},GH_CLIENT_ID=${{ secrets.GH_CLIENT_ID }},GH_CLIENT_SECRET=${{ secrets.GH_CLIENT_SECRET }} \
+            --set-env-vars POSTGRES_SERVER=${{ secrets.POSTGRES_SERVER }},POSTGRES_PORT=${{ secrets.POSTGRES_PORT }},POSTGRES_DB=${{ secrets.POSTGRES_DB }},POSTGRES_USER=${{ secrets.POSTGRES_USER }},POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }},ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }},PROJECT_NAME=${{ env.PROJECT_ID }},FIRST_SUPERUSER=${{ secrets.FIRST_SUPERUSER }},FIRST_SUPERUSER_PASSWORD=${{ secrets.FIRST_SUPERUSER_PASSWORD }},USERS_OPEN_REGISTRATION=${{ env.USERS_OPEN_REGISTRATION }},GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }},GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }},GOOGLE_REDIRECT_URI=${{ secrets.GOOGLE_REDIRECT_URI }},GH_CLIENT_ID=${{ secrets.GH_CLIENT_ID }},GH_CLIENT_SECRET=${{ secrets.GH_CLIENT_SECRET }},OAUTH_REDIRECT_URI=${{ secrets.OAUTH_REDIRECT_URI }} \
             --region australia-southeast1 \
             --allow-unauthenticated

backend/src/app/api/routes/login.py

@@ -171,7 +171,7 @@ def google_oauth(session: SessionDep, code: str, response: Response):
     user = crud.get_user_by_email(session=session, email=user_info["email"])
     access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
     if user:
-        response = RedirectResponse("http://localhost:3000/dashboard")
+        response = RedirectResponse(settings.OAUTH_REDIRECT_URI)
         response.set_cookie(
             key="access_token",
             value=security.create_access_token(
@@ -199,7 +199,7 @@ def google_oauth(session: SessionDep, code: str, response: Response):
     )
     user = crud.create_user_oauth(session=session, user_create=user_create)
 
-    response = RedirectResponse("http://localhost:3000/dashboard")
+    response = RedirectResponse(settings.OAUTH_REDIRECT_URI)
     response.set_cookie(
         key="access_token",
         value=security.create_access_token(user.id, expires_delta=access_token_expires),
@@ -214,8 +214,8 @@ def github_oauth(session: SessionDep, code: str, response: Response):
     token_url = "https://github.com/login/oauth/access_token"
     token_data = {
         "code": code,
-        "client_id": settings.GITHUB_CLIENT_ID,
-        "client_secret": settings.GITHUB_CLIENT_SECRET,
+        "client_id": settings.GH_CLIENT_ID,
+        "client_secret": settings.GH_SECRET,
     }
     headers = {"Accept": "application/json"}
 
@@ -241,7 +241,7 @@ def github_oauth(session: SessionDep, code: str, response: Response):
     user = crud.get_user_by_email(session=session, email=user_emails[0]["email"])
     access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
     if user:
-        response = RedirectResponse("http://localhost:3000/dashboard")
+        response = RedirectResponse(settings.OAUTH_REDIRECT_URI)
         response.set_cookie(
             key="access_token",
             value=security.create_access_token(
@@ -269,7 +269,7 @@ def github_oauth(session: SessionDep, code: str, response: Response):
     )
     user = crud.create_user_oauth(session=session, user_create=user_create)
 
-    response = RedirectResponse("http://localhost:3000/dashboard")
+    response = RedirectResponse(settings.OAUTH_REDIRECT_URI)
     response.set_cookie(
         key="access_token",
         value=security.create_access_token(user.id, expires_delta=access_token_expires),

backend/src/app/core/config.py

@@ -125,5 +125,7 @@ def _enforce_non_default_secrets(self) -> Self:
     GH_CLIENT_ID: str
     GH_CLIENT_SECRET: str
 
+    OAUTH_REDIRECT_URI: str
+
 
 settings = Settings()  # type: ignore