From 06acfb8aab7c155ea809905730dcd293d42a5ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20M?= <jeremy.magrin@gmail.com>
Date: Thu, 22 Jun 2023 15:15:04 +0200
Subject: [PATCH] fix: token expires in not set properly (#357)

---
 .../src/core/auth/services/token.service.ts   | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/server/src/core/auth/services/token.service.ts b/server/src/core/auth/services/token.service.ts
index 2e35a2195..ce82bbee7 100644
--- a/server/src/core/auth/services/token.service.ts
+++ b/server/src/core/auth/services/token.service.ts
@@ -25,10 +25,9 @@ export class TokenService {
   ) {}
 
   async generateAccessToken(userId: string): Promise<TokenEntity> {
-    const expires = this.configService.get<string>('ACCESS_TOKEN_EXPIRES_IN');
-    assert(expires, '', InternalServerErrorException);
-    const expiresIn = ms(expires);
-    const expiresAt = addMilliseconds(new Date().getTime(), expiresIn);
+    const expiresIn = this.configService.get<string>('ACCESS_TOKEN_EXPIRES_IN');
+    assert(expiresIn, '', InternalServerErrorException);
+    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
 
     const user = await this.prismaService.user.findUnique({
       where: { id: userId },
@@ -58,10 +57,11 @@ export class TokenService {
 
   async generateRefreshToken(userId: string): Promise<TokenEntity> {
     const secret = this.configService.get('REFRESH_TOKEN_SECRET');
-    const expires = this.configService.get<string>('REFRESH_TOKEN_EXPIRES_IN');
-    assert(expires, '', InternalServerErrorException);
-    const expiresIn = ms(expires);
-    const expiresAt = addMilliseconds(new Date().getTime(), expiresIn);
+    const expiresIn = this.configService.get<string>(
+      'REFRESH_TOKEN_EXPIRES_IN',
+    );
+    assert(expiresIn, '', InternalServerErrorException);
+    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
 
     const refreshTokenPayload = {
       userId,
@@ -88,10 +88,9 @@ export class TokenService {
 
   async generateLoginToken(email: string): Promise<TokenEntity> {
     const secret = this.configService.get('LOGIN_TOKEN_SECRET');
-    const expires = this.configService.get<string>('LOGIN_TOKEN_EXPIRES_IN');
-    assert(expires, '', InternalServerErrorException);
-    const expiresIn = ms(expires);
-    const expiresAt = addMilliseconds(new Date().getTime(), expiresIn);
+    const expiresIn = this.configService.get<string>('LOGIN_TOKEN_EXPIRES_IN');
+    assert(expiresIn, '', InternalServerErrorException);
+    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
     const jwtPayload = {
       sub: email,
     };