@churchapps/apihelper 0.0.7 → 0.0.11
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/auth/AuthenticatedUser.d.ts +1 -0
- package/dist/auth/AuthenticatedUser.d.ts.map +1 -1
- package/dist/auth/AuthenticatedUser.js +1 -0
- package/dist/auth/AuthenticatedUser.js.map +1 -1
- package/dist/auth/CustomAuthProvider.d.ts.map +1 -1
- package/dist/auth/CustomAuthProvider.js +4 -1
- package/dist/auth/CustomAuthProvider.js.map +1 -1
- package/dist/helpers/EmailHelper.js +1 -1
- package/dist/helpers/EmailHelper.js.map +1 -1
- package/package.json +2 -2
- package/src/auth/AuthenticatedUser.ts +2 -0
- package/src/auth/CustomAuthProvider.ts +3 -1
- package/src/helpers/EmailHelper.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthenticatedUser.d.ts","sourceRoot":"","sources":["../../src/auth/AuthenticatedUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,qBAAa,iBAAiB;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthenticatedUser.d.ts","sourceRoot":"","sources":["../../src/auth/AuthenticatedUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,qBAAa,iBAAiB;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;gBAEA,SAAS,EAAE,SAAS;IAchC,WAAW,CAAC,UAAU,EAAE,WAAW;CAW3C"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AuthenticatedUser = void 0;
|
|
4
4
|
class AuthenticatedUser {
|
|
5
5
|
constructor(principal) {
|
|
6
|
+
this.jwt = principal.details.jwt;
|
|
6
7
|
this.id = principal.details.id;
|
|
7
8
|
this.churchId = principal.details.churchId;
|
|
8
9
|
this.permissions = principal.details.permissions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthenticatedUser.js","sourceRoot":"","sources":["../../src/auth/AuthenticatedUser.ts"],"names":[],"mappings":";;;AAGA,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"AuthenticatedUser.js","sourceRoot":"","sources":["../../src/auth/AuthenticatedUser.ts"],"names":[],"mappings":";;;AAGA,MAAa,iBAAiB;IAa5B,YAAmB,SAAoB;QACrC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC3D,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC7C,CAAC;IAEM,WAAW,CAAC,UAAuB;;QACxC,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;YAC9B,CAAC,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,GAAG,UAAU,CAAC,WAAW,GAAG,IAAI,GAAG,UAAU,CAAC,MAAM;YAC9E,CAAC,CAAC,UAAU,CAAC,WAAW,GAAG,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC;QAEtD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,MAAA,IAAI,CAAC,WAAW,0CAAE,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;YACtC,IAAI,CAAC,KAAK,GAAG;gBAAE,MAAM,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtCD,8CAsCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomAuthProvider.d.ts","sourceRoot":"","sources":["../../src/auth/CustomAuthProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAG/B,qBACa,kBAAmB,YAAW,UAAU,CAAC,YAAY;IAEnD,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"CustomAuthProvider.d.ts","sourceRoot":"","sources":["../../src/auth/CustomAuthProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAG/B,qBACa,kBAAmB,YAAW,UAAU,CAAC,YAAY;IAEnD,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;CAclH"}
|
|
@@ -33,7 +33,10 @@ let CustomAuthProvider = class CustomAuthProvider {
|
|
|
33
33
|
if (!token)
|
|
34
34
|
return null;
|
|
35
35
|
const decoded = jsonwebtoken_1.default.verify(token, __1.EnvironmentBase.jwtSecret);
|
|
36
|
-
|
|
36
|
+
const result = decoded ? new _1.Principal(decoded) : null;
|
|
37
|
+
if (result)
|
|
38
|
+
result.details.jwt = token;
|
|
39
|
+
return result;
|
|
37
40
|
}
|
|
38
41
|
return null;
|
|
39
42
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomAuthProvider.js","sourceRoot":"","sources":["../../src/auth/CustomAuthProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAGvC,gEAA+B;AAC/B,yBAA+B;AAC/B,0BAAqC;AAG9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,iIAAiI;IACpH,OAAO,CAAC,GAAoB,EAAE,GAAqB,EAAE,IAA0B;;YAC1F,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;YAC7C,IAAI,UAAU,EAAE;gBACd,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvC,IAAI,CAAC,KAAK;oBAAE,OAAO,IAAI,CAAC;gBACxB,MAAM,OAAO,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAe,CAAC,SAAS,CAAC,CAAC;gBAE7D,
|
|
1
|
+
{"version":3,"file":"CustomAuthProvider.js","sourceRoot":"","sources":["../../src/auth/CustomAuthProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAGvC,gEAA+B;AAC/B,yBAA+B;AAC/B,0BAAqC;AAG9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,iIAAiI;IACpH,OAAO,CAAC,GAAoB,EAAE,GAAqB,EAAE,IAA0B;;YAC1F,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;YAC7C,IAAI,UAAU,EAAE;gBACd,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvC,IAAI,CAAC,KAAK;oBAAE,OAAO,IAAI,CAAC;gBACxB,MAAM,OAAO,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAe,CAAC,SAAS,CAAC,CAAC;gBAE7D,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,YAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACvD,IAAI,MAAM;oBAAE,MAAM,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC;gBACvC,OAAO,MAAM,CAAC;aACf;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;CACF,CAAA;AAhBY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAgB9B"}
|
|
@@ -28,7 +28,7 @@ class EmailHelper {
|
|
|
28
28
|
appUrl = "https://chums.org";
|
|
29
29
|
const template = EmailHelper.readTemplate(emailTemplate);
|
|
30
30
|
const emailBody = template
|
|
31
|
-
.replace("{appLink}", "<a href=\"" + appUrl + "/\">" + appName + "</a>")
|
|
31
|
+
.replace("{appLink}", "<a target='_blank' rel='noreferrer noopener' href=\"" + appUrl + "/\">" + appName + "</a>")
|
|
32
32
|
.replace("{contents}", contents);
|
|
33
33
|
yield EmailHelper.sendEmail({ from, to, subject, body: emailBody });
|
|
34
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailHelper.js","sourceRoot":"","sources":["../../src/helpers/EmailHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAAyB;AACzB,4DAAmC;AACnC,8FAAyD;AACzD,wBAAkD;AAClD,4CAAoB;AACpB,gDAAwB;AAExB,MAAa,WAAW;IAEf,MAAM,CAAO,kBAAkB,CAAC,IAAY,EAAE,EAAU,EAAE,OAAe,EAAE,MAAc,EAAE,OAAe,EAAE,QAAgB,EAAE,gBAAmE,oBAAoB;;YAC1N,IAAI,CAAC,OAAO;gBAAE,OAAO,GAAG,OAAO,CAAC;YAChC,IAAI,CAAC,MAAM;gBAAE,MAAM,GAAG,mBAAmB,CAAC;YAE1C,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACzD,MAAM,SAAS,GAAG,QAAQ;iBACvB,OAAO,CAAC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"EmailHelper.js","sourceRoot":"","sources":["../../src/helpers/EmailHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/apihelper",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.11",
|
|
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": {
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"homepage": "https://github.com/LiveChurchSolutions/Helpers#readme",
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@aws-sdk/client-cloudwatch-logs": "^3.408.0",
|
|
29
|
-
"@churchapps/helpers": "^1.0.
|
|
29
|
+
"@churchapps/helpers": "^1.0.12",
|
|
30
30
|
"aws-sdk": "^2.1445.0",
|
|
31
31
|
"date-fns": "^2.30.0",
|
|
32
32
|
"dotenv": "^16.3.1",
|
|
@@ -12,8 +12,10 @@ export class AuthenticatedUser {
|
|
|
12
12
|
public lastName: string;
|
|
13
13
|
public membershipStatus?: string;
|
|
14
14
|
public groupIds?: string[];
|
|
15
|
+
public jwt: string;
|
|
15
16
|
|
|
16
17
|
public constructor(principal: Principal) {
|
|
18
|
+
this.jwt = principal.details.jwt;
|
|
17
19
|
this.id = principal.details.id;
|
|
18
20
|
this.churchId = principal.details.churchId;
|
|
19
21
|
this.permissions = principal.details.permissions;
|
|
@@ -15,7 +15,9 @@ export class CustomAuthProvider implements interfaces.AuthProvider {
|
|
|
15
15
|
if (!token) return null;
|
|
16
16
|
const decoded = jwt.verify(token, EnvironmentBase.jwtSecret);
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
const result = decoded ? new Principal(decoded) : null;
|
|
19
|
+
if (result) result.details.jwt = token;
|
|
20
|
+
return result;
|
|
19
21
|
}
|
|
20
22
|
|
|
21
23
|
return null;
|
|
@@ -13,7 +13,7 @@ export class EmailHelper {
|
|
|
13
13
|
|
|
14
14
|
const template = EmailHelper.readTemplate(emailTemplate);
|
|
15
15
|
const emailBody = template
|
|
16
|
-
.replace("{appLink}", "<a href=\"" + appUrl + "/\">" + appName + "</a>")
|
|
16
|
+
.replace("{appLink}", "<a target='_blank' rel='noreferrer noopener' href=\"" + appUrl + "/\">" + appName + "</a>")
|
|
17
17
|
.replace("{contents}", contents);
|
|
18
18
|
await EmailHelper.sendEmail({ from, to, subject, body: emailBody });
|
|
19
19
|
}
|