admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: token expires in not set properly (#357)

Browse Source
This commit is contained in:
Jérémy M
2023-06-22 15:15:04 +02:00
committed by GitHub
parent ca283a2196
commit 06acfb8aab
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/src/core/auth/services/token.service.ts
View File

@ -25,10 +25,9 @@ export class TokenService {
) {} ) {}
async generateAccessToken(userId: string): Promise<TokenEntity> { async generateAccessToken(userId: string): Promise<TokenEntity> {
const expires = this.configService.get<string>('ACCESS_TOKEN_EXPIRES_IN'); const expiresIn = this.configService.get<string>('ACCESS_TOKEN_EXPIRES_IN');
assert(expires, '', InternalServerErrorException); assert(expiresIn, '', InternalServerErrorException);
const expiresIn = ms(expires); const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
const expiresAt = addMilliseconds(new Date().getTime(), expiresIn);
const user = await this.prismaService.user.findUnique({ const user = await this.prismaService.user.findUnique({
where: { id: userId }, where: { id: userId },
@ -58,10 +57,11 @@ export class TokenService {
async generateRefreshToken(userId: string): Promise<TokenEntity> { async generateRefreshToken(userId: string): Promise<TokenEntity> {
const secret = this.configService.get('REFRESH_TOKEN_SECRET'); const secret = this.configService.get('REFRESH_TOKEN_SECRET');
const expires = this.configService.get<string>('REFRESH_TOKEN_EXPIRES_IN'); const expiresIn = this.configService.get<string>(
assert(expires, '', InternalServerErrorException); 'REFRESH_TOKEN_EXPIRES_IN',
const expiresIn = ms(expires); );
const expiresAt = addMilliseconds(new Date().getTime(), expiresIn); assert(expiresIn, '', InternalServerErrorException);
const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
const refreshTokenPayload = { const refreshTokenPayload = {
userId, userId,
@ -88,10 +88,9 @@ export class TokenService {
async generateLoginToken(email: string): Promise<TokenEntity> { async generateLoginToken(email: string): Promise<TokenEntity> {
const secret = this.configService.get('LOGIN_TOKEN_SECRET'); const secret = this.configService.get('LOGIN_TOKEN_SECRET');
const expires = this.configService.get<string>('LOGIN_TOKEN_EXPIRES_IN'); const expiresIn = this.configService.get<string>('LOGIN_TOKEN_EXPIRES_IN');
assert(expires, '', InternalServerErrorException); assert(expiresIn, '', InternalServerErrorException);
const expiresIn = ms(expires); const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
const expiresAt = addMilliseconds(new Date().getTime(), expiresIn);
const jwtPayload = { const jwtPayload = {
sub: email, sub: email,
}; };