feat: made handling of timezones

Author: TarasBlatnoi

prisma/migrations/20251103113749_added_timezone_to_user/migration.sql

@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Game" ALTER COLUMN "dices" SET DEFAULT '';
+
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "timezone" TEXT NOT NULL DEFAULT 'UTC';

prisma/schema.prisma

@@ -21,6 +21,8 @@ model User {
     isEmailConfirmed       Boolean @default(false)
     emailConfirmationToken String  @default("")
 
+    timezone String @default("UTC")
+
     requestedBy  Follow[]   @relation("requestedBy")
     requested    Follow[]   @relation("requested")
     sentMessages Message[]  @relation("sentMessages")

src/auth/auth.service.ts

@@ -47,6 +47,7 @@ export class AuthService {
           email: dto.email,
           hash,
           emailConfirmationToken,
+          timezone: dto.timezone,
         },
       });
       this.emailService.sendVerificationEmail(
@@ -58,6 +59,7 @@ export class AuthService {
         id: user.id,
         nickname: user.nickname,
         isEmailConfirmed: user.isEmailConfirmed,
+        timezone: user.timezone,
       };
     } catch (error) {
       if (error instanceof PrismaClientKnownRequestError) {
@@ -87,10 +89,15 @@ export class AuthService {
       throw new ForbiddenException('Password is incorrect');
     }
     const tokens = await this.signTokens(user.id, user.email);
-    await this.updateRtHash(user.id, tokens.refreshToken);
+
+    if (dto.timezone && dto.timezone !== user.timezone) {
+      await this.updateLoginData(user.id, tokens.refreshToken, dto.timezone);
+    } else {
+      await this.updateLoginData(user.id, tokens.refreshToken);
+    }
     return {
       tokens,
-      user: { email: user.email, id: user.id },
+      user: { email: user.email, id: user.id, timezone: user.timezone },
     };
   }
 
@@ -101,6 +108,7 @@ export class AuthService {
       email: userFromDB.email,
       id: userFromDB.id,
       isEmailConfirmed: userFromDB.isEmailConfirmed,
+      timezone: userFromDB.timezone,
     };
   }
 
@@ -127,7 +135,7 @@ export class AuthService {
     if (!rtMatches) throw new ForbiddenException('Rt token does not match');
 
     const tokens = await this.signTokens(user.id, user.email);
-    await this.updateRtHash(user.id, tokens.refreshToken);
+    await this.updateLoginData(user.id, tokens.refreshToken);
     return tokens;
   }
 
@@ -173,9 +181,9 @@ export class AuthService {
     });
 
     const tokens = await this.signTokens(user.id, user.email);
-    await this.updateRtHash(user.id, tokens.refreshToken);
+    await this.updateLoginData(user.id, tokens.refreshToken);
     this.sseService.sendToUser(user.id, { type: 'email_verified' });
-    return { tokens, user: { email: user.email } };
+    return { tokens, user: { email: user.email, timezone: user.timezone } };
   }
 
   async changePassword(
@@ -262,15 +270,20 @@ export class AuthService {
     }
   }
 
-  async updateRtHash(id: string, rt: string) {
+  async updateLoginData(id: string, rt: string, timezone?: string) {
     const hash = await argon2.hash(rt);
+    const updateData = { hashedRt: hash } as {
+      hashedRt: string;
+      timezone?: string;
+    };
+    if (timezone) {
+      updateData.timezone = timezone;
+    }
     await this.userRepository.update({
       where: {
         id,
       },
-      data: {
-        hashedRt: hash,
-      },
+      data: updateData,
     });
   }
 

src/auth/dto/auth.dto.ts

@@ -1,4 +1,4 @@
-import { IsEmail, IsNotEmpty, IsString } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsString, IsTimeZone } from 'class-validator';
 
 export class SignUpDto {
   @IsEmail()
@@ -12,6 +12,10 @@ export class SignUpDto {
   @IsString()
   @IsNotEmpty()
   nickname: string;
+
+  @IsString()
+  @IsTimeZone()
+  timezone: string;
 }
 
 export class SignInDto {
@@ -22,6 +26,10 @@ export class SignInDto {
   @IsString()
   @IsNotEmpty()
   password: string;
+
+  @IsString()
+  @IsTimeZone()
+  timezone: string;
 }
 
 export class ChangePasswordDto {

src/auth/dto/isTimezone.ts

@@ -0,0 +1,30 @@
+import {
+  registerDecorator,
+  ValidationOptions,
+  ValidationArguments,
+} from 'class-validator';
+
+export function IsTimeZone(validationOptions?: ValidationOptions) {
+  return function (object: object, propertyName: string) {
+    registerDecorator({
+      name: 'isTimeZone',
+      target: object.constructor,
+      propertyName,
+      options: validationOptions,
+      validator: {
+        validate(value: any) {
+          if (typeof value !== 'string') return false;
+          try {
+            new Intl.DateTimeFormat('en-US', { timeZone: value });
+            return true;
+          } catch {
+            return false;
+          }
+        },
+        defaultMessage(args: ValidationArguments) {
+          return `${args.property} must be a valid IANA time zone identifier`;
+        },
+      },
+    });
+  };
+}