@churchapps/apphelper-login 0.6.14 → 0.6.16

package/dist/helpers/Locale.js

@@ -21,7 +21,7 @@ export class Locale {
     }
     // Helper method to get value from nested object using dot notation
     static getNestedValue(obj, path) {
-        return path.split('.').reduce((current, key) => {
+        return path.split(".").reduce((current, key) => {
             return current && current[key] !== undefined ? current[key] : undefined;
         }, obj);
     }
@@ -45,16 +45,16 @@ export class Locale {
         const fallbackValue = this.getNestedValue(this.englishFallbacks, key);
         if (fallbackValue !== undefined) {
             // Handle simple string interpolation for options
-            if (typeof fallbackValue === 'string' && options) {
+            if (typeof fallbackValue === "string" && options) {
                 let result = fallbackValue;
                 Object.keys(options).forEach(optionKey => {
                     const placeholder = `{{${optionKey}}}`;
                     if (result.includes(placeholder)) {
-                        result = result.replace(new RegExp(placeholder, 'g'), String(options[optionKey]));
+                        result = result.replace(new RegExp(placeholder, "g"), String(options[optionKey]));
                     }
                     // Also handle {} placeholder for backward compatibility
-                    if (result.includes('{}')) {
-                        result = result.replace('{}', String(options[optionKey]));
+                    if (result.includes("{}")) {
+                        result = result.replace("{}", String(options[optionKey]));
                     }
                 });
                 return result;
@@ -90,7 +90,7 @@ Locale.supportedLanguages = [
     "pt",
     "ru",
     "tl",
-    "zh",
+    "zh"
 ];
 Locale.extraCodes = { no: ["nb", "nn"] };
 // Hard-coded English fallbacks for when locale files are not available
@@ -205,13 +205,11 @@ Locale.init = async (backends) => {
             resources,
             fallbackLng: "en",
             debug: false,
-            interpolation: {
-                escapeValue: false,
-            },
+            interpolation: { escapeValue: false },
             detection: {
                 order: ["navigator"],
-                caches: ["localStorage"],
-            },
+                caches: ["localStorage"]
+            }
         });
     }
     catch (error) {

package/dist/helpers/Locale.js.map

@@ -1 +1 @@
-{"version":3,"file":"Locale.js","sourceRoot":"","sources":["../../src/helpers/Locale.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Locale.js","sourceRoot":"","sources":["../../src/helpers/Locale.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,57 +1,98 @@
-{
-  "name": "@churchapps/apphelper-login",
-  "version": "0.6.14",
-  "description": "Login components for ChurchApps AppHelper",
-  "type": "module",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "clean": "rimraf dist",
-    "tsc": "tsc",
-    "build": "npm-run-all clean tsc"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/LiveChurchSolutions/AppHelper.git"
-  },
-  "keywords": [
-    "ChurchApps",
-    "login",
-    "authentication"
-  ],
-  "author": "ChurchApps.org",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/LiveChurchSolutions/AppHelper/issues"
-  },
-  "homepage": "https://github.com/LiveChurchSolutions/AppHelper#readme",
-  "peerDependencies": {
-    "@churchapps/helpers": "^1.2.4",
-    "@churchapps/apphelper": "^0.6.0",
-    "react": "^18.0.0 || ^19.0.0",
-    "react-dom": "^18.0.0 || ^19.0.0",
-    "react-router-dom": "^7.6.3"
-  },
-  "dependencies": {
-    "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.1",
-    "@mui/material": "^7.3.1",
-    "axios": "^1.11.0",
-    "i18next": "^25.3.2",
-    "jwt-decode": "^4.0.0",
-    "react-cookie": "^8.0.1",
-    "react-google-recaptcha": "^3.1.0",
-    "react-i18next": "^15.6.1",
-    "react-ga4": "^2.1.0"
-  },
-  "devDependencies": {
-    "@types/node": "^24.2.0",
-    "@types/react": "^19.1.9",
-    "@types/react-dom": "^19.1.7",
-    "@types/react-google-recaptcha": "^2.1.9",
-    "npm-run-all2": "^8.0.4",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.9.2"
-  }
-}
+{
+  "name": "@churchapps/apphelper-login",
+  "version": "0.6.16",
+  "description": "Login components for ChurchApps AppHelper",
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "clean": "rimraf dist",
+    "tsc": "tsc",
+    "build": "npm-run-all clean tsc",
+    "lint": "eslint --fix src/",
+    "dev": "vite"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ChurchApps/Packages.git",
+    "directory": "apphelper-login"
+  },
+  "keywords": [
+    "ChurchApps",
+    "login",
+    "authentication"
+  ],
+  "author": "ChurchApps.org",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/ChurchApps/Packages/issues"
+  },
+  "homepage": "https://github.com/ChurchApps/Packages#readme",
+  "peerDependencies": {
+    "@churchapps/apphelper": "^0.6.0",
+    "@churchapps/helpers": "^1.2.19",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
+    "axios": "^1.11.0",
+    "i18next": "^25.3.2",
+    "i18next-browser-languagedetector": "^8.0.0",
+    "i18next-chained-backend": "^4.6.0",
+    "jwt-decode": "^4.0.0",
+    "react": "^18.0.0 || ^19.0.0",
+    "react-cookie": "^8.0.1",
+    "react-dom": "^18.0.0 || ^19.0.0",
+    "react-ga4": "^2.1.0",
+    "react-google-recaptcha": "^3.1.0",
+    "react-i18next": "^15.6.1",
+    "react-router-dom": "^7.6.3"
+  },
+  "peerDependenciesMeta": {
+    "react-google-recaptcha": { "optional": true }
+  },
+  "dependencies": {
+    "@mui/icons-material": "^7.3.1",
+    "@mui/material": "^7.3.1"
+  },
+  "devDependencies": {
+    "@churchapps/apphelper": "^0.6.0",
+    "@churchapps/helpers": "^1.2.19",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
+    "@eslint/js": "^9.28.0",
+    "@types/node": "^24.2.0",
+    "@types/react": "^19.1.9",
+    "@types/react-dom": "^19.1.7",
+    "@types/react-google-recaptcha": "^2.1.9",
+    "@vitejs/plugin-react": "^4.7.0",
+    "axios": "^1.11.0",
+    "eslint": "^9.28.0",
+    "eslint-plugin-unused-imports": "^4.4.1",
+    "globals": "^16.2.0",
+    "i18next": "^25.3.2",
+    "i18next-browser-languagedetector": "^8.2.0",
+    "i18next-chained-backend": "^4.6.2",
+    "jwt-decode": "^4.0.0",
+    "npm-run-all2": "^8.0.4",
+    "react": "^19.1.0",
+    "react-cookie": "^8.0.1",
+    "react-dom": "^19.1.0",
+    "react-ga4": "^2.1.0",
+    "react-google-recaptcha": "^3.1.0",
+    "react-i18next": "^15.6.1",
+    "react-router-dom": "^7.6.3",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.35.0",
+    "vite": "^7.0.6"
+  }
+}

package/src/LoginPage.tsx

@@ -1,314 +0,0 @@
-"use client";
-
-import * as React from "react";
-import { ErrorMessages, FloatingSupport, Loading } from "@churchapps/apphelper";
-import { LoginResponseInterface, UserContextInterface, ChurchInterface, UserInterface, LoginUserChurchInterface, PersonInterface } from "@churchapps/helpers";
-import { ApiHelper, ArrayHelper, UserHelper, CommonEnvironmentHelper } from "@churchapps/helpers";
-import { AnalyticsHelper, Locale } from "./helpers";
-import { useCookies, CookiesProvider } from "react-cookie"
-import { Register } from "./components/Register"
-import { SelectChurchModal } from "./components/SelectChurchModal"
-import { Forgot } from "./components/Forgot";
-import { Alert, PaperProps, Typography } from "@mui/material";
-import { Login } from "./components/Login";
-import { LoginSetPassword } from "./components/LoginSetPassword";
-import ga4 from "react-ga4";
-
-interface Props {
-	context: UserContextInterface,
-	jwt: string,
-	auth: string,
-	keyName?: string,
-	logo?: string,
-	appName?: string,
-	appUrl?: string,
-	returnUrl?: string,
-	userRegisteredCallback?: (user: UserInterface) => Promise<void>;
-	churchRegisteredCallback?: (church: ChurchInterface) => Promise<void>;
-	callbackErrors?: string[];
-	showLogo?: boolean;
-	showFooter?: boolean;
-	loginContainerCssProps?: PaperProps;
-	defaultEmail?: string;
-	defaultPassword?: string;
-	handleRedirect?: (url: string, user?: UserInterface, person?: PersonInterface, userChurch?: LoginUserChurchInterface, userChurches?: LoginUserChurchInterface[]) => 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 performLogout = () => {
-		// Clear all authentication cookies
-		setCookie("jwt", "", { path: "/", maxAge: 0 });
-		setCookie("name", "", { path: "/", maxAge: 0 });
-		setCookie("email", "", { path: "/", maxAge: 0 });
-		setCookie("lastChurchId", "", { path: "/", maxAge: 0 });
-		// Clear any JWT in the ApiHelper
-		ApiHelper.clearPermissions();
-		// Clear user context
-		props.context.setUser(null);
-		props.context.setUserChurches([]);
-		props.context.setUserChurch(null);
-		props.context.setPerson(null);
-		// Show a logout success message
-		setErrors(["You have been successfully logged out."]);
-
-		// Handle redirect after logout
-		const search = new URLSearchParams(location?.search);
-		const returnUrl = search.get("returnUrl") || props.returnUrl || "/";
-
-		// Use handleRedirect if available, otherwise use window.location
-		if (props.handleRedirect) {
-			props.handleRedirect(returnUrl);
-		} else if (typeof window !== "undefined") {
-			window.location.href = returnUrl;
-		}
-	};
-
-	const init = () => {
-		const search = new URLSearchParams(location?.search);
-		const action = search.get("action");
-		if (action === "logout") performLogout();
-		else 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;
-
-		// JWT church selection is handled by the server response, no client-side decoding needed
-
-		const search = new URLSearchParams(location?.search);
-		const churchIdInParams = search.get("churchId");
-
-		if (props.keyName) selectChurchByKeyName();
-		else if (churchIdInParams) selectChurch(churchIdInParams);
-		else if (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")
-			}
-		}
-
-		props.context.setUser(UserHelper.user);
-		props.context.setUserChurches(UserHelper.userChurches)
-		props.context.setUserChurch(UserHelper.currentUserChurch)
-
-		// Get or claim person before proceeding
-		let person;
-		try {
-			person = await ApiHelper.get(`/people/${UserHelper.currentUserChurch.person?.id}`, "MembershipApi");
-			if (person) props.context.setPerson(person);
-		} catch {
-			person = await ApiHelper.get("/people/claim/" + UserHelper.currentUserChurch.church.id, "MembershipApi");
-			props.context.setPerson(person);
-		}
-
-		// Handle redirect with actual data
-		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, UserHelper.user, person, UserHelper.currentUserChurch, UserHelper.userChurches);
-			} 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("");
-		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);
-			setWelcomeBackName("");
-			if (!data.jwt) handleLoginErrors([e.toString()]);
-			setIsSubmitting(false);
-		}
-	};;
-
-	const getWelcomeBack = () => {
-		if (welcomeBackName !== "") {
-			const label = Locale.label("login.welcomeName") || "Welcome back, {}!";
-			const parts = label.split("{}");
-			return (
-				<>
-					<Alert severity="info">
-						{parts[0]}{welcomeBackName}{parts[1] || ""}
-					</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); }
-
-	const getInputBox = () => {
-		if (showRegister) return (
-
-			<Register updateErrors={setErrors} appName={props.appName} appUrl={cleanAppUrl()} loginCallback={handleLoginCallback} userRegisteredCallback={props.userRegisteredCallback} />
-
-		);
-		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} showFooter={props.showFooter} />;
-	}
-
-	React.useEffect(init, []); //eslint-disable-line
-
-	return (
-		<>
-			<ErrorMessages errors={errors} />
-			{getWelcomeBack()}
-			{getCheckEmail()}
-			{!pendingAutoLogin && getInputBox()}
-			<SelectChurchModal show={showSelectModal} userChurches={loginResponse?.userChurches} selectChurch={selectChurch} registeredChurchCallback={handleChurchRegistered} errors={errors} appName={props.appName} handleRedirect={props.handleRedirect} />
-			<FloatingSupport appName={props.appName} />
-		</>
-	);
-
-};
-
-export const LoginPage: React.FC<Props> = (props) => {
-	// Always wrap with CookiesProvider to ensure context is available
-	return (
-		<CookiesProvider defaultSetOptions={{ path: '/' }}>
-			<LoginPageContent {...props} />
-		</CookiesProvider>
-	);
-};

