@autofleet/zehut 1.5.1 → 1.5.3
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/index.d.ts +2 -0
- package/lib/index.js +3 -0
- package/lib/secret-getter.d.ts +2 -0
- package/lib/secret-getter.js +23 -0
- package/lib/utils.js +2 -1
- package/package.json +2 -1
package/lib/index.d.ts
CHANGED
|
@@ -5,6 +5,8 @@ declare const getCurrentPayload: () => any;
|
|
|
5
5
|
export { User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getCurrentPayload, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, UnauthorizedAccessError, };
|
|
6
6
|
declare const _default: {
|
|
7
7
|
User: typeof User;
|
|
8
|
+
getRefreshTokenSecret: (token: any) => string;
|
|
9
|
+
getTokenSecret: (token: any) => string;
|
|
8
10
|
middleware: (options?: {
|
|
9
11
|
eagerLoadUserPermissions?: boolean;
|
|
10
12
|
eagerLoadUserPermissionsLegacy?: boolean;
|
package/lib/index.js
CHANGED
|
@@ -35,11 +35,14 @@ Object.defineProperty(exports, "isUserExist", { enumerable: true, get: function
|
|
|
35
35
|
Object.defineProperty(exports, "getUser", { enumerable: true, get: function () { return check_permission_1.getUser; } });
|
|
36
36
|
const errors_1 = require("./errors");
|
|
37
37
|
Object.defineProperty(exports, "UnauthorizedAccessError", { enumerable: true, get: function () { return errors_1.UnauthorizedAccessError; } });
|
|
38
|
+
const secret_getter_1 = require("./secret-getter");
|
|
38
39
|
tracer_1.enable();
|
|
39
40
|
const getCurrentPayload = tracer_1.getCurrentTrace;
|
|
40
41
|
exports.getCurrentPayload = getCurrentPayload;
|
|
41
42
|
exports.default = {
|
|
42
43
|
User: user_1.default,
|
|
44
|
+
getRefreshTokenSecret: secret_getter_1.getRefreshTokenSecret,
|
|
45
|
+
getTokenSecret: secret_getter_1.getTokenSecret,
|
|
43
46
|
middleware: user_1.middleware,
|
|
44
47
|
middlewareWithDecode: user_1.middlewareWithDecode,
|
|
45
48
|
eagerLoadPermissionsMiddleware: user_1.eagerLoadPermissionsMiddleware,
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getTokenSecret = exports.getRefreshTokenSecret = void 0;
|
|
7
|
+
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
8
|
+
const moment_1 = __importDefault(require("moment"));
|
|
9
|
+
const { DEPRECATED_JWT_SECRET, JWT_SECRET, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET, DEPRECATION_UNIX_TIMESTAMP, } = process.env;
|
|
10
|
+
const deprecationTime = moment_1.default(DEPRECATION_UNIX_TIMESTAMP || undefined);
|
|
11
|
+
const getRelevantSecret = (token, deprecatedSecret, newSecret) => {
|
|
12
|
+
let unixTime;
|
|
13
|
+
if (token) {
|
|
14
|
+
const { payload: { iat } } = jsonwebtoken_1.default.decode(token);
|
|
15
|
+
unixTime = moment_1.default(iat * 1000);
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
unixTime = moment_1.default();
|
|
19
|
+
}
|
|
20
|
+
return unixTime.isBefore(deprecationTime) ? deprecatedSecret : newSecret;
|
|
21
|
+
};
|
|
22
|
+
exports.getRefreshTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET);
|
|
23
|
+
exports.getTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_JWT_SECRET, JWT_SECRET);
|
package/lib/utils.js
CHANGED
|
@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
22
22
|
exports.getContextAttributes = exports.getEntitiesFromContext = exports.parsePermissions = exports.decodeBearer = exports.getAuthFromBearer = void 0;
|
|
23
23
|
/* eslint-disable prefer-destructuring */
|
|
24
24
|
const jwt = __importStar(require("jsonwebtoken"));
|
|
25
|
+
const secret_getter_1 = require("./secret-getter");
|
|
25
26
|
const CONTEXT_PROPS = ['fleetId', 'businessModelId', 'demandSourceId'];
|
|
26
27
|
const CONTEXT_MAP_PROPS = {
|
|
27
28
|
fleet: 'fleets',
|
|
@@ -31,7 +32,7 @@ const CONTEXT_MAP_PROPS = {
|
|
|
31
32
|
exports.getAuthFromBearer = (bearer) => bearer.replace('Bearer ', '');
|
|
32
33
|
exports.decodeBearer = (bearer) => {
|
|
33
34
|
const token = bearer.replace('Bearer ', '');
|
|
34
|
-
const decoded = jwt.verify(token);
|
|
35
|
+
const decoded = jwt.verify(token, secret_getter_1.getTokenSecret(token));
|
|
35
36
|
return decoded;
|
|
36
37
|
};
|
|
37
38
|
exports.parsePermissions = (contextId, decodedToken) => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@autofleet/zehut",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.3",
|
|
4
4
|
"description": "manage user's identity",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -31,6 +31,7 @@
|
|
|
31
31
|
"@autofleet/outbreak": "0.0.7",
|
|
32
32
|
"axios": "^0.19.2",
|
|
33
33
|
"jsonwebtoken": "^8.5.1",
|
|
34
|
+
"moment": "^2.29.1",
|
|
34
35
|
"uuid": "^8.3.2"
|
|
35
36
|
},
|
|
36
37
|
"devDependencies": {
|