Change cookies' attributes

Author: mmahdigh

.gitignore

@@ -5,7 +5,7 @@
 
 # Envs
 
-.env
+.env*
 
 # Logs
 logs

.staging.env

@@ -48,11 +48,11 @@ export class AuthController {
     // expire the token from the db because the expiration time of the tokens are rather long
     res.clearCookie('auth', {
       httpOnly: true,
-      sameSite: process.env.NODE_ENV === 'staging' ? 'none' : 'lax',
+      // sameSite: process.env.NODE_ENV === 'staging' ? 'none' : 'lax',
       domain:
-        process.env.NODE_ENV === 'staging'
-          ? 'pairwise.iran.liara.run'
-          : undefined,
+        process.env.NODE_ENV === 'development'
+          ? undefined
+          : 'pairwise.generalmagic.io',
       secure: true,
     });
     res.send('Logged out.');
@@ -92,11 +92,11 @@ export class AuthController {
 
     res.cookie('auth', nonce, {
       httpOnly: true,
-      sameSite: process.env.NODE_ENV === 'staging' ? 'none' : 'lax',
+      // sameSite: process.env.NODE_ENV === 'staging' ? 'none' : 'lax',
       domain:
-        process.env.NODE_ENV === 'staging'
-          ? 'pairwise.iran.liara.run'
-          : undefined,
+        process.env.NODE_ENV === 'development'
+          ? undefined
+          : 'pairwise.generalmagic.io',
       secure: true,
       expires: new Date(Date.now() + this.authService.TokenExpirationDuration),
     });

src/auth/auth.controller.ts

@@ -93,84 +93,4 @@ export class AuthService {
       return false;
     }
   };
-
-  // async login(
-  //   email: string,
-  //   password: string,
-  //   twoFAToken?: string,
-  // ): Promise<UserAuthToken> {
-  //   const user = await this.usersService.findOne({
-  //     where: { email },
-  //     include: { artist: true },
-  //   });
-
-  //   if (!user) {
-  //     throw new NotFoundException(`No user found for email: ${email}`);
-  //   }
-
-  //   if (user.status === UserStatus.RESTRICTED) {
-  //     throw new UnauthorizedException('Your account is inactive');
-  //   } else if (user.status === UserStatus.DELETED) {
-  //     throw new UnauthorizedException('Your account is deleted');
-  //   }
-
-  //   const passwordValid = await Utils.validatePassword(password, user.password);
-
-  //   if (user.twoFASecret) {
-  //     if (!twoFAToken) {
-  //       throw new UnauthorizedException('Two factor authentication required');
-  //     } else {
-  //       if (!this.isTwoFACodeValid(twoFAToken, user)) {
-  //         throw new BadRequestException(
-  //           'Invalid two factor authentication token',
-  //         );
-  //       }
-  //     }
-  //   }
-
-  //   if (!passwordValid) {
-  //     throw new BadRequestException('Invalid password');
-  //   }
-
-  //   if (isEmailNotVerified(user.status)) {
-  //     await this.requestEmailVerification(email);
-  //   }
-
-  //   return {
-  //     ...this.generateTokens({
-  //       user_id: user.id,
-  //     }),
-  //     user,
-  //   };
-  // }
-
-  // getUserFromToken(token: string): Promise<User> {
-  //   const decodedToken = this.jwtService.decode(token);
-
-  //   if (!decodedToken) {
-  //     throw new BadRequestException('Invalid token');
-  //   }
-
-  //   return this.usersService.findOne({
-  //     where: { id: decodedToken['user_id'] },
-  //     include: { artist: true },
-  //   });
-  // }
-
-  // private generateAccessToken(payload: { user_id: string }): string {
-  //   const securityConfig = this.configService.get<SecurityConfig>('security');
-  //   // TODO: Check if this is how to do this. This doesn't match the template
-  //   return this.jwtService.sign(payload, {
-  //     secret: securityConfig.jwt_access_secret,
-  //     expiresIn: securityConfig.expiresIn,
-  //   });
-  // }
-
-  // private generateRefreshToken(payload: { user_id: string }): string {
-  //   const securityConfig = this.configService.get<SecurityConfig>('security');
-  //   return this.jwtService.sign(payload, {
-  //     secret: securityConfig.jwt_refresh_secret,
-  //     expiresIn: securityConfig.refreshIn,
-  //   });
-  // }
 }

src/auth/auth.service.ts

@@ -86,10 +86,10 @@ export class FlowController {
       pairs = await this.flowService.getCollectionPairs(
         userId,
         collectionId,
-        3,
+        1,
       );
     else if (collectionId && type === 'project')
-      pairs = await this.flowService.getProjectPairs(userId, collectionId, 3);
+      pairs = await this.flowService.getProjectPairs(userId, collectionId, 1);
     else pairs = [] as any;
 
     return pairs;