@churchapps/apphelper 0.4.12 → 0.4.18

package/src/donationComponents/modals/DonationPreviewModal.tsx

@@ -1,70 +0,0 @@
-"use client";
-
-import React from "react";
-import { DateHelper, CurrencyHelper, Locale } from "../../helpers";
-import { StripeDonationInterface } from "@churchapps/helpers";
-import {
- Table, TableBody, TableRow, TableCell, Dialog, DialogTitle, DialogContent, DialogActions, Button 
-} from "@mui/material";
-
-interface Props {
-  show: boolean;
-  onHide: () => void;
-  handleDonate: (message: string) => void;
-  donation: StripeDonationInterface;
-  donationType: string;
-  paymentMethodName: string;
-  funds: any;
-  payFee: number;
-}
-
-export const DonationPreviewModal: React.FC<Props> = (props) => {
-  const donationType: any = { once: "One-time Donation", recurring: "Recurring Donation" };
-  const [isLoading, setLoading] = React.useState<boolean>(false);
-
-  const handleClick = () => {
-    setLoading(true);
-    let message = "Thank you for your donation.";
-    if (props.donationType === "recurring") message = "Recurring donation created. " + message;
-    props.handleDonate(message);
-  };
-
-  const formatInterval = () => {
-    const count = props.donation.interval.interval_count;
-    const interval = props.donation.interval.interval;
-    const result = `${count} ${interval}`;
-    return count > 1 ? result + "s" : result;
-  };
-
-  return (
-    <Dialog open={props.show} {...props}>
-      <DialogTitle>Donation Preview</DialogTitle>
-      <DialogContent>
-        <Table>
-          <TableBody>
-            <TableRow><TableCell>{Locale.label("person.name")}:</TableCell><TableCell>{props.donation.person.name}</TableCell></TableRow>
-            <TableRow><TableCell>{Locale.label("donation.preview.method")}:</TableCell><TableCell className="capitalize">{props.paymentMethodName}</TableCell></TableRow>
-            <TableRow><TableCell>{Locale.label("donation.preview.type")}:</TableCell><TableCell>{donationType[props.donationType]}</TableCell></TableRow>
-            {props.donationType === "once"
-              && <TableRow><TableCell>{Locale.label("donation.preview.date")}:</TableCell><TableCell>{DateHelper.formatHtml5Date(new Date(props.donation.billing_cycle_anchor))}</TableCell></TableRow>
-            }
-            <TableRow><TableCell>{Locale.label("donation.preview.weekly")}:</TableCell><TableCell>{props.donation.notes}</TableCell></TableRow>
-            {props.donationType === "recurring"
-              && <>
-                <TableRow><TableCell>{Locale.label("donation.preview.startingOn")}:</TableCell><TableCell>{DateHelper.formatHtml5Date(new Date(props.donation.billing_cycle_anchor))}</TableCell></TableRow>
-                <TableRow><TableCell>{Locale.label("donation.preview.every")}:</TableCell><TableCell className="capitalize">{formatInterval()}</TableCell></TableRow>
-              </>
-            }
-            <TableRow><TableCell>{Locale.label("donation.preview.funds")}:</TableCell><TableCell>{props.donation.funds.map((fund: any, i: number) => <p key={i}>{CurrencyHelper.formatCurrency(fund.amount)} - {fund.name}</p>)}</TableCell></TableRow>
-            {props.payFee > 0 && <TableRow><TableCell>{Locale.label("donation.preview.fee")}:</TableCell><TableCell>{CurrencyHelper.formatCurrency(props.payFee)}</TableCell></TableRow>}
-            <TableRow><TableCell>{Locale.label("donation.preview.total")}:</TableCell><TableCell><h4>{CurrencyHelper.formatCurrency(props.donation.amount)}</h4></TableCell></TableRow>
-          </TableBody>
-        </Table>
-      </DialogContent>
-      <DialogActions>
-        <Button onClick={props.onHide} variant="outlined" aria-label="cancel-button">{Locale.label("donation.common.cancel")}</Button>
-        <Button onClick={handleClick} variant="contained" aria-label="donate-button" disabled={isLoading}>{Locale.label("donation.preview.donate")}</Button>
-      </DialogActions>
-    </Dialog>
-  );
-};

