@autofleet/zehut 1.5.2 → 1.5.3

package/lib/index.d.ts

@@ -5,6 +5,8 @@ declare const getCurrentPayload: () => any;
 export { User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getCurrentPayload, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, UnauthorizedAccessError, };
 declare const _default: {
     User: typeof User;
+    getRefreshTokenSecret: (token: any) => string;
+    getTokenSecret: (token: any) => string;
     middleware: (options?: {
         eagerLoadUserPermissions?: boolean;
         eagerLoadUserPermissionsLegacy?: boolean;

package/lib/index.js

@@ -35,11 +35,14 @@ Object.defineProperty(exports, "isUserExist", { enumerable: true, get: function
 Object.defineProperty(exports, "getUser", { enumerable: true, get: function () { return check_permission_1.getUser; } });
 const errors_1 = require("./errors");
 Object.defineProperty(exports, "UnauthorizedAccessError", { enumerable: true, get: function () { return errors_1.UnauthorizedAccessError; } });
+const secret_getter_1 = require("./secret-getter");
 tracer_1.enable();
 const getCurrentPayload = tracer_1.getCurrentTrace;
 exports.getCurrentPayload = getCurrentPayload;
 exports.default = {
     User: user_1.default,
+    getRefreshTokenSecret: secret_getter_1.getRefreshTokenSecret,
+    getTokenSecret: secret_getter_1.getTokenSecret,
     middleware: user_1.middleware,
     middlewareWithDecode: user_1.middlewareWithDecode,
     eagerLoadPermissionsMiddleware: user_1.eagerLoadPermissionsMiddleware,

package/lib/secret-getter.d.ts

@@ -0,0 +1,2 @@
+export declare const getRefreshTokenSecret: (token: any) => string;
+export declare const getTokenSecret: (token: any) => string;

package/lib/secret-getter.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTokenSecret = exports.getRefreshTokenSecret = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const moment_1 = __importDefault(require("moment"));
+const { DEPRECATED_JWT_SECRET, JWT_SECRET, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET, DEPRECATION_UNIX_TIMESTAMP, } = process.env;
+const deprecationTime = moment_1.default(DEPRECATION_UNIX_TIMESTAMP || undefined);
+const getRelevantSecret = (token, deprecatedSecret, newSecret) => {
+    let unixTime;
+    if (token) {
+        const { payload: { iat } } = jsonwebtoken_1.default.decode(token);
+        unixTime = moment_1.default(iat * 1000);
+    }
+    else {
+        unixTime = moment_1.default();
+    }
+    return unixTime.isBefore(deprecationTime) ? deprecatedSecret : newSecret;
+};
+exports.getRefreshTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET);
+exports.getTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_JWT_SECRET, JWT_SECRET);

package/lib/utils.js

@@ -22,17 +22,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContextAttributes = exports.getEntitiesFromContext = exports.parsePermissions = exports.decodeBearer = exports.getAuthFromBearer = void 0;
 /* eslint-disable prefer-destructuring */
 const jwt = __importStar(require("jsonwebtoken"));
+const secret_getter_1 = require("./secret-getter");
 const CONTEXT_PROPS = ['fleetId', 'businessModelId', 'demandSourceId'];
 const CONTEXT_MAP_PROPS = {
     fleet: 'fleets',
     business: 'businessModels',
     demand: 'demandSources',
 };
-const jwtSecret = process.env.JWT_SECRET || 'pGVYfg9Nt-ugw&R=wB!9SFaRs=f3pS#L!';
 exports.getAuthFromBearer = (bearer) => bearer.replace('Bearer ', '');
 exports.decodeBearer = (bearer) => {
     const token = bearer.replace('Bearer ', '');
-    const decoded = jwt.verify(token, jwtSecret);
+    const decoded = jwt.verify(token, secret_getter_1.getTokenSecret(token));
     return decoded;
 };
 exports.parsePermissions = (contextId, decodedToken) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -31,6 +31,7 @@
     "@autofleet/outbreak": "0.0.7",
     "axios": "^0.19.2",
     "jsonwebtoken": "^8.5.1",
+    "moment": "^2.29.1",
     "uuid": "^8.3.2"
   },
   "devDependencies": {