@autofleet/zehut 1.6.3-beta-1 → 1.7.0-beta1

package/lib/check-permission.d.ts

@@ -1,6 +1,5 @@
-import ApiUser from './user/api-user';
-export declare const getUser: () => ApiUser;
+export declare const getUser: () => any;
 export declare const isUserExist: () => boolean;
-export declare const checkFleetPermission: (fleetId: string) => boolean;
-export declare const checkBusinessModelPermission: (businessModelId: string) => boolean;
-export declare const checkDemandSourcePermission: (demandSourceId: string) => boolean;
+export declare const checkFleetPermission: (fleetId: any) => boolean;
+export declare const checkBusinessModelPermission: (businessModelId: any) => boolean;
+export declare const checkDemandSourcePermission: (demandSourceId: any) => 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 context_manager_1 = require("./context-manager");
-exports.getUser = () => context_manager_1.contextManager.getContext().get('user');
+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; };
 exports.isUserExist = () => !!exports.getUser();
 exports.checkFleetPermission = (fleetId) => {
     if (exports.isUserExist()) {
-        const context = context_manager_1.contextManager.getContext();
+        const { context } = tracer_1.getCurrentTrace();
         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 = context_manager_1.contextManager.getContext();
+        const { context } = tracer_1.getCurrentTrace();
         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 = context_manager_1.contextManager.getContext();
+        const { context } = tracer_1.getCurrentTrace();
         const user = context === null || context === void 0 ? void 0 : context.get('userObject');
         return !user || Object.keys(user.permissions.demandSources).includes(demandSourceId);
     }

package/lib/index.d.ts

@@ -2,5 +2,27 @@ import User, { middleware, eagerLoadPermissionsMiddleware, middlewareWithDecode,
 import { checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser } from './check-permission';
 import { UnauthorizedAccessError } from './errors';
 import { getRefreshTokenSecret, getTokenSecret } from './secret-getter';
-export * from './context-manager';
-export { User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, getRefreshTokenSecret, getTokenSecret, UnauthorizedAccessError, };
+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;
+        customPermissionLoader?: import("./user/ApiUser").CustomPermissionLoader;
+    }) => (req: any, res: any, next: any) => Promise<any>;
+    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;

package/lib/index.js

@@ -18,17 +18,15 @@ 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.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.getCurrentPayload = 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; } });
@@ -40,4 +38,20 @@ 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; } });
-__exportStar(require("./context-manager"), exports);
+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,
+};

package/lib/{secret-getter/index.test.js → secret-getter.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('.')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
         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('.')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
         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('.')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
         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('.')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
         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('.')));
+        const { getTokenSecret } = yield Promise.resolve().then(() => __importStar(require('./secret-getter')));
         const token = 'shit';
         const result = getTokenSecret(token);
         expect(result).toBe(testSecrets.JWT_NEW_SECRET);

package/lib/tracer.d.ts

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,55 @@
+"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;

package/lib/user/ApiUser.d.ts

@@ -0,0 +1,28 @@
+interface EntityPermissions {
+    [key: string]: string[];
+}
+export interface UserPayload {
+    businessModels: EntityPermissions;
+    fleets: EntityPermissions;
+    demandSources: EntityPermissions;
+    contexts?: EntityPermissions;
+    createdAt?: string;
+}
+export declare type CustomPermissionLoader = (string: any) => Promise<UserPayload>;
+export default class ApiUser {
+    id: string | undefined;
+    privatePermissions: UserPayload | undefined;
+    privatePermissionsLegacy: any;
+    emptyUser: boolean;
+    constructor(id?: string);
+    getUserPermissions(): Promise<UserPayload>;
+    useCustomPermissionLoader(customPermissionLoader: any): Promise<unknown>;
+    get businessModels(): string[] | undefined;
+    get fleets(): string[] | undefined;
+    get demandSources(): string[] | undefined;
+    getUserProperty(key: any): string[] | undefined;
+    get permissions(): UserPayload | undefined;
+    getUserPermissionsLegacy(): Promise<any>;
+    get permissionsLegacy(): any;
+}
+export {};

package/lib/user/ApiUser.js