package/src/LogoutPage.tsx

@@ -1,43 +0,0 @@
-"use client";
-
-import React from "react";
-import { useCookies, CookiesProvider } from "react-cookie"
-import { ApiHelper, UserContextInterface } from "@churchapps/helpers";
-
-interface Props { context?: UserContextInterface, handleRedirect?: (url: string) => void }
-
-const LogoutPageContent: React.FC<Props> = (props) => {
-	const [, , removeCookie] = useCookies(["jwt", "email", "name", "lastChurchId"]);
-
-	removeCookie("jwt");
-	removeCookie("email");
-	removeCookie("name");
-	removeCookie("lastChurchId");
-
-	ApiHelper.clearPermissions();
-	props.context?.setUser(null);
-	props.context?.setPerson(null);
-	props.context?.setUserChurches(null);
-	props.context?.setUserChurch(null);
-
-	setTimeout(() => {
-		// a must check for Nextjs
-		if (typeof window !== "undefined") {
-			// Use handleRedirect function if available, otherwise fallback to window.location
-			if (props.handleRedirect) {
-				props.handleRedirect("/");
-			} else {
-				window.location.href = "/";
-			}
-		}
-	}, 300);
-	return null;
-}
-
-export const LogoutPage: React.FC<Props> = (props) => {
-	return (
-		<CookiesProvider defaultSetOptions={{ path: '/' }}>
-			<LogoutPageContent {...props} />
-		</CookiesProvider>
-	);
-}