Merge branch 'dev' of https://github.com/wafflestudio/23-5-team9-server into dev

Author: xeavveed

.env.dev.example

@@ -1,3 +1,4 @@
+ENV=dev
 DB_DIALECT=mysql
 DB_DRIVER=aiomysql
 DB_HOST=127.0.0.1
@@ -10,7 +11,7 @@ DB_DATABASE=
 GOOGLE_CLIENT_ID=local
 GOOGLE_CLIENT_SECRET=local
 
-FRONTEND_URL=http://localhost:3000
+FRONTEND_URL=https://wafflestudio.github.io/23-5-team9-web
 
 ACCESS_TOKEN_SECRET=local_access_secret_please_change
 REFRESH_TOKEN_SECRET=local_refresh_secret_please_change

.env.local.example

@@ -0,0 +1,14 @@
+ENV=local
+DB_DIALECT=mysql
+DB_DRIVER=aiomysql
+DB_HOST=localhost
+DB_PORT=3306
+DB_USER=
+DB_PASSWORD=
+DB_DATABASE=
+ACCESS_TOKEN_SECRET=
+REFRESH_TOKEN_SECRET=
+SESSION_SECRET=
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+FRONTEND_URL=http://localhost:8080

.env.prod.example

@@ -1,3 +1,4 @@
+ENV=prod
 DB_DIALECT=mysql
 DB_DRIVER=aiomysql
 DB_HOST=

.github/workflows/publish-ghcr.yml

@@ -72,6 +72,7 @@ jobs:
               AT_SECRET="${{ secrets.ACCESS_TOKEN_SECRET_DEV }}"
               RT_SECRET="${{ secrets.REFRESH_TOKEN_SECRET_DEV }}"
               SESS_SECRET="${{ secrets.SESSION_SECRET_DEV }}"
+              ENV_VAR="dev"
             else
               ENV_FILE=".env.prod"
               DB_USER="${{ secrets.DB_USER_PROD }}"
@@ -81,9 +82,11 @@ jobs:
               AT_SECRET="${{ secrets.ACCESS_TOKEN_SECRET_PROD }}"
               RT_SECRET="${{ secrets.REFRESH_TOKEN_SECRET_PROD }}"
               SESS_SECRET="${{ secrets.SESSION_SECRET_PROD }}"
+              ENV_VAR="prod"
             fi
 
             cat > $ENV_FILE <<EOF
+            ENV=$ENV_VAR
             DB_DIALECT=${{ secrets.DB_DIALECT }}
             DB_DRIVER=${{ secrets.DB_DRIVER }}
             DB_HOST=${{ secrets.DB_HOST }}

carrot/api.py

@@ -2,10 +2,13 @@
 
 from carrot.app.auth.router import auth_router
 from carrot.app.user.router import user_router
-from carrot.app.region.router import region_router
+from carrot.app.chat.router import chat_router
+# from carrot.app.chat.websocket import chat_ws_router
 
 api_router = APIRouter()
 
 api_router.include_router(auth_router, prefix="/auth", tags=["auth"])
 api_router.include_router(user_router, prefix="/user", tags=["user"])
-api_router.include_router(region_router, prefix="/region", tags=["region"])
+api_router.include_router(chat_router, prefix="/chat", tags=["chat"])
+# api_router.include_router(chat_ws_router, prefix="/ws", tags=["chat"])
+

carrot/app/auth/router.py

@@ -1,6 +1,6 @@
 from typing import Annotated
 
-from fastapi import APIRouter, Depends, Header, HTTPException, status
+from fastapi import APIRouter, Depends, Header, HTTPException, logger, status
 from fastapi.responses import RedirectResponse
 from starlette.requests import Request
 
@@ -9,6 +9,7 @@
 from carrot.app.auth.schemas import TokenResponse, UserSigninRequest
 from carrot.app.auth.services import AuthService
 from carrot.app.auth.settings import AUTH_SETTINGS
+from carrot.settings import SETTINGS
 
 auth_router = APIRouter()
 
