fix: update google auth

Author: chertik77

app/controllers/auth.controller.ts

@@ -6,10 +6,7 @@ import type {
 } from '@/schemas'
 import type { JwtPayload } from '@/types'
 import type { NextFunction, Request, Response } from 'express'
-import type {
-  TypedRequestBody,
-  TypedRequestQuery
-} from 'zod-express-middleware'
+import type { TypedRequestBody } from 'zod-express-middleware'
 
 import { prisma } from '@/prisma'
 import { hash, verify } from 'argon2'
@@ -95,21 +92,21 @@ class AuthController {
     res.json({ user: userWithoutPassword, ...tokens })
   }
 
-  googleRedirect = async (_: Request, res: Response) => {
+  getGoogleRedirectUrl = async (_: Request, res: Response) => {
     const url = this.googleClient.generateAuthUrl({
       access_type: 'offline',
       scope: ['profile', 'email']
     })
 
-    res.redirect(url)
+    res.json({ redirectUrl: url })
   }
 
   googleCallback = async (
-    req: TypedRequestQuery<typeof GoogleCodeSchema>,
+    req: TypedRequestBody<typeof GoogleCodeSchema>,
     res: Response,
     next: NextFunction
   ) => {
-    const { tokens } = await this.googleClient.getToken(req.query.code)
+    const { tokens } = await this.googleClient.getToken(req.body.code)
 
     if (!tokens.id_token) return next(Forbidden())
 

app/routes/api/auth.ts

@@ -26,11 +26,11 @@ authRouter.post(
   authController.signin
 )
 
-authRouter.post('/google/redirect', authController.googleRedirect)
+authRouter.get('/google/initiate', authController.getGoogleRedirectUrl)
 
-authRouter.get(
+authRouter.post(
   '/google/callback',
-  validateRequest({ query: GoogleCodeSchema }),
+  validateRequest({ body: GoogleCodeSchema }),
   authController.googleCallback
 )
 

swagger.json

@@ -87,41 +87,36 @@
         }
       }
     },
-    "/auth/google/redirect": {
-      "post": {
+    "/auth/google/initiate": {
+      "get": {
         "tags": ["Auth"],
-        "summary": "Redirect to Google for OAuth authentication",
+        "summary": "Get redirect url for Google authentication",
         "responses": {
-          "302": {
-            "headers": {
-              "Location": {
-                "description": "The URL to which the client should be redirected for Google authentication.",
-                "schema": {
-                  "type": "string",
-                  "format": "uri",
-                  "example": "https://accounts.google.com/o/oauth2/v2/auth?access_type=offline&scope=profile%20email&response_type=code&client_id=YOUR_CLIENT_ID&redirect_uri=YOUR_REDIRECT_URI"
-                }
-              }
-            }
-          }
+          "200": { "$ref": "#/components/responses/GoogleInitiateResponse" }
         }
       }
     },
     "/auth/google/callback": {
-      "get": {
+      "post": {
         "tags": ["Auth"],
         "summary": "Handle Google OAuth callback and sign-in/sign-up",
-        "parameters": [
-          {
-            "name": "code",
-            "in": "query",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "example": "4/0AT5xKif_S_..."
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": ["code"],
+                "properties": {
+                  "code": {
+                    "type": "string",
+                    "example": "4/0AT5xKif_S_..."
+                  }
+                }
+              }
             }
           }
-        ],
+        },
         "responses": {
           "200": { "$ref": "#/components/responses/GoogleResponse" },
           "400": { "$ref": "#/components/responses/BadRequestError" },
@@ -1044,6 +1039,22 @@
           }
         }
       },
+      "GoogleInitiateResponse": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object",
+              "properties": {
+                "redirectUrl": {
+                  "type": "string",
+                  "format": "url",
+                  "example": "https://accounts.google.com/o/oauth2/v2/auth?client_id=YOUR_CLIENT_ID&redirect_uri=YOUR_REDIRECT_URI&response_type=code&scope=email%20profile&access_type=offline"
+                }
+              }
+            }
+          }
+        }
+      },
       "GoogleResponse": {
         "content": {
           "application/json": {