From 3a370070885b131fb51902269032649895c7e9c1 Mon Sep 17 00:00:00 2001 From: Nemi Shah Date: Wed, 4 Oct 2023 12:54:08 +0530 Subject: [PATCH] Rename app info properties --- lib/build/recipe/dashboard/api/analytics.js | 2 +- lib/build/recipe/emailpassword/utils.js | 2 +- lib/build/recipe/emailverification/utils.js | 2 +- lib/build/recipe/passwordless/api/implementation.js | 4 ++-- lib/build/recipe/passwordless/recipe.js | 2 +- lib/build/recipe/session/utils.js | 2 +- lib/build/types.d.ts | 4 ++-- lib/build/utils.js | 6 +++--- lib/ts/recipe/dashboard/api/analytics.ts | 2 +- lib/ts/recipe/emailpassword/utils.ts | 2 +- lib/ts/recipe/emailverification/utils.ts | 2 +- lib/ts/recipe/passwordless/api/implementation.ts | 4 ++-- lib/ts/recipe/passwordless/recipe.ts | 2 +- lib/ts/recipe/session/utils.ts | 2 +- lib/ts/types.ts | 4 ++-- lib/ts/utils.ts | 6 +++--- test/with-typescript/index.ts | 10 +++++----- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/build/recipe/dashboard/api/analytics.js b/lib/build/recipe/dashboard/api/analytics.js index d7a770dc1..734a1c3be 100644 --- a/lib/build/recipe/dashboard/api/analytics.js +++ b/lib/build/recipe/dashboard/api/analytics.js @@ -60,7 +60,7 @@ async function analyticsPost(_, ___, options, __) { status: "OK", }; } - const { apiDomain, websiteDomain, appName } = options.appInfo; + const { apiDomain, getOrigin: websiteDomain, appName } = options.appInfo; const data = { websiteDomain: websiteDomain({ request: undefined, diff --git a/lib/build/recipe/emailpassword/utils.js b/lib/build/recipe/emailpassword/utils.js index 830ae2ef9..b52124d85 100644 --- a/lib/build/recipe/emailpassword/utils.js +++ b/lib/build/recipe/emailpassword/utils.js @@ -215,7 +215,7 @@ exports.defaultEmailValidator = defaultEmailValidator; function getPasswordResetLink(input) { return ( input.appInfo - .websiteDomain({ + .getOrigin({ request: __1.getRequestFromUserContext(input.userContext), userContext: input.userContext, }) diff --git a/lib/build/recipe/emailverification/utils.js b/lib/build/recipe/emailverification/utils.js index 82c1e1fb4..c066dfd65 100644 --- a/lib/build/recipe/emailverification/utils.js +++ b/lib/build/recipe/emailverification/utils.js @@ -67,7 +67,7 @@ exports.validateAndNormaliseUserInput = validateAndNormaliseUserInput; function getEmailVerifyLink(input) { return ( input.appInfo - .websiteDomain({ + .getOrigin({ request: __1.getRequestFromUserContext(input.userContext), userContext: input.userContext, }) diff --git a/lib/build/recipe/passwordless/api/implementation.js b/lib/build/recipe/passwordless/api/implementation.js index e0755d3b3..9ac97df00 100644 --- a/lib/build/recipe/passwordless/api/implementation.js +++ b/lib/build/recipe/passwordless/api/implementation.js @@ -225,7 +225,7 @@ function getAPIImplementation() { if (flowType === "MAGIC_LINK" || flowType === "USER_INPUT_CODE_AND_MAGIC_LINK") { magicLink = input.options.appInfo - .websiteDomain({ + .getOrigin({ request: input.options.req, userContext: input.userContext, }) @@ -360,7 +360,7 @@ function getAPIImplementation() { if (flowType === "MAGIC_LINK" || flowType === "USER_INPUT_CODE_AND_MAGIC_LINK") { magicLink = input.options.appInfo - .websiteDomain({ + .getOrigin({ request: input.options.req, userContext: input.userContext, }) diff --git a/lib/build/recipe/passwordless/recipe.js b/lib/build/recipe/passwordless/recipe.js index 79d52c1f3..d506ea7ef 100644 --- a/lib/build/recipe/passwordless/recipe.js +++ b/lib/build/recipe/passwordless/recipe.js @@ -131,7 +131,7 @@ class Recipe extends recipeModule_1.default { const appInfo = this.getAppInfo(); let magicLink = appInfo - .websiteDomain({ + .getOrigin({ request: __1.getRequestFromUserContext(input.userContext), userContext: input.userContext, }) diff --git a/lib/build/recipe/session/utils.js b/lib/build/recipe/session/utils.js index a31184923..8614f9848 100644 --- a/lib/build/recipe/session/utils.js +++ b/lib/build/recipe/session/utils.js @@ -105,7 +105,7 @@ function validateAndNormaliseUserInput(recipeInstance, appInfo, config) { let protocolOfAPIDomain = getURLProtocol(appInfo.apiDomain.getAsStringDangerous()); let protocolOfWebsiteDomain = getURLProtocol( appInfo - .websiteDomain({ + .getOrigin({ request: undefined, userContext: {}, }) diff --git a/lib/build/types.d.ts b/lib/build/types.d.ts index 8c355c28e..955d42394 100644 --- a/lib/build/types.d.ts +++ b/lib/build/types.d.ts @@ -7,7 +7,7 @@ import { RecipeLevelUser } from "./recipe/accountlinking/types"; import { BaseRequest } from "./framework"; export declare type AppInfo = { appName: string; - websiteDomain: string | ((input: { request: BaseRequest | undefined; userContext: any }) => string); + origin: string | ((input: { request: BaseRequest | undefined; userContext: any }) => string); websiteBasePath?: string; apiDomain: string; apiBasePath?: string; @@ -15,7 +15,7 @@ export declare type AppInfo = { }; export declare type NormalisedAppinfo = { appName: string; - websiteDomain: (input: { request: BaseRequest | undefined; userContext: any }) => NormalisedURLDomain; + getOrigin: (input: { request: BaseRequest | undefined; userContext: any }) => NormalisedURLDomain; apiDomain: NormalisedURLDomain; topLevelAPIDomain: string; topLevelWebsiteDomain: (input: { request: BaseRequest | undefined; userContext: any }) => string; diff --git a/lib/build/utils.js b/lib/build/utils.js index 9ed7e8e41..b7441f701 100644 --- a/lib/build/utils.js +++ b/lib/build/utils.js @@ -89,7 +89,7 @@ function normaliseInputAppInfoOrThrowError(appInfo) { if (appInfo.appName === undefined) { throw new Error("Please provide your appName inside the appInfo object when calling supertokens.init"); } - if (appInfo.websiteDomain === undefined) { + if (appInfo.origin === undefined) { throw new Error("Please provide your websiteDomain inside the appInfo object when calling supertokens.init"); } let apiGatewayPath = @@ -97,7 +97,7 @@ function normaliseInputAppInfoOrThrowError(appInfo) { ? new normalisedURLPath_1.default(appInfo.apiGatewayPath) : new normalisedURLPath_1.default(""); let websiteDomainFunction = (input) => { - let domain = appInfo.websiteDomain; + let domain = appInfo.origin; if (typeof domain === "function") { domain = domain(input); } @@ -110,7 +110,7 @@ function normaliseInputAppInfoOrThrowError(appInfo) { }; return { appName: appInfo.appName, - websiteDomain: websiteDomainFunction, + getOrigin: websiteDomainFunction, apiDomain, apiBasePath: apiGatewayPath.appendPath( appInfo.apiBasePath === undefined diff --git a/lib/ts/recipe/dashboard/api/analytics.ts b/lib/ts/recipe/dashboard/api/analytics.ts index 7f6e35d19..12a8f4986 100644 --- a/lib/ts/recipe/dashboard/api/analytics.ts +++ b/lib/ts/recipe/dashboard/api/analytics.ts @@ -71,7 +71,7 @@ export default async function analyticsPost( }; } - const { apiDomain, websiteDomain, appName } = options.appInfo; + const { apiDomain, getOrigin: websiteDomain, appName } = options.appInfo; const data = { websiteDomain: websiteDomain({ request: undefined, diff --git a/lib/ts/recipe/emailpassword/utils.ts b/lib/ts/recipe/emailpassword/utils.ts index 233885793..ecd791d21 100644 --- a/lib/ts/recipe/emailpassword/utils.ts +++ b/lib/ts/recipe/emailpassword/utils.ts @@ -258,7 +258,7 @@ export function getPasswordResetLink(input: { }): string { return ( input.appInfo - .websiteDomain({ + .getOrigin({ request: getRequestFromUserContext(input.userContext), userContext: input.userContext, }) diff --git a/lib/ts/recipe/emailverification/utils.ts b/lib/ts/recipe/emailverification/utils.ts index 8851cd5d1..5d91c7503 100644 --- a/lib/ts/recipe/emailverification/utils.ts +++ b/lib/ts/recipe/emailverification/utils.ts @@ -73,7 +73,7 @@ export function getEmailVerifyLink(input: { }): string { return ( input.appInfo - .websiteDomain({ + .getOrigin({ request: getRequestFromUserContext(input.userContext), userContext: input.userContext, }) diff --git a/lib/ts/recipe/passwordless/api/implementation.ts b/lib/ts/recipe/passwordless/api/implementation.ts index 4d416092f..1b34bdade 100644 --- a/lib/ts/recipe/passwordless/api/implementation.ts +++ b/lib/ts/recipe/passwordless/api/implementation.ts @@ -242,7 +242,7 @@ export default function getAPIImplementation(): APIInterface { if (flowType === "MAGIC_LINK" || flowType === "USER_INPUT_CODE_AND_MAGIC_LINK") { magicLink = input.options.appInfo - .websiteDomain({ + .getOrigin({ request: input.options.req, userContext: input.userContext, }) @@ -386,7 +386,7 @@ export default function getAPIImplementation(): APIInterface { if (flowType === "MAGIC_LINK" || flowType === "USER_INPUT_CODE_AND_MAGIC_LINK") { magicLink = input.options.appInfo - .websiteDomain({ + .getOrigin({ request: input.options.req, userContext: input.userContext, }) diff --git a/lib/ts/recipe/passwordless/recipe.ts b/lib/ts/recipe/passwordless/recipe.ts index 91b142e83..4d8e6552b 100644 --- a/lib/ts/recipe/passwordless/recipe.ts +++ b/lib/ts/recipe/passwordless/recipe.ts @@ -245,7 +245,7 @@ export default class Recipe extends RecipeModule { let magicLink = appInfo - .websiteDomain({ + .getOrigin({ request: getRequestFromUserContext(input.userContext), userContext: input.userContext, }) diff --git a/lib/ts/recipe/session/utils.ts b/lib/ts/recipe/session/utils.ts index 33c8c8da9..a5d1a0e90 100644 --- a/lib/ts/recipe/session/utils.ts +++ b/lib/ts/recipe/session/utils.ts @@ -139,7 +139,7 @@ export function validateAndNormaliseUserInput( let protocolOfAPIDomain = getURLProtocol(appInfo.apiDomain.getAsStringDangerous()); let protocolOfWebsiteDomain = getURLProtocol( appInfo - .websiteDomain({ + .getOrigin({ request: undefined, userContext: {}, }) diff --git a/lib/ts/types.ts b/lib/ts/types.ts index b19d63218..a8c2251ac 100644 --- a/lib/ts/types.ts +++ b/lib/ts/types.ts @@ -22,7 +22,7 @@ import { BaseRequest } from "./framework"; export type AppInfo = { appName: string; - websiteDomain: string | ((input: { request: BaseRequest | undefined; userContext: any }) => string); + origin: string | ((input: { request: BaseRequest | undefined; userContext: any }) => string); websiteBasePath?: string; apiDomain: string; apiBasePath?: string; @@ -31,7 +31,7 @@ export type AppInfo = { export type NormalisedAppinfo = { appName: string; - websiteDomain: (input: { request: BaseRequest | undefined; userContext: any }) => NormalisedURLDomain; + getOrigin: (input: { request: BaseRequest | undefined; userContext: any }) => NormalisedURLDomain; apiDomain: NormalisedURLDomain; topLevelAPIDomain: string; topLevelWebsiteDomain: (input: { request: BaseRequest | undefined; userContext: any }) => string; diff --git a/lib/ts/utils.ts b/lib/ts/utils.ts index 45d5d1ca6..e9777c732 100644 --- a/lib/ts/utils.ts +++ b/lib/ts/utils.ts @@ -51,7 +51,7 @@ export function normaliseInputAppInfoOrThrowError(appInfo: AppInfo): NormalisedA if (appInfo.appName === undefined) { throw new Error("Please provide your appName inside the appInfo object when calling supertokens.init"); } - if (appInfo.websiteDomain === undefined) { + if (appInfo.origin === undefined) { throw new Error("Please provide your websiteDomain inside the appInfo object when calling supertokens.init"); } let apiGatewayPath = @@ -60,7 +60,7 @@ export function normaliseInputAppInfoOrThrowError(appInfo: AppInfo): NormalisedA : new NormalisedURLPath(""); let websiteDomainFunction = (input: { request: BaseRequest | undefined; userContext: any }) => { - let domain = appInfo.websiteDomain; + let domain = appInfo.origin; if (typeof domain === "function") { domain = domain(input); } @@ -75,7 +75,7 @@ export function normaliseInputAppInfoOrThrowError(appInfo: AppInfo): NormalisedA return { appName: appInfo.appName, - websiteDomain: websiteDomainFunction, + getOrigin: websiteDomainFunction, apiDomain, apiBasePath: apiGatewayPath.appendPath( appInfo.apiBasePath === undefined diff --git a/test/with-typescript/index.ts b/test/with-typescript/index.ts index 79d8c9bb1..0e0842631 100644 --- a/test/with-typescript/index.ts +++ b/test/with-typescript/index.ts @@ -980,7 +980,7 @@ let config: TypeInput = { appInfo: { apiDomain: "", appName: "", - websiteDomain: "", + origin: "", }, recipeList: [Session.init(sessionConfig), EmailPassword.init(epConfig)], isInServerlessEnv: true, @@ -1110,7 +1110,7 @@ Supertokens.init({ appInfo: { apiDomain: "", appName: "", - websiteDomain: "", + origin: "", }, recipeList: [ Session.init({ getTokenTransferMethod: () => "cookie", antiCsrf: "NONE", cookieDomain: "" }), @@ -1127,7 +1127,7 @@ Supertokens.init({ appInfo: { apiDomain: "", appName: "", - websiteDomain: "", + origin: "", }, recipeList: [ Session.init({ @@ -1424,7 +1424,7 @@ Supertokens.init({ appInfo: { apiDomain: "", appName: "", - websiteDomain: "", + origin: "", }, recipeList: [ Dashboard.init({ @@ -1501,7 +1501,7 @@ Supertokens.init({ appInfo: { apiDomain: "..", appName: "..", - websiteDomain: "..", + origin: "..", }, recipeList: [JWT.init()], });