@alanszp/express 10.0.3 → 11.0.0
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/middlewares/authenticateUser.js +4 -3
- package/dist/middlewares/authenticateUser.js.map +1 -1
- package/dist/middlewares/hasRoles.js +1 -2
- package/dist/middlewares/hasRoles.js.map +1 -1
- package/dist/test/mocks/jwtUserMocks.js +7 -6
- package/dist/test/mocks/jwtUserMocks.js.map +1 -1
- package/package.json +7 -7
- package/src/middlewares/authenticateUser.ts +11 -8
- package/src/middlewares/hasRoles.ts +1 -2
- package/src/test/mocks/jwtUserMocks.ts +6 -6
|
@@ -54,14 +54,15 @@ const middlewareGetterByAuthType = {
|
|
|
54
54
|
user: "0",
|
|
55
55
|
org: "lara",
|
|
56
56
|
});
|
|
57
|
-
return Promise.resolve({
|
|
57
|
+
return Promise.resolve(new jwt_1.JWTUser({
|
|
58
58
|
id: "0",
|
|
59
59
|
employeeReference: "0",
|
|
60
60
|
organizationReference: "lara",
|
|
61
61
|
roles: [],
|
|
62
62
|
segmentReference: null,
|
|
63
|
-
permissions
|
|
64
|
-
|
|
63
|
+
// This will be changed in the near future to grab all permissions.
|
|
64
|
+
permissions: "MA==", // 0 in base64
|
|
65
|
+
}));
|
|
65
66
|
}
|
|
66
67
|
else {
|
|
67
68
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticateUser.js","sourceRoot":"","sources":["../../src/middlewares/authenticateUser.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAiE;AACjE,4CAAoD;AACpD,kDAA+C;AAE/C,kEAA+D;AAG/D,mCAAgD;AAEhD,SAAS,wBAAwB,CAC/B,aAAiC;IAEjC,IAAI,CAAC,aAAa;QAAE,OAAO,SAAS,CAAC;IACrC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEzD,IAAI,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAE9D,OAAO,GAAG,CAAC;AACb,CAAC;AAED,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,0BAAW,CAAA;IACX,kCAAmB,CAAA;AACrB,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AA0BD,MAAM,0BAA0B,GAO5B;IACF,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CACjB,GAA8B,EAC9B,OAA4C,EAC5C,MAAe,EACf,EAAE;QACF,IAAI;YACF,IAAI,CAAC,GAAG;gBAAE,OAAO,SAAS,CAAC;YAC3B,MAAM,OAAO,GAAG,MAAM,IAAA,eAAS,EAC7B,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAClC,GAAG,EACH,IAAA,aAAI,EAAC,OAAO,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAC5C,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE;gBACtC,IAAI,EAAE,OAAO,CAAC,EAAE;gBAChB,GAAG,EAAE,OAAO,CAAC,qBAAqB;aACnC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC;SAChB;QAAC,OAAO,KAAc,EAAE;YACvB,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAA;IACD,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CACrB,KAAgC,EAChC,OAAyC,EACzC,MAAe,EACsB,EAAE;QACvC,IAAI;YACF,IAAI,CAAC,KAAK;gBAAE,OAAO,SAAS,CAAC;YAC7B,IAAI,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACxC,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE;oBACzC,IAAI,EAAE,GAAG;oBACT,GAAG,EAAE,MAAM;iBACZ,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"authenticateUser.js","sourceRoot":"","sources":["../../src/middlewares/authenticateUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.hasRoles = void 0;
|
|
4
4
|
const errors_1 = require("@alanszp/errors");
|
|
5
5
|
const errorView_1 = require("../views/errorView");
|
|
6
|
-
const jwt_1 = require("@alanszp/jwt");
|
|
7
6
|
function response401(res) {
|
|
8
7
|
res.status(401).json((0, errorView_1.errorView)(new errors_1.UnauthorizedError(["permissions"])));
|
|
9
8
|
}
|
|
@@ -13,7 +12,7 @@ function hasRoles(roles) {
|
|
|
13
12
|
if (!jwtUser) {
|
|
14
13
|
return response401(res);
|
|
15
14
|
}
|
|
16
|
-
if (
|
|
15
|
+
if (jwtUser.hasRoles(roles)) {
|
|
17
16
|
return next();
|
|
18
17
|
}
|
|
19
18
|
response401(res);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasRoles.js","sourceRoot":"","sources":["../../src/middlewares/hasRoles.ts"],"names":[],"mappings":";;;AAAA,4CAAoD;AACpD,kDAA+C;
|
|
1
|
+
{"version":3,"file":"hasRoles.js","sourceRoot":"","sources":["../../src/middlewares/hasRoles.ts"],"names":[],"mappings":";;;AAAA,4CAAoD;AACpD,kDAA+C;AAI/C,SAAS,WAAW,CAAC,GAAa;IAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,qBAAS,EAAC,IAAI,0BAAiB,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED,SAAgB,QAAQ,CACtB,KAAwB;IAExB,OAAO,CAAC,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAChE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;SACzB;QAED,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC3B,OAAO,IAAI,EAAE,CAAC;SACf;QAED,WAAW,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AAfD,4BAeC"}
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.laraJwtUserMock = exports.userJwtUserMock = void 0;
|
|
4
|
-
|
|
4
|
+
const jwt_1 = require("@alanszp/jwt");
|
|
5
|
+
exports.userJwtUserMock = new jwt_1.JWTUser({
|
|
5
6
|
id: "1",
|
|
6
7
|
employeeReference: "1",
|
|
7
8
|
organizationReference: "test",
|
|
8
9
|
roles: [],
|
|
9
|
-
permissions:
|
|
10
|
+
permissions: "MA==",
|
|
10
11
|
segmentReference: null,
|
|
11
|
-
};
|
|
12
|
-
exports.laraJwtUserMock = {
|
|
12
|
+
});
|
|
13
|
+
exports.laraJwtUserMock = new jwt_1.JWTUser({
|
|
13
14
|
id: "0",
|
|
14
15
|
employeeReference: "0",
|
|
15
16
|
organizationReference: "lara",
|
|
16
17
|
roles: [],
|
|
17
|
-
permissions:
|
|
18
|
+
permissions: "MA==",
|
|
18
19
|
segmentReference: null,
|
|
19
|
-
};
|
|
20
|
+
});
|
|
20
21
|
//# sourceMappingURL=jwtUserMocks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtUserMocks.js","sourceRoot":"","sources":["../../../src/test/mocks/jwtUserMocks.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"jwtUserMocks.js","sourceRoot":"","sources":["../../../src/test/mocks/jwtUserMocks.ts"],"names":[],"mappings":";;;AAAA,sCAAuC;AAE1B,QAAA,eAAe,GAAY,IAAI,aAAO,CAAC;IAClD,EAAE,EAAE,GAAG;IACP,iBAAiB,EAAE,GAAG;IACtB,qBAAqB,EAAE,MAAM;IAC7B,KAAK,EAAE,EAAE;IACT,WAAW,EAAE,MAAM;IACnB,gBAAgB,EAAE,IAAI;CACvB,CAAC,CAAC;AAEU,QAAA,eAAe,GAAY,IAAI,aAAO,CAAC;IAClD,EAAE,EAAE,GAAG;IACP,iBAAiB,EAAE,GAAG;IACtB,qBAAqB,EAAE,MAAM;IAC7B,KAAK,EAAE,EAAE;IACT,WAAW,EAAE,MAAM;IACnB,gBAAgB,EAAE,IAAI;CACvB,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanszp/express",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "11.0.0",
|
|
4
4
|
"description": "Alan's express utils and middlewares.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -35,15 +35,15 @@
|
|
|
35
35
|
"typescript": "^4.3.4"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@alanszp/audit": "^
|
|
39
|
-
"@alanszp/errors": "^
|
|
40
|
-
"@alanszp/jwt": "^
|
|
41
|
-
"@alanszp/logger": "^
|
|
42
|
-
"@alanszp/shared-context": "^
|
|
38
|
+
"@alanszp/audit": "^11.0.0",
|
|
39
|
+
"@alanszp/errors": "^11.0.0",
|
|
40
|
+
"@alanszp/jwt": "^11.0.0",
|
|
41
|
+
"@alanszp/logger": "^11.0.0",
|
|
42
|
+
"@alanszp/shared-context": "^11.0.0",
|
|
43
43
|
"@babel/core": "^7.23.9",
|
|
44
44
|
"@paralleldrive/cuid2": "^2.2.2",
|
|
45
45
|
"body-parser": "^1.20.2",
|
|
46
46
|
"lodash": "^4.17.21"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "60b62fa2fff34ef094ea9af69c2bed2373c70f64"
|
|
49
49
|
}
|
|
@@ -89,14 +89,17 @@ const middlewareGetterByAuthType: Record<
|
|
|
89
89
|
user: "0",
|
|
90
90
|
org: "lara",
|
|
91
91
|
});
|
|
92
|
-
return Promise.resolve(
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
92
|
+
return Promise.resolve(
|
|
93
|
+
new JWTUser({
|
|
94
|
+
id: "0",
|
|
95
|
+
employeeReference: "0",
|
|
96
|
+
organizationReference: "lara",
|
|
97
|
+
roles: [],
|
|
98
|
+
segmentReference: null,
|
|
99
|
+
// This will be changed in the near future to grab all permissions.
|
|
100
|
+
permissions: "MA==", // 0 in base64
|
|
101
|
+
})
|
|
102
|
+
);
|
|
100
103
|
} else {
|
|
101
104
|
return null;
|
|
102
105
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { UnauthorizedError } from "@alanszp/errors";
|
|
2
2
|
import { errorView } from "../views/errorView";
|
|
3
3
|
import { NextFunction, Response } from "express";
|
|
4
|
-
import { jwtUserHasRoles } from "@alanszp/jwt";
|
|
5
4
|
import { GenericRequest } from "../types/GenericRequest";
|
|
6
5
|
|
|
7
6
|
function response401(res: Response): void {
|
|
@@ -17,7 +16,7 @@ export function hasRoles(
|
|
|
17
16
|
return response401(res);
|
|
18
17
|
}
|
|
19
18
|
|
|
20
|
-
if (
|
|
19
|
+
if (jwtUser.hasRoles(roles)) {
|
|
21
20
|
return next();
|
|
22
21
|
}
|
|
23
22
|
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { JWTUser } from "@alanszp/jwt";
|
|
2
2
|
|
|
3
|
-
export const userJwtUserMock: JWTUser = {
|
|
3
|
+
export const userJwtUserMock: JWTUser = new JWTUser({
|
|
4
4
|
id: "1",
|
|
5
5
|
employeeReference: "1",
|
|
6
6
|
organizationReference: "test",
|
|
7
7
|
roles: [],
|
|
8
|
-
permissions:
|
|
8
|
+
permissions: "MA==",
|
|
9
9
|
segmentReference: null,
|
|
10
|
-
};
|
|
10
|
+
});
|
|
11
11
|
|
|
12
|
-
export const laraJwtUserMock: JWTUser = {
|
|
12
|
+
export const laraJwtUserMock: JWTUser = new JWTUser({
|
|
13
13
|
id: "0",
|
|
14
14
|
employeeReference: "0",
|
|
15
15
|
organizationReference: "lara",
|
|
16
16
|
roles: [],
|
|
17
|
-
permissions:
|
|
17
|
+
permissions: "MA==",
|
|
18
18
|
segmentReference: null,
|
|
19
|
-
};
|
|
19
|
+
});
|