@autofleet/zehut 1.5.13 → 1.6.0-beta-1

package/lib/check-permission.d.ts

@@ -1,5 +1,6 @@
-export declare const getUser: () => any;
+import ApiUser from './user/api-user';
+export declare const getUser: () => ApiUser;
 export declare const isUserExist: () => boolean;
-export declare const checkFleetPermission: (fleetId: any) => boolean;
-export declare const checkBusinessModelPermission: (businessModelId: any) => boolean;
-export declare const checkDemandSourcePermission: (demandSourceId: any) => boolean;
+export declare const checkFleetPermission: (fleetId: string) => boolean;
+export declare const checkBusinessModelPermission: (businessModelId: string) => boolean;
+export declare const checkDemandSourcePermission: (demandSourceId: string) => boolean;

package/lib/check-permission.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDemandSourcePermission = exports.checkBusinessModelPermission = exports.checkFleetPermission = exports.isUserExist = exports.getUser = void 0;
-const tracer_1 = require("./tracer");
-exports.getUser = () => { var _a, _b; return (_b = (_a = tracer_1.getCurrentTrace()) === null || _a === void 0 ? void 0 : _a.context) === null || _b === void 0 ? void 0 : _b.user; };
+const context_manager_1 = require("./context-manager");
+exports.getUser = () => context_manager_1.contextManager.getContext().get('user');
 exports.isUserExist = () => !!exports.getUser();
 exports.checkFleetPermission = (fleetId) => {
     if (exports.isUserExist()) {
-        const { context } = tracer_1.getCurrentTrace();
+        const context = context_manager_1.contextManager.getContext();
         const user = context === null || context === void 0 ? void 0 : context.get('userObject');
         return !user || Object.keys(user.permissions.fleets).includes(fleetId);
     }
@@ -14,7 +14,7 @@ exports.checkFleetPermission = (fleetId) => {
 };
 exports.checkBusinessModelPermission = (businessModelId) => {
     if (exports.isUserExist()) {
-        const { context } = tracer_1.getCurrentTrace();
+        const context = context_manager_1.contextManager.getContext();
         const user = context === null || context === void 0 ? void 0 : context.get('userObject');
         return !user || Object.keys(user.permissions.businessModels).includes(businessModelId);
     }
@@ -22,7 +22,7 @@ exports.checkBusinessModelPermission = (businessModelId) => {
 };
 exports.checkDemandSourcePermission = (demandSourceId) => {
     if (exports.isUserExist()) {
-        const { context } = tracer_1.getCurrentTrace();
+        const context = context_manager_1.contextManager.getContext();
         const user = context === null || context === void 0 ? void 0 : context.get('userObject');
         return !user || Object.keys(user.permissions.demandSources).includes(demandSourceId);
     }

package/lib/context-manager/context-manager.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" />
+import { AsyncLocalStorage } from 'async_hooks';
+import Context from './context';
+export default class ContextManager extends AsyncLocalStorage<Context> {
+    getContext(): Context;
+}

package/lib/context-manager/context-manager.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_hooks_1 = require("async_hooks");
+class ContextManager extends async_hooks_1.AsyncLocalStorage {
+    getContext() {
+        return this.getStore();
+    }
+}
+exports.default = ContextManager;

package/lib/context-manager/context.d.ts

@@ -0,0 +1,7 @@
+export default class Context {
+    id: string;
+    private store;
+    constructor();
+    set(key: string, value: any): void;
+    get(key: string): any;
+}

package/lib/context-manager/context.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const uuid_1 = __importDefault(require("uuid"));
+class Context {
+    constructor() {
+        this.id = uuid_1.default.v4();
+        this.store = new Map();
+    }
+    set(key, value) {
+        this.store.set(key, value);
+    }
+    get(key) {
+        return this.store.get(key);
+    }
+}
+exports.default = Context;

package/lib/context-manager/index.d.ts

@@ -0,0 +1,4 @@
+import ContextManager from './context-manager';
+import Context from './context';
+declare const contextManager: ContextManager;
+export { contextManager, Context, };

package/lib/context-manager/index.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Context = exports.contextManager = void 0;
+const context_manager_1 = __importDefault(require("./context-manager"));
+const context_1 = __importDefault(require("./context"));
+exports.Context = context_1.default;
+const contextManager = new context_manager_1.default();
+exports.contextManager = contextManager;

package/lib/index.d.ts

@@ -2,26 +2,5 @@ import User, { middleware, eagerLoadPermissionsMiddleware, middlewareWithDecode,
 import { checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser } from './check-permission';
 import { UnauthorizedAccessError } from './errors';
 import { getRefreshTokenSecret, getTokenSecret } from './secret-getter';
-declare const getCurrentPayload: () => any;
-export { User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getCurrentPayload, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, getRefreshTokenSecret, getTokenSecret, UnauthorizedAccessError, };
-declare const _default: {
-    User: typeof User;
-    middleware: (options?: {
-        eagerLoadUserPermissions?: boolean;
-        eagerLoadUserPermissionsLegacy?: boolean;
-    }) => (req: any, res: any, next: any) => Promise<void>;
-    middlewareWithDecode: (options?: {
-        eagerLoadUserPermissions?: boolean;
-        eagerLoadUserPermissionsLegacy?: boolean;
-    }) => (req: any, res: any, next: any) => Promise<void>;
-    eagerLoadPermissionsMiddleware: (req: any, res: any, next: any) => Promise<any>;
-    getCurrentPayload: () => any;
-    getDecodedBearer: (req: any) => any;
-    checkFleetPermission: (fleetId: any) => boolean;
-    checkBusinessModelPermission: (businessModelId: any) => boolean;
-    checkDemandSourcePermission: (demandSourceId: any) => boolean;
-    isUserExist: () => boolean;
-    getUser: () => any;
-    UnauthorizedAccessError: typeof UnauthorizedAccessError;
-};
-export default _default;
+export * from './context-manager';
+export { User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, getRefreshTokenSecret, getTokenSecret, UnauthorizedAccessError, };

package/lib/index.js

@@ -18,15 +18,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnauthorizedAccessError = exports.getTokenSecret = exports.getRefreshTokenSecret = exports.getUser = exports.isUserExist = exports.checkDemandSourcePermission = exports.checkBusinessModelPermission = exports.checkFleetPermission = exports.getDecodedBearer = exports.getCurrentPayload = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = exports.User = void 0;
+exports.UnauthorizedAccessError = exports.getTokenSecret = exports.getRefreshTokenSecret = exports.getUser = exports.isUserExist = exports.checkDemandSourcePermission = exports.checkBusinessModelPermission = exports.checkFleetPermission = exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = exports.User = void 0;
 const user_1 = __importStar(require("./user"));
 exports.User = user_1.default;
 Object.defineProperty(exports, "middleware", { enumerable: true, get: function () { return user_1.middleware; } });
 Object.defineProperty(exports, "eagerLoadPermissionsMiddleware", { enumerable: true, get: function () { return user_1.eagerLoadPermissionsMiddleware; } });
 Object.defineProperty(exports, "middlewareWithDecode", { enumerable: true, get: function () { return user_1.middlewareWithDecode; } });
 Object.defineProperty(exports, "getDecodedBearer", { enumerable: true, get: function () { return user_1.getDecodedBearer; } });
-const tracer_1 = require("./tracer");
 const check_permission_1 = require("./check-permission");
 Object.defineProperty(exports, "checkFleetPermission", { enumerable: true, get: function () { return check_permission_1.checkFleetPermission; } });
 Object.defineProperty(exports, "checkBusinessModelPermission", { enumerable: true, get: function () { return check_permission_1.checkBusinessModelPermission; } });
@@ -38,20 +40,4 @@ Object.defineProperty(exports, "UnauthorizedAccessError", { enumerable: true, ge
 const secret_getter_1 = require("./secret-getter");
 Object.defineProperty(exports, "getRefreshTokenSecret", { enumerable: true, get: function () { return secret_getter_1.getRefreshTokenSecret; } });
 Object.defineProperty(exports, "getTokenSecret", { enumerable: true, get: function () { return secret_getter_1.getTokenSecret; } });
-tracer_1.enable();
-const getCurrentPayload = tracer_1.getCurrentTrace;
-exports.getCurrentPayload = getCurrentPayload;
-exports.default = {
-    User: user_1.default,
-    middleware: user_1.middleware,
-    middlewareWithDecode: user_1.middlewareWithDecode,
-    eagerLoadPermissionsMiddleware: user_1.eagerLoadPermissionsMiddleware,
-    getCurrentPayload,
-    getDecodedBearer: user_1.getDecodedBearer,
-    checkFleetPermission: check_permission_1.checkFleetPermission,
-    checkBusinessModelPermission: check_permission_1.checkBusinessModelPermission,
-    checkDemandSourcePermission: check_permission_1.checkDemandSourcePermission,
-    isUserExist: check_permission_1.isUserExist,
-    getUser: check_permission_1.getUser,
-    UnauthorizedAccessError: errors_1.UnauthorizedAccessError,
-};
+__exportStar(require("./context-manager"), exports);

package/lib/{secret-getter.test.js → secret-getter/index.test.js}

@@ -48,7 +48,7 @@ describe('secret getter tests', () => {
     });
     it('test get new refresh token secret when after deprecation timestamp', () => __awaiter(void 0, void 0, void 0, function* () {
         process.env.DEPRECATION_UNIX_TIMESTAMP = moment_1.default().subtract(1, 'days').unix().toString();
-        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('.')));
         const token = jsonwebtoken_1.default.sign({
             exp: moment_1.default().unix() + (60 * 60 * 24 * 365),
         }, testSecrets.JWT_NEW_SECRET);
@@ -57,7 +57,7 @@ describe('secret getter tests', () => {
     }));
     it('test get old refresh token secret when before deprecation timestamp', () => __awaiter(void 0, void 0, void 0, function* () {
         process.env.DEPRECATION_UNIX_TIMESTAMP = moment_1.default().add(1, 'days').unix().toString();
-        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('.')));
         const token = jsonwebtoken_1.default.sign({
             exp: moment_1.default().unix() + (60 * 60 * 24 * 365),
         }, testSecrets.DEPRECATED_JWT_SECRET);
@@ -69,20 +69,20 @@ describe('secret getter tests', () => {
             exp: moment_1.default().unix() + (60 * 60 * 24 * 365),
         }, testSecrets.DEPRECATED_JWT_SECRET);
         process.env.DEPRECATION_UNIX_TIMESTAMP = moment_1.default().add(10, 'seconds').unix().toString();
-        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('.')));
         yield sleep(1000);
         const result = getTokenSecret(token);
         expect(result).toBe(testSecrets.DEPRECATED_JWT_SECRET);
     }));
     it('test malformed token returns new secret', () => __awaiter(void 0, void 0, void 0, function* () {
-        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('.')));
         const token = 'shit';
         const result = getTokenSecret(token);
         expect(result).toBe(testSecrets.JWT_NEW_SECRET);
     }));
     it('test malformed token returns new secret even before deprecation time', () => __awaiter(void 0, void 0, void 0, function* () {
         process.env.DEPRECATION_UNIX_TIMESTAMP = moment_1.default().add(10, 'day').unix().toString();
-        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('.')));
         const token = 'shit';
         const result = getTokenSecret(token);
         expect(result).toBe(testSecrets.JWT_NEW_SECRET);

package/lib/user/{ApiUser.js → api-user.js}

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable consistent-return */
-const services_1 = require("../services");
+const identity_ms_1 = require("../services/identity-ms");
 class ApiUser {
     constructor(id) {
         this.id = id;
@@ -24,7 +24,7 @@ class ApiUser {
             if (this.privatePermissions) {
                 return this.privatePermissions;
             }
-            const { data } = yield services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`);
+            const { data } = yield identity_ms_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`);
             this.privatePermissions = data;
             return this.privatePermissions;
         });
@@ -58,7 +58,7 @@ class ApiUser {
             if (this.privatePermissionsLegacy) {
                 return this.privatePermissionsLegacy;
             }
-            const { data } = yield services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload-legacy`);
+            const { data } = yield identity_ms_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload-legacy`);
             this.privatePermissionsLegacy = data;
             return this.privatePermissionsLegacy;
         });

