@churchapps/apihelper 0.1.10 → 0.4.35
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/controllers/CustomBaseController.d.ts.map +1 -1
- package/dist/controllers/CustomBaseController.js +4 -16
- package/dist/controllers/CustomBaseController.js.map +1 -1
- package/dist/helpers/EmailHelper.js +2 -2
- package/dist/helpers/EmailHelper.js.map +1 -1
- package/dist/helpers/LoggingHelper.d.ts.map +1 -1
- package/dist/helpers/LoggingHelper.js +1 -7
- package/dist/helpers/LoggingHelper.js.map +1 -1
- package/dist/templates/EmailTemplate.html +0 -1
- package/package.json +2 -2
- package/src/controllers/CustomBaseController.ts +4 -16
- package/src/helpers/EmailHelper.ts +2 -2
- package/src/helpers/LoggingHelper.ts +1 -5
- package/src/tools/templates/EmailTemplate.html +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomBaseController.d.ts","sourceRoot":"","sources":["../../src/controllers/CustomBaseController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,qBAAa,oBAAqB,SAAQ,kBAAkB;IAEjD,MAAM,EAAE,aAAa,CAAC;;IAOtB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE;IAItB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE;IAI3B,QAAQ,IAAI,iBAAiB;IAK7B,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM;IAUpC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"CustomBaseController.d.ts","sourceRoot":"","sources":["../../src/controllers/CustomBaseController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,qBAAa,oBAAqB,SAAQ,kBAAkB;IAEjD,MAAM,EAAE,aAAa,CAAC;;IAOtB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE;IAItB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE;IAI3B,QAAQ,IAAI,iBAAiB;IAK7B,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM;IAUpC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAWlI,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAahI"}
|
|
@@ -38,14 +38,8 @@ class CustomBaseController extends inversify_express_utils_1.BaseHttpController
|
|
|
38
38
|
return result;
|
|
39
39
|
}
|
|
40
40
|
catch (e) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
await this.logger.flush();
|
|
44
|
-
}
|
|
45
|
-
catch (e) {
|
|
46
|
-
console.log(e);
|
|
47
|
-
}
|
|
48
|
-
return this.internalServerError(e);
|
|
41
|
+
// Since logger.error now throws, just re-throw the error
|
|
42
|
+
throw e;
|
|
49
43
|
}
|
|
50
44
|
}
|
|
51
45
|
async actionWrapperAnon(_req, _res, fetchFunction) {
|
|
@@ -55,14 +49,8 @@ class CustomBaseController extends inversify_express_utils_1.BaseHttpController
|
|
|
55
49
|
return result;
|
|
56
50
|
}
|
|
57
51
|
catch (e) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
await this.logger.flush();
|
|
61
|
-
}
|
|
62
|
-
catch (e) {
|
|
63
|
-
console.log(e);
|
|
64
|
-
}
|
|
65
|
-
return this.internalServerError(e);
|
|
52
|
+
// Since logger.error now throws, just re-throw the error
|
|
53
|
+
throw e;
|
|
66
54
|
}
|
|
67
55
|
}
|
|
68
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomBaseController.js","sourceRoot":"","sources":["../../src/controllers/CustomBaseController.ts"],"names":[],"mappings":";;;AAAA,qEAA6D;AAE7D,4DAAyD;AACzD,kCAAsD;AAEtD,MAAa,oBAAqB,SAAQ,4CAAkB;IAIxD;QACI,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,6BAAa,CAAC,UAAU,EAAE,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,MAAgB;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,UAAU,CAAC,MAAgB;QAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,QAAQ;QACX,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,wBAAiB,CAAC,IAAI,gBAAS,CAAC,EAAE,CAAC,CAAC,CAAC;;YAC/E,OAAO,IAAI,wBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAiB,CAAC,CAAC;IAC1E,CAAC;IAEM,OAAO,CAAC,GAAoB,EAAE,IAAY;QAC7C,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,CAAC,OAAiB,CAAC;YAClD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAAE,MAAM,GAAG,IAAI,CAAC;QAChD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,IAAqB,EAAE,IAAsB,EAAE,aAAkD;QACxH,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YAClB,
|
|
1
|
+
{"version":3,"file":"CustomBaseController.js","sourceRoot":"","sources":["../../src/controllers/CustomBaseController.ts"],"names":[],"mappings":";;;AAAA,qEAA6D;AAE7D,4DAAyD;AACzD,kCAAsD;AAEtD,MAAa,oBAAqB,SAAQ,4CAAkB;IAIxD;QACI,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,6BAAa,CAAC,UAAU,EAAE,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,MAAgB;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,UAAU,CAAC,MAAgB;QAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,QAAQ;QACX,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,wBAAiB,CAAC,IAAI,gBAAS,CAAC,EAAE,CAAC,CAAC,CAAC;;YAC/E,OAAO,IAAI,wBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAiB,CAAC,CAAC;IAC1E,CAAC;IAEM,OAAO,CAAC,GAAoB,EAAE,IAAY;QAC7C,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,CAAC,OAAiB,CAAC;YAClD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAAE,MAAM,GAAG,IAAI,CAAC;QAChD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,IAAqB,EAAE,IAAsB,EAAE,aAAkD;QACxH,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YAClB,yDAAyD;YACzD,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,IAAqB,EAAE,IAAsB,EAAE,aAA4B;QACtG,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YAClB,yDAAyD;YACzD,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;CAIJ;AAxDD,oDAwDC"}
|
|
@@ -16,9 +16,9 @@ class EmailHelper {
|
|
|
16
16
|
}
|
|
17
17
|
static async sendTemplatedEmail(from, to, appName, appUrl, subject, contents, emailTemplate = "EmailTemplate.html") {
|
|
18
18
|
if (!appName)
|
|
19
|
-
appName = "
|
|
19
|
+
appName = "B1";
|
|
20
20
|
if (!appUrl)
|
|
21
|
-
appUrl = "https://
|
|
21
|
+
appUrl = "https://b1.church";
|
|
22
22
|
const template = EmailHelper.readTemplate(emailTemplate);
|
|
23
23
|
const emailBody = template
|
|
24
24
|
.replace("{appLink}", "<a target='_blank' rel='noreferrer noopener' href=\"" + appUrl + "/\">" + appName + "</a>")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailHelper.js","sourceRoot":"","sources":["../../src/helpers/EmailHelper.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAkE;AAClE,4DAAmC;AACnC,sEAAsE;AACtE,wBAAkD;AAClD,4CAAoB;AACpB,gDAAwB;AAExB,MAAa,WAAW;IAEd,MAAM,CAAC,YAAY;QACzB,OAAO,IAAI,sBAAS,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;IAChD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAY,EAAE,EAAU,EAAE,OAAe,EAAE,MAAc,EAAE,OAAe,EAAE,QAAgB,EAAE,gBAAmE,oBAAoB;QAC1N,IAAI,CAAC,OAAO;YAAE,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"EmailHelper.js","sourceRoot":"","sources":["../../src/helpers/EmailHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggingHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/LoggingHelper.ts"],"names":[],"mappings":"AAKA,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAuB;IAC9C,OAAc,UAAU,sBAMvB;IAED,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAA0D;IAC9E,OAAO,CAAC,cAAc,CAAa;IAI5B,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"LoggingHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/LoggingHelper.ts"],"names":[],"mappings":"AAKA,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAuB;IAC9C,OAAc,UAAU,sBAMvB;IAED,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAA0D;IAC9E,OAAO,CAAC,cAAc,CAAa;IAI5B,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI1B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAMzB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;IAQlE,OAAO,CAAC,IAAI;IAaL,KAAK;CAgBb"}
|
|
@@ -16,13 +16,7 @@ class LoggingHelper {
|
|
|
16
16
|
this.logDestination = "console";
|
|
17
17
|
}
|
|
18
18
|
error(msg) {
|
|
19
|
-
|
|
20
|
-
this.init("API");
|
|
21
|
-
this.pendingMessages = true;
|
|
22
|
-
if (_1.EnvironmentBase.appEnv === "dev")
|
|
23
|
-
console.log(msg);
|
|
24
|
-
this._logger.error(msg);
|
|
25
|
-
this._logger.error(new Error().stack.toString());
|
|
19
|
+
throw msg instanceof Error ? msg : new Error(typeof msg === 'string' ? msg : JSON.stringify(msg));
|
|
26
20
|
}
|
|
27
21
|
info(msg) {
|
|
28
22
|
if (this._logger === null)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggingHelper.js","sourceRoot":"","sources":["../../src/helpers/LoggingHelper.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,4EAAmD;AACnD,4BAA4B;AAC5B,wBAAoC;AAEpC,MAAa,aAAa;IAA1B;QAUU,YAAO,GAAmB,IAAI,CAAC;QAE/B,oBAAe,GAAG,KAAK,CAAC;QACxB,iBAAY,GAAG,kBAAe,CAAC,OAAO,GAAG,GAAG,GAAG,kBAAe,CAAC,MAAM,CAAC;QACtE,mBAAc,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"LoggingHelper.js","sourceRoot":"","sources":["../../src/helpers/LoggingHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -404,7 +404,6 @@
|
|
|
404
404
|
<h3 class="heading">Explore Our Apps</h3>
|
|
405
405
|
<ul>
|
|
406
406
|
<li><a href="https://lessons.church/">Lessons.church</a></li>
|
|
407
|
-
<li><a href="https://chums.org/">CHUMS</a></li>
|
|
408
407
|
<li><a href="https://b1.church/">B1</a></li>
|
|
409
408
|
<li><a href="https://streaminglive.church/">StreamingLive</a></li>
|
|
410
409
|
<li><a href="https://votd.org/">Verse of the Day</a></li>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/apihelper",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.35",
|
|
4
4
|
"description": "Library of helper functions not specific to any one ChurchApps project or framework.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"exports": {
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@aws-sdk/client-ses": "^3.862.0",
|
|
40
40
|
"@aws-sdk/client-ssm": "^3.862.0",
|
|
41
41
|
"@aws-sdk/s3-presigned-post": "^3.862.0",
|
|
42
|
-
"@churchapps/helpers": "^1.
|
|
42
|
+
"@churchapps/helpers": "^1.2.4",
|
|
43
43
|
"dotenv": "^17.2.1",
|
|
44
44
|
"express": "^4.21.2",
|
|
45
45
|
"inversify": "^6.2.2",
|
|
@@ -41,14 +41,8 @@ export class CustomBaseController extends BaseHttpController {
|
|
|
41
41
|
await this.logger.flush();
|
|
42
42
|
return result;
|
|
43
43
|
} catch (e: unknown) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
await this.logger.flush();
|
|
47
|
-
} catch (e) {
|
|
48
|
-
console.log(e);
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
return this.internalServerError(e as Error);
|
|
44
|
+
// Since logger.error now throws, just re-throw the error
|
|
45
|
+
throw e;
|
|
52
46
|
}
|
|
53
47
|
}
|
|
54
48
|
|
|
@@ -58,14 +52,8 @@ export class CustomBaseController extends BaseHttpController {
|
|
|
58
52
|
await this.logger.flush();
|
|
59
53
|
return result;
|
|
60
54
|
} catch (e: unknown) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
await this.logger.flush();
|
|
64
|
-
} catch (e) {
|
|
65
|
-
console.log(e);
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
return this.internalServerError(e as Error);
|
|
55
|
+
// Since logger.error now throws, just re-throw the error
|
|
56
|
+
throw e;
|
|
69
57
|
}
|
|
70
58
|
}
|
|
71
59
|
|
|
@@ -12,8 +12,8 @@ export class EmailHelper {
|
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
public static async sendTemplatedEmail(from: string, to: string, appName: string, appUrl: string, subject: string, contents: string, emailTemplate: "EmailTemplate.html" | "ChurchEmailTemplate.html" = "EmailTemplate.html") {
|
|
15
|
-
if (!appName) appName = "
|
|
16
|
-
if (!appUrl) appUrl = "https://
|
|
15
|
+
if (!appName) appName = "B1";
|
|
16
|
+
if (!appUrl) appUrl = "https://b1.church";
|
|
17
17
|
|
|
18
18
|
const template = EmailHelper.readTemplate(emailTemplate);
|
|
19
19
|
const emailBody = template
|
|
@@ -22,11 +22,7 @@ export class LoggingHelper {
|
|
|
22
22
|
|
|
23
23
|
|
|
24
24
|
public error(msg: string | object) {
|
|
25
|
-
|
|
26
|
-
this.pendingMessages = true;
|
|
27
|
-
if (EnvironmentBase.appEnv === "dev") console.log(msg);
|
|
28
|
-
this._logger.error(msg);
|
|
29
|
-
this._logger.error(new Error().stack.toString());
|
|
25
|
+
throw msg instanceof Error ? msg : new Error(typeof msg === 'string' ? msg : JSON.stringify(msg));
|
|
30
26
|
}
|
|
31
27
|
|
|
32
28
|
public info(msg: string | object) {
|
|
@@ -404,7 +404,6 @@
|
|
|
404
404
|
<h3 class="heading">Explore Our Apps</h3>
|
|
405
405
|
<ul>
|
|
406
406
|
<li><a href="https://lessons.church/">Lessons.church</a></li>
|
|
407
|
-
<li><a href="https://chums.org/">CHUMS</a></li>
|
|
408
407
|
<li><a href="https://b1.church/">B1</a></li>
|
|
409
408
|
<li><a href="https://streaminglive.church/">StreamingLive</a></li>
|
|
410
409
|
<li><a href="https://votd.org/">Verse of the Day</a></li>
|