Compare commits

...

4 commits

Author SHA1 Message Date
Trenten Vollmer
577df13f16 fix: correct proxy for host 2024-11-12 15:19:23 -05:00
Trenten Vollmer
42dd32eed4 fix: redid email verification endpoint
fix: corrected api prefix
2024-11-12 15:14:40 -05:00
9689a328b9 Merge branch 'main' of github.com:WaterWolfDev/waterwolf-auth 2024-11-12 09:38:58 -05:00
5e595c21e2 fix: properly proxy the websocket for the frontend dev 2024-11-12 09:38:55 -05:00
3 changed files with 22 additions and 34 deletions

View file

@ -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 { AuthService } from '../services/auth.service';
import { ForgotPasswordDto } from '../dto/forgotPassword.dto'; import { ForgotPasswordDto } from '../dto/forgotPassword.dto';
import { CreateUserDto } from '../dto/register.dto'; import { CreateUserDto } from '../dto/register.dto';
import { LoginUserDto } from '../dto/loginUser.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 { Response, Request } from 'express';
import { LoginResponse } from '../dto/loginResponse.dto'; import { LoginResponse } from '../dto/loginResponse.dto';
@ -48,34 +46,18 @@ export class AuthController {
return await this.authService.sendVerificationEmail(body.email); return await this.authService.sendVerificationEmail(body.email);
} }
// ==== Render pages ==== //
@Get('verify-email') @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) { 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 { try {
await this.authService.markEmailVerified(code); 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' };
}
} }
} }

View file

@ -14,14 +14,7 @@ async function bootstrap() {
app.disable('x-powered-by'); app.disable('x-powered-by');
app.setGlobalPrefix('api', { 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({ app.enableVersioning({

View file

@ -27,6 +27,8 @@ http {
resolver 127.0.0.11 valid=30s; # Docker DNS resolver 127.0.0.11 valid=30s; # Docker DNS
proxy_pass http://host.docker.internal:3001/api/; # Local back end proxy_pass http://host.docker.internal:3001/api/; # Local back end
proxy_redirect default; proxy_redirect default;
proxy_set_header Host $host;
} }
#OIDC Provider #OIDC Provider
@ -34,6 +36,9 @@ http {
resolver 127.0.0.11 valid=30s; # Docker DNS resolver 127.0.0.11 valid=30s; # Docker DNS
proxy_pass http://host.docker.internal:3001/oidc/; # Local back end proxy_pass http://host.docker.internal:3001/oidc/; # Local back end
proxy_redirect default; proxy_redirect default;
#Needed for Host File
proxy_set_header Host $host;
} }
#Frontend Next.js App #Frontend Next.js App
@ -41,6 +46,14 @@ http {
resolver 127.0.0.11 valid=30s; # Docker DNS resolver 127.0.0.11 valid=30s; # Docker DNS
proxy_pass http://host.docker.internal:3000/; # Local back end proxy_pass http://host.docker.internal:3000/; # Local back end
proxy_redirect default; 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;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $host;
} }
} }
} }