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

Fix loginToken and legacy apiToken not working (#8369)

Browse Source
This commit is contained in:
Charles Bochet
2024-11-06 15:56:14 +01:00
committed by GitHub
parent 4b5d096441
commit 278ab4c513
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/twenty-server/src/engine/core-modules/jwt/services/jwt-wrapper.service.ts
View File

@ -59,10 +59,11 @@ export class JwtWrapperService {
} }
try { try {
if (!type && !payload.workspaceId) { // TODO: Deprecate this once old API KEY tokens are no longer in use
if (!payload.type && !payload.workspaceId && type === 'ACCESS') {
return this.jwtService.verify(token, { return this.jwtService.verify(token, {
...options, ...options,
secret: this.generateAppSecretLegacy(type, payload.workspaceId), secret: this.generateAppSecretLegacy(),
}); });
} }
@ -102,10 +103,7 @@ export class JwtWrapperService {
.digest('hex'); .digest('hex');
} }
generateAppSecretLegacy( generateAppSecretLegacy(): string {
type: WorkspaceTokenType,
workspaceId?: string,
): string {
const accessTokenSecret = this.environmentService.get( const accessTokenSecret = this.environmentService.get(
'ACCESS_TOKEN_SECRET', 'ACCESS_TOKEN_SECRET',
); );
@ -114,8 +112,6 @@ export class JwtWrapperService {
throw new Error('ACCESS_TOKEN_SECRET is not set'); throw new Error('ACCESS_TOKEN_SECRET is not set');
} }
return createHash('sha256') return accessTokenSecret;
.update(`${accessTokenSecret}${workspaceId}${type}`)
.digest('hex');
} }
} }