fix: userContext refactor

supertokens · Oct 4, 2023 · f76d69b · f76d69b
1 parent cdb53c2
commit f76d69b
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 49 deletions.
diff --git a/lib/build/recipe/totp/api/createDevice.d.ts b/lib/build/recipe/totp/api/createDevice.d.ts
@@ -1,3 +1,7 @@
 // @ts-nocheck
 import { APIInterface, APIOptions } from "../types";
-export default function createDevice(apiImplementation: APIInterface, options: APIOptions): Promise<boolean>;
+export default function createDevice(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean>;
diff --git a/lib/build/recipe/totp/api/createDevice.js b/lib/build/recipe/totp/api/createDevice.js
@@ -20,9 +20,8 @@ var __importDefault =
     };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
-const utils_2 = require("../../../utils");
 const session_1 = __importDefault(require("../../session"));
-async function createDevice(apiImplementation, options) {
+async function createDevice(apiImplementation, options, userContext) {
     if (apiImplementation.createDevicePOST === undefined) {
         return false;
     }
@@ -35,7 +34,6 @@ async function createDevice(apiImplementation, options) {
         overrideGlobalClaimValidators: (_) => [],
     });
     let { deviceName } = await options.req.getJSONBody();
-    const userContext = utils_2.makeDefaultUserContextFromAPI(options.req);
     let result = await apiImplementation.createDevicePOST({
         session,
         deviceName,

diff --git a/lib/build/recipe/totp/api/listDevices.d.ts b/lib/build/recipe/totp/api/listDevices.d.ts
@@ -1,3 +1,7 @@
 // @ts-nocheck
 import { APIInterface, APIOptions } from "../types";
-export default function listDevices(apiImplementation: APIInterface, options: APIOptions): Promise<boolean>;
+export default function listDevices(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean>;
diff --git a/lib/build/recipe/totp/api/listDevices.js b/lib/build/recipe/totp/api/listDevices.js
@@ -20,14 +20,12 @@ var __importDefault =
     };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
-const utils_2 = require("../../../utils");
 const session_1 = __importDefault(require("../../session"));
-async function listDevices(apiImplementation, options) {
+async function listDevices(apiImplementation, options, userContext) {
     if (apiImplementation.listDevicesGET === undefined) {
         return false;
     }
     let session = await session_1.default.getSession(options.req, options.res);
-    const userContext = utils_2.makeDefaultUserContextFromAPI(options.req);
     let result = await apiImplementation.listDevicesGET({
         session,
         options,

diff --git a/lib/build/recipe/totp/api/removeDevice.d.ts b/lib/build/recipe/totp/api/removeDevice.d.ts
@@ -1,3 +1,7 @@
 // @ts-nocheck
 import { APIInterface, APIOptions } from "../types";
-export default function removeDevice(apiImplementation: APIInterface, options: APIOptions): Promise<boolean>;
+export default function removeDevice(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean>;
diff --git a/lib/build/recipe/totp/api/removeDevice.js b/lib/build/recipe/totp/api/removeDevice.js
@@ -21,9 +21,8 @@ var __importDefault =
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const error_1 = __importDefault(require("../error"));
-const utils_2 = require("../../../utils");
 const session_1 = __importDefault(require("../../session"));
-async function removeDevice(apiImplementation, options) {
+async function removeDevice(apiImplementation, options, userContext) {
     if (apiImplementation.removeDevicePOST === undefined) {
         return false;
     }
@@ -35,7 +34,6 @@ async function removeDevice(apiImplementation, options) {
             message: "Please provide deviceName",
         });
     }
-    const userContext = utils_2.makeDefaultUserContextFromAPI(options.req);
     let result = await apiImplementation.removeDevicePOST({
         session,
         deviceName,

diff --git a/lib/build/recipe/totp/api/verifyCode.d.ts b/lib/build/recipe/totp/api/verifyCode.d.ts
@@ -1,3 +1,7 @@
 // @ts-nocheck
 import { APIInterface, APIOptions } from "../types";
-export default function verifyCode(apiImplementation: APIInterface, options: APIOptions): Promise<boolean>;
+export default function verifyCode(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean>;
diff --git a/lib/build/recipe/totp/api/verifyCode.js b/lib/build/recipe/totp/api/verifyCode.js
@@ -21,9 +21,8 @@ var __importDefault =
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const error_1 = __importDefault(require("../error"));
-const utils_2 = require("../../../utils");
 const session_1 = __importDefault(require("../../session"));
-async function verifyCode(apiImplementation, options) {
+async function verifyCode(apiImplementation, options, userContext) {
     if (apiImplementation.verifyCodePOST === undefined) {
         return false;
     }
@@ -37,7 +36,6 @@ async function verifyCode(apiImplementation, options) {
             message: "Please provide totp",
         });
     }
-    const userContext = utils_2.makeDefaultUserContextFromAPI(options.req);
     let result = await apiImplementation.verifyCodePOST({
         session,
         totp,

diff --git a/lib/build/recipe/totp/api/verifyDevice.d.ts b/lib/build/recipe/totp/api/verifyDevice.d.ts
@@ -1,3 +1,7 @@
 // @ts-nocheck
 import { APIInterface, APIOptions } from "../types";
-export default function verifyDevice(apiImplementation: APIInterface, options: APIOptions): Promise<boolean>;
+export default function verifyDevice(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean>;
diff --git a/lib/build/recipe/totp/api/verifyDevice.js b/lib/build/recipe/totp/api/verifyDevice.js
@@ -21,9 +21,8 @@ var __importDefault =
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const error_1 = __importDefault(require("../error"));
-const utils_2 = require("../../../utils");
 const session_1 = __importDefault(require("../../session"));
-async function verifyDevice(apiImplementation, options) {
+async function verifyDevice(apiImplementation, options, userContext) {
     if (apiImplementation.verifyDevicePOST === undefined) {
         return false;
     }
@@ -43,7 +42,6 @@ async function verifyDevice(apiImplementation, options) {
             message: "Please provide totp",
         });
     }
-    const userContext = utils_2.makeDefaultUserContextFromAPI(options.req);
     let result = await apiImplementation.verifyDevicePOST({
         session,
         deviceName,

diff --git a/lib/build/recipe/totp/recipe.d.ts b/lib/build/recipe/totp/recipe.d.ts
@@ -29,7 +29,8 @@ export default class TotpRecipe extends RecipeModule {
         req: BaseRequest,
         res: BaseResponse,
         _: NormalisedURLPath,
-        __: HTTPMethod
+        __: HTTPMethod,
+        userContext: any
     ) => Promise<boolean>;
     handleError: (err: STError, _: BaseRequest, __: BaseResponse) => Promise<void>;
     getAllCORSHeaders: () => string[];

diff --git a/lib/build/recipe/totp/recipe.js b/lib/build/recipe/totp/recipe.js
@@ -72,7 +72,7 @@ class TotpRecipe extends recipeModule_1.default {
                 },
             ];
         };
-        this.handleAPIRequest = async (id, ___, req, res, _, __) => {
+        this.handleAPIRequest = async (id, ___, req, res, _, __, userContext) => {
             const options = {
                 config: this.config,
                 recipeId: this.getRecipeId(),
@@ -83,15 +83,15 @@ class TotpRecipe extends recipeModule_1.default {
                 appInfo: this.getAppInfo(),
             };
             if (id === constants_1.CREATE_DEVICE_API) {
-                return await createDevice_1.default(this.apiImpl, options);
+                return await createDevice_1.default(this.apiImpl, options, userContext);
             } else if (id == constants_1.VERIFY_DEVICE_API) {
-                return await verifyDevice_1.default(this.apiImpl, options);
+                return await verifyDevice_1.default(this.apiImpl, options, userContext);
             } else if (id == constants_1.VERIFY_CODE_API) {
-                return await verifyCode_1.default(this.apiImpl, options);
+                return await verifyCode_1.default(this.apiImpl, options, userContext);
             } else if (id == constants_1.REMOVE_DEVICE_API) {
-                return await removeDevice_1.default(this.apiImpl, options);
+                return await removeDevice_1.default(this.apiImpl, options, userContext);
             } else if (id == constants_1.LIST_DEVICE_API) {
-                return await listDevices_1.default(this.apiImpl, options);
+                return await listDevices_1.default(this.apiImpl, options, userContext);
             }
             return false;
         };

diff --git a/lib/ts/recipe/totp/api/createDevice.ts b/lib/ts/recipe/totp/api/createDevice.ts
@@ -15,11 +15,14 @@
 
 import { send200Response } from "../../../utils";
 import { APIInterface, APIOptions } from "../types";
-import { makeDefaultUserContextFromAPI } from "../../../utils";
 
 import Session from "../../session";
 
-export default async function createDevice(apiImplementation: APIInterface, options: APIOptions): Promise<boolean> {
+export default async function createDevice(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean> {
     if (apiImplementation.createDevicePOST === undefined) {
         return false;
     }
@@ -33,7 +36,6 @@ export default async function createDevice(apiImplementation: APIInterface, opti
 
     let { deviceName } = await options.req.getJSONBody();
 
-    const userContext = makeDefaultUserContextFromAPI(options.req);
     let result = await apiImplementation.createDevicePOST({
         session,
         deviceName,

diff --git a/lib/ts/recipe/totp/api/listDevices.ts b/lib/ts/recipe/totp/api/listDevices.ts
@@ -15,18 +15,20 @@
 
 import { send200Response } from "../../../utils";
 import { APIInterface, APIOptions } from "../types";
-import { makeDefaultUserContextFromAPI } from "../../../utils";
 
 import Session from "../../session";
 
-export default async function listDevices(apiImplementation: APIInterface, options: APIOptions): Promise<boolean> {
+export default async function listDevices(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean> {
     if (apiImplementation.listDevicesGET === undefined) {
         return false;
     }
 
     let session = await Session.getSession(options.req, options.res);
 
-    const userContext = makeDefaultUserContextFromAPI(options.req);
     let result = await apiImplementation.listDevicesGET({
         session,
         options,

diff --git a/lib/ts/recipe/totp/api/removeDevice.ts b/lib/ts/recipe/totp/api/removeDevice.ts
@@ -16,11 +16,14 @@
 import { send200Response } from "../../../utils";
 import STError from "../error";
 import { APIInterface, APIOptions } from "../types";
-import { makeDefaultUserContextFromAPI } from "../../../utils";
 
 import Session from "../../session";
 
-export default async function removeDevice(apiImplementation: APIInterface, options: APIOptions): Promise<boolean> {
+export default async function removeDevice(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean> {
     if (apiImplementation.removeDevicePOST === undefined) {
         return false;
     }
@@ -35,7 +38,6 @@ export default async function removeDevice(apiImplementation: APIInterface, opti
         });
     }
 
-    const userContext = makeDefaultUserContextFromAPI(options.req);
     let result = await apiImplementation.removeDevicePOST({
         session,
         deviceName,

diff --git a/lib/ts/recipe/totp/api/verifyCode.ts b/lib/ts/recipe/totp/api/verifyCode.ts
@@ -16,11 +16,14 @@
 import { send200Response } from "../../../utils";
 import STError from "../error";
 import { APIInterface, APIOptions } from "../types";
-import { makeDefaultUserContextFromAPI } from "../../../utils";
 
 import Session from "../../session";
 
-export default async function verifyCode(apiImplementation: APIInterface, options: APIOptions): Promise<boolean> {
+export default async function verifyCode(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean> {
     if (apiImplementation.verifyCodePOST === undefined) {
         return false;
     }
@@ -35,8 +38,6 @@ export default async function verifyCode(apiImplementation: APIInterface, option
         });
     }
 
-    const userContext = makeDefaultUserContextFromAPI(options.req);
-
     let result = await apiImplementation.verifyCodePOST({
         session,
         totp,

diff --git a/lib/ts/recipe/totp/api/verifyDevice.ts b/lib/ts/recipe/totp/api/verifyDevice.ts
@@ -16,11 +16,14 @@
 import { send200Response } from "../../../utils";
 import STError from "../error";
 import { APIInterface, APIOptions } from "../types";
-import { makeDefaultUserContextFromAPI } from "../../../utils";
 
 import Session from "../../session";
 
-export default async function verifyDevice(apiImplementation: APIInterface, options: APIOptions): Promise<boolean> {
+export default async function verifyDevice(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: any
+): Promise<boolean> {
     if (apiImplementation.verifyDevicePOST === undefined) {
         return false;
     }
@@ -42,7 +45,6 @@ export default async function verifyDevice(apiImplementation: APIInterface, opti
         });
     }
 
-    const userContext = makeDefaultUserContextFromAPI(options.req);
     let result = await apiImplementation.verifyDevicePOST({
         session,
         deviceName,

diff --git a/lib/ts/recipe/totp/recipe.ts b/lib/ts/recipe/totp/recipe.ts
@@ -135,7 +135,8 @@ export default class TotpRecipe extends RecipeModule {
         req: BaseRequest,
         res: BaseResponse,
         _: NormalisedURLPath,
-        __: HTTPMethod
+        __: HTTPMethod,
+        userContext: any
     ): Promise<boolean> => {
         const options = {
             config: this.config,
@@ -147,15 +148,15 @@ export default class TotpRecipe extends RecipeModule {
             appInfo: this.getAppInfo(),
         };
         if (id === CREATE_DEVICE_API) {
-            return await createDeviceAPI(this.apiImpl, options);
+            return await createDeviceAPI(this.apiImpl, options, userContext);
         } else if (id == VERIFY_DEVICE_API) {
-            return await verifyDeviceAPI(this.apiImpl, options);
+            return await verifyDeviceAPI(this.apiImpl, options, userContext);
         } else if (id == VERIFY_CODE_API) {
-            return await verifyCodeAPI(this.apiImpl, options);
+            return await verifyCodeAPI(this.apiImpl, options, userContext);
         } else if (id == REMOVE_DEVICE_API) {
-            return await removeDeviceAPI(this.apiImpl, options);
+            return await removeDeviceAPI(this.apiImpl, options, userContext);
         } else if (id == LIST_DEVICE_API) {
-            return await listDevicesAPI(this.apiImpl, options);
+            return await listDevicesAPI(this.apiImpl, options, userContext);
         }
 
         return false;