package/lib/user/index.d.ts

@@ -1,12 +1,12 @@
-import ApiUser from './ApiUser';
+import ApiUser from './api-user';
 export declare const middleware: (options?: {
     eagerLoadUserPermissions?: boolean;
     eagerLoadUserPermissionsLegacy?: boolean;
-}) => (req: any, res: any, next: any) => Promise<void>;
+}) => (req: any, res: any, next: any) => Promise<any>;
 export declare const middlewareWithDecode: (options?: {
     eagerLoadUserPermissions?: boolean;
     eagerLoadUserPermissionsLegacy?: boolean;
-}) => (req: any, res: any, next: any) => Promise<void>;
-export declare const eagerLoadPermissionsMiddleware: (req: any, res: any, next: any) => Promise<any>;
+}) => (req: any, res: any, next: any) => Promise<any>;
+export declare const eagerLoadPermissionsMiddleware: (req: any, res: any, next: any) => Promise<void>;
 export declare const getDecodedBearer: (req: any) => any;
 export default ApiUser;

package/lib/user/index.js

@@ -14,32 +14,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
 const jsonwebtoken_1 = require("jsonwebtoken");
-const ApiUser_1 = __importDefault(require("./ApiUser"));
+const api_user_1 = __importDefault(require("./api-user"));
 const utils_1 = require("../utils");