package/src/helpers/ApiHelper.ts

@@ -1,127 +0,0 @@
-import { ApiConfig, RolePermissionInterface, ApiListType } from "@churchapps/helpers";
-import { ErrorHelper } from "./ErrorHelper";
-
-export class ApiHelper {
-
-	static apiConfigs: ApiConfig[] = [];
-	static isAuthenticated = false;
-
-	static getConfig(keyName: string) {
-		let result: ApiConfig;
-		this.apiConfigs.forEach(config => { if (config.keyName === keyName) result = config });
-		//if (result === null) throw new Error("Unconfigured API: " + keyName);
-		return result;
-	}
-
-	static setDefaultPermissions(jwt: string) {
-		this.apiConfigs.forEach(config => {
-			config.jwt = jwt;
-			config.permissions = [];
-		});
-		this.isAuthenticated = true;
-	}
-
-	static setPermissions(keyName: string, jwt: string, permissions: RolePermissionInterface[]) {
-		this.apiConfigs.forEach(config => {
-			if (config.keyName === keyName) {
-				config.jwt = jwt;
-				config.permissions = permissions;
-			}
-		});
-		this.isAuthenticated = true;
-	}
-
-	static clearPermissions() {
-		this.apiConfigs.forEach(config => { config.jwt = ""; config.permissions = []; });
-		this.isAuthenticated = false;
-	}
-
-	static async get(path: string, apiName: ApiListType) {
-		const config = this.getConfig(apiName);
-		const requestOptions = {
-			method: "GET",
-			headers: { Authorization: "Bearer " + config.jwt },
-			cache: "no-store"
-		};
-
-		return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-	}
-
-	static async getAnonymous(path: string, apiName: ApiListType, tags?: string[]) {
-		const config = this.getConfig(apiName);
-		const requestOptions: RequestInit = { method: "GET" };
-		if (tags?.length > 0) (requestOptions as any).next = { tags: tags };
-		else requestOptions.cache = "no-store";
-		return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-	}
-
-	static async post(path: string, data: any[] | {}, apiName: ApiListType) {
-		const config = this.getConfig(apiName);
-		const requestOptions = {
-			method: "POST",
-			headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
-			body: JSON.stringify(data)
-		};
-		return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-	}
-
-	static async patch(path: string, data: any[] | {}, apiName: ApiListType) {
-		const config = this.getConfig(apiName);
-		const requestOptions = {
-			method: "PATCH",
-			headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
-			body: JSON.stringify(data)
-		};
-		return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-	}
-
-	static async delete(path: string, apiName: ApiListType) {
-		const config = this.getConfig(apiName);
-		const requestOptions = {
-			method: "DELETE",
-			headers: { Authorization: "Bearer " + config.jwt }
-		};
-		try {
-			const response = await fetch(config.url + path, requestOptions);
-			if (!response.ok) await this.throwApiError(response);
-		} catch (e) {
-			throw (e);
-		}
-	}
-
-	static async postAnonymous(path: string, data: any[] | {}, apiName: ApiListType) {
-		const config = this.getConfig(apiName);
-		const requestOptions = {
-			method: "POST",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify(data)
-		};
-		return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-	}
-
-	static async fetchWithErrorHandling(url: string, requestOptions: any) {
-		try {
-			const response = await fetch(url, requestOptions);
-			if (!response.ok) await this.throwApiError(response);
-			else {
-				if (response.status !== 204) {
-					return response.json();
-				}
-			}
-		} catch (e) {
-			console.log("Failed to fetch from " + url);
-			throw (e);
-		}
-	}
-
-	private static async throwApiError(response: Response) {
-		let msg = response.statusText;
-		try {
-			const json = await response.json();
-			msg = json.errors[0];
-		} catch { }
-		ErrorHelper.logError(response.status.toString(), response.url, msg);
-		throw new Error(msg || "Error");
-	}
-
-}

