Refactor getEmailVerifyLink

supertokens · Oct 9, 2023 · db21d5e · db21d5e
1 parent d896dc5
commit db21d5e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/lib/build/recipe/emailverification/api/implementation.js b/lib/build/recipe/emailverification/api/implementation.js
@@ -166,6 +166,7 @@ function getAPIInterface() {
                     token: response.token,
                     recipeId: options.recipeId,
                     tenantId,
+                    request: options.req,
                     userContext,
                 });
                 logger_1.logDebugMessage(`Sending email verification email to ${emailInfo}`);

diff --git a/lib/build/recipe/emailverification/index.js b/lib/build/recipe/emailverification/index.js
@@ -24,6 +24,7 @@ const recipe_1 = __importDefault(require("./recipe"));
 const error_1 = __importDefault(require("./error"));
 const emailVerificationClaim_1 = require("./emailVerificationClaim");
 const utils_1 = require("./utils");
+const __1 = require("../..");
 class Wrapper {
     static async createEmailVerificationToken(tenantId, recipeUserId, email, userContext = {}) {
         const recipeInstance = recipe_1.default.getInstanceOrThrowError();
@@ -67,6 +68,7 @@ class Wrapper {
                 token: emailVerificationToken.token,
                 recipeId: recipeInstance.getRecipeId(),
                 tenantId,
+                request: __1.getRequestFromUserContext(userContext),
                 userContext,
             }),
         };

diff --git a/lib/build/recipe/emailverification/utils.d.ts b/lib/build/recipe/emailverification/utils.d.ts
@@ -2,6 +2,7 @@
 import Recipe from "./recipe";
 import { TypeInput, TypeNormalisedInput } from "./types";
 import { NormalisedAppinfo } from "../../types";
+import { BaseRequest } from "../../framework";
 export declare function validateAndNormaliseUserInput(
     _: Recipe,
     appInfo: NormalisedAppinfo,
@@ -12,5 +13,6 @@ export declare function getEmailVerifyLink(input: {
     token: string;
     recipeId: string;
     tenantId: string;
+    request: BaseRequest | undefined;
     userContext: any;
 }): string;
diff --git a/lib/build/recipe/emailverification/utils.js b/lib/build/recipe/emailverification/utils.js
@@ -21,7 +21,6 @@ var __importDefault =
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEmailVerifyLink = exports.validateAndNormaliseUserInput = void 0;
 const backwardCompatibility_1 = __importDefault(require("./emaildelivery/services/backwardCompatibility"));
-const __1 = require("../..");
 function validateAndNormaliseUserInput(_, appInfo, config) {
     let override = Object.assign(
         {
@@ -68,7 +67,7 @@ function getEmailVerifyLink(input) {
     return (
         input.appInfo
             .getOrigin({
-                request: __1.getRequestFromUserContext(input.userContext),
+                request: input.request,
                 userContext: input.userContext,
             })
             .getAsStringDangerous() +

diff --git a/lib/ts/recipe/emailverification/api/implementation.ts b/lib/ts/recipe/emailverification/api/implementation.ts
@@ -201,6 +201,7 @@ export default function getAPIInterface(): APIInterface {
                     token: response.token,
                     recipeId: options.recipeId,
                     tenantId,
+                    request: options.req,
                     userContext,
                 });
 

diff --git a/lib/ts/recipe/emailverification/index.ts b/lib/ts/recipe/emailverification/index.ts
@@ -25,6 +25,7 @@ import {
 import { EmailVerificationClaim } from "./emailVerificationClaim";
 import RecipeUserId from "../../recipeUserId";
 import { getEmailVerifyLink } from "./utils";
+import { getRequestFromUserContext } from "../..";
 
 export default class Wrapper {
     static init = Recipe.init;
@@ -97,6 +98,7 @@ export default class Wrapper {
                 token: emailVerificationToken.token,
                 recipeId: recipeInstance.getRecipeId(),
                 tenantId,
+                request: getRequestFromUserContext(userContext),
                 userContext,
             }),
         };

diff --git a/lib/ts/recipe/emailverification/utils.ts b/lib/ts/recipe/emailverification/utils.ts
@@ -17,7 +17,7 @@ import Recipe from "./recipe";
 import { TypeInput, TypeNormalisedInput, RecipeInterface, APIInterface } from "./types";
 import { NormalisedAppinfo } from "../../types";
 import BackwardCompatibilityService from "./emaildelivery/services/backwardCompatibility";
-import { getRequestFromUserContext } from "../..";
+import { BaseRequest } from "../../framework";
 
 export function validateAndNormaliseUserInput(
     _: Recipe,
@@ -69,12 +69,13 @@ export function getEmailVerifyLink(input: {
     token: string;
     recipeId: string;
     tenantId: string;
+    request: BaseRequest | undefined;
     userContext: any;
 }): string {
     return (
         input.appInfo
             .getOrigin({
-                request: getRequestFromUserContext(input.userContext),
+                request: input.request,
                 userContext: input.userContext,
             })
             .getAsStringDangerous() +