Merge branch 'main' of git.kakio.us:kakious/waterwolf-auth

apps/backend/src/auth/controllers/auth.controller.ts

@@ -1,12 +1,10 @@
-import { Body, Controller, Get, Post, Query, Render, Req, Res, UseGuards } from '@nestjs/common';
+import { Body, Controller, Get, Post, Query, Req, Res } from '@nestjs/common';
-import { ApiExcludeEndpoint, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { ApiTags } from '@nestjs/swagger';
 
 import { AuthService } from '../services/auth.service';
 import { ForgotPasswordDto } from '../dto/forgotPassword.dto';
 import { CreateUserDto } from '../dto/register.dto';
 import { LoginUserDto } from '../dto/loginUser.dto';
-import { CurrentUser } from '../decorators/user.decorator';
-import { ViewLoginGuard } from '../guard/viewLogin.guard';
 import { Response, Request } from 'express';
 import { LoginResponse } from '../dto/loginResponse.dto';
 
@@ -48,34 +46,18 @@ export class AuthController {
     return await this.authService.sendVerificationEmail(body.email);
   }
 
-  // ==== Render pages ==== //
-
   @Get('verify-email')
-  @UseGuards(ViewLoginGuard)
+  public async verifyEmail(@Query('code') code: string): Promise<any> {
-  @ApiExcludeEndpoint()
-  public async verifyEmail(@Res() response: Response, @Query('code') code: string): Promise<any> {
     if (!code) {
-      return response.render('base/error', {
+      return { error: true, message: 'Invalid Verification Code' };
-        error_header: 'Invalid Verification Code',
-        error_message:
-          'The verification code provided is invalid. Please try sending your verification email again.',
-        button_name: 'Go Back to Login',
-        button_link: '/api/v1/auth/login',
-      });
     }
 
     try {
       await this.authService.markEmailVerified(code);
-    } catch (e) {
-      return response.render('base/error', {
-        error_header: 'Invalid Verification Code',
-        error_message:
-          'The verification code provided is invalid. Please try sending your verification email again.',
-        button_name: 'Go Back to Login',
-        button_link: 'api/v1/auth/login',
-      });
-    }
 
-    response.redirect('/auth/login');
+      return { error: false, message: 'Email Verified' };
+    } catch (e) {
+      return { error: true, message: 'Invalid Verification Code' };
+    }
   }
 }

apps/backend/src/main.ts

@@ -14,14 +14,7 @@ async function bootstrap() {
   app.disable('x-powered-by');
 
   app.setGlobalPrefix('api', {
-    exclude: [
+    exclude: [{ path: 'oidc/:splat*', method: RequestMethod.ALL }],
-      { path: 'auth/login', method: RequestMethod.GET },
-      { path: '', method: RequestMethod.GET },
-      { path: 'auth/login/totp', method: RequestMethod.GET },
-      { path: 'auth/forgot-password', method: RequestMethod.GET },
-      { path: ':oidc*', method: RequestMethod.ALL },
-      { path: ':interaction*', method: RequestMethod.ALL },
-    ],
   });
 
   app.enableVersioning({

configs/nginx-dev.conf

@@ -27,6 +27,8 @@ http {
             resolver 127.0.0.11 valid=30s; # Docker DNS
             proxy_pass http://host.docker.internal:3001/api/; # Local back end
             proxy_redirect default;
+
+            proxy_set_header Host $host;
         }
 
         #OIDC Provider
@@ -34,6 +36,9 @@ http {
             resolver 127.0.0.11 valid=30s; # Docker DNS
             proxy_pass http://host.docker.internal:3001/oidc/; # Local back end
             proxy_redirect default;
+
+            #Needed for Host File
+            proxy_set_header Host $host;
         }
 
         #Frontend Next.js App
@@ -41,6 +46,9 @@ http {
             resolver 127.0.0.11 valid=30s; # Docker DNS
             proxy_pass http://host.docker.internal:3000/; # Local back end
             proxy_redirect default;
+            # Change the host header to the original host
+
+            proxy_set_header Host $host;
 
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;