package/src/helpers/CommonEnvironmentHelper.ts

@@ -1,98 +0,0 @@
-
-export class CommonEnvironmentHelper {
-	public static AttendanceApi = "";
-	public static DoingApi = "";
-	public static GivingApi = "";
-	public static MembershipApi = "";
-	public static ReportingApi = "";
-	public static MessagingApi = "";
-	public static MessagingApiSocket = "";
-	public static ContentApi = "";
-	public static GoogleAnalyticsTag = "";
-
-	static ContentRoot = "";
-	static B1Root = "";
-	static ChumsRoot = "";
-	static LessonsRoot = "";
-
-	static init = (stage: string) => {
-		switch (stage) {
-			case "demo": CommonEnvironmentHelper.initDemo(); break;
-			case "staging": CommonEnvironmentHelper.initStaging(); break;
-			case "prod": CommonEnvironmentHelper.initProd(); break;
-			default: CommonEnvironmentHelper.initDev(); break;
-		}
-	}
-
-	static initDev = () => {
-		this.initStaging(); //Use staging values for anything not provided
-		CommonEnvironmentHelper.AttendanceApi = process.env.REACT_APP_ATTENDANCE_API || process.env.NEXT_PUBLIC_ATTENDANCE_API || CommonEnvironmentHelper.AttendanceApi;
-		CommonEnvironmentHelper.DoingApi = process.env.REACT_APP_DOING_API || process.env.NEXT_PUBLIC_DOING_API || CommonEnvironmentHelper.DoingApi;
-		CommonEnvironmentHelper.GivingApi = process.env.REACT_APP_GIVING_API || process.env.NEXT_PUBLIC_GIVING_API || CommonEnvironmentHelper.GivingApi;
-		CommonEnvironmentHelper.MembershipApi = process.env.REACT_APP_MEMBERSHIP_API || process.env.NEXT_PUBLIC_MEMBERSHIP_API || CommonEnvironmentHelper.MembershipApi;
-		CommonEnvironmentHelper.ReportingApi = process.env.REACT_APP_REPORTING_API || process.env.NEXT_PUBLIC_REPORTING_API || CommonEnvironmentHelper.ReportingApi;
-		CommonEnvironmentHelper.MessagingApi = process.env.REACT_APP_MESSAGING_API || process.env.NEXT_PUBLIC_MESSAGING_API || CommonEnvironmentHelper.MessagingApi;
-		CommonEnvironmentHelper.MessagingApiSocket = process.env.REACT_APP_MESSAGING_API_SOCKET || process.env.NEXT_PUBLIC_MESSAGING_API_SOCKET || CommonEnvironmentHelper.MessagingApiSocket;
-		CommonEnvironmentHelper.ContentApi = process.env.REACT_APP_CONTENT_API || process.env.NEXT_PUBLIC_CONTENT_API || CommonEnvironmentHelper.ContentApi;
-		CommonEnvironmentHelper.GoogleAnalyticsTag = process.env.REACT_APP_GOOGLE_ANALYTICS || process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS || CommonEnvironmentHelper.GoogleAnalyticsTag;
-
-		CommonEnvironmentHelper.ContentRoot = process.env.REACT_APP_CONTENT_ROOT || process.env.NEXT_PUBLIC_CONTENT_ROOT || CommonEnvironmentHelper.ContentRoot;
-		CommonEnvironmentHelper.B1Root = process.env.REACT_APP_B1_ROOT || process.env.NEXT_PUBLIC_B1_ROOT || CommonEnvironmentHelper.B1Root;
-		CommonEnvironmentHelper.ChumsRoot = process.env.REACT_APP_CHUMS_ROOT || process.env.NEXT_PUBLIC_CHUMS_ROOT || CommonEnvironmentHelper.ChumsRoot;
-		CommonEnvironmentHelper.LessonsRoot = process.env.REACT_APP_LESSONS_ROOT || process.env.NEXT_PUBLIC_LESSONS_ROOT || CommonEnvironmentHelper.LessonsRoot;
-	}
-
-	//NOTE: None of these values are secret.
-	static initDemo = () => {
-		CommonEnvironmentHelper.AttendanceApi = "https://attendanceapi.demo.churchapps.org";
-		CommonEnvironmentHelper.DoingApi = "https://doingapi.demo.churchapps.org";
-		CommonEnvironmentHelper.GivingApi = "https://givingapi.demo.churchapps.org";
-		CommonEnvironmentHelper.MembershipApi = "https://membershipapi.demo.churchapps.org";
-		CommonEnvironmentHelper.ReportingApi = "https://reportingapi.demo.churchapps.org";
-		CommonEnvironmentHelper.MessagingApi = "https://messagingapi.demo.churchapps.org";
-		CommonEnvironmentHelper.MessagingApiSocket = "wss://socket.demo.churchapps.org";
-		CommonEnvironmentHelper.ContentApi = "https://contentapi.demo.churchapps.org";
-		CommonEnvironmentHelper.GoogleAnalyticsTag = "";
-
-		CommonEnvironmentHelper.ContentRoot = "https://content.demo.churchapps.org";
-		CommonEnvironmentHelper.B1Root = "https://{key}.demo.b1.church";
-		CommonEnvironmentHelper.ChumsRoot = "https://app.demo.chums.org";
-		CommonEnvironmentHelper.LessonsRoot = "https://demo.lessons.church";
-	}
-
-	static initStaging = () => {
-		CommonEnvironmentHelper.AttendanceApi = "https://attendanceapi.staging.churchapps.org";
-		CommonEnvironmentHelper.DoingApi = "https://doingapi.staging.churchapps.org";
-		CommonEnvironmentHelper.GivingApi = "https://givingapi.staging.churchapps.org";
-		CommonEnvironmentHelper.MembershipApi = "https://membershipapi.staging.churchapps.org";
-		CommonEnvironmentHelper.ReportingApi = "https://reportingapi.staging.churchapps.org";
-		CommonEnvironmentHelper.MessagingApi = "https://messagingapi.staging.churchapps.org";
-		CommonEnvironmentHelper.MessagingApiSocket = "wss://socket.staging.churchapps.org";
-		CommonEnvironmentHelper.ContentApi = "https://contentapi.staging.churchapps.org";
-		CommonEnvironmentHelper.GoogleAnalyticsTag = "";
-
-		CommonEnvironmentHelper.ContentRoot = "https://content.staging.churchapps.org";
-		CommonEnvironmentHelper.B1Root = "https://{key}.staging.b1.church";
-		CommonEnvironmentHelper.ChumsRoot = "https://app.staging.chums.org";
-		CommonEnvironmentHelper.LessonsRoot = "https://staging.lessons.church";
-	}
-
-	//NOTE: None of these values are secret.
-	static initProd = () => {
-		CommonEnvironmentHelper.AttendanceApi = "https://attendanceapi.churchapps.org";
-		CommonEnvironmentHelper.DoingApi = "https://doingapi.churchapps.org";
-		CommonEnvironmentHelper.GivingApi = "https://givingapi.churchapps.org";
-		CommonEnvironmentHelper.MembershipApi = "https://membershipapi.churchapps.org";
-		CommonEnvironmentHelper.ReportingApi = "https://reportingapi.churchapps.org";
-		CommonEnvironmentHelper.MessagingApi = "https://messagingapi.churchapps.org";
-		CommonEnvironmentHelper.MessagingApiSocket = "wss://socket.churchapps.org";
-		CommonEnvironmentHelper.ContentApi = "https://contentapi.churchapps.org";
-
-		CommonEnvironmentHelper.ContentRoot = "https://content.churchapps.org";
-		CommonEnvironmentHelper.B1Root = "https://{key}.b1.church";
-		CommonEnvironmentHelper.ChumsRoot = "https://app.chums.org";
-		CommonEnvironmentHelper.LessonsRoot = "https://lessons.church";
-	}
-
-}
-

