@churchapps/helpers 1.0.6 → 1.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ApiHelper.d.ts +2 -0
- package/dist/ApiHelper.d.ts.map +1 -1
- package/dist/ApiHelper.js +6 -1
- package/dist/ApiHelper.js.map +1 -1
- package/package.json +2 -2
- package/src/ApiHelper.ts +6 -2
package/dist/ApiHelper.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ import { ApiConfig, RolePermissionInterface, ApiListType } from "./interfaces";
|
|
|
2
2
|
export declare class ApiHelper {
|
|
3
3
|
static apiConfigs: ApiConfig[];
|
|
4
4
|
static isAuthenticated: boolean;
|
|
5
|
+
static onRequest: (url: string, requestOptions: any) => void;
|
|
6
|
+
static onError: (url: string, requestOptions: any, error: any) => void;
|
|
5
7
|
static getConfig(keyName: string): ApiConfig;
|
|
6
8
|
static setDefaultPermissions(jwt: string): void;
|
|
7
9
|
static setPermissions(keyName: string, jwt: string, permissions: RolePermissionInterface[]): void;
|
package/dist/ApiHelper.d.ts.map
CHANGED
|
@@ -1 +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;
|
|
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"}
|
package/dist/ApiHelper.js
CHANGED
|
@@ -82,6 +82,8 @@ class ApiHelper {
|
|
|
82
82
|
method: "DELETE",
|
|
83
83
|
headers: { Authorization: "Bearer " + config.jwt }
|
|
84
84
|
};
|
|
85
|
+
if (this.onRequest)
|
|
86
|
+
this.onRequest(config.url + path, requestOptions);
|
|
85
87
|
try {
|
|
86
88
|
const response = yield fetch(config.url + path, requestOptions);
|
|
87
89
|
if (!response.ok)
|
|
@@ -89,6 +91,8 @@ class ApiHelper {
|
|
|
89
91
|
}
|
|
90
92
|
catch (e) {
|
|
91
93
|
console.log(e);
|
|
94
|
+
if (this.onError)
|
|
95
|
+
this.onError(config.url + path, requestOptions, e);
|
|
92
96
|
throw (e);
|
|
93
97
|
}
|
|
94
98
|
});
|
|
@@ -107,6 +111,8 @@ class ApiHelper {
|
|
|
107
111
|
}
|
|
108
112
|
static fetchWithErrorHandling(url, requestOptions) {
|
|
109
113
|
return __awaiter(this, void 0, void 0, function* () {
|
|
114
|
+
if (this.onRequest)
|
|
115
|
+
this.onRequest(url, requestOptions);
|
|
110
116
|
try {
|
|
111
117
|
const response = yield fetch(url, requestOptions);
|
|
112
118
|
if (!response.ok)
|
|
@@ -126,7 +132,6 @@ class ApiHelper {
|
|
|
126
132
|
}
|
|
127
133
|
static throwApiError(response) {
|
|
128
134
|
return __awaiter(this, void 0, void 0, function* () {
|
|
129
|
-
console.log("THROW API ERROR");
|
|
130
135
|
let msg = response.statusText;
|
|
131
136
|
try {
|
|
132
137
|
const json = yield response.json();
|
package/dist/ApiHelper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiHelper.js","sourceRoot":"","sources":["../src/ApiHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+CAA4C;AAE5C,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"ApiHelper.js","sourceRoot":"","sources":["../src/ApiHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/helpers",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.7",
|
|
4
4
|
"description": "Library of helper functions not specific to any one ChurchApps project or framework.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
},
|
|
24
24
|
"homepage": "https://github.com/LiveChurchSolutions/Helpers#readme",
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@types/node": "^20.5.
|
|
26
|
+
"@types/node": "^20.5.8",
|
|
27
27
|
"npm-run-all": "^4.1.5",
|
|
28
28
|
"rimraf": "^5.0.1",
|
|
29
29
|
"typescript": "^5.2.2"
|
package/src/ApiHelper.ts
CHANGED
|
@@ -5,6 +5,8 @@ export class ApiHelper {
|
|
|
5
5
|
|
|
6
6
|
static apiConfigs: ApiConfig[] = [];
|
|
7
7
|
static isAuthenticated = false;
|
|
8
|
+
static onRequest: (url:string, requestOptions:any) => void;
|
|
9
|
+
static onError: (url:string, requestOptions:any, error: any) => void;
|
|
8
10
|
|
|
9
11
|
static getConfig(keyName: string) {
|
|
10
12
|
let result: ApiConfig = null;
|
|
@@ -74,11 +76,13 @@ export class ApiHelper {
|
|
|
74
76
|
method: "DELETE",
|
|
75
77
|
headers: { Authorization: "Bearer " + config.jwt }
|
|
76
78
|
};
|
|
79
|
+
if (this.onRequest) this.onRequest(config.url + path, requestOptions);
|
|
77
80
|
try {
|
|
78
81
|
const response = await fetch(config.url + path, requestOptions);
|
|
79
82
|
if (!response.ok) await this.throwApiError(response);
|
|
80
83
|
} catch (e) {
|
|
81
|
-
console.log(e)
|
|
84
|
+
console.log(e);
|
|
85
|
+
if (this.onError) this.onError(config.url + path, requestOptions, e);
|
|
82
86
|
throw (e);
|
|
83
87
|
}
|
|
84
88
|
}
|
|
@@ -95,6 +99,7 @@ export class ApiHelper {
|
|
|
95
99
|
}
|
|
96
100
|
|
|
97
101
|
static async fetchWithErrorHandling(url: string, requestOptions: any) {
|
|
102
|
+
if (this.onRequest) this.onRequest(url, requestOptions);
|
|
98
103
|
try {
|
|
99
104
|
const response = await fetch(url, requestOptions);
|
|
100
105
|
if (!response.ok) await this.throwApiError(response);
|
|
@@ -111,7 +116,6 @@ export class ApiHelper {
|
|
|
111
116
|
}
|
|
112
117
|
|
|
113
118
|
private static async throwApiError(response: Response) {
|
|
114
|
-
console.log("THROW API ERROR");
|
|
115
119
|
let msg = response.statusText;
|
|
116
120
|
try {
|
|
117
121
|
const json = await response.json();
|