@churchapps/apphelper 0.3.38 → 0.3.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/helpers/UserHelper.d.ts +1 -0
- package/dist/helpers/UserHelper.d.ts.map +1 -1
- package/dist/helpers/UserHelper.js +14 -2
- package/dist/helpers/UserHelper.js.map +1 -1
- package/dist/pageComponents/LoginPage.d.ts.map +1 -1
- package/dist/pageComponents/LoginPage.js +16 -1
- package/dist/pageComponents/LoginPage.js.map +1 -1
- package/dist/pageComponents/LogoutPage.d.ts.map +1 -1
- package/dist/pageComponents/LogoutPage.js +2 -1
- package/dist/pageComponents/LogoutPage.js.map +1 -1
- package/package.json +1 -1
- package/src/helpers/UserHelper.ts +14 -2
- package/src/pageComponents/LoginPage.tsx +17 -1
- package/src/pageComponents/LogoutPage.tsx +2 -1
|
@@ -10,5 +10,6 @@ export declare class UserHelper {
|
|
|
10
10
|
static setupApiHelperNoChurch(user: LoginUserChurchInterface): void;
|
|
11
11
|
static checkAccess({ api, contentType, action }: IApiPermission): boolean;
|
|
12
12
|
static createAppUrl(appUrl: string, returnUrl: string): string;
|
|
13
|
+
static redirectToLogin(returnUrl?: string): void;
|
|
13
14
|
}
|
|
14
15
|
//# sourceMappingURL=UserHelper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAErI,qBAAa,UAAU;IACrB,MAAM,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IACnD,MAAM,CAAC,YAAY,EAAE,wBAAwB,EAAE,CAAC;IAChD,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC;IAC3B,MAAM,CAAC,aAAa,EAAE,OAAO,CAAS;IACtC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAE/B,MAAM,CAAC,YAAY,GAAU,UAAU,oBAAoB,EAAE,WAAW,MAAM,EAAE,UAAU,MAAM,mBAoB/F;IAED,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,wBAAwB;IAK1D,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,wBAAwB;IAI5D,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,OAAO;IAYzE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"UserHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAErI,qBAAa,UAAU;IACrB,MAAM,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IACnD,MAAM,CAAC,YAAY,EAAE,wBAAwB,EAAE,CAAC;IAChD,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC;IAC3B,MAAM,CAAC,aAAa,EAAE,OAAO,CAAS;IACtC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAE/B,MAAM,CAAC,YAAY,GAAU,UAAU,oBAAoB,EAAE,WAAW,MAAM,EAAE,UAAU,MAAM,mBAoB/F;IAED,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,wBAAwB;IAK1D,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,wBAAwB;IAI5D,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,OAAO;IAYzE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAUrD,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM;CAO1C"}
|
|
@@ -23,8 +23,20 @@ class UserHelper {
|
|
|
23
23
|
return result;
|
|
24
24
|
}
|
|
25
25
|
static createAppUrl(appUrl, returnUrl) {
|
|
26
|
-
const jwt = ApiHelper_1.ApiHelper.getConfig("MembershipApi")
|
|
27
|
-
|
|
26
|
+
const jwt = ApiHelper_1.ApiHelper.getConfig("MembershipApi")?.jwt;
|
|
27
|
+
if (jwt) {
|
|
28
|
+
return `${appUrl}/login/?jwt=${jwt}&returnUrl=${encodeURIComponent(returnUrl)}`;
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
return `${appUrl}/login/?returnUrl=${encodeURIComponent(returnUrl)}`;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
static redirectToLogin(returnUrl) {
|
|
35
|
+
if (typeof window !== "undefined") {
|
|
36
|
+
const currentUrl = returnUrl || window.location.pathname + window.location.search;
|
|
37
|
+
const encodedReturnUrl = encodeURIComponent(currentUrl);
|
|
38
|
+
window.location.href = `/login?returnUrl=${encodedReturnUrl}`;
|
|
39
|
+
}
|
|
28
40
|
}
|
|
29
41
|
}
|
|
30
42
|
exports.UserHelper = UserHelper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserHelper.js","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":";;;;AAAA,2CAAuC;AAGvC,MAAa,UAAU;IA6BrB,MAAM,CAAC,cAAc,CAAC,UAAoC;QACxD,qBAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAChD,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,qBAAS,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvG,CAAC;IAED,MAAM,CAAC,sBAAsB,CAAC,IAA8B;QAC1D,qBAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAkB;QAC7D,MAAM,WAAW,GAAG,qBAAS,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,YAAY,IAAI,EAAE,CAAC;QAEjE,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC5B,IAAI,OAAO,CAAC,WAAW,KAAK,WAAW,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM;oBAAE,MAAM,GAAG,IAAI,CAAC;YACtF,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,MAAc,EAAE,SAAiB;QACnD,MAAM,GAAG,GAAG,qBAAS,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"UserHelper.js","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginPage.d.ts","sourceRoot":"","sources":["../../src/pageComponents/LoginPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAA0B,oBAAoB,EAAE,eAAe,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAO7I,OAAO,EAAc,UAAU,EAAc,MAAM,eAAe,CAAC;AAMnE,UAAU,KAAK;IACb,OAAO,EAAE,oBAAoB,CAAC;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;IAClC,sBAAsB,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,sBAAsB,CAAC,EAAE,UAAU,CAAC;CACrC;AAED,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"LoginPage.d.ts","sourceRoot":"","sources":["../../src/pageComponents/LoginPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAA0B,oBAAoB,EAAE,eAAe,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAO7I,OAAO,EAAc,UAAU,EAAc,MAAM,eAAe,CAAC;AAMnE,UAAU,KAAK;IACb,OAAO,EAAE,oBAAoB,CAAC;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;IAClC,sBAAsB,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,sBAAsB,CAAC,EAAE,UAAU,CAAC;CACrC;AAED,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAqOrC,CAAC"}
|
|
@@ -56,7 +56,7 @@ const LoginPage = ({ showLogo = true, loginContainerCssProps, ...props }) => {
|
|
|
56
56
|
const [welcomeBackName, setWelcomeBackName] = React.useState("");
|
|
57
57
|
const [pendingAutoLogin, setPendingAutoLogin] = React.useState(false);
|
|
58
58
|
const [errors, setErrors] = React.useState([]);
|
|
59
|
-
const [cookies, setCookie] = (0, react_cookie_1.useCookies)(["jwt", "name", "email"]);
|
|
59
|
+
const [cookies, setCookie] = (0, react_cookie_1.useCookies)(["jwt", "name", "email", "lastChurchId"]);
|
|
60
60
|
const [showForgot, setShowForgot] = React.useState(false);
|
|
61
61
|
const [showRegister, setShowRegister] = React.useState(false);
|
|
62
62
|
const [showSelectModal, setShowSelectModal] = React.useState(false);
|
|
@@ -126,11 +126,16 @@ const LoginPage = ({ showLogo = true, loginContainerCssProps, ...props }) => {
|
|
|
126
126
|
selectChurchById();
|
|
127
127
|
else if (churchIdInParams)
|
|
128
128
|
selectChurch(churchIdInParams);
|
|
129
|
+
else if (props.jwt && cookies.lastChurchId && helpers_1.ArrayHelper.getOne(resp.userChurches, "church.id", cookies.lastChurchId)) {
|
|
130
|
+
selectedChurchId = cookies.lastChurchId;
|
|
131
|
+
selectChurchById();
|
|
132
|
+
}
|
|
129
133
|
else
|
|
130
134
|
setShowSelectModal(true);
|
|
131
135
|
};
|
|
132
136
|
const selectChurchById = async () => {
|
|
133
137
|
await helpers_1.UserHelper.selectChurch(props.context, selectedChurchId, undefined);
|
|
138
|
+
setCookie("lastChurchId", selectedChurchId, { path: "/" });
|
|
134
139
|
if (registeredChurch) {
|
|
135
140
|
helpers_1.AnalyticsHelper.logEvent("Church", "Register", helpers_1.UserHelper.currentUserChurch.church.name);
|
|
136
141
|
try {
|
|
@@ -154,12 +159,16 @@ const LoginPage = ({ showLogo = true, loginContainerCssProps, ...props }) => {
|
|
|
154
159
|
if (!helpers_1.ArrayHelper.getOne(helpers_1.UserHelper.userChurches, "church.subDomain", props.keyName)) {
|
|
155
160
|
const userChurch = await helpers_1.ApiHelper.post("/churches/select", { subDomain: props.keyName }, "MembershipApi");
|
|
156
161
|
helpers_1.UserHelper.setupApiHelper(userChurch);
|
|
162
|
+
setCookie("lastChurchId", userChurch.church.id, { path: "/" });
|
|
157
163
|
//create/claim the person record and relogin
|
|
158
164
|
await helpers_1.ApiHelper.get("/people/claim/" + userChurch.church.id, "MembershipApi");
|
|
159
165
|
login({ jwt: userJwt || userJwtBackup });
|
|
160
166
|
return;
|
|
161
167
|
}
|
|
162
168
|
await helpers_1.UserHelper.selectChurch(props.context, undefined, props.keyName);
|
|
169
|
+
const selectedChurch = helpers_1.ArrayHelper.getOne(helpers_1.UserHelper.userChurches, "church.subDomain", props.keyName);
|
|
170
|
+
if (selectedChurch)
|
|
171
|
+
setCookie("lastChurchId", selectedChurch.church.id, { path: "/" });
|
|
163
172
|
await continueLoginProcess();
|
|
164
173
|
return;
|
|
165
174
|
};
|
|
@@ -193,12 +202,18 @@ const LoginPage = ({ showLogo = true, loginContainerCssProps, ...props }) => {
|
|
|
193
202
|
const personClaim = await helpers_1.ApiHelper.get("/people/claim/" + helpers_1.UserHelper.currentUserChurch.church.id, "MembershipApi");
|
|
194
203
|
props.context.setPerson(personClaim);
|
|
195
204
|
}
|
|
205
|
+
const search = new URLSearchParams(location?.search);
|
|
206
|
+
const returnUrl = search.get("returnUrl") || props.returnUrl;
|
|
207
|
+
if (returnUrl && typeof window !== "undefined") {
|
|
208
|
+
window.location.href = returnUrl;
|
|
209
|
+
}
|
|
196
210
|
}
|
|
197
211
|
}
|
|
198
212
|
async function selectChurch(churchId) {
|
|
199
213
|
try {
|
|
200
214
|
setErrors([]);
|
|
201
215
|
selectedChurchId = churchId;
|
|
216
|
+
setCookie("lastChurchId", churchId, { path: "/" });
|
|
202
217
|
if (!helpers_1.ArrayHelper.getOne(helpers_1.UserHelper.userChurches, "church.id", churchId)) {
|
|
203
218
|
const userChurch = await helpers_1.ApiHelper.post("/churches/select", { churchId: churchId }, "MembershipApi");
|
|
204
219
|
helpers_1.UserHelper.setupApiHelper(userChurch);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginPage.js","sourceRoot":"","sources":["../../src/pageComponents/LoginPage.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,6CAA+B;AAC/B,8CAAwE;AAExE,wCAAyF;AACzF,+CAAyC;AACzC,4DAAmC;AACnC,oDAAgD;AAChD,sEAAkE;AAClE,gDAA6C;AAC7C,4CAAmE;AACnE,8CAA2C;AAC3C,oEAAiE;AACjE,gFAA6E;AAC7E,0DAA4B;AAmBrB,MAAM,SAAS,GAAoB,CAAC,EAAE,QAAQ,GAAG,IAAI,EAAE,sBAAsB,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAClG,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACjE,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,IAAA,yBAAU,EAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAyB,IAAI,CAAC,CAAA;IACtF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACjD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,CAAC;IAClE,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,gBAAgB,GAAoB,IAAI,CAAC;IAC7C,IAAI,aAAa,GAAG,EAAE,CAAC,CAAC,uFAAuF;IAE/G,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;aAC1B,CAAC;YACJ,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAC3C,IAAI,KAAK,KAAK,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC,MAAM,CAAC;;gBACjC,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC,CAAA;IAED,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,KAAK,CAAC,cAAc,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QACjC,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAA;IAE1B,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,MAAM,KAAK,QAAQ;YAAE,aAAa,CAAC,IAAI,CAAC,CAAC;aACxC,IAAI,MAAM,KAAK,UAAU;YAAE,eAAe,CAAC,IAAI,CAAC,CAAC;aACjD,CAAC;YACJ,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;gBAChC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACjC,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC1B,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAA4B,EAAE,EAAE;QAChE,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QAC9B,UAAU,CAAC,aAAa,CAAC,CAAC;QAC1B,mBAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/C,gBAAgB,CAAC,IAAI,CAAC,CAAA;QACtB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI;YAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,oBAAU,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAE5C,SAAS,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QACjF,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QACnD,oBAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAE5B,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,OAAO,GAAQ,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAA;YAC9C,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAA;QACrC,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACrD,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAEhD,IAAI,KAAK,CAAC,OAAO;YAAE,qBAAqB,EAAE,CAAC;aACtC,IAAI,gBAAgB;YAAE,gBAAgB,EAAE,CAAC;aACzC,IAAI,gBAAgB;YAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;;YACrD,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,CAAA;IAED,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAClC,MAAM,oBAAU,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAC;QAE1E,IAAI,gBAAgB,EAAE,CAAC;YACrB,yBAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,oBAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACzF,IAAI,CAAC;gBACH,IAAI,iDAAuB,CAAC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,WAAW,EAAE,CAAC;oBAClF,mBAAG,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC,CAAC;gBACpF,CAAC;YACH,CAAC;YAAC,MAAM,CAAC,CAAC,CAAC;QACb,CAAC;;YACI,yBAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,oBAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE5F,IAAI,KAAK,CAAC,wBAAwB,IAAI,gBAAgB,EAAE,CAAC;YACvD,MAAM,KAAK,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAA;YACtD,gBAAgB,GAAG,IAAI,CAAC;YACxB,KAAK,CAAC,EAAE,GAAG,EAAE,OAAO,IAAI,aAAa,EAAE,CAAC,CAAC;QAC3C,CAAC;;YAAM,MAAM,oBAAoB,EAAE,CAAC;IACtC,CAAC,CAAA;IAED,MAAM,qBAAqB,GAAG,KAAK,IAAI,EAAE;QACvC,IAAI,CAAC,qBAAW,CAAC,MAAM,CAAC,oBAAU,CAAC,YAAY,EAAE,kBAAkB,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACpF,MAAM,UAAU,GAA6B,MAAM,mBAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;YACrI,oBAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YACtC,4CAA4C;YAC5C,MAAM,mBAAS,CAAC,GAAG,CAAC,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;YAC9E,KAAK,CAAC,EAAE,GAAG,EAAE,OAAO,IAAI,aAAa,EAAE,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QACD,MAAM,oBAAU,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,oBAAoB,EAAE,CAAA;QAC5B,OAAO;IACT,CAAC,CAAA;IAED,KAAK,UAAU,oBAAoB;QACjC,IAAI,oBAAU,CAAC,iBAAiB,EAAE,CAAC;YACjC,oBAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC9C,IAAI,GAAG,CAAC,OAAO,KAAK,eAAe;oBAAE,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;YAChF,CAAC,CAAC,CAAA;YACF,IAAI,CAAC;gBACH,IAAI,oBAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE;oBAAE,mBAAS,CAAC,KAAK,CAAC,eAAe,oBAAU,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,oBAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,eAAe,CAAC,CAAA;YAC3N,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,oBAAoB,KAAK,SAAS;YAAE,KAAK,CAAC,oBAAoB,EAAE,CAAC;aACtE,CAAC;YACJ,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAU,CAAC,IAAI,CAAC,CAAC;YACvC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAU,CAAC,YAAY,CAAC,CAAA;YACtD,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,oBAAU,CAAC,iBAAiB,CAAC,CAAA;YACzD,IAAI,CAAC;gBACH,MAAM,CAAC,GAAG,MAAM,mBAAS,CAAC,GAAG,CAAC,WAAW,oBAAU,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;gBACrG,IAAI,CAAC;oBAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBAC/B,MAAM,WAAW,GAAG,MAAM,mBAAS,CAAC,GAAG,CAAC,gBAAgB,GAAG,oBAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;gBACpH,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,UAAU,YAAY,CAAC,QAAgB;QAC1C,IAAI,CAAC;YACH,SAAS,CAAC,EAAE,CAAC,CAAA;YACb,gBAAgB,GAAG,QAAQ,CAAC;YAC5B,IAAI,CAAC,qBAAW,CAAC,MAAM,CAAC,oBAAU,CAAC,YAAY,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;gBACxE,MAAM,UAAU,GAA6B,MAAM,mBAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;gBAC/H,oBAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;gBAEtC,4CAA4C;gBAC5C,MAAM,mBAAS,CAAC,GAAG,CAAC,gBAAgB,GAAG,QAAQ,EAAE,eAAe,CAAC,CAAC;gBAClE,KAAK,CAAC,EAAE,GAAG,EAAE,OAAO,IAAI,aAAa,EAAE,CAAC,CAAC;gBACzC,OAAO;YACT,CAAC;YACD,oBAAU,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,oBAAoB,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC;QAChG,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAA;YAC/C,SAAS,CAAC,CAAC,gBAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAA;YAC3D,YAAY,EAAE,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9C,CAAC;IAEH,CAAC;IAED,MAAM,iBAAiB,GAAG,CAAC,MAAgB,EAAE,EAAE;QAC7C,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,SAAS,CAAC,CAAC,gBAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAA;IAED,MAAM,KAAK,GAAG,KAAK,EAAE,IAAS,EAAE,EAAE;QAChC,SAAS,CAAC,EAAE,CAAC,CAAA;QACb,eAAe,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,IAAI,GAA2B,MAAM,mBAAS,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;YAC1G,eAAe,CAAC,KAAK,CAAC,CAAC;YACvB,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,GAAG;gBAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;;gBAC5C,kBAAkB,CAAC,EAAE,CAAC,CAAC;YAC5B,eAAe,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,GAAG,EAAE,GAAG,IAAI,eAAe,KAAK,EAAE;QAAE,OAAO,CAAC,6DAAE,uBAAC,gBAAK,IAAC,QAAQ,EAAC,MAAM,YAAC,gCAAK,uBAAuB,EAAE,EAAE,MAAM,EAAE,gBAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,GAAI,GAAQ,EAAA,uBAAC,oBAAO,KAAG,IAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IACrO,MAAM,aAAa,GAAG,GAAG,EAAE,GAAG,IAAI,IAAI,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,GAAG;QAAE,OAAO,uBAAC,gBAAK,IAAC,QAAQ,EAAC,MAAM,YAAE,gBAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,GAAS,CAAA,CAAC,CAAC,CAAA;IACnL,MAAM,sBAAsB,GAAG,GAAG,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IACrF,MAAM,mBAAmB,GAAG,GAAG,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IACnF,MAAM,sBAAsB,GAAG,CAAC,MAAuB,EAAE,EAAE,GAAG,gBAAgB,GAAG,MAAM,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA,CAAC,CAAC,CAAA;IAEzJ,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,IAAI,YAAY;YAAE,OAAO,CACvB,wBAAC,cAAG,IAAC,EAAE,EAAC,UAAU,EAAC,EAAE,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,aAChH,uBAAC,qBAAU,IAAC,SAAS,EAAC,IAAI,EAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,YAAG,gBAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,GAAc,EAC9J,uBAAC,mBAAQ,IAAC,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,aAAa,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,KAAK,CAAC,sBAAsB,GAAI,IAC1K,CACP,CAAC;aACG,IAAI,UAAU;YAAE,OAAO,CAAC,uBAAC,eAAM,IAAC,gBAAgB,EAAE,sBAAsB,EAAE,aAAa,EAAE,mBAAmB,GAAI,CAAC,CAAC;aAClH,IAAI,KAAK,CAAC,IAAI;YAAE,OAAO,CAAC,uBAAC,mCAAgB,IAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,GAAI,CAAC,CAAA;;YAC5M,OAAO,uBAAC,aAAK,IAAC,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,qBAAqB,EAAE,sBAAsB,GAAI,CAAC;IACvM,CAAC,CAAA;IAED,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB;IAEhD,OAAO,CACL,wBAAC,cAAG,IAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,EAAC,MAAM,EAAC,EAAE,EAAC,MAAM,aAChD,QAAQ,IAAI,gCAAK,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,wBAAwB,EAAE,GAAG,EAAC,MAAM,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,GAAI,EACxI,uBAAC,0BAAa,IAAC,MAAM,EAAE,MAAM,GAAI,EAChC,cAAc,EAAE,EAChB,aAAa,EAAE,EACf,CAAC,gBAAgB,IAAI,WAAW,EAAE,EACnC,uBAAC,qCAAiB,IAAC,IAAI,EAAE,eAAe,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,GAAI,EAC7M,uBAAC,4BAAe,IAAC,OAAO,EAAE,KAAK,CAAC,OAAO,GAAI,IACvC,CACP,CAAC;AAEJ,CAAC,CAAC;AArNW,QAAA,SAAS,aAqNpB"}
|
|
1
|
+
{"version":3,"file":"LoginPage.js","sourceRoot":"","sources":["../../src/pageComponents/LoginPage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogoutPage.d.ts","sourceRoot":"","sources":["../../src/pageComponents/LogoutPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAa,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAE7D,UAAU,KAAK;IAAG,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAAE;AAEnD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"LogoutPage.d.ts","sourceRoot":"","sources":["../../src/pageComponents/LogoutPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAa,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAE7D,UAAU,KAAK;IAAG,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAAE;AAEnD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAqBtC,CAAA"}
|
|
@@ -5,10 +5,11 @@ exports.LogoutPage = void 0;
|
|
|
5
5
|
const react_cookie_1 = require("react-cookie");
|
|
6
6
|
const helpers_1 = require("../helpers");
|
|
7
7
|
const LogoutPage = (props) => {
|
|
8
|
-
const [, , removeCookie] = (0, react_cookie_1.useCookies)(["jwt", "email", "name"]);
|
|
8
|
+
const [, , removeCookie] = (0, react_cookie_1.useCookies)(["jwt", "email", "name", "lastChurchId"]);
|
|
9
9
|
removeCookie("jwt");
|
|
10
10
|
removeCookie("email");
|
|
11
11
|
removeCookie("name");
|
|
12
|
+
removeCookie("lastChurchId");
|
|
12
13
|
helpers_1.ApiHelper.clearPermissions();
|
|
13
14
|
props.context?.setUser(null);
|
|
14
15
|
props.context?.setPerson(null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogoutPage.js","sourceRoot":"","sources":["../../src/pageComponents/LogoutPage.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;AAGb,+CAAyC;AACzC,wCAA6D;AAItD,MAAM,UAAU,GAAoB,CAAC,KAAK,EAAE,EAAE;IACnD,MAAM,CAAC,EAAE,AAAD,EAAG,YAAY,CAAC,GAAG,IAAA,yBAAU,EAAC,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"LogoutPage.js","sourceRoot":"","sources":["../../src/pageComponents/LogoutPage.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;AAGb,+CAAyC;AACzC,wCAA6D;AAItD,MAAM,UAAU,GAAoB,CAAC,KAAK,EAAE,EAAE;IACnD,MAAM,CAAC,EAAE,AAAD,EAAG,YAAY,CAAC,GAAG,IAAA,yBAAU,EAAC,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAEhF,YAAY,CAAC,KAAK,CAAC,CAAC;IACpB,YAAY,CAAC,OAAO,CAAC,CAAC;IACtB,YAAY,CAAC,MAAM,CAAC,CAAC;IACrB,YAAY,CAAC,cAAc,CAAC,CAAC;IAE7B,mBAAS,CAAC,gBAAgB,EAAE,CAAC;IAC7B,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/B,KAAK,CAAC,OAAO,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IACrC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IAEnC,UAAU,CAAC,GAAG,EAAE;QACd,0BAA0B;QAC1B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;YAClC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;QAC7B,CAAC;IACH,CAAC,EAAE,GAAG,CAAC,CAAC;IACR,OAAO,IAAI,CAAC;AACd,CAAC,CAAA;AArBY,QAAA,UAAU,cAqBtB"}
|
package/package.json
CHANGED
|
@@ -52,8 +52,20 @@ export class UserHelper {
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
static createAppUrl(appUrl: string, returnUrl: string) {
|
|
55
|
-
const jwt = ApiHelper.getConfig("MembershipApi")
|
|
55
|
+
const jwt = ApiHelper.getConfig("MembershipApi")?.jwt;
|
|
56
56
|
|
|
57
|
-
|
|
57
|
+
if (jwt) {
|
|
58
|
+
return `${appUrl}/login/?jwt=${jwt}&returnUrl=${encodeURIComponent(returnUrl)}`;
|
|
59
|
+
} else {
|
|
60
|
+
return `${appUrl}/login/?returnUrl=${encodeURIComponent(returnUrl)}`;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
static redirectToLogin(returnUrl?: string) {
|
|
65
|
+
if (typeof window !== "undefined") {
|
|
66
|
+
const currentUrl = returnUrl || window.location.pathname + window.location.search;
|
|
67
|
+
const encodedReturnUrl = encodeURIComponent(currentUrl);
|
|
68
|
+
window.location.href = `/login?returnUrl=${encodedReturnUrl}`;
|
|
69
|
+
}
|
|
58
70
|
}
|
|
59
71
|
}
|
|
@@ -36,7 +36,7 @@ export const LoginPage: React.FC<Props> = ({ showLogo = true, loginContainerCssP
|
|
|
36
36
|
const [welcomeBackName, setWelcomeBackName] = React.useState("");
|
|
37
37
|
const [pendingAutoLogin, setPendingAutoLogin] = React.useState(false);
|
|
38
38
|
const [errors, setErrors] = React.useState([]);
|
|
39
|
-
const [cookies, setCookie] = useCookies(["jwt", "name", "email"]);
|
|
39
|
+
const [cookies, setCookie] = useCookies(["jwt", "name", "email", "lastChurchId"]);
|
|
40
40
|
const [showForgot, setShowForgot] = React.useState(false);
|
|
41
41
|
const [showRegister, setShowRegister] = React.useState(false);
|
|
42
42
|
const [showSelectModal, setShowSelectModal] = React.useState(false);
|
|
@@ -105,12 +105,18 @@ export const LoginPage: React.FC<Props> = ({ showLogo = true, loginContainerCssP
|
|
|
105
105
|
if (props.keyName) selectChurchByKeyName();
|
|
106
106
|
else if (selectedChurchId) selectChurchById();
|
|
107
107
|
else if (churchIdInParams) selectChurch(churchIdInParams);
|
|
108
|
+
else if (props.jwt && cookies.lastChurchId && ArrayHelper.getOne(resp.userChurches, "church.id", cookies.lastChurchId)) {
|
|
109
|
+
selectedChurchId = cookies.lastChurchId;
|
|
110
|
+
selectChurchById();
|
|
111
|
+
}
|
|
108
112
|
else setShowSelectModal(true);
|
|
109
113
|
}
|
|
110
114
|
|
|
111
115
|
const selectChurchById = async () => {
|
|
112
116
|
await UserHelper.selectChurch(props.context, selectedChurchId, undefined);
|
|
113
117
|
|
|
118
|
+
setCookie("lastChurchId", selectedChurchId, { path: "/" });
|
|
119
|
+
|
|
114
120
|
if (registeredChurch) {
|
|
115
121
|
AnalyticsHelper.logEvent("Church", "Register", UserHelper.currentUserChurch.church.name);
|
|
116
122
|
try {
|
|
@@ -132,12 +138,15 @@ export const LoginPage: React.FC<Props> = ({ showLogo = true, loginContainerCssP
|
|
|
132
138
|
if (!ArrayHelper.getOne(UserHelper.userChurches, "church.subDomain", props.keyName)) {
|
|
133
139
|
const userChurch: LoginUserChurchInterface = await ApiHelper.post("/churches/select", { subDomain: props.keyName }, "MembershipApi");
|
|
134
140
|
UserHelper.setupApiHelper(userChurch);
|
|
141
|
+
setCookie("lastChurchId", userChurch.church.id, { path: "/" });
|
|
135
142
|
//create/claim the person record and relogin
|
|
136
143
|
await ApiHelper.get("/people/claim/" + userChurch.church.id, "MembershipApi");
|
|
137
144
|
login({ jwt: userJwt || userJwtBackup });
|
|
138
145
|
return;
|
|
139
146
|
}
|
|
140
147
|
await UserHelper.selectChurch(props.context, undefined, props.keyName);
|
|
148
|
+
const selectedChurch = ArrayHelper.getOne(UserHelper.userChurches, "church.subDomain", props.keyName);
|
|
149
|
+
if (selectedChurch) setCookie("lastChurchId", selectedChurch.church.id, { path: "/" });
|
|
141
150
|
await continueLoginProcess()
|
|
142
151
|
return;
|
|
143
152
|
}
|
|
@@ -167,6 +176,12 @@ export const LoginPage: React.FC<Props> = ({ showLogo = true, loginContainerCssP
|
|
|
167
176
|
const personClaim = await ApiHelper.get("/people/claim/" + UserHelper.currentUserChurch.church.id, "MembershipApi");
|
|
168
177
|
props.context.setPerson(personClaim);
|
|
169
178
|
}
|
|
179
|
+
|
|
180
|
+
const search = new URLSearchParams(location?.search);
|
|
181
|
+
const returnUrl = search.get("returnUrl") || props.returnUrl;
|
|
182
|
+
if (returnUrl && typeof window !== "undefined") {
|
|
183
|
+
window.location.href = returnUrl;
|
|
184
|
+
}
|
|
170
185
|
}
|
|
171
186
|
}
|
|
172
187
|
|
|
@@ -174,6 +189,7 @@ export const LoginPage: React.FC<Props> = ({ showLogo = true, loginContainerCssP
|
|
|
174
189
|
try {
|
|
175
190
|
setErrors([])
|
|
176
191
|
selectedChurchId = churchId;
|
|
192
|
+
setCookie("lastChurchId", churchId, { path: "/" });
|
|
177
193
|
if (!ArrayHelper.getOne(UserHelper.userChurches, "church.id", churchId)) {
|
|
178
194
|
const userChurch: LoginUserChurchInterface = await ApiHelper.post("/churches/select", { churchId: churchId }, "MembershipApi");
|
|
179
195
|
UserHelper.setupApiHelper(userChurch);
|
|
@@ -7,11 +7,12 @@ import { ApiHelper, UserContextInterface } from "../helpers";
|
|
|
7
7
|
interface Props { context?: UserContextInterface, }
|
|
8
8
|
|
|
9
9
|
export const LogoutPage: React.FC<Props> = (props) => {
|
|
10
|
-
const [, , removeCookie] = useCookies(["jwt", "email", "name"]);
|
|
10
|
+
const [, , removeCookie] = useCookies(["jwt", "email", "name", "lastChurchId"]);
|
|
11
11
|
|
|
12
12
|
removeCookie("jwt");
|
|
13
13
|
removeCookie("email");
|
|
14
14
|
removeCookie("name");
|
|
15
|
+
removeCookie("lastChurchId");
|
|
15
16
|
|
|
16
17
|
ApiHelper.clearPermissions();
|
|
17
18
|
props.context?.setUser(null);
|