-const tracer_1 = require("../tracer");
+const context_manager_1 = require("../context-manager");
 exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     const userId = req.headers['x-af-user-id'];
-    const trace = tracer_1.newTrace('userPayload');
+    const context = new context_manager_1.Context();
     if (!userId) {
-        trace.context.set('userObject', {});
-        return next();
+        context.set('userObject', {});
     }
-    const userObject = new ApiUser_1.default(userId);
-    if (options.eagerLoadUserPermissions) {
-        yield userObject.getUserPermissions();
-    }
-    if (options.eagerLoadUserPermissionsLegacy) {
-        yield userObject.getUserPermissionsLegacy();
+    else {
+        const userObject = new api_user_1.default(userId);
+        if (options.eagerLoadUserPermissions) {
+            yield userObject.getUserPermissions();
+        }
+        if (options.eagerLoadUserPermissionsLegacy) {
+            yield userObject.getUserPermissionsLegacy();
+        }
+        req.user = userObject;
+        context.set('userObject', userObject);
     }
-    req.user = userObject;
-    trace.context.set('userObject', userObject);
-    // Added in order to support outbreak.
-    req.headers['x-af-user-permissions'] = userObject;
-    return next();
+    return context_manager_1.contextManager.run(context, () => {
+        next();
+    });
 });
 exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const trace = tracer_1.newTrace('userPayload');
