Skip to content

Commit

Permalink
Rename app info properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@nkshah2
nkshah2 committed Oct 4, 2023
1 parent f749956 commit 3a37007
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion lib/build/recipe/dashboard/api/analytics.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/build/recipe/emailpassword/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ exports.defaultEmailValidator = defaultEmailValidator;
function getPasswordResetLink(input) {
return (
input.appInfo
.websiteDomain({
.getOrigin({
request: __1.getRequestFromUserContext(input.userContext),
userContext: input.userContext,
})
Expand Down
2 changes: 1 addition & 1 deletion lib/build/recipe/emailverification/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ exports.validateAndNormaliseUserInput = validateAndNormaliseUserInput;
function getEmailVerifyLink(input) {
return (
input.appInfo
.websiteDomain({
.getOrigin({
request: __1.getRequestFromUserContext(input.userContext),
userContext: input.userContext,
})
Expand Down
4 changes: 2 additions & 2 deletions lib/build/recipe/passwordless/api/implementation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
Expand Down Expand Up @@ -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,
})
Expand Down
2 changes: 1 addition & 1 deletion lib/build/recipe/passwordless/recipe.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
Expand Down
2 changes: 1 addition & 1 deletion lib/build/recipe/session/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function validateAndNormaliseUserInput(recipeInstance, appInfo, config) {
let protocolOfAPIDomain = getURLProtocol(appInfo.apiDomain.getAsStringDangerous());
let protocolOfWebsiteDomain = getURLProtocol(
appInfo
.websiteDomain({
.getOrigin({
request: undefined,
userContext: {},
})
Expand Down
4 changes: 2 additions & 2 deletions lib/build/types.d.ts
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/build/utils.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/ts/recipe/dashboard/api/analytics.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/ts/recipe/emailpassword/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ export function getPasswordResetLink(input: {
}): string {
return (
input.appInfo
.websiteDomain({
.getOrigin({
request: getRequestFromUserContext(input.userContext),
userContext: input.userContext,
})
Expand Down
2 changes: 1 addition & 1 deletion lib/ts/recipe/emailverification/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export function getEmailVerifyLink(input: {
}): string {
return (
input.appInfo
.websiteDomain({
.getOrigin({
request: getRequestFromUserContext(input.userContext),
userContext: input.userContext,
})
Expand Down
4 changes: 2 additions & 2 deletions lib/ts/recipe/passwordless/api/implementation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
Expand Down Expand Up @@ -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,
})
Expand Down
2 changes: 1 addition & 1 deletion lib/ts/recipe/passwordless/recipe.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export default class Recipe extends RecipeModule {

let magicLink =
appInfo
.websiteDomain({
.getOrigin({
request: getRequestFromUserContext(input.userContext),
userContext: input.userContext,
})
Expand Down
2 changes: 1 addition & 1 deletion lib/ts/recipe/session/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export function validateAndNormaliseUserInput(
let protocolOfAPIDomain = getURLProtocol(appInfo.apiDomain.getAsStringDangerous());
let protocolOfWebsiteDomain = getURLProtocol(
appInfo
.websiteDomain({
.getOrigin({
request: undefined,
userContext: {},
})
Expand Down
4 changes: 2 additions & 2 deletions lib/ts/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions lib/ts/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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);
}
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions test/with-typescript/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ let config: TypeInput = {
appInfo: {
apiDomain: "",
appName: "",
websiteDomain: "",
origin: "",
},
recipeList: [Session.init(sessionConfig), EmailPassword.init(epConfig)],
isInServerlessEnv: true,
Expand Down Expand Up @@ -1110,7 +1110,7 @@ Supertokens.init({
appInfo: {
apiDomain: "",
appName: "",
websiteDomain: "",
origin: "",
},
recipeList: [
Session.init({ getTokenTransferMethod: () => "cookie", antiCsrf: "NONE", cookieDomain: "" }),
Expand All @@ -1127,7 +1127,7 @@ Supertokens.init({
appInfo: {
apiDomain: "",
appName: "",
websiteDomain: "",
origin: "",
},
recipeList: [
Session.init({
Expand Down Expand Up @@ -1424,7 +1424,7 @@ Supertokens.init({
appInfo: {
apiDomain: "",
appName: "",
websiteDomain: "",
origin: "",
},
recipeList: [
Dashboard.init({
Expand Down Expand Up @@ -1501,7 +1501,7 @@ Supertokens.init({
appInfo: {
apiDomain: "..",
appName: "..",
websiteDomain: "..",
origin: "..",
},
recipeList: [JWT.init()],
});
Expand Down

0 comments on commit 3a37007

Please sign in to comment.