feat: add threshold in DateProvider (#242)

* Add threshold in DateProvider * PR changes * PR changes * PR changes * PR changes * PR changes
supertokens · Jan 23, 2024 · 1306e38 · 1306e38
1 parent 416edab
commit 1306e38
Show file tree

Hide file tree

Showing 21 changed files with 305 additions and 83 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/index.js b/lib/build/utils/dateProvider/index.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
@@ -36,10 +36,20 @@ export class PrimitiveArrayClaim<ValueType> {
             return {
                 id: id !== undefined ? id : this.id,
                 refresh: ctx => this.refresh(ctx),
-                shouldRefresh: (payload, ctx) =>
-                    this.getValueFromPayload(payload, ctx) === undefined ||
-                    // We know payload[this.id] is defined since the value is not undefined in this branch
-                    (maxAgeInSeconds !== undefined && payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000),
+                shouldRefresh: (payload, ctx) => {
+                    if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+                        throw new Error(
+                            `maxAgeInSeconds must be greater than or equal to the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
+                        );
+                    }
+
+                    return (
+                        this.getValueFromPayload(payload, ctx) === undefined ||
+                        // We know payload[this.id] is defined since the value is not undefined in this branch
+                        (maxAgeInSeconds !== undefined &&
+                            payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000)
+                    );
+                },
                 validate: async (payload, ctx) => {
                     const claimVal = this.getValueFromPayload(payload, ctx);
                     if (claimVal === undefined) {
@@ -78,10 +88,19 @@ export class PrimitiveArrayClaim<ValueType> {
             return {
                 id: id !== undefined ? id : this.id,
                 refresh: ctx => this.refresh(ctx),
-                shouldRefresh: (payload, ctx) =>
-                    this.getValueFromPayload(payload, ctx) === undefined ||
-                    // We know payload[this.id] is defined since the value is not undefined in this branch
-                    (maxAgeInSeconds !== undefined && payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000),
+                shouldRefresh: (payload, ctx) => {
+                    if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+                        throw new Error(
+                            `maxAgeInSeconds must be greater than or equal to the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
+                        );
+                    }
+                    return (
+                        this.getValueFromPayload(payload, ctx) === undefined ||
+                        // We know payload[this.id] is defined since the value is not undefined in this branch
+                        (maxAgeInSeconds !== undefined &&
+                            payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000)
+                    );
+                },
                 validate: async (payload, ctx) => {
                     const claimVal = this.getValueFromPayload(payload, ctx);
                     if (claimVal === undefined) {
@@ -124,10 +143,19 @@ export class PrimitiveArrayClaim<ValueType> {
             return {
                 id: id !== undefined ? id : this.id,
                 refresh: ctx => this.refresh(ctx),
-                shouldRefresh: (payload, ctx) =>
-                    this.getValueFromPayload(payload, ctx) === undefined ||
-                    // We know payload[this.id] is defined since the value is not undefined in this branch
-                    (maxAgeInSeconds !== undefined && payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000),
+                shouldRefresh: (payload, ctx) => {
+                    if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+                        throw new Error(
+                            `maxAgeInSeconds must be greater than or equal to the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
+                        );
+                    }
+                    return (
+                        this.getValueFromPayload(payload, ctx) === undefined ||
+                        // We know payload[this.id] is defined since the value is not undefined in this branch
+                        (maxAgeInSeconds !== undefined &&
+                            payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000)
+                    );
+                },
                 validate: async (payload, ctx) => {
                     const claimVal = this.getValueFromPayload(payload, ctx);
                     if (claimVal === undefined) {
@@ -167,10 +195,20 @@ export class PrimitiveArrayClaim<ValueType> {
             return {
                 id: id !== undefined ? id : this.id,
                 refresh: ctx => this.refresh(ctx),
-                shouldRefresh: (payload, ctx) =>
-                    this.getValueFromPayload(payload, ctx) === undefined ||
-                    // We know payload[this.id] is defined since the value is not undefined in this branch
-                    (maxAgeInSeconds !== undefined && payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000),
+                shouldRefresh: (payload, ctx) => {
+                    if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+                        throw new Error(
+                            `maxAgeInSeconds must be greater than or equal to the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
+                        );
+                    }
+
+                    return (
+                        this.getValueFromPayload(payload, ctx) === undefined ||
+                        // We know payload[this.id] is defined since the value is not undefined in this branch
+                        (maxAgeInSeconds !== undefined &&
+                            payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000)
+                    );
+                },
                 validate: async (payload, ctx) => {
                     const claimVal = this.getValueFromPayload(payload, ctx);
                     if (claimVal === undefined) {
@@ -214,10 +252,20 @@ export class PrimitiveArrayClaim<ValueType> {
             return {
                 id: id !== undefined ? id : this.id,
                 refresh: ctx => this.refresh(ctx),
-                shouldRefresh: (payload, ctx) =>
-                    this.getValueFromPayload(payload, ctx) === undefined ||
-                    // We know payload[this.id] is defined since the value is not undefined in this branch
-                    (maxAgeInSeconds !== undefined && payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000),
+                shouldRefresh: (payload, ctx) => {
+                    if (maxAgeInSeconds !== undefined && maxAgeInSeconds < DateProvider.getThresholdInSeconds()) {
+                        throw new Error(
+                            `maxAgeInSeconds must be greater than or equal to the DateProvider threshold value -> ${DateProvider.getThresholdInSeconds()}`
+                        );
+                    }
+
+                    return (
+                        this.getValueFromPayload(payload, ctx) === undefined ||
+                        // We know payload[this.id] is defined since the value is not undefined in this branch
+                        (maxAgeInSeconds !== undefined &&
+                            payload[this.id].t < DateProvider.now() - maxAgeInSeconds * 1000)
+                    );
+                },
                 validate: async (payload, ctx) => {
                     const claimVal = this.getValueFromPayload(payload, ctx);
                     if (claimVal === undefined) {