PR changes

supertokens · Jan 22, 2024 · 57a7149 · 57a7149
1 parent 4449011
commit 57a7149
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 52 deletions.
diff --git a/bundle/emailverification.js b/bundle/emailverification.js
diff --git a/bundle/website.js b/bundle/website.js
diff --git a/lib/build/recipe/emailverification/emailVerificationClaim.js b/lib/build/recipe/emailverification/emailVerificationClaim.js
diff --git a/lib/ts/recipe/emailverification/emailVerificationClaim.ts b/lib/ts/recipe/emailverification/emailVerificationClaim.ts
@@ -18,43 +18,46 @@ export class EmailVerificationClaimClass extends BooleanClaim {
 
         this.validators = {
             ...this.validators,
-            isVerified: (refetchTimeOnFalseInSeconds = 10, maxAgeInSeconds = 300) => ({
-                id: this.id,
-                refresh: this.refresh,
-                shouldRefresh: (payload, userContext) => {
-                    const DateProvider = DateProviderReference.getReferenceOrThrow().dateProvider;
+            isVerified: (refetchTimeOnFalseInSeconds = 10, maxAgeInSeconds = 300) => {
+                const DateProvider = DateProviderReference.getReferenceOrThrow().dateProvider;
 
-                    if (maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
-                        throw new Error(
-                            `maxAgeInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
-                        );
-                    }
+                if (maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+                    throw new Error(
+                        `maxAgeInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
+                    );
+                }
 
-                    if (refetchTimeOnFalseInSeconds < DateProvider.getThresholdInSeconds()) {
-                        throw new Error(
-                            `refetchTimeOnFalseInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
-                        );
-                    }
+                if (refetchTimeOnFalseInSeconds < DateProvider.getThresholdInSeconds()) {
+                    throw new Error(
+                        `refetchTimeOnFalseInSeconds must be greater than the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
+                    );
+                }
 
-                    const value = this.getValueFromPayload(payload, userContext);
-                    return (
-                        value === undefined ||
-                        this.getLastFetchedTime(payload, userContext)! < DateProvider.now() - maxAgeInSeconds * 1000 ||
-                        (value === false &&
+                return {
+                    id: this.id,
+                    refresh: this.refresh,
+                    shouldRefresh: (payload, userContext) => {
+                        const value = this.getValueFromPayload(payload, userContext);
+                        return (
+                            value === undefined ||
                             this.getLastFetchedTime(payload, userContext)! <
-                                DateProvider.now() - refetchTimeOnFalseInSeconds * 1000)
-                    );
-                },
-                validate: async (payload, userContext) => {
-                    const value = this.getValueFromPayload(payload, userContext);
-                    return value === true
-                        ? { isValid: true }
-                        : {
-                              isValid: false,
-                              reason: { message: "wrong value", expectedValue: true, actualValue: value },
-                          };
-                },
-            }),
+                                DateProvider.now() - maxAgeInSeconds * 1000 ||
+                            (value === false &&
+                                this.getLastFetchedTime(payload, userContext)! <
+                                    DateProvider.now() - refetchTimeOnFalseInSeconds * 1000)
+                        );
+                    },
+                    validate: async (payload, userContext) => {
+                        const value = this.getValueFromPayload(payload, userContext);
+                        return value === true
+                            ? { isValid: true }
+                            : {
+                                  isValid: false,
+                                  reason: { message: "wrong value", expectedValue: true, actualValue: value },
+                              };
+                    },
+                };
+            },
         };
     }
 

diff --git a/test/with-typescript/index.ts b/test/with-typescript/index.ts
@@ -837,8 +837,8 @@ function getSessionFunctions(original: SessionRecipeInterface): SessionRecipeInt
         shouldDoInterceptionBasedOnUrl: function (...input) {
             return original.shouldDoInterceptionBasedOnUrl(...input);
         },
-        getClockSkewInMillis: function (input) {
-            return original.getClockSkewInMillis(input);
+        calculateClockSkewInMillis: function (input) {
+            return original.calculateClockSkewInMillis(input);
         },
     };
 }
@@ -1072,6 +1072,7 @@ const cookieHandlerInput: CookieHandlerInput = (original: CookieHandlerInterface
 
 const dateProviderImplementation: DateProviderInterface = {
     getThresholdInSeconds: () => 0,
+    setThresholdInSeconds: () => {},
     getClientClockSkewInMillis: () => 0,
     setClientClockSkewInMillis: () => {},
     now: () => Date.now(),