@@ -59,22 +60,40 @@ async def delete_token(
 google: StarletteOAuth2App = oauth.create_client("google")  # type: ignore
 
 
-@auth_router.get("/oauth2/login/google", status_code=status.HTTP_200_OK)
+def get_redirect_uri(request: Request) -> str:
+    uri_obj = request.url_for("receive_code")
+
+    if not SETTINGS.is_local:
+        uri_obj = uri_obj.replace(scheme="https")  # nginx changes scheme to https
+
+    return str(uri_obj)
+
+
+@auth_router.get("/oauth2/login/google", status_code=status.HTTP_307_TEMPORARY_REDIRECT)
 async def get_redirect_url(request: Request):
-    redirect_uri = str(request.url_for("receive_code"))
+    redirect_uri = get_redirect_uri(request)
     auth_data = await google.create_authorization_url(redirect_uri)
     google_auth_url = auth_data.get("url")
+
+    if google_auth_url is None:
+        logger.logger.error("Google OAuth URL generation failed: URL is None")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="구글 로그인 초기화에 실패했습니다.",
+        )
+
     await google.save_authorize_data(request, **auth_data)
     # print(f"DEBUG SESSION: {request.session}")
-    return {"redirect_url": google_auth_url}
+    return RedirectResponse(google_auth_url)
+    # return {"redirect_url": google_auth_url}
 
 
 @auth_router.get("/oauth2/code/google")
 async def receive_code(
     request: Request,
     auth_service: Annotated[AuthService, Depends()],
 ):
-    redirect_uri = str(request.url_for("receive_code"))
+    redirect_uri = get_redirect_uri(request)
 
     try:
         token = await google.authorize_access_token(request, redirect_uri=redirect_uri)

carrot/app/auth/services.py

@@ -142,7 +142,6 @@ async def get_current_user_from_token(self, token: str, db: AsyncSession) -> Use
             username = claims.get("sub")
             if not username:
                 raise UnauthenticatedException()
-
         except (InvalidTokenException, JoseError):
             # 검증 함수에서 발생한 예외나 Jose 관련 에러를 인증 예외로 변환
             raise UnauthenticatedException()
@@ -153,5 +152,5 @@ async def get_current_user_from_token(self, token: str, db: AsyncSession) -> Use
 
         if user is None:
             raise UnauthenticatedException()
-
+            
         return user

carrot/app/auth/settings.py

@@ -1,3 +1,4 @@
+from urllib.parse import urlparse
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from carrot.settings import SETTINGS
 
@@ -7,6 +8,11 @@ class AuthSettings(BaseSettings):
     GOOGLE_CLIENT_SECRET: str
     FRONTEND_URL: str
 
+    @property
+    def ALLOW_ORIGIN(self) -> str:
+        parsed = urlparse(self.FRONTEND_URL)
+        return f"{parsed.scheme}://{parsed.netloc}"
+
     ACCESS_TOKEN_SECRET: str
     REFRESH_TOKEN_SECRET: str
     SESSION_SECRET: str

carrot/app/auth/utils.py

@@ -122,4 +122,4 @@ async def login_with_header_optional(
     if user.status != UserStatus.ACTIVE:
         raise OnboardingException()
 
-    return user
+    return user

carrot/app/chat/chat_manager.py

@@ -0,0 +1,27 @@
+# from fastapi import WebSocket
+# from collections import defaultdict
+
+# class ConnectionManager:
+#     def __init__(self):
+#         # 방 ID별로 연결된 소켓 리스트 관리 {room_id: [ws1, ws2, ...]}
+#         self.active_connections: dict[str, list[WebSocket]] = defaultdict(list)
+
+#     async def connect(self, websocket: WebSocket, room_id: str):
+#         await websocket.accept()
+#         self.active_connections[room_id].append(websocket)
+
+#     def disconnect(self, websocket: WebSocket, room_id: str):
+#         if websocket in self.active_connections[room_id]:
+#             self.active_connections[room_id].remove(websocket)
+#         if not self.active_connections[room_id]:
+#             del self.active_connections[room_id]
+
+#     async def send_personal_message(self, message: dict, websocket: WebSocket):
+#         await websocket.send_json(message)
+
+#     async def broadcast_to_room(self, room_id: str, message: dict):
+#         # 해당 방에 접속 중인 모든 클라이언트에게 메시지 전송
+#         for connection in self.active_connections.get(room_id, []):
+#             await connection.send_json(message)
+
+# manager = ConnectionManager()