@autofleet/zehut 1.3.1 → 1.4.1

package/lib/index.d.ts

@@ -1,2 +1,16 @@
-import User, { middleware, eagerLoadPermissionsMiddleware, middlewareWithDecode } from './user';
-export { User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, };
+import User from './user';
+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<void>;
+    getCurrentPayload: () => any;
+    getDecodedBearer: (req: any) => any;
+};
+export default _default;

package/lib/index.js

@@ -19,9 +19,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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; } });
+const tracer_1 = require("./tracer");
+tracer_1.enable();
+exports.default = {
+    User: user_1.default,
+    middleware: user_1.middleware,
+    middlewareWithDecode: user_1.middlewareWithDecode,
+    eagerLoadPermissionsMiddleware: user_1.eagerLoadPermissionsMiddleware,
+    getCurrentPayload: tracer_1.getCurrentTrace,
+    getDecodedBearer: user_1.getDecodedBearer
+};

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 = __importDefault(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.default.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/index.d.ts

@@ -8,4 +8,5 @@ export declare const middlewareWithDecode: (options?: {
     eagerLoadUserPermissionsLegacy?: boolean;
 }) => (req: any, res: any, next: any) => Promise<void>;
 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

@@ -12,26 +12,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
+exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
 const ApiUser_1 = __importDefault(require("./ApiUser"));
 const utils_1 = require("../utils");
+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 trace = tracer_1.newTrace('userPayload');
     if (!userId) {
         next();
+        trace.context.set('userObject', {});
         return;
     }
-    req.user = new ApiUser_1.default(userId);
+    const userObject = new ApiUser_1.default(userId);
     if (options.eagerLoadUserPermissions) {
-        yield req.user.getUserPermissions();
+        yield userObject.getUserPermissions();
     }
     if (options.eagerLoadUserPermissionsLegacy) {
-        yield req.user.getUserPermissionsLegacy();
+        yield userObject.getUserPermissionsLegacy();
     }
+    req.user = userObject;
+    trace.context.set('userObject', userObject);
+    // Added in order to support outbreak.
+    req.headers['x-af-user-permissions'] = userObject;
     next();
 });
 exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    const trace = tracer_1.newTrace('userPayload');
     if (req.headers.authorization) {
         const decoded = utils_1.decodeBearer(req.headers.authorization);
         const userId = (_a = decoded === null || decoded === void 0 ? void 0 : decoded.user) === null || _a === void 0 ? void 0 : _a.id;
@@ -39,19 +47,29 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
             req.headers['X-AF-USER-ID'] = userId;
         }
         const userObject = new ApiUser_1.default(userId);
-        req.user = userObject;
         if (options.eagerLoadUserPermissions) {
-            yield req.user.getUserPermissions();
+            yield userObject.getUserPermissions();
         }
         if (options.eagerLoadUserPermissionsLegacy) {
-            yield req.user.getUserPermissionsLegacy();
+            yield userObject.getUserPermissionsLegacy();
         }
+        req.user = userObject;
+        trace.context.set('userObject', userObject);
+        // Added in order to support outbreak.
+        req.headers['x-af-user-permissions'] = userObject;
         const entities = req.user.permissions;
     }
+    trace.context.set('userObject', {});
     next();
 });
 exports.eagerLoadPermissionsMiddleware = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     yield req.user.getUserPermissions();
     next();
 });
+exports.getDecodedBearer = (req) => {
+    if (req.headers.authorization) {
+        return utils_1.decodeBearer(req.headers.authorization);
+    }
+    return null;
+};
 exports.default = ApiUser_1.default;

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@autofleet/zehut",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "rm -rf lib && tsc",
-    "prepublish": "npm run build",
     "coverage": "jest --coverage --forceExit --runInBand",
     "test": "jest --forceExit --runInBand",
     "test-auto": "jest --watch --runInBand",