add profile type in google login callback request

wafflestudio · Feb 4, 2025 · 7fa49bf · 7fa49bf
1 parent 9b7f299
commit 7fa49bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/oauth/views.py b/oauth/views.py
@@ -29,16 +29,19 @@ class GoogleLoginCallback(APIView):
 
     def get(self, request, *args, **kwargs):
         code = request.GET.get("code")
+        profile = request.GET.get("profile")
 
         if not code:
             return Response({"error": "Authorization code not provided"}, status=status.HTTP_400_BAD_REQUEST)
+        if not profile:
+            return Response({"error": "Profile not provided"}, status=status.HTTP_400_BAD_REQUEST)
 
         token_url = "https://oauth2.googleapis.com/token"
         payload = {
             "code": code,
             "client_id": settings.GOOGLE_OAUTH_CLIENT_ID,
             "client_secret": settings.GOOGLE_OAUTH_CLIENT_SECRET,
-            "redirect_uri": settings.GOOGLE_OAUTH_CALLBACK_URL,
+            "redirect_uri": settings.GOOGLE_OAUTH_CALLBACK_URLS[profile],
             "grant_type": "authorization_code",
         }
 

diff --git a/wemade_2024_server/settings.py b/wemade_2024_server/settings.py
@@ -164,7 +164,7 @@
 # Google OAuth
 GOOGLE_OAUTH_CLIENT_ID = os.getenv("GOOGLE_OAUTH_CLIENT_ID")
 GOOGLE_OAUTH_CLIENT_SECRET = os.getenv("GOOGLE_OAUTH_CLIENT_SECRET")
-GOOGLE_OAUTH_CALLBACK_URL = os.getenv("GOOGLE_OAUTH_CALLBACK_URL")
+GOOGLE_OAUTH_CALLBACK_URLS = {"prod": os.getenv("GOOGLE_OAUTH_CALLBACK_URL_PROD"), "dev": os.getenv("GOOGLE_OAUTH_CALLBACK_URL_DEV"), "local": os.getenv("GOOGLE_OAUTH_CALLBACK_URL_LOCAL")}
 
 SOCIALACCOUNT_PROVIDERS = {
     "google": {