@@ -0,0 +1,96 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable consistent-return */
+const node_cache_1 = __importDefault(require("node-cache"));
+const services_1 = require("../services");
+const userCache = new node_cache_1.default({ stdTTL: 10 });
+class ApiUser {
+    constructor(id) {
+        this.id = id;
+        this.emptyUser = !!id;
+    }
+    getUserPermissions() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.id) {
+                return;
+            }
+            if (this.privatePermissions) {
+                return this.privatePermissions;
+            }
+            const { data } = yield services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`);
+            this.privatePermissions = data;
+            return this.privatePermissions;
+        });
+    }
+    useCustomPermissionLoader(customPermissionLoader) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.id) {
+                return;
+            }
+            if (this.privatePermissions) {
+                return this.privatePermissions;
+            }
+            const cachedResult = userCache.get(this.id);
+            if (cachedResult) {
+                return cachedResult;
+            }
+            const data = yield customPermissionLoader(this.id);
+            userCache.set(this.id, data, data);
+            this.privatePermissions = data;
+            return this.privatePermissions;
+        });
+    }
+    get businessModels() {
+        return this.getUserProperty('businessModels');
+    }
+    get fleets() {
+        return this.getUserProperty('fleets');
+    }
+    get demandSources() {
+        return this.getUserProperty('demandSources');
+    }
+    getUserProperty(key) {
+        if (!this.privatePermissions) {
+            throw new Error(`Cannot get ${key} without calling (async) getUserPermissions before`);
+        }
+        return Object.keys(this.privatePermissions[key] || {});
+    }
+    get permissions() {
+        if (!this.privatePermissions) {
+            throw new Error('Cannot get permissions without calling (async) getUserPermissions before');
+        }
+        return this.privatePermissions;
+    }
+    getUserPermissionsLegacy() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.id) {
+                return;
+            }
+            if (this.privatePermissionsLegacy) {
+                return this.privatePermissionsLegacy;
+            }
+            const { data } = yield services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload-legacy`);
+            this.privatePermissionsLegacy = data;
+            return this.privatePermissionsLegacy;
+        });
+    }
+    get permissionsLegacy() {
+        if (!this.privatePermissionsLegacy) {
+            throw new Error('Cannot get permissionsLegacy without calling (async) getUserPermissionsLegacy before');
+        }
+        return this.privatePermissionsLegacy;
+    }
+}
+exports.default = ApiUser;

package/lib/user/api-user.d.ts

@@ -7,7 +7,6 @@ export interface UserPayload {
     demandSources: EntityPermissions;
     createdAt?: string;
 }
-export declare type CustomPermissionLoader = (string: any) => Promise<UserPayload>;
 export default class ApiUser {
     id: string | undefined;
     privatePermissions: UserPayload | undefined;
@@ -15,7 +14,6 @@ export default class ApiUser {
     emptyUser: boolean;
     constructor(id?: string);
     getUserPermissions(): Promise<UserPayload>;
-    useCustomPermissionLoader(customPermissionLoader: any): Promise<unknown>;
     get businessModels(): string[] | undefined;
     get fleets(): string[] | undefined;
     get demandSources(): string[] | undefined;

package/lib/user/api-user.js

@@ -8,14 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable consistent-return */
-const node_cache_1 = __importDefault(require("node-cache"));
-const identity_ms_1 = require("../services/identity-ms");
-const userCache = new node_cache_1.default({ stdTTL: 10 });
+const services_1 = require("../services");
 class ApiUser {
     constructor(id) {
         this.id = id;
@@ -29,25 +24,7 @@ class ApiUser {
             if (this.privatePermissions) {
                 return this.privatePermissions;
             }
-            const { data } = yield identity_ms_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`);
-            this.privatePermissions = data;
-            return this.privatePermissions;
-        });
-    }
-    useCustomPermissionLoader(customPermissionLoader) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.id) {
-                return;
-            }
-            if (this.privatePermissions) {
-                return this.privatePermissions;
-            }
-            const cachedResult = userCache.get(this.id);
-            if (cachedResult) {
-                return cachedResult;
-            }
-            const data = yield customPermissionLoader(this.id);
-            userCache.set(this.id, data, data);
+            const { data } = yield services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`);
             this.privatePermissions = data;
             return this.privatePermissions;
         });
@@ -81,7 +58,7 @@ class ApiUser {
             if (this.privatePermissionsLegacy) {
                 return this.privatePermissionsLegacy;
             }
-            const { data } = yield identity_ms_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload-legacy`);
+            const { data } = yield services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload-legacy`);
             this.privatePermissionsLegacy = data;
             return this.privatePermissionsLegacy;
         });

package/lib/user/index.d.ts

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

package/lib/user/index.js

@@ -14,38 +14,40 @@ 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 api_user_1 = __importDefault(require("./api-user"));
+const ApiUser_1 = __importDefault(require("./ApiUser"));
 const utils_1 = require("../utils");
-const context_manager_1 = require("../context-manager");
+const tracer_1 = require("../tracer");
 exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     const userId = req.headers['x-af-user-id'];
-    const context = new context_manager_1.Context();
+    const trace = tracer_1.newTrace('userPayload');
     if (!userId) {
-        context.set('userObject', {});
+        trace.context.set('userObject', {});
+        return next();
     }
