Don't use a async call for getSubject

labd · Dec 27, 2023 · 3df5163 · 3df5163
1 parent 491d7ad
commit 3df5163
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.changeset/lemon-spiders-double.md b/.changeset/lemon-spiders-double.md
@@ -0,0 +1,5 @@
+---
+"@labdigital/federated-token": patch
+---
+
+Don't use a async call for getSubject
diff --git a/src/jwt.test.ts b/src/jwt.test.ts
@@ -52,7 +52,7 @@ describe("PublicFederatedToken", async () => {
 	test("createAccessJWT with TokenSigner create hook", async () => {
 		const signer = new TokenSigner({
 			...signOptions,
-			getSubject: async (token) => token.tokens.exampleName?.sub,
+			getSubject: (token) => token.tokens.exampleName?.sub,
 		});
 
 		const token = new PublicFederatedToken();

diff --git a/src/jwt.ts b/src/jwt.ts
@@ -33,12 +33,11 @@ export class PublicFederatedToken extends FederatedToken {
 	async createAccessJWT(signer: TokenSigner) {
 		const exp = this.getExpireTime();
 		const fingerprint = generateFingerprint();
-		const subject = await signer.getSubject(this);
 
 		const payload: JWTPayload = {
 			...this.values,
 			exp,
-			sub: subject,
+			sub: signer.getSubject(this),
 			jwe: await signer.encryptObject(this.tokens),
 			_fingerprint: hashFingerprint(fingerprint),
 		};

diff --git a/src/sign.ts b/src/sign.ts
@@ -7,7 +7,7 @@ type TokenSignerOptions = {
 	signKeys: KeyManagerInterface;
 	audience: string;
 	issuer: string;
-	getSubject?: (token: PublicFederatedToken) => Promise<string>;
+	getSubject?: (token: PublicFederatedToken) => string;
 };
 
 export class ConfigurationError extends Error {}
@@ -54,7 +54,7 @@ export class TokenSigner {
 		return JSON.parse(data);
 	}
 
-	async getSubject(token: PublicFederatedToken): Promise<string | undefined> {
+	getSubject(token: PublicFederatedToken): string | undefined {
 		return this.config.getSubject ? this.config.getSubject(token) : undefined;
 	}