fix: tenant id in get global claim validators (#634)

* fix: tenant id in global claim validators * fix: pr comments
supertokens · Jul 12, 2023 · 040e0f2 · 040e0f2
1 parent e0ab26e
commit 040e0f2
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/lib/build/recipe/session/index.d.ts b/lib/build/recipe/session/index.d.ts
@@ -51,6 +51,7 @@ export default class SessionWrapper {
           }
     >;
     static validateClaimsInJWTPayload(
+        tenantId: string,
         userId: string,
         jwtPayload: JSONObject,
         overrideGlobalClaimValidators?: (

diff --git a/lib/build/recipe/session/index.js b/lib/build/recipe/session/index.js
@@ -128,7 +128,8 @@ class SessionWrapper {
                 .getInstanceOrThrowError()
                 .getClaimValidatorsAddedByOtherRecipes();
             const globalClaimValidators = yield recipeImpl.getGlobalClaimValidators({
-                userId: sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.userId,
+                userId: sessionInfo.userId,
+                tenantId: sessionInfo.tenantId,
                 claimValidatorsAddedByOtherRecipes,
                 userContext,
             });
@@ -161,13 +162,14 @@ class SessionWrapper {
             };
         });
     }
-    static validateClaimsInJWTPayload(userId, jwtPayload, overrideGlobalClaimValidators, userContext = {}) {
+    static validateClaimsInJWTPayload(tenantId, userId, jwtPayload, overrideGlobalClaimValidators, userContext = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const recipeImpl = recipe_1.default.getInstanceOrThrowError().recipeInterfaceImpl;
             const claimValidatorsAddedByOtherRecipes = recipe_1.default
                 .getInstanceOrThrowError()
                 .getClaimValidatorsAddedByOtherRecipes();
             const globalClaimValidators = yield recipeImpl.getGlobalClaimValidators({
+                tenantId,
                 userId,
                 claimValidatorsAddedByOtherRecipes,
                 userContext,

diff --git a/lib/build/recipe/session/types.d.ts b/lib/build/recipe/session/types.d.ts
@@ -162,6 +162,7 @@ export declare type RecipeInterface = {
         userContext: any;
     }): Promise<SessionContainerInterface>;
     getGlobalClaimValidators(input: {
+        tenantId: string;
         userId: string;
         claimValidatorsAddedByOtherRecipes: SessionClaimValidator[];
         userContext: any;

diff --git a/lib/build/recipe/session/utils.js b/lib/build/recipe/session/utils.js
@@ -287,6 +287,7 @@ function getRequiredClaimValidators(session, overrideGlobalClaimValidators, user
             .getInstanceOrThrowError()
             .recipeInterfaceImpl.getGlobalClaimValidators({
                 userId: session.getUserId(),
+                tenantId: session.getTenantId(),
                 claimValidatorsAddedByOtherRecipes,
                 userContext,
             });

diff --git a/lib/ts/recipe/session/index.ts b/lib/ts/recipe/session/index.ts
@@ -130,7 +130,8 @@ export default class SessionWrapper {
 
         const claimValidatorsAddedByOtherRecipes = Recipe.getInstanceOrThrowError().getClaimValidatorsAddedByOtherRecipes();
         const globalClaimValidators: SessionClaimValidator[] = await recipeImpl.getGlobalClaimValidators({
-            userId: sessionInfo?.userId,
+            userId: sessionInfo.userId,
+            tenantId: sessionInfo.tenantId,
             claimValidatorsAddedByOtherRecipes,
             userContext,
         });
@@ -167,6 +168,7 @@ export default class SessionWrapper {
     }
 
     static async validateClaimsInJWTPayload(
+        tenantId: string,
         userId: string,
         jwtPayload: JSONObject,
         overrideGlobalClaimValidators?: (
@@ -183,6 +185,7 @@ export default class SessionWrapper {
 
         const claimValidatorsAddedByOtherRecipes = Recipe.getInstanceOrThrowError().getClaimValidatorsAddedByOtherRecipes();
         const globalClaimValidators: SessionClaimValidator[] = await recipeImpl.getGlobalClaimValidators({
+            tenantId,
             userId,
             claimValidatorsAddedByOtherRecipes,
             userContext,

diff --git a/lib/ts/recipe/session/types.ts b/lib/ts/recipe/session/types.ts
@@ -197,6 +197,7 @@ export type RecipeInterface = {
     }): Promise<SessionContainerInterface>;
 
     getGlobalClaimValidators(input: {
+        tenantId: string;
         userId: string;
         claimValidatorsAddedByOtherRecipes: SessionClaimValidator[];
         userContext: any;

diff --git a/lib/ts/recipe/session/utils.ts b/lib/ts/recipe/session/utils.ts
@@ -284,6 +284,7 @@ export async function getRequiredClaimValidators(
     const globalClaimValidators: SessionClaimValidator[] = await SessionRecipe.getInstanceOrThrowError().recipeInterfaceImpl.getGlobalClaimValidators(
         {
             userId: session.getUserId(),
+            tenantId: session.getTenantId(),
             claimValidatorsAddedByOtherRecipes,
             userContext,
         }

diff --git a/test/with-typescript/index.ts b/test/with-typescript/index.ts
@@ -1359,12 +1359,13 @@ Session.validateClaimsForSessionHandle(
     { test: 1 }
 );
 
-Session.validateClaimsInJWTPayload("userId", {});
-Session.validateClaimsInJWTPayload("userId", {}, (globalClaimValidators) => [
+Session.validateClaimsInJWTPayload("public", "userId", {});
+Session.validateClaimsInJWTPayload("public", "userId", {}, (globalClaimValidators) => [
     ...globalClaimValidators,
     boolClaim.validators.isTrue(),
 ]);
 Session.validateClaimsInJWTPayload(
+    "public",
     "userId",
     {},
     (globalClaimValidators, userId) => [...globalClaimValidators, stringClaim.validators.startsWith(userId)],