@churchapps/apphelper 0.3.42 → 0.3.45

package/src/helpers/ApiHelper.ts

@@ -3,124 +3,124 @@ 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.permisssions = [];
-    });
-    this.isAuthenticated = true;
-  }
-
-  static setPermissions(keyName: string, jwt: string, permissions: RolePermissionInterface[]) {
-    this.apiConfigs.forEach(config => {
-      if (config.keyName === keyName) {
-        config.jwt = jwt;
-        config.permisssions = permissions;
-      }
-    });
-    this.isAuthenticated = true;
-  }
-
-  static clearPermissions() {
-    this.apiConfigs.forEach(config => { config.jwt = ""; config.permisssions = []; });
-    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) {
-      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");
-  }
+	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) {
+			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/ErrorHelper.ts

@@ -1,4 +1,4 @@
-import { ErrorLogInterface, ErrrorAppDataInterface } from "@churchapps/helpers";
+import { ErrorLogInterface, ErrorAppDataInterface } from "@churchapps/helpers";
 import { ApiHelper } from "./ApiHelper";
 
 
@@ -7,7 +7,7 @@ export class ErrorHelper {
 	static getAppData: () => { churchId: string, userId: string, originUrl: string, application: string };
 	static customErrorHandler: (errorLog: ErrorLogInterface) => void;
 
-	static init = (getAppData: () => ErrrorAppDataInterface, customErrorHandler: (errorLog: ErrorLogInterface) => void) => {
+	static init = (getAppData: () => ErrorAppDataInterface, customErrorHandler: (errorLog: ErrorLogInterface) => void) => {
 		ErrorHelper.getAppData = getAppData;
 		ErrorHelper.customErrorHandler = customErrorHandler;
 	}

package/src/helpers/FileHelper.ts

@@ -1,8 +1,8 @@
 import axios from "axios";
 
 export class FileHelper {
-  static postPresignedFile = (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void, axiosInstance?: any) => {
-    const axiosToUse = axiosInstance || axios;
+
+  static postPresignedFile = (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void) => {
     const formData = new FormData();
     //formData.append("key", presigned.key); //no longer needed with new aws sdk
     formData.append("acl", "public-read");
@@ -17,10 +17,7 @@ export class FileHelper {
       }
     };
 
-    console.log("#10");
-    console.log("axios: ", axiosToUse);
-    console.log("axios tyeof: ", typeof axiosToUse.post);
-    return axiosToUse.post(presigned.url, formData, axiosConfig);
+    return axios.post(presigned.url, formData, axiosConfig);
   };
 
   static dataURLtoBlob(dataurl: string) {

package/src/helpers/UserHelper.ts

@@ -2,70 +2,77 @@ import { ApiHelper } from "./ApiHelper"
 import { UserInterface, UserContextInterface, IApiPermission, PersonInterface, LoginUserChurchInterface } from "@churchapps/helpers";
 
 export class UserHelper {
-  static currentUserChurch: LoginUserChurchInterface;
-  static userChurches: LoginUserChurchInterface[];
-  static user: UserInterface;
-  static churchChanged: boolean = false;
-  static person: PersonInterface;
+	static currentUserChurch: LoginUserChurchInterface;
+	static userChurches: LoginUserChurchInterface[];
+	static user: UserInterface;
+	static churchChanged: boolean = false;
+	static person: PersonInterface;
 
-  static selectChurch = async (context?: UserContextInterface, churchId?: string, keyName?: string) => {
-    let userChurch = null;
+	static selectChurch = async (context?: UserContextInterface, churchId?: string, keyName?: string) => {
+		let userChurch = null;
 
-    if (churchId) {
-      UserHelper.userChurches.forEach(uc => {
-        if (uc.church.id === churchId) userChurch = uc;
-      });
-    }
-    else if (keyName) UserHelper.userChurches.forEach(uc => { if (uc.church.subDomain === keyName) userChurch = uc; });
-    else userChurch = UserHelper.userChurches[0];
-    if (!userChurch) return;
-    else {
-      UserHelper.currentUserChurch = userChurch;
-      UserHelper.setupApiHelper(UserHelper.currentUserChurch);
-      // TODO - remove context code from here and perform the logic in the component itself.
-      if (context) {
-        if (context.userChurch !== null) UserHelper.churchChanged = true;
-        context.setUserChurch(UserHelper.currentUserChurch);
-      }
-    }
-  }
+		if (churchId) {
+			UserHelper.userChurches.forEach(uc => {
+				if (uc.church.id === churchId) userChurch = uc;
+			});
+		}
+		else if (keyName) UserHelper.userChurches.forEach(uc => { if (uc.church.subDomain === keyName) userChurch = uc; });
+		else userChurch = UserHelper.userChurches[0];
+		if (!userChurch) return;
+		else {
+			UserHelper.currentUserChurch = userChurch;
+			UserHelper.setupApiHelper(UserHelper.currentUserChurch);
+			// TODO - remove context code from here and perform the logic in the component itself.
+			if (context) {
+				if (context.userChurch !== null) UserHelper.churchChanged = true;
+				context.setUserChurch(UserHelper.currentUserChurch);
+			}
+		}
+	}
 
-  static setupApiHelper(userChurch: LoginUserChurchInterface) {
-    ApiHelper.setDefaultPermissions(userChurch.jwt);
-    userChurch.apis.forEach(api => { ApiHelper.setPermissions(api.keyName, api.jwt, api.permissions); });
-  }
+	static setupApiHelper(userChurch: LoginUserChurchInterface) {
+		ApiHelper.setDefaultPermissions(userChurch.jwt);
+		userChurch.apis.forEach(api => { ApiHelper.setPermissions(api.keyName, api.jwt, api.permissions); });
+	}
 
-  static setupApiHelperNoChurch(user: LoginUserChurchInterface) {
-    ApiHelper.setDefaultPermissions(user.jwt);
-  }
+	static setupApiHelperNoChurch(user: LoginUserChurchInterface) {
+		ApiHelper.setDefaultPermissions(user.jwt);
+	}
 
-  static checkAccess({ api, contentType, action }: IApiPermission): boolean {
-    const permissions = ApiHelper.getConfig(api)?.permisssions || [];
+	static checkAccess({ api, contentType, action }: IApiPermission): boolean {
+		const permissions = ApiHelper.getConfig(api)?.permissions || [];
 
-    let result = false;
-    if (permissions !== undefined) {
-      permissions.forEach(element => {
-        if (element.contentType === contentType && element.action === action) result = true;
-      });
-    }
-    return result;
-  }
+		let result = false;
+		if (permissions !== undefined) {
+			permissions.forEach(element => {
+				if (element.contentType === contentType && element.action === action) result = true;
+			});
+		}
+		return result;
+	}
 
-  static createAppUrl(appUrl: string, returnUrl: string) {
-    const jwt = ApiHelper.getConfig("MembershipApi")?.jwt;
+	static createAppUrl(appUrl: string, returnUrl: string) {
+		const jwt = ApiHelper.getConfig("MembershipApi")?.jwt;
 
-    if (jwt) {
-      return `${appUrl}/login/?jwt=${jwt}&returnUrl=${encodeURIComponent(returnUrl)}`;
-    } else {
-      return `${appUrl}/login/?returnUrl=${encodeURIComponent(returnUrl)}`;
-    }
-  }
+		if (jwt) {
+			return `${appUrl}/login/?jwt=${jwt}&returnUrl=${encodeURIComponent(returnUrl)}`;
+		} else {
+			return `${appUrl}/login/?returnUrl=${encodeURIComponent(returnUrl)}`;
+		}
+	}
 
-  static redirectToLogin(returnUrl?: string) {
-    if (typeof window !== "undefined") {
-      const currentUrl = returnUrl || window.location.pathname + window.location.search;
-      const encodedReturnUrl = encodeURIComponent(currentUrl);
-      window.location.href = `/login?returnUrl=${encodedReturnUrl}`;
-    }
-  }
+	static redirectToLogin(returnUrl?: string, handleRedirect?: (url: string) => void) {
+		if (typeof window !== "undefined") {
+			const currentUrl = returnUrl || window.location.pathname + window.location.search;
+			const encodedReturnUrl = encodeURIComponent(currentUrl);
+			const loginUrl = `/login?returnUrl=${encodedReturnUrl}`;
+
+			// Use handleRedirect function if available, otherwise fallback to window.location
+			if (handleRedirect) {
+				handleRedirect(loginUrl);
+			} else {
+				window.location.href = loginUrl;
+			}
+		}
+	}
 }