-    else {
-        const userObject = new api_user_1.default(userId);
-        if (options.eagerLoadUserPermissions) {
-            if (options.customPermissionLoader) {
-                yield userObject.useCustomPermissionLoader(options.customPermissionLoader);
-            }
-            else {
-                yield userObject.getUserPermissions();
-            }
+    const userObject = new ApiUser_1.default(userId);
+    if (options.eagerLoadUserPermissions) {
+        if (options.customPermissionLoader) {
+            yield userObject.useCustomPermissionLoader(options.customPermissionLoader);
         }
-        if (options.eagerLoadUserPermissionsLegacy) {
-            yield userObject.getUserPermissionsLegacy();
+        else {
+            yield userObject.getUserPermissions();
         }
-        req.user = userObject;
-        context.set('userObject', userObject);
     }
-    return context_manager_1.contextManager.run(context, () => {
-        next();
-    });
+    if (options.eagerLoadUserPermissions) {
+        yield userObject.getUserPermissions();
+    }
+    if (options.eagerLoadUserPermissionsLegacy) {
+        yield userObject.getUserPermissionsLegacy();
+    }
+    req.user = userObject;
+    trace.context.set('userObject', userObject);
+    // Added in order to support outbreak.
+    req.headers['x-af-user-permissions'] = userObject;
+    return next();
 });
 exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const context = new context_manager_1.Context();
+    const trace = tracer_1.newTrace('userPayload');
     let decoded;
     if (req.headers.authorization) {
         try {
@@ -53,24 +55,30 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
         }
         catch (e) {
             if (e instanceof jsonwebtoken_1.TokenExpiredError) {
-                return res.status(401).json({
+                res.status(401);
+                res.json({
                     errors: ['Access token expired'],
                 });
             }
-            if (e instanceof jsonwebtoken_1.JsonWebTokenError) {
-                return res.status(400).json({
+            else if (e instanceof jsonwebtoken_1.JsonWebTokenError) {
+                res.status(400);
+                res.json({
                     errors: [e.message],
                 });
             }
-            return res.status(500).json({
-                errors: ['Server error while parsing token'],
-            });
+            else {
+                res.status(500);
+                res.json({
+                    errors: ['Server error while parsing token'],
+                });
+            }
+            return;
         }
         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 api_user_1.default(userId);
+        const userObject = new ApiUser_1.default(userId);
         if (options.eagerLoadUserPermissions) {
             yield userObject.getUserPermissions();
         }
@@ -78,20 +86,17 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
             yield userObject.getUserPermissionsLegacy();
         }
         req.user = userObject;
-        context.set('userObject', userObject);
-    }
-    else {
-        context.set('userObject', {});
+        trace.context.set('userObject', userObject);
+        // Added in order to support outbreak.
+        req.headers['x-af-user-permissions'] = userObject;
     }
-    return context_manager_1.contextManager.run(context, () => {
-        next();
-    });
+    trace.context.set('userObject', {});
+    // eslint-disable-next-line consistent-return
+    return next();
 });
 exports.eagerLoadPermissionsMiddleware = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     yield req.user.getUserPermissions();
-    return context_manager_1.contextManager.run(new context_manager_1.Context(), () => {
-        next();
-    });
+    return next();
 });
 exports.getDecodedBearer = (req) => {
     if (req.headers.authorization) {
@@ -99,4 +104,4 @@ exports.getDecodedBearer = (req) => {
     }
     return null;
 };
-exports.default = api_user_1.default;
+exports.default = ApiUser_1.default;

package/lib/{utils/index.js → utils.js}

@@ -22,7 +22,7 @@ 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 secret_getter_1 = require("./secret-getter");
 const CONTEXT_PROPS = ['fleetId', 'businessModelId', 'demandSourceId'];
 const CONTEXT_MAP_PROPS = {
     fleet: 'fleets',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "1.6.3-beta-1",
+  "version": "1.7.0-beta1",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -28,6 +28,7 @@
   "homepage": "https://github.com/Autofleet/zehut",
   "dependencies": {
     "@autofleet/network": "^1.2.5",
+    "@autofleet/outbreak": "0.0.7",
     "@types/jest": "^22.0.0",
     "jsonwebtoken": "^8.5.1",
     "moment": "^2.29.1",
@@ -35,19 +36,15 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@autofleet/outbreak": "*",
+    "typescript": "^3.9.5",
+    "jest": "^22.4.4",
+    "ts-jest": "^25.4.0",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "eslint": "^7.13.0",
     "eslint-config-airbnb-typescript": "^12.0.0",
-    "eslint-plugin-import": "^2.22.1",
-    "jest": "^22.4.4",
-    "ts-jest": "^25.4.0",
-    "typescript": "^3.9.5"
+    "eslint-plugin-import": "^2.22.1"
   },
   "files": [
     "lib/**/*"
-  ],
-  "peerDependencies": {
-    "@autofleet/outbreak": "^0.1.1"
-  }
+  ]
 }

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

@@ -1,6 +0,0 @@
-/// <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

@@ -1,9 +0,0 @@
-"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

@@ -1,7 +0,0 @@
-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

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const uuid_1 = require("uuid");
-class Context {
-    constructor() {
-        this.id = uuid_1.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

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

package/lib/context-manager/index.js

@@ -1,11 +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.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;