@churchapps/helpers 1.0.8 → 1.0.10

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 Live Church Solutions
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2023 Live Church Solutions
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,15 +1,15 @@
-# Helpers
-
-Library of helper functions not specific to any project or framework.
-
-## To Test
-
-1. After making changes run `npm build` followed by `npm link` to expose the package locally
-2. In your test project run `@npm link @churchapps/helpers`
-3. Rerun both after changes
-
-## To Publish
-
-1. Update version number in package.json
-2. Run `npm run build`
-3. Run `npm publish --access=public`
+# Helpers
+
+Library of helper functions not specific to any project or framework.
+
+## To Test
+
+1. After making changes run `npm build` followed by `npm link` to expose the package locally
+2. In your test project run `@npm link @churchapps/helpers`
+3. Rerun both after changes
+
+## To Publish
+
+1. Update version number in package.json
+2. Run `npm run build`
+3. Run `npm publish --access=public`

package/dist/ApiHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApiHelper.d.ts","sourceRoot":"","sources":["../src/ApiHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG/E,qBAAa,SAAS;IAEpB,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,CAAM;IACpC,MAAM,CAAC,eAAe,UAAS;IAC/B,MAAM,CAAC,SAAS,EAAE,CAAC,GAAG,EAAC,MAAM,EAAE,cAAc,EAAC,GAAG,KAAK,IAAI,CAAC;IAC3D,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,EAAC,MAAM,EAAE,cAAc,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAErE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM;IAOhC,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE,MAAM;IAQxC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,uBAAuB,EAAE;IAU1F,MAAM,CAAC,gBAAgB;WAKV,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;WAMtC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;WAM/C,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW;WAUzD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW;WAU1D,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;WAiBzC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW;WAWlE,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG;mBAiB/C,aAAa;CAWnC"}
+{"version":3,"file":"ApiHelper.d.ts","sourceRoot":"","sources":["../src/ApiHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG/E,qBAAa,SAAS;IAEpB,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,CAAM;IACpC,MAAM,CAAC,eAAe,UAAS;IAC/B,MAAM,CAAC,SAAS,EAAE,CAAC,GAAG,EAAC,MAAM,EAAE,cAAc,EAAC,GAAG,KAAK,IAAI,CAAC;IAC3D,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,EAAC,MAAM,EAAE,cAAc,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAErE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM;IAOhC,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE,MAAM;IAQxC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,uBAAuB,EAAE;IAU1F,MAAM,CAAC,gBAAgB;WAKV,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;WAMtC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;WAM/C,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW;WAUzD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW;WAU1D,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;WAiBzC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW;WAWlE,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG;mBAiB/C,aAAa;CAcnC"}

package/dist/ApiHelper.js

@@ -133,11 +133,15 @@ class ApiHelper {
     static throwApiError(response) {
         return __awaiter(this, void 0, void 0, function* () {
             let msg = response.statusText;
+            try {
+                msg = yield response.text();
+            }
+            catch (_a) { }
             try {
                 const json = yield response.json();
                 msg = json.errors[0];
             }
-            catch (_a) { }
+            catch (_b) { }
             console.log("RESPONSE", response);
             ErrorHelper_1.ErrorHelper.logError(response.status.toString(), response.url, msg);
             throw new Error(msg || "Error");

package/dist/ApiHelper.js.map

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

package/dist/ArrayHelper.js

@@ -89,7 +89,7 @@ class ArrayHelper {
     static getAllOperatorArray(array, propertyName, values, operator, dataType = "string") {
         const result = [];
         values.forEach(v => {
-            const filtered = this.getAllOperator(array, propertyName, v, operator.replace("notIn", "notEqual").replace("in", "equals"), dataType);
+            const filtered = this.getAllOperator(array, propertyName, v, operator.replace("notIn", "notEqual").replace("in", "equals").replace("donatedTo", "equals"), dataType);
             filtered.forEach(f => result.push(f));
         });
         return result;

package/dist/ArrayHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArrayHelper.js","sourceRoot":"","sources":["../src/ArrayHelper.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAElD,MAAa,WAAW;IACtB,MAAM,CAAC,MAAM,CAAC,KAAY,EAAE,YAAoB;;QAC9C,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,EAAE,GAAG,MAAA,IAAI,CAAC,YAAY,CAAC,0CAAE,QAAQ,EAAE,CAAC;YAC1C,IAAI,CAAC,+BAAc,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;gBAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACjF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAAY,EAAE,YAAoB,EAAE,aAAsB,KAAK;QAC3E,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAClB,MAAM,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;YAC7B,MAAM,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;YAC7B,IAAI,IAAI,GAAG,IAAI;gBAAE,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;;gBACvC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,KAAY,EAAE,YAAoB,EAAE,KAAU;QAC5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC;gBAAE,OAAO,CAAC,CAAC;SAC9D;QACD,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAAY,EAAE,YAAoB,EAAE,KAAU;QAC1D,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,EAAE;YAAE,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;QAChG,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAAY,EAAE,YAAoB,EAAE,KAAU;QAC1D,MAAM,MAAM,GAAU,EAAE,CAAA;QACxB,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,EAAE,EAAE;YAC9B,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC;gBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACvE;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,KAAY,EAAE,YAAoB,EAAE,MAAa;QAClE,MAAM,MAAM,GAAU,EAAE,CAAA;QACxB,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,EAAE;YAAE,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC;gBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/F,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,IAAS,EAAE,YAAoB,EAAE,KAAU;QAChE,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,KAAK,CAAC;aAC3D;YACH,IAAI,GAAG,GAAG,IAAI,CAAC;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7C,IAAI,GAAG;oBAAE,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;aACnC;YACD,OAAO,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC;SACvD;IACH,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,KAAY,EAAE,YAAoB;QACvD,MAAM,MAAM,GAAU,EAAE,CAAC;QAEzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;YAC3G,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAClD;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,KAAY;QAC3B,MAAM,MAAM,GAAU,EAAE,CAAA;QACxB,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;gBACjC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACrB;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,KAAY,EAAE,YAAoB,EAAE,MAAa,EAAE,QAAgB,EAAE,QAAQ,GAAG,QAAQ;QACjH,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;YACtI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,KAAY,EAAE,YAAoB,EAAE,KAAU,EAAE,QAAgB,EAAE,QAAQ,GAAG,QAAQ;QACzG,MAAM,MAAM,GAAU,EAAE,CAAA;QACxB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YAGxB,IAAI,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,OAAO,GAAG,KAAK,IAAI,EAAE,CAAC;YAC1B,IAAI,QAAQ,KAAK,QAAQ,EAAE;gBACzB,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC9B,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;aAC/B;iBAAM,IAAI,QAAQ,KAAK,QAAQ,EAAE;gBAChC,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;gBAChC,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;aACjC;YAED,QAAQ,QAAQ,EAAE;gBAChB,KAAK,QAAQ;oBACX,IAAI,OAAO,KAAK,OAAO;wBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC3C,MAAM;gBACR,KAAK,YAAY;oBACf,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;wBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACtD,MAAM;gBACR,KAAK,UAAU;oBACb,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM;wBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACpF,MAAM;gBACR,KAAK,UAAU;oBACb,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;wBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACrD,MAAM;gBACR,KAAK,aAAa;oBAChB,IAAI,OAAO,GAAG,OAAO;wBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACzC,MAAM;gBACR,KAAK,kBAAkB;oBACrB,IAAI,OAAO,IAAI,OAAO;wBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC1C,MAAM;gBACR,KAAK,UAAU;oBACb,IAAI,OAAO,GAAG,OAAO;wBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACzC,MAAM;gBACR,KAAK,eAAe;oBAClB,IAAI,OAAO,IAAI,OAAO;wBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC1C,MAAM;gBACR,KAAK,UAAU;oBACb,IAAI,OAAO,KAAK,OAAO;wBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC3C,MAAM;aACT;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,IAAS,EAAE,YAAoB;QACjD,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,MAAM,GAAQ,IAAI,CAAC;QACvB,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC3B,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,QAAgB,EAAE,MAAc;QAC/C,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE;YAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvD,OAAO,MAAM,CAAC;IAChB,CAAC;CAEF;AAzJD,kCAyJC"}
+{"version":3,"file":"ArrayHelper.js","sourceRoot":"","sources":["../src/ArrayHelper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@churchapps/helpers",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Library of helper functions not specific to any one ChurchApps project or framework.",
   "main": "dist/index.js",
   "scripts": {

package/src/ApiHelper.ts

@@ -1,129 +1,132 @@
-import { ApiConfig, RolePermissionInterface, ApiListType } from "./interfaces";
-import { ErrorHelper } from "./ErrorHelper";
-
-export class ApiHelper {
-
-  static apiConfigs: ApiConfig[] = [];
-  static isAuthenticated = false;
-  static onRequest: (url:string, requestOptions:any) => void;
-  static onError: (url:string, requestOptions:any, error: any) => void;
-
-  static getConfig(keyName: string) {
-    let result: ApiConfig = null;
-    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 } };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  static async getAnonymous(path: string, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    const requestOptions = { method: "GET" };
-    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 }
-    };
-    if (this.onRequest) this.onRequest(config.url + path, requestOptions);
-    try {
-      const response = await fetch(config.url + path, requestOptions);
-      if (!response.ok) await this.throwApiError(response);
-    } catch (e) {
-      console.log(e);
-      if (this.onError) this.onError(config.url + path, requestOptions, 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)
-    };
-    console.log(config.url + path, requestOptions);
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  static async fetchWithErrorHandling(url: string, requestOptions: any) {
-    if (this.onRequest) this.onRequest(url, requestOptions);
-    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("Error loading url: " + url);
-      console.log(e)
-      throw (e);
-    }
-  }
-
-  private static async throwApiError(response: Response) {
-    let msg = response.statusText;
-    try {
-      const json = await response.json();
-      msg = json.errors[0];
-    } catch { }
-    console.log("RESPONSE", response)
-    ErrorHelper.logError(response.status.toString(), response.url, msg);
-    throw new Error(msg || "Error");
-  }
-
-}
+import { ApiConfig, RolePermissionInterface, ApiListType } from "./interfaces";
+import { ErrorHelper } from "./ErrorHelper";
+
+export class ApiHelper {
+
+  static apiConfigs: ApiConfig[] = [];
+  static isAuthenticated = false;
+  static onRequest: (url:string, requestOptions:any) => void;
+  static onError: (url:string, requestOptions:any, error: any) => void;
+
+  static getConfig(keyName: string) {
+    let result: ApiConfig = null;
+    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 } };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  static async getAnonymous(path: string, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    const requestOptions = { method: "GET" };
+    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 }
+    };
+    if (this.onRequest) this.onRequest(config.url + path, requestOptions);
+    try {
+      const response = await fetch(config.url + path, requestOptions);
+      if (!response.ok) await this.throwApiError(response);
+    } catch (e) {
+      console.log(e);
+      if (this.onError) this.onError(config.url + path, requestOptions, 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)
+    };
+    console.log(config.url + path, requestOptions);
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  static async fetchWithErrorHandling(url: string, requestOptions: any) {
+    if (this.onRequest) this.onRequest(url, requestOptions);
+    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("Error loading url: " + url);
+      console.log(e)
+      throw (e);
+    }
+  }
+
+  private static async throwApiError(response: Response) {
+    let msg = response.statusText;
+    try {
+      msg = await response.text();
+    } catch {}
+    try {
+      const json = await response.json();
+      msg = json.errors[0];
+    } catch { }
+    console.log("RESPONSE", response)
+    ErrorHelper.logError(response.status.toString(), response.url, msg);
+    throw new Error(msg || "Error");
+  }
+
+}

package/src/AppearanceHelper.ts

@@ -1,69 +1,69 @@
-
-export interface AppearanceInterface { primaryColor?: string, primaryContrast?: string, secondaryColor?: string, secondaryContrast?: string, logoLight?: string, logoDark?: string, favicon_400x400?: string, favicon_16x16?: string }
-
-export class AppearanceHelper {
-
-  public static getLogoDark(appearanceSettings: AppearanceInterface, defaultLogo: string) {
-    return (appearanceSettings?.logoDark) ? appearanceSettings.logoDark : defaultLogo;
-  }
-
-  public static getLogoLight(appearanceSettings: AppearanceInterface, defaultLogo: string) {
-    return (appearanceSettings?.logoLight) ? appearanceSettings.logoLight : defaultLogo;
-  }
-
-  public static getFavicon(appearanceSettings: AppearanceInterface, size: "400" | "16") {
-    if (size === "400") {
-      return appearanceSettings?.favicon_400x400;
-    }
-
-    if (size === "16") {
-      return appearanceSettings?.favicon_16x16;
-    }
-
-    return null;
-  }
-
-  public static getLogo(appearanceSettings: AppearanceInterface, defaultLogoLight: string, defaultLogoDark: string, backgroundColor: string) {
-    const isDark = (appearanceSettings.logoDark) ? this.isDark(backgroundColor) : false;
-    if (isDark) return this.getLogoDark(appearanceSettings, defaultLogoDark);
-    else return this.getLogoLight(appearanceSettings, defaultLogoLight);
-  }
-
-  private static isDark(backgroundColor: string) {
-    let valid = false;
-    let r = 0;
-    let g = 0;
-    let b = 0;
-
-    if (backgroundColor.match(/#[0-9a-fA-F{6}]/)) {
-      r = this.getHexValue(backgroundColor.substring(1, 2));
-      g = this.getHexValue(backgroundColor.substring(3, 4));
-      b = this.getHexValue(backgroundColor.substring(5, 6));
-      valid = true;
-    } else if (backgroundColor.match(/#[0-9a-fA-F{3}]/)) {
-      r = this.getHexValue(backgroundColor.substring(1, 1));
-      g = this.getHexValue(backgroundColor.substring(2, 2));
-      b = this.getHexValue(backgroundColor.substring(3, 3));
-      valid = true;
-    }
-
-    if (!valid) return false;
-    else {
-      //HSP brightness formula.  Some colors have a bigger impact on our perceived brightness than others.
-      const rWeight = .299 * Math.pow(r, 2);
-      const gWeight = .587 * Math.pow(g, 2);
-      const bWeight = .114 * Math.pow(b, 2);
-      const brightness = Math.sqrt(rWeight + gWeight + bWeight);
-      //return brightness < 128;  //
-      return brightness < 156;
-    }
-
-  }
-
-  private static getHexValue(hex: string) {
-    let result = parseInt(hex, 16);
-    if (hex.length === 1) result = result * 16;
-    return result;
-  }
-
-}
+
+export interface AppearanceInterface { primaryColor?: string, primaryContrast?: string, secondaryColor?: string, secondaryContrast?: string, logoLight?: string, logoDark?: string, favicon_400x400?: string, favicon_16x16?: string }
+
+export class AppearanceHelper {
+
+  public static getLogoDark(appearanceSettings: AppearanceInterface, defaultLogo: string) {
+    return (appearanceSettings?.logoDark) ? appearanceSettings.logoDark : defaultLogo;
+  }
+
+  public static getLogoLight(appearanceSettings: AppearanceInterface, defaultLogo: string) {
+    return (appearanceSettings?.logoLight) ? appearanceSettings.logoLight : defaultLogo;
+  }
+
+  public static getFavicon(appearanceSettings: AppearanceInterface, size: "400" | "16") {
+    if (size === "400") {
+      return appearanceSettings?.favicon_400x400;
+    }
+
+    if (size === "16") {
+      return appearanceSettings?.favicon_16x16;
+    }
+
+    return null;
+  }
+
+  public static getLogo(appearanceSettings: AppearanceInterface, defaultLogoLight: string, defaultLogoDark: string, backgroundColor: string) {
+    const isDark = (appearanceSettings.logoDark) ? this.isDark(backgroundColor) : false;
+    if (isDark) return this.getLogoDark(appearanceSettings, defaultLogoDark);
+    else return this.getLogoLight(appearanceSettings, defaultLogoLight);
+  }
+
+  private static isDark(backgroundColor: string) {
+    let valid = false;
+    let r = 0;
+    let g = 0;
+    let b = 0;
+
+    if (backgroundColor.match(/#[0-9a-fA-F{6}]/)) {
+      r = this.getHexValue(backgroundColor.substring(1, 2));
+      g = this.getHexValue(backgroundColor.substring(3, 4));
+      b = this.getHexValue(backgroundColor.substring(5, 6));
+      valid = true;
+    } else if (backgroundColor.match(/#[0-9a-fA-F{3}]/)) {
+      r = this.getHexValue(backgroundColor.substring(1, 1));
+      g = this.getHexValue(backgroundColor.substring(2, 2));
+      b = this.getHexValue(backgroundColor.substring(3, 3));
+      valid = true;
+    }
+
+    if (!valid) return false;
+    else {
+      //HSP brightness formula.  Some colors have a bigger impact on our perceived brightness than others.
+      const rWeight = .299 * Math.pow(r, 2);
+      const gWeight = .587 * Math.pow(g, 2);
+      const bWeight = .114 * Math.pow(b, 2);
+      const brightness = Math.sqrt(rWeight + gWeight + bWeight);
+      //return brightness < 128;  //
+      return brightness < 156;
+    }
+
+  }
+
+  private static getHexValue(hex: string) {
+    let result = parseInt(hex, 16);
+    if (hex.length === 1) result = result * 16;
+    return result;
+  }
+
+}