@autofleet/zehut 1.4.12 → 1.5.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/lib/user/index.js +26 -1
- package/lib/utils.js +1 -1
- package/package.json +1 -1
package/lib/user/index.js
CHANGED
|
@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
|
|
16
|
+
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
16
17
|
const ApiUser_1 = __importDefault(require("./ApiUser"));
|
|
17
18
|
const utils_1 = require("../utils");
|
|
18
19
|
const tracer_1 = require("../tracer");
|
|
@@ -39,8 +40,32 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
|
|
|
39
40
|
exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
40
41
|
var _a;
|
|
41
42
|
const trace = tracer_1.newTrace('userPayload');
|
|
43
|
+
let decoded;
|
|
42
44
|
if (req.headers.authorization) {
|
|
43
|
-
|
|
45
|
+
try {
|
|
46
|
+
decoded = utils_1.decodeBearer(req.headers.authorization);
|
|
47
|
+
}
|
|
48
|
+
catch (e) {
|
|
49
|
+
if (e instanceof jsonwebtoken_1.TokenExpiredError) {
|
|
50
|
+
res.status(401);
|
|
51
|
+
res.json({
|
|
52
|
+
errors: ['Access token expired'],
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
else if (e instanceof jsonwebtoken_1.JsonWebTokenError) {
|
|
56
|
+
res.status(400);
|
|
57
|
+
res.json({
|
|
58
|
+
errors: [e.message],
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
res.status(500);
|
|
63
|
+
res.json({
|
|
64
|
+
errors: ['Server error while parsing token'],
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
44
69
|
const userId = (_a = decoded === null || decoded === void 0 ? void 0 : decoded.user) === null || _a === void 0 ? void 0 : _a.id;
|
|
45
70
|
if (userId) {
|
|
46
71
|
req.headers['X-AF-USER-ID'] = userId;
|
package/lib/utils.js
CHANGED
|
@@ -31,7 +31,7 @@ const CONTEXT_MAP_PROPS = {
|
|
|
31
31
|
exports.getAuthFromBearer = (bearer) => bearer.replace('Bearer ', '');
|
|
32
32
|
exports.decodeBearer = (bearer) => {
|
|
33
33
|
const token = bearer.replace('Bearer ', '');
|
|
34
|
-
const decoded = jwt.
|
|
34
|
+
const decoded = jwt.verify(token);
|
|
35
35
|
return decoded;
|
|
36
36
|
};
|
|
37
37
|
exports.parsePermissions = (contextId, decodedToken) => {
|