Merge pull request #104 from codegasms/experimental-deploy-rollback-bad-commits

rollback experimental dirty work,

Author: aahnik

server/src/auth/auth.controller.ts

@@ -18,7 +18,6 @@ import { UserPermsOutDto } from 'src/users/dto/user-perms-out.dto';
 import { Response } from 'express';
 import { AuthorizedRequest } from './entities/authorized-request.entity';
 import { Throttle } from '@nestjs/throttler';
-import { appConfig } from 'src/config';
 
 @Throttle({ default: { limit: 2, ttl: 60000 } })
 @ApiTags('auth')
@@ -34,9 +33,9 @@ export class AuthController {
   ) {
     const token = await this.service.login(loginDto.email, loginDto.password);
     res.cookie('accessToken', token.access_token, {
-      sameSite: 'none',
-      domain: appConfig.frontendDomain,
+      sameSite: 'strict',
     });
+
     return token;
   }
 
@@ -48,8 +47,7 @@ export class AuthController {
   ): Promise<RegisterResponseDto> {
     const token = await this.service.register(registerDto);
     res.cookie('accessToken', token.access_token, {
-      sameSite: 'none',
-      domain: appConfig.frontendDomain,
+      sameSite: 'strict',
     });
     return token;
   }

server/src/config.ts

@@ -23,8 +23,6 @@ export const appConfig = {
     port: parseInt(fromEnv('REDIS_PORT')),
   },
 
-  frontendDomain: fromEnv('FRONTEND_DOMAIN'),
-
   debug: fromEnv('DEBUG', 'false').toLowerCase() === 'true',
 };
 

server/src/oauth/oauth.controller.ts

@@ -9,7 +9,6 @@ import { AuthService } from 'src/auth/auth.service';
 import { OAuthProvider } from 'src/users/dto/find-or-create-user.dto';
 import { Response } from 'express';
 import { oauthConfig } from './config';
-import { appConfig } from 'src/config';
 
 @ApiTags('oauth')
 @Public()
@@ -41,8 +40,7 @@ export class OauthController {
 
     const token = await this.authService.generateJwtToken(user.email);
     res.cookie('accessToken', token, {
-      sameSite: 'none',
-      domain: appConfig.frontendDomain,
+      sameSite: 'strict',
     });
     res.redirect(oauthConfig.frontendUrl);
   }
@@ -66,8 +64,7 @@ export class OauthController {
     });
     const token = await this.authService.generateJwtToken(user.email);
     res.cookie('accessToken', token, {
-      sameSite: 'none',
-      domain: appConfig.frontendDomain,
+      sameSite: 'strict',
     });
     res.redirect(oauthConfig.frontendUrl);
   }