[Feat] Auth redirects to client

Made the API login endpoints redirect to the client application. References #17, #21.
fanton-dev · Oct 23, 2021 · 7e73d8c · 7e73d8c
1 parent 2622df4
commit 7e73d8c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 19 deletions.
diff --git a/server/.env.template b/server/.env.template
@@ -1,6 +1,8 @@
 APP_PORT=
 APP_PREFIX=
 
+CLIENT_ROOT=
+
 DATABASE_DRIVER=
 DATABASE_HOST=
 DATABASE_PORT=

diff --git a/server/src/auth/controllers/auth.controller.ts b/server/src/auth/controllers/auth.controller.ts
@@ -6,6 +6,7 @@ import {
   HttpCode,
   HttpStatus,
   Post,
+  Redirect,
   Req,
   Res,
   UseGuards,
@@ -16,10 +17,12 @@ import {
   ApiCookieAuth,
   ApiCreatedResponse,
   ApiForbiddenResponse,
+  ApiMovedPermanentlyResponse,
   ApiOkResponse,
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger';
 import { Request, Response } from 'express';
+import { configObject } from 'src/configuration';
 import AuthError from '../errors/auth.error';
 import { AuthErrorCode } from '../errors/auth.error.code';
 import { AuthDiscordGuard } from '../guards/auth.discord.guard';
@@ -66,24 +69,30 @@ export class AuthController {
 
   @Get('/login/google')
   @HttpCode(HttpStatus.OK)
+  @Redirect(configObject.client.root, HttpStatus.MOVED_PERMANENTLY)
   @UseGuards(AuthGoogleGuard)
-  @ApiOkResponse({ description: 'User logged in.' })
+  @ApiOkResponse({ description: 'Google OAuth screen.' })
+  @ApiMovedPermanentlyResponse({ description: 'User logged in.' })
   getGoogleLogin() {
     return 'OK';
   }
 
   @Get('/login/discord')
   @HttpCode(HttpStatus.OK)
+  @Redirect(configObject.client.root, HttpStatus.MOVED_PERMANENTLY)
   @UseGuards(AuthDiscordGuard)
-  @ApiOkResponse({ description: 'User logged in.' })
+  @ApiOkResponse({ description: 'Discord OAuth screen.' })
+  @ApiMovedPermanentlyResponse({ description: 'User logged in.' })
   getDiscordLogin() {
     return 'OK';
   }
 
   @Get('/login/github')
   @HttpCode(HttpStatus.OK)
+  @Redirect(configObject.client.root, HttpStatus.MOVED_PERMANENTLY)
   @UseGuards(AuthGithubGuard)
-  @ApiOkResponse({ description: 'User logged in.' })
+  @ApiOkResponse({ description: 'GitHub OAuth screen.' })
+  @ApiMovedPermanentlyResponse({ description: 'User logged in.' })
   getGithubLogin() {
     return 'OK';
   }

diff --git a/server/src/configuration.ts b/server/src/configuration.ts
@@ -11,6 +11,9 @@ const configuration = () => ({
     port: parseInt(process.env.APP_PORT || '3000'),
     prefix: process.env.APP_PREFIX || 'api',
   },
+  client: {
+    root: process.env.CLIENT_ROOT,
+  },
   database: {
     type: process.env.DATABASE_DRIVER,
     host: process.env.DATABASE_HOST,

diff --git a/server/types/enviourment.d.ts b/server/types/enviourment.d.ts
@@ -1,35 +1,37 @@
 declare namespace NodeJS {
   export interface ProcessEnv {
-    NODE_ENV: 'development' | 'production';
+    NODE_ENV?: 'development' | 'production';
 
     APP_PORT?: string;
     APP_PREFIX?: string;
 
+    CLIENT_ROOT?: string;
+
     DATABASE_DRIVER?: string;
     DATABASE_HOST?: string;
     DATABASE_PORT?: string;
     DATABASE_USERNAME?: string;
     DATABASE_PASSWORD?: string;
     DATABASE_NAME?: string;
 
-    SESSION_SECRET: string;
+    SESSION_SECRET?: string;
 
-    GOOGLE_CLIENT_ID: string;
-    GOOGLE_CLIENT_SECRET: string;
-    GOOGLE_CALLBACK_API: string;
+    GOOGLE_CLIENT_ID?: string;
+    GOOGLE_CLIENT_SECRET?: string;
+    GOOGLE_CALLBACK_API?: string;
 
-    DISCORD_CLIENT_ID: string;
-    DISCORD_CLIENT_SECRET: string;
-    DISCORD_CALLBACK_API: string;
+    DISCORD_CLIENT_ID?: string;
+    DISCORD_CLIENT_SECRET?: string;
+    DISCORD_CALLBACK_API?: string;
 
-    GITHUB_CLIENT_ID: string;
-    GITHUB_CLIENT_SECRET: string;
-    GITHUB_CALLBACK_URL: string;
+    GITHUB_CLIENT_ID?: string;
+    GITHUB_CLIENT_SECRET?: string;
+    GITHUB_CALLBACK_URL?: string;
 
-    AWS_REGION: string;
-    AWS_ACCESS_KEY_ID: string;
-    AWS_SECRET_ACCESS_KEY: string;
-    AWS_CODE_SNIPPETS_S3_BUCKET: string;
-    AWS_RECORDINGS_S3_BUCKET: string;
+    AWS_REGION?: string;
+    AWS_ACCESS_KEY_ID?: string;
+    AWS_SECRET_ACCESS_KEY?: string;
+    AWS_CODE_SNIPPETS_S3_BUCKET?: string;
+    AWS_RECORDINGS_S3_BUCKET?: string;
   }
 }