+    const context = new context_manager_1.Context();
     let decoded;
     if (req.headers.authorization) {
         try {
@@ -47,30 +48,24 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
         }
         catch (e) {
             if (e instanceof jsonwebtoken_1.TokenExpiredError) {
-                res.status(401);
-                res.json({
+                return res.status(401).json({
                     errors: ['Access token expired'],
                 });
             }
-            else if (e instanceof jsonwebtoken_1.JsonWebTokenError) {
-                res.status(400);
-                res.json({
+            if (e instanceof jsonwebtoken_1.JsonWebTokenError) {
+                return res.status(400).json({
                     errors: [e.message],
                 });
             }
-            else {
-                res.status(500);
-                res.json({
-                    errors: ['Server error while parsing token'],
-                });
-            }
-            return;
+            return res.status(500).json({
+                errors: ['Server error while parsing token'],
+            });
         }
         const userId = (_a = decoded === null || decoded === void 0 ? void 0 : decoded.user) === null || _a === void 0 ? void 0 : _a.id;
         if (userId) {
             req.headers['X-AF-USER-ID'] = userId;
         }
-        const userObject = new ApiUser_1.default(userId);
+        const userObject = new api_user_1.default(userId);
         if (options.eagerLoadUserPermissions) {
             yield userObject.getUserPermissions();
         }
@@ -78,17 +73,20 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
             yield userObject.getUserPermissionsLegacy();
         }
         req.user = userObject;
-        trace.context.set('userObject', userObject);
-        // Added in order to support outbreak.
-        req.headers['x-af-user-permissions'] = userObject;
+        context.set('userObject', userObject);
     }
-    trace.context.set('userObject', {});
-    // eslint-disable-next-line consistent-return
-    return next();
+    else {
+        context.set('userObject', {});
+    }
+    return context_manager_1.contextManager.run(context, () => {
+        next();
+    });
 });
 exports.eagerLoadPermissionsMiddleware = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     yield req.user.getUserPermissions();
-    return next();
+    return context_manager_1.contextManager.run(new context_manager_1.Context(), () => {
+        next();
+    });
 });
 exports.getDecodedBearer = (req) => {
     if (req.headers.authorization) {
@@ -96,4 +94,4 @@ exports.getDecodedBearer = (req) => {
     }
     return null;
 };
-exports.default = ApiUser_1.default;
+exports.default = api_user_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "1.5.13",
+  "version": "1.6.0-beta-1",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/lib/tracer.d.ts

@@ -1,15 +0,0 @@
-import asyncHooks from 'async_hooks';
-declare const tracer: {
-    currentTrace: any;
-    traces: {};
-};
-declare class Trace {
-    id: string;
-    type: string;
-    context: Map<string, any>;
-    constructor(type: any);
-}
-export declare const newTrace: (type: any) => Trace;
-export declare const enable: () => asyncHooks.AsyncHook;
-export declare const getCurrentTrace: () => any;
-export default tracer;

package/lib/tracer.js

@@ -1,55 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentTrace = exports.enable = exports.newTrace = void 0;
-const async_hooks_1 = __importDefault(require("async_hooks"));
-const uuid_1 = require("uuid");
-const prevStates = {};
-const tracer = {
-    currentTrace: null,
-    traces: {},
-};
-function init(asyncId, type, triggerAsyncId) {
-    if (tracer.traces[triggerAsyncId]) {
-        tracer.traces[asyncId] = tracer.traces[triggerAsyncId];
-    }
-}
-function before(asyncId) {
-    if (!tracer.traces[asyncId]) {
-        return;
-    }
-    prevStates[asyncId] = tracer.currentTrace;
-    tracer.currentTrace = tracer.traces[asyncId];
-}
-function after(asyncId) {
-    if (!tracer.traces[asyncId]) {
-        return;
-    }
-    tracer.currentTrace = prevStates[asyncId];
-}
-function destroy(asyncId) {
-    if (tracer.traces[asyncId]) {
-        delete tracer.traces[asyncId];
-        delete prevStates[asyncId];
-    }
-}
-const hook = async_hooks_1.default.createHook({
-    init, before, after, destroy,
-});
-class Trace {
-    constructor(type) {
-        this.id = uuid_1.v1();
-        this.type = type;
-        this.context = new Map();
-    }
-}
-exports.newTrace = (type) => {
-    tracer.currentTrace = new Trace(type);
-    tracer.traces[async_hooks_1.default.executionAsyncId()] = tracer.currentTrace;
-    return tracer.currentTrace;
-};
-exports.enable = () => hook.enable();
-exports.getCurrentTrace = () => tracer.currentTrace || {};
-exports.default = tracer;