package/src/helpers/DonationHelper.ts

@@ -1,26 +0,0 @@
-export class DonationHelper {
-
-  static getInterval(intervalName:string) {
-    let intervalCount = 1;
-    let intervalType = "month";
-    let parts = intervalName.split("_");
-    if (parts.length === 2) {
-      switch (parts[0])
-      {
-        case "two": intervalCount = 2; break;
-        case "three": intervalCount = 3; break;
-      }
-      intervalType = parts[1];
-    }
-    let result = { interval_count: intervalCount, interval: intervalType };
-    return result;
-  }
-
-  static getIntervalKeyName(intervalCount: number, intervalType: string) {
-    let firstPart = "one";
-    if (intervalCount === 2) firstPart = "two";
-    else if (intervalCount === 3) firstPart = "three";
-    return firstPart + "_" + intervalType;
-  }
-
-}

package/src/helpers/ReportHelper.ts

@@ -1,34 +0,0 @@
-import { ColumnInterface } from "@churchapps/helpers";
-import { DateHelper } from "./DateHelper";
-
-export class ReportHelper {
-
-  static getField = (column: ColumnInterface, dataRow: any) => {
-    let result = ""
-    try {
-      result = dataRow[column.value]?.toString() || "";
-    } catch { }
-
-    switch (column.formatter) {
-      case "date":
-        let dt = new Date(result);
-        result = DateHelper.prettyDate(dt);
-        break;
-      case "number":
-        try {
-          const num = parseFloat(result);
-          result = num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-        } catch {}
-        break;
-      case "dollars":
-        try {
-          const num = parseFloat(result);
-          const usd = new Intl.NumberFormat("en-US", { style:"currency", currency:"USD" });
-          result = usd.format(num).replace(".00", "");
-        } catch {}
-        break;
-    }
-    return result;
-  }
-
-}

package/src/pageComponents/LoginPage.tsx

@@ -1,284 +0,0 @@
-"use client";
-
-import * as React from "react";
-import { ErrorMessages, FloatingSupport, Loading } from "../components";
-import { LoginResponseInterface, UserContextInterface, ChurchInterface, UserInterface, LoginUserChurchInterface } from "@churchapps/helpers";
-import { AnalyticsHelper, ApiHelper, ArrayHelper, Locale, UserHelper } from "../helpers";
-import { useCookies, CookiesProvider } from "react-cookie"
-import { jwtDecode } from "jwt-decode"
-import { Register } from "./components/Register"
-import { SelectChurchModal } from "./components/SelectChurchModal"
-import { Forgot } from "./components/Forgot";
-import { Alert, Box, PaperProps, Typography } from "@mui/material";
-import { Login } from "./components/Login";
-import { LoginSetPassword } from "./components/LoginSetPassword";
-import { CommonEnvironmentHelper } from "../helpers/CommonEnvironmentHelper";
-import ga4 from "react-ga4";
-
-interface Props {
-	context: UserContextInterface,
-	jwt: string,
-	auth: string,
-	keyName?: string,
-	logo?: string,
-	appName?: string,
-	appUrl?: string,
-	returnUrl?: string,
-	loginSuccessOverride?: () => void,
-	userRegisteredCallback?: (user: UserInterface) => Promise<void>;
-	churchRegisteredCallback?: (church: ChurchInterface) => Promise<void>;
-	callbackErrors?: string[];
-	showLogo?: boolean;
-	loginContainerCssProps?: PaperProps;
-	defaultEmail?: string;
-	defaultPassword?: string;
-	handleRedirect?: (url: string) => void; // Function to handle redirects from parent component
-}
-
-const LoginPageContent: React.FC<Props> = ({ showLogo = true, loginContainerCssProps, ...props }) => {
-	const [welcomeBackName, setWelcomeBackName] = React.useState("");
-	const [pendingAutoLogin, setPendingAutoLogin] = React.useState(false);
-	const [errors, setErrors] = React.useState([]);
-	const [cookies, setCookie] = useCookies(["jwt", "name", "email", "lastChurchId"]);
-	const [showForgot, setShowForgot] = React.useState(false);
-	const [showRegister, setShowRegister] = React.useState(false);
-	const [showSelectModal, setShowSelectModal] = React.useState(false);
-	const [loginResponse, setLoginResponse] = React.useState<LoginResponseInterface>(null)
-	const [userJwt, setUserJwt] = React.useState("");
-	const [isSubmitting, setIsSubmitting] = React.useState(false);
-
-	const loginFormRef = React.useRef(null);
-	const location = typeof window !== "undefined" && window.location;
-	let selectedChurchId = "";
-	let registeredChurch: ChurchInterface = null;
-	let userJwtBackup = ""; //use state copy for storing between page updates.  This copy for instant availability.
-
-	const cleanAppUrl = () => {
-		if (!props.appUrl) return null;
-		else {
-			const index = props.appUrl.indexOf("/", 9);
-			if (index === -1) return props.appUrl;
-			else return props.appUrl.substring(0, index);
-		}
-	}
-
-	React.useEffect(() => {
-		if (props.callbackErrors?.length > 0) {
-			setErrors(props.callbackErrors)
-		}
-	}, [props.callbackErrors])
-
-	const init = () => {
-		const search = new URLSearchParams(location?.search);
-		const action = search.get("action");
-		if (action === "forgot") setShowForgot(true);
-		else if (action === "register") setShowRegister(true);
-		else {
-			if (!props.auth && props.jwt) {
-				setWelcomeBackName(cookies.name);
-				login({ jwt: props.jwt });
-				setPendingAutoLogin(true);
-			} else {
-				setPendingAutoLogin(false);
-			}
-		}
-	};
-
-	const handleLoginSuccess = async (resp: LoginResponseInterface) => {
-		userJwtBackup = resp.user.jwt;
-		setUserJwt(userJwtBackup);
-		ApiHelper.setDefaultPermissions(resp.user.jwt);
-		setLoginResponse(resp)
-		resp.userChurches.forEach(uc => { if (!uc.apis) uc.apis = []; });
-		UserHelper.userChurches = resp.userChurches;
-
-		setCookie("name", `${resp.user.firstName} ${resp.user.lastName}`, { path: "/" });
-		setCookie("email", resp.user.email, { path: "/" });
-		UserHelper.user = resp.user;
-
-		if (props.jwt) {
-			const decoded: any = jwtDecode(userJwtBackup)
-			selectedChurchId = decoded.churchId
-		}
-
-		const search = new URLSearchParams(location?.search);
-		const churchIdInParams = search.get("churchId");
-
-		if (props.keyName) selectChurchByKeyName();
-		else if (selectedChurchId) selectChurchById();
-		else if (churchIdInParams) selectChurch(churchIdInParams);
-		else if (props.jwt && cookies.lastChurchId && ArrayHelper.getOne(resp.userChurches, "church.id", cookies.lastChurchId)) {
-			selectedChurchId = cookies.lastChurchId;
-			selectChurchById();
-		}
-		else setShowSelectModal(true);
-	}
-
-	const selectChurchById = async () => {
-		await UserHelper.selectChurch(props.context, selectedChurchId, undefined);
-
-		setCookie("lastChurchId", selectedChurchId, { path: "/" });
-
-		if (registeredChurch) {
-			AnalyticsHelper.logEvent("Church", "Register", UserHelper.currentUserChurch.church.name);
-			try {
-				if (CommonEnvironmentHelper.GoogleAnalyticsTag && typeof (window) !== "undefined") {
-					ga4.gtag("event", "conversion", { send_to: "AW-427967381/Ba2qCLrXgJoYEJWHicwB" });
-				}
-			} catch { }
-		}
-		else AnalyticsHelper.logEvent("Church", "Select", UserHelper.currentUserChurch.church.name);
-
-		if (props.churchRegisteredCallback && registeredChurch) {
-			await props.churchRegisteredCallback(registeredChurch)
-			registeredChurch = null;
-			login({ jwt: userJwt || userJwtBackup });
-		} else await continueLoginProcess();
-	}
-
-	const selectChurchByKeyName = async () => {
-		if (!ArrayHelper.getOne(UserHelper.userChurches, "church.subDomain", props.keyName)) {
-			const userChurch: LoginUserChurchInterface = await ApiHelper.post("/churches/select", { subDomain: props.keyName }, "MembershipApi");
-			UserHelper.setupApiHelper(userChurch);
-			setCookie("lastChurchId", userChurch.church.id, { path: "/" });
-			//create/claim the person record and relogin
-			await ApiHelper.get("/people/claim/" + userChurch.church.id, "MembershipApi");
-			login({ jwt: userJwt || userJwtBackup });
-			return;
-		}
-		await UserHelper.selectChurch(props.context, undefined, props.keyName);
-		const selectedChurch = ArrayHelper.getOne(UserHelper.userChurches, "church.subDomain", props.keyName);
-		if (selectedChurch) setCookie("lastChurchId", selectedChurch.church.id, { path: "/" });
-		await continueLoginProcess()
-		return;
-	}
-
-	async function continueLoginProcess() {
-		if (UserHelper.currentUserChurch) {
-			UserHelper.currentUserChurch.apis.forEach(api => {
-				if (api.keyName === "MembershipApi") setCookie("jwt", api.jwt, { path: "/" });
-			})
-			try {
-				if (UserHelper.currentUserChurch.church.id) ApiHelper.patch(`/userChurch/${UserHelper.user.id}`, { churchId: UserHelper.currentUserChurch.church.id, appName: props.appName, lastAccessed: new Date() }, "MembershipApi")
-			} catch (e) {
-				console.log("Could not update user church accessed date")
-			}
-		}
-
-		if (props.loginSuccessOverride !== undefined) props.loginSuccessOverride();
-		else {
-			props.context.setUser(UserHelper.user);
-			props.context.setUserChurches(UserHelper.userChurches)
-			props.context.setUserChurch(UserHelper.currentUserChurch)
-			try {
-				const p = await ApiHelper.get(`/people/${UserHelper.currentUserChurch.person?.id}`, "MembershipApi");
-				if (p) props.context.setPerson(p);
-			} catch {
-				console.log("claiming person");
-				const personClaim = await ApiHelper.get("/people/claim/" + UserHelper.currentUserChurch.church.id, "MembershipApi");
-				props.context.setPerson(personClaim);
-			}
-
-			const search = new URLSearchParams(location?.search);
-			const returnUrl = search.get("returnUrl") || props.returnUrl;
-			if (returnUrl && typeof window !== "undefined") {
-				// Use handleRedirect function if available, otherwise fallback to window.location
-				if (props.handleRedirect) {
-					props.handleRedirect(returnUrl);
-				} else {
-					window.location.href = returnUrl;
-				}
-			}
-		}
-	}
-
-	async function selectChurch(churchId: string) {
-		try {
-			setErrors([])
-			selectedChurchId = churchId;
-			setCookie("lastChurchId", churchId, { path: "/" });
-			if (!ArrayHelper.getOne(UserHelper.userChurches, "church.id", churchId)) {
-				const userChurch: LoginUserChurchInterface = await ApiHelper.post("/churches/select", { churchId: churchId }, "MembershipApi");
-				UserHelper.setupApiHelper(userChurch);
-
-				//create/claim the person record and relogin
-				await ApiHelper.get("/people/claim/" + churchId, "MembershipApi");
-				login({ jwt: userJwt || userJwtBackup });
-				return;
-			}
-			UserHelper.selectChurch(props.context, churchId, null).then(() => { continueLoginProcess() });
-		} catch (err) {
-			console.log("Error in selecting church: ", err)
-			setErrors([Locale.label("login.validate.selectingChurch")])
-			loginFormRef?.current?.setSubmitting(false);
-		}
-
-	}
-
-	const handleLoginErrors = (errors: string[]) => {
-		setWelcomeBackName("");
-		console.log(errors);
-		setErrors([Locale.label("login.validate.invalid")]);
-	}
-
-	const login = async (data: any) => {
-		setErrors([])
-		setIsSubmitting(true);
-		try {
-			const resp: LoginResponseInterface = await ApiHelper.postAnonymous("/users/login", data, "MembershipApi");
-			setIsSubmitting(false);
-			handleLoginSuccess(resp);
-		} catch (e: any) {
-			setPendingAutoLogin(false);
-			if (!data.jwt) handleLoginErrors([e.toString()]);
-			else setWelcomeBackName("");
-			setIsSubmitting(false);
-		}
-	};
-
-	const getWelcomeBack = () => { if (welcomeBackName !== "") return (<><Alert severity="info"><div dangerouslySetInnerHTML={{ __html: Locale.label("login.welcomeName")?.replace("{}", welcomeBackName) }} /></Alert><Loading /></>); }
-	const getCheckEmail = () => { if (new URLSearchParams(location?.search).get("checkEmail") === "1") return <Alert severity="info">{Locale.label("login.registerThankYou")}</Alert> }
-	const handleRegisterCallback = () => { setShowForgot(false); setShowRegister(true); }
-	const handleLoginCallback = () => { setShowForgot(false); setShowRegister(false); }
-	const handleChurchRegistered = (church: ChurchInterface) => { registeredChurch = church; setShowRegister(false); console.log("Updated VERSION********") }
-
-	const getInputBox = () => {
-		if (showRegister) return (
-			<Box id="loginBox" sx={{ backgroundColor: "#FFF", border: "1px solid #CCC", borderRadius: "5px", padding: "20px" }}>
-				<Typography component="h2" sx={{ fontSize: "32px", fontWeight: 500, lineHeight: 1.2, margin: "0 0 8px 0" }}>{Locale.label("login.createAccount")}</Typography>
-				<Register updateErrors={setErrors} appName={props.appName} appUrl={cleanAppUrl()} loginCallback={handleLoginCallback} userRegisteredCallback={props.userRegisteredCallback} />
-			</Box>
-		);
-		else if (showForgot) return (<Forgot registerCallback={handleRegisterCallback} loginCallback={handleLoginCallback} />);
-		else if (props.auth) return (<LoginSetPassword setErrors={setErrors} setShowForgot={setShowForgot} isSubmitting={isSubmitting} auth={props.auth} login={login} appName={props.appName} appUrl={cleanAppUrl()} />)
-		else return <Login setShowRegister={setShowRegister} setShowForgot={setShowForgot} setErrors={setErrors} isSubmitting={isSubmitting} login={login} mainContainerCssProps={loginContainerCssProps} defaultEmail={props.defaultEmail} defaultPassword={props.defaultPassword} />;
-	}
-
-	React.useEffect(init, []); //eslint-disable-line
-
-	return (
-		<Box sx={{ maxWidth: "382px" }} px="16px" mx="auto">
-			{showLogo && <img src={props.logo || "/images/logo-login.png"} alt="logo" style={{ width: "100%", marginTop: 100, marginBottom: 60 }} />}
-			<ErrorMessages errors={errors} />
-			{getWelcomeBack()}
-			{getCheckEmail()}
-			{!pendingAutoLogin && getInputBox()}
-			<SelectChurchModal show={showSelectModal} userChurches={loginResponse?.userChurches} selectChurch={selectChurch} registeredChurchCallback={handleChurchRegistered} errors={errors} appName={props.appName} />
-			<FloatingSupport appName={props.appName} />
-		</Box>
-	);
-
-};
-
-export const LoginPage: React.FC<Props> = (props) => {
-	// Try to detect if CookiesProvider is available
-	const CookiesContext = React.createContext(null);
-	const context = React.useContext(CookiesContext);
-	
-	// Always wrap with CookiesProvider to ensure context is available
-	return (
-		<CookiesProvider defaultSetOptions={{ path: '/' }}>
-			<LoginPageContent {...props} />
-		</CookiesProvider>
-	);
-};