Skip to content

Commit 8f1b9e5

Browse files
psubram3jmorton
andcommitted
update JWT Expiration type to work with jwt.SignOptions
Co-authored-by: Pranav Subramanian <pranav.subramanian@nasa.gov> Co-authored-by: Jonathan Morton <jonathan.r.morton@nasa.gov>
1 parent 4e40fb9 commit 8f1b9e5

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎src/env.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { Algorithm } from 'jsonwebtoken';
22
import { GroupRoleMapping } from './types/auth';
3+
import { StringValue } from 'ms';
34

45
export type Env = {
56
ALLOWED_ROLES: string[];
@@ -16,7 +17,7 @@ export type Env = {
1617
HASURA_API_URL: string;
1718
HASURA_GRAPHQL_JWT_SECRET: string;
1819
JWT_ALGORITHMS: Algorithm[];
19-
JWT_EXPIRATION: string;
20+
JWT_EXPIRATION: StringValue;
2021
LOG_FILE: string;
2122
LOG_LEVEL: string;
2223
PORT: string;
@@ -48,7 +49,7 @@ export const defaultEnv: Env = {
4849
HASURA_API_URL: 'http://hasura:8080',
4950
HASURA_GRAPHQL_JWT_SECRET: '',
5051
JWT_ALGORITHMS: ['HS256'],
51-
JWT_EXPIRATION: '36h',
52+
JWT_EXPIRATION: '36h' as StringValue,
5253
LOG_FILE: 'console',
5354
LOG_LEVEL: 'info',
5455
PORT: '9000',
@@ -120,7 +121,7 @@ export function getEnv(): Env {
120121
const HASURA_GRAPHQL_JWT_SECRET = env['HASURA_GRAPHQL_JWT_SECRET'] ?? defaultEnv.HASURA_GRAPHQL_JWT_SECRET;
121122
const HASURA_API_URL = env['HASURA_API_URL'] ?? defaultEnv.HASURA_API_URL;
122123
const JWT_ALGORITHMS = parseArray(env['JWT_ALGORITHMS'], defaultEnv.JWT_ALGORITHMS);
123-
const JWT_EXPIRATION = env['JWT_EXPIRATION'] ?? defaultEnv.JWT_EXPIRATION;
124+
const JWT_EXPIRATION = (env['JWT_EXPIRATION'] as StringValue) ?? defaultEnv.JWT_EXPIRATION;
124125
const LOG_FILE = env['LOG_FILE'] ?? defaultEnv.LOG_FILE;
125126
const LOG_LEVEL = env['LOG_LEVEL'] ?? defaultEnv.LOG_LEVEL;
126127
const PORT = env['PORT'] ?? defaultEnv.PORT;

‎src/packages/auth/functions.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import type {
1414
UserRoles,
1515
} from '../../types/auth.js';
1616
import { loginSSO } from './adapters/CAMAuthAdapter.js';
17+
import { StringValue } from 'ms';
1718

1819
const logger = getLogger('packages/auth/functions');
1920

@@ -133,7 +134,7 @@ export function generateJwt(
133134
username: string,
134135
defaultRole: string,
135136
allowedRoles: string[],
136-
expiry: string = getEnv().JWT_EXPIRATION,
137+
expiry: StringValue = getEnv().JWT_EXPIRATION,
137138
): string | null {
138139
try {
139140
const { HASURA_GRAPHQL_JWT_SECRET } = getEnv();

0 commit comments

Comments
 (0)