Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions packages/wabe/src/authentication/Session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,18 @@ const getJwtSecret = <T extends WabeTypes>(context: WabeContext<T>): string => {
return secret
}

const JWT_ALGORITHM = 'HS256'

const safeVerify = (
token: string,
secret: string,
options: Pick<SignOptions, 'audience' | 'issuer'> = {},
) => {
try {
return !!verify(token, secret, options)
return !!verify(token, secret, {
...options,
algorithms: [JWT_ALGORITHM],
})
} catch {
return false
}
Expand Down Expand Up @@ -258,7 +263,10 @@ export class Session<T extends WabeTypes> {

const secretKey = getJwtSecret(context)

const signOptions: SignOptions = { jwtid: crypto.randomUUID() }
const signOptions: SignOptions = {
jwtid: crypto.randomUUID(),
algorithm: JWT_ALGORITHM,
}
const audience = context.wabe.config.authentication?.session?.jwtAudience
const issuer = context.wabe.config.authentication?.session?.jwtIssuer
if (audience) signOptions.audience = audience
Expand All @@ -272,7 +280,7 @@ export class Session<T extends WabeTypes> {
exp: Math.floor(this.getAccessTokenExpireAt(context.wabe.config).getTime() / 1000),
},
secretKey,
signOptions,
{ ...signOptions, algorithm: JWT_ALGORITHM },
)

this.refreshToken = jwt.sign(
Expand All @@ -283,7 +291,7 @@ export class Session<T extends WabeTypes> {
exp: Math.floor(this.getRefreshTokenExpireAt(context.wabe.config).getTime() / 1000),
},
secretKey,
signOptions,
{ ...signOptions, algorithm: JWT_ALGORITHM },
)

const accessTokenEncrypted = encryptDeterministicToken(
Expand Down Expand Up @@ -430,7 +438,10 @@ export class Session<T extends WabeTypes> {

const nowSeconds = Math.floor(Date.now() / 1000)

const signOptions: SignOptions = { jwtid: crypto.randomUUID() }
const signOptions: SignOptions = {
jwtid: crypto.randomUUID(),
algorithm: JWT_ALGORITHM,
}
const audience = context.wabe.config.authentication?.session?.jwtAudience
const issuer = context.wabe.config.authentication?.session?.jwtIssuer
if (audience) signOptions.audience = audience
Expand All @@ -444,7 +455,7 @@ export class Session<T extends WabeTypes> {
exp: Math.floor(this.getAccessTokenExpireAt(context.wabe.config).getTime() / 1000),
},
secretKey,
signOptions,
{ ...signOptions, algorithm: JWT_ALGORITHM },
)

const newRefreshToken = jwt.sign(
Expand All @@ -455,7 +466,7 @@ export class Session<T extends WabeTypes> {
exp: Math.floor(this.getRefreshTokenExpireAt(context.wabe.config).getTime() / 1000),
},
secretKey,
signOptions,
{ ...signOptions, algorithm: JWT_ALGORITHM },
)

const newAccessTokenEncrypted = encryptDeterministicToken(
Expand Down