Merge pull request #80 from CS3219-AY2425S1/ms4-evan/patch-social-oauth

Patch: Redirect page to FE after social oauth

Author: evanyan13

backend/auth-service/src/app.service.ts

@@ -154,7 +154,9 @@ export class AppService {
     }
   }
 
-  public async generateResetPasswordRequest(dto: ResetPasswordRequestDto): Promise<boolean> {
+  public async generateResetPasswordRequest(
+    dto: ResetPasswordRequestDto,
+  ): Promise<boolean> {
     const user = await firstValueFrom(
       this.userClient.send(
         {
@@ -293,13 +295,13 @@ export class AppService {
 
     const [accessToken, refreshToken] = await Promise.all([
       this.jwtService.signAsync(
-      {
-        sub: id,
-        ...rest,
-      },
-      {
-        secret: process.env.JWT_SECRET,
-        expiresIn: '1h', // 1 hour
+        {
+          sub: id,
+          ...rest,
+        },
+        {
+          secret: process.env.JWT_SECRET,
+          expiresIn: '1h', // 1 hour
         },
       ),
       this.jwtService.signAsync(

backend/gateway-service/src/modules/auth/auth.controller.ts

@@ -133,10 +133,14 @@ export class AuthController {
   @Public()
   @Get('google/callback')
   @ApiOkResponse({ description: 'Google auth callback successful' })
-  async googleAuthCallback(@Query('code') code: string) {
-    return await firstValueFrom(
-      this.authClient.send({ cmd: 'google-auth-redirect' }, { code }),
-    );
+  async googleAuthCallback(@Query('code') code: string, @Res() res: Response) {
+    const { access_token: accessToken, refresh_token: refreshToken } =
+      await firstValueFrom(
+        this.authClient.send({ cmd: 'google-auth-redirect' }, { code }),
+      );
+
+    const redirectUrl = `${process.env.FRONTEND_URL}/oauth?accessToken=${accessToken}&refreshToken=${refreshToken}`;
+    res.redirect(redirectUrl);
   }
 
   @Public()
@@ -154,9 +158,13 @@ export class AuthController {
   @Public()
   @Get('github/callback')
   @ApiOkResponse({ description: 'Github auth callback successful' })
-  async githubAuthCallback(@Query('code') code: string) {
-    return await firstValueFrom(
-      this.authClient.send({ cmd: 'github-auth-redirect' }, { code }),
-    );
+  async githubAuthCallback(@Query('code') code: string, @Res() res: Response) {
+    const { access_token: accessToken, refresh_token: refreshToken } =
+      await firstValueFrom(
+        this.authClient.send({ cmd: 'github-auth-redirect' }, { code }),
+      );
+
+    const redirectUrl = `${process.env.FRONTEND_URL}/oauth?accessToken=${accessToken}&refreshToken=${refreshToken}`;
+    res.redirect(redirectUrl);
   }
 }