PR changes

supertokens · Jan 22, 2024 · 95f0d03 · 95f0d03
1 parent 5f52287
commit 95f0d03
Show file tree

Hide file tree

Showing 18 changed files with 58 additions and 49 deletions.
diff --git a/bundle/bundle.js b/bundle/bundle.js
diff --git a/lib/build/claims/primitiveArrayClaim.js b/lib/build/claims/primitiveArrayClaim.js
diff --git a/lib/build/claims/primitiveClaim.js b/lib/build/claims/primitiveClaim.js
diff --git a/lib/build/fetch.js b/lib/build/fetch.js
diff --git a/lib/build/recipeImplementation.js b/lib/build/recipeImplementation.js
diff --git a/lib/build/types.d.ts b/lib/build/types.d.ts
diff --git a/lib/build/utils/dateProvider/defaultImplementation.d.ts b/lib/build/utils/dateProvider/defaultImplementation.d.ts
diff --git a/lib/build/utils/dateProvider/defaultImplementation.js b/lib/build/utils/dateProvider/defaultImplementation.js
diff --git a/lib/build/utils/dateProvider/types.d.ts b/lib/build/utils/dateProvider/types.d.ts
diff --git a/lib/ts/claims/primitiveArrayClaim.ts b/lib/ts/claims/primitiveArrayClaim.ts
@@ -33,7 +33,7 @@ export class PrimitiveArrayClaim<ValueType> {
             id?: string
         ): SessionClaimValidator => {
             const DateProvider = DateProviderReference.getReferenceOrThrow().dateProvider;
-            if (maxAgeInSeconds && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+            if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
                 throw new Error(
                     `maxAgeInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
                 );
@@ -80,7 +80,7 @@ export class PrimitiveArrayClaim<ValueType> {
             id?: string
         ): SessionClaimValidator => {
             const DateProvider = DateProviderReference.getReferenceOrThrow().dateProvider;
-            if (maxAgeInSeconds && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+            if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
                 throw new Error(
                     `maxAgeInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
                 );
@@ -131,7 +131,7 @@ export class PrimitiveArrayClaim<ValueType> {
             id?: string
         ): SessionClaimValidator => {
             const DateProvider = DateProviderReference.getReferenceOrThrow().dateProvider;
-            if (maxAgeInSeconds && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+            if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
                 throw new Error(
                     `maxAgeInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
                 );
@@ -179,7 +179,7 @@ export class PrimitiveArrayClaim<ValueType> {
             id?: string
         ): SessionClaimValidator => {
             const DateProvider = DateProviderReference.getReferenceOrThrow().dateProvider;
-            if (maxAgeInSeconds && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+            if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
                 throw new Error(
                     `maxAgeInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
                 );
@@ -231,7 +231,7 @@ export class PrimitiveArrayClaim<ValueType> {
             id?: string
         ): SessionClaimValidator => {
             const DateProvider = DateProviderReference.getReferenceOrThrow().dateProvider;
-            if (maxAgeInSeconds && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+            if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
                 throw new Error(
                     `maxAgeInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
                 );

diff --git a/lib/ts/claims/primitiveClaim.ts b/lib/ts/claims/primitiveClaim.ts
@@ -33,7 +33,7 @@ export class PrimitiveClaim<ValueType> {
             id?: string
         ): SessionClaimValidator => {
             const DateProvider = DateProviderReference.getReferenceOrThrow().dateProvider;
-            if (maxAgeInSeconds && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+            if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
                 throw new Error(
                     `maxAgeInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
                 );

diff --git a/lib/ts/fetch.ts b/lib/ts/fetch.ts
@@ -951,7 +951,7 @@ export const updateClockSkewUsingFrontToken = ({
     }
 
     const frontTokenPayload = parseFrontToken(frontToken);
-    const clockSkewInMillis = AuthHttpRequest.recipeImpl.getClockSkewInMillis({
+    const clockSkewInMillis = AuthHttpRequest.recipeImpl.calculateClockSkewInMillis({
         accessTokenPayload: frontTokenPayload.up,
         responseHeaders
     });

diff --git a/lib/ts/recipeImplementation.ts b/lib/ts/recipeImplementation.ts
@@ -311,25 +311,25 @@ export default function RecipeImplementation(recipeImplInput: {
             }
         },
 
-        getClockSkewInMillis: function ({
+        calculateClockSkewInMillis: function ({
             accessTokenPayload
         }: {
             accessTokenPayload: any;
             responseHeaders: Headers;
         }): number {
-            logDebugMessage("getClockSkewInMillis: called");
+            logDebugMessage("calculateClockSkewInMillis: called");
 
             const tokenIssuedAt = accessTokenPayload?.iat;
             if (tokenIssuedAt === undefined || typeof tokenIssuedAt !== "number") {
                 logDebugMessage(
-                    `getClockSkewInMillis: payload iat is undefined or not a number. This may happen due to an unsupported backend sdk. Returning 0`
+                    `calculateClockSkewInMillis: payload iat is undefined or not a number. This may happen due to an unsupported backend sdk. Returning 0`
                 );
                 return 0;
             }
 
             const estimatedServerTimeNow = tokenIssuedAt * 1000;
             const clockSkewInMillis = estimatedServerTimeNow - Date.now();
-            logDebugMessage("getClockSkewInMillis: returning " + clockSkewInMillis);
+            logDebugMessage("calculateClockSkewInMillis: returning " + clockSkewInMillis);
 
             return clockSkewInMillis;
         }

diff --git a/lib/ts/types.ts b/lib/ts/types.ts
@@ -153,7 +153,7 @@ export type RecipeInterface = {
         sessionTokenBackendDomain: string | undefined
     ): boolean;
 
-    getClockSkewInMillis(params: { accessTokenPayload: any; responseHeaders: Headers }): number;
+    calculateClockSkewInMillis(params: { accessTokenPayload: any; responseHeaders: Headers }): number;
 };
 
 export type ClaimValidationResult = { isValid: true } | { isValid: false; reason?: any };

diff --git a/lib/ts/utils/dateProvider/defaultImplementation.ts b/lib/ts/utils/dateProvider/defaultImplementation.ts
@@ -63,6 +63,10 @@ export class DateProvider {
         return this.thresholdInSeconds;
     }
 
+    setThresholdInSeconds(thresholdInSeconds: number): void {
+        this.thresholdInSeconds = thresholdInSeconds;
+    }
+
     setClientClockSkewInMillis(clockSkewInMillis: number): void {
         this.clockSkewInMillis = Math.abs(clockSkewInMillis) > this.thresholdInSeconds * 1000 ? clockSkewInMillis : 0;
         const localStorage = WindowHandlerReference.getReferenceOrThrow().windowHandler.localStorage;

diff --git a/lib/ts/utils/dateProvider/types.ts b/lib/ts/utils/dateProvider/types.ts
@@ -15,6 +15,7 @@
 
 export interface DateProviderInterface {
     getThresholdInSeconds(): number;
+    setThresholdInSeconds(thresholdInSeconds: number): void;
     now(): number;
     setClientClockSkewInMillis(clockSkewInMillis: number): void;
     getClientClockSkewInMillis(): number;

diff --git a/test/interception.claims.test.js b/test/interception.claims.test.js
@@ -85,7 +85,7 @@ addGenericTestCases((name, transferMethod, setupFunc, setupArgs = []) => {
                         {
                             // enableDebugLogs: true,
                             // This isn't used in all tests but it only produces some extra logs
-                            override: ["log_getClockSkewInMillis"]
+                            override: ["log_calculateClockSkewInMillis"]
                         },
                         ...setupArgs
                     );
@@ -338,13 +338,12 @@ addGenericTestCases((name, transferMethod, setupFunc, setupArgs = []) => {
             }
         });
 
-        it("should call getClockSkewInMillis with appropriate headers", async function () {
+        it("should call calculateClockSkewInMillis with appropriate headers", async function () {
             await startST();
             let clockSkewParams = [];
             page.on("console", ev => {
                 const text = ev.text();
-                // console.log(text);
-                const key = "TEST_getClockSkewInMillis$";
+                const key = "TEST_calculateClockSkewInMillis$";
                 if (text.startsWith(key)) {
                     clockSkewParams.push(JSON.parse(text.substr(key.length)));
                 }