npm - @autofleet/zehut - Versions diffs - 2.0.3 → 3.0.0-beta.0 - Mend

@autofleet/zehut 2.0.3 → 3.0.0-beta.0

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.

Files changed (13) hide show

package/lib/app-auth.js +6 -15
package/lib/check-permission.js +1 -1
package/lib/index.d.ts +8 -1
package/lib/index.js +9 -2
package/lib/secret-getter.test.js +21 -27
package/lib/test-helpers/index.js +3 -4
package/lib/tracer.d.ts +6 -1
package/lib/tracer.js +7 -1
package/lib/user/ApiUser.js +56 -73
package/lib/user/api-user-flows.test.js +19 -28
package/lib/user/index.js +20 -30
package/lib/utils.js +1 -2
package/package.json +2 -6

package/lib/app-auth.js CHANGED Viewed

@@ -1,21 +1,12 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClientSecret = exports.decodeAppBearer = void 0;
 const services_1 = require("./services");
-exports.decodeAppBearer = (bearer, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const { data: decoded } = yield services_1.AutofleetApiNetwork.post('/api/v1/auth', { bearer, appId });
+exports.decodeAppBearer = async (bearer, appId) => {
+    const { data: decoded } = await services_1.AutofleetApiNetwork.post('/api/v1/auth', { bearer, appId });
     return decoded;
-});
-exports.getClientSecret = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const { data: secret } = yield services_1.AutofleetApiNetwork.get(`/api/v1/auth/client-secret/${appId}`);
+};
+exports.getClientSecret = async (appId) => {
+    const { data: secret } = await services_1.AutofleetApiNetwork.get(`/api/v1/auth/client-secret/${appId}`);
     return secret;
-});
+};

package/lib/check-permission.js CHANGED Viewed

@@ -2,7 +2,7 @@
 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.get('userObject'); };
+exports.getUser = () => tracer_1.getCurrentTrace()?.context?.get('userObject');
 exports.isUserExist = () => {
     const u = exports.getUser();
     return u && u.id;

package/lib/index.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import User, { middleware, eagerLoadPermissionsMiddleware, middlewareWithDecode, getDecodedBearer, appMiddleware } from './user';
+import { newTrace, traceTypes } from './tracer';
 import { checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser } from './check-permission';
 import { UnauthorizedAccessError } from './errors';
 import { getRefreshTokenSecret, getTokenSecret } from './secret-getter';
@@ -6,8 +7,14 @@ declare const getCurrentPayload: () => any;
 declare const enableTracing: ({ outbreakOptions }?: {
     outbreakOptions?: {};
 }) => void;
-export { enableTracing, User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getCurrentPayload, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, getRefreshTokenSecret, getTokenSecret, UnauthorizedAccessError, appMiddleware, };
+export { traceTypes, newTrace, enableTracing, User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getCurrentPayload, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, getRefreshTokenSecret, getTokenSecret, UnauthorizedAccessError, appMiddleware, };
 declare const _default: {
+    traceTypes: {
+        HTTP_REQUEST: string;
+        WEB_SOCKET: string;
+        RABBIT: string;
+    };
+    newTrace: (type: any) => import("./tracer").Trace;
     User: typeof User;
     middleware: (options?: {
         eagerLoadUserPermissions?: boolean;

package/lib/index.js CHANGED Viewed

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appMiddleware = 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 = exports.enableTracing = void 0;
+exports.appMiddleware = 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 = exports.enableTracing = exports.newTrace = exports.traceTypes = void 0;
 const outbreak_1 = __importDefault(require("@autofleet/outbreak"));
 const user_1 = __importStar(require("./user"));
 exports.User = user_1.default;
@@ -32,6 +32,8 @@ Object.defineProperty(exports, "middlewareWithDecode", { enumerable: true, get:
 Object.defineProperty(exports, "getDecodedBearer", { enumerable: true, get: function () { return user_1.getDecodedBearer; } });
 Object.defineProperty(exports, "appMiddleware", { enumerable: true, get: function () { return user_1.appMiddleware; } });
 const tracer_1 = require("./tracer");
+Object.defineProperty(exports, "newTrace", { enumerable: true, get: function () { return tracer_1.newTrace; } });
+Object.defineProperty(exports, "traceTypes", { enumerable: true, get: function () { return tracer_1.traceTypes; } });
 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; } });
@@ -46,11 +48,16 @@ Object.defineProperty(exports, "getTokenSecret", { enumerable: true, get: functi
 const getCurrentPayload = tracer_1.getCurrentTrace;
 exports.getCurrentPayload = getCurrentPayload;
 const enableTracing = ({ outbreakOptions = {} } = {}) => {
-    outbreak_1.default(Object.assign({ headersPrefix: 'x-af' }, outbreakOptions));
+    outbreak_1.default({
+        headersPrefix: 'x-af',
+        ...outbreakOptions,
+    });
     tracer_1.enable();
 };
 exports.enableTracing = enableTracing;
 exports.default = {
+    traceTypes: tracer_1.traceTypes,
+    newTrace: tracer_1.newTrace,
     User: user_1.default,
     middleware: user_1.middleware,
     middlewareWithDecode: user_1.middlewareWithDecode,

package/lib/secret-getter.test.js CHANGED Viewed

@@ -18,22 +18,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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 });
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const moment_1 = __importDefault(require("moment"));
-const sleep = (ms) => __awaiter(void 0, void 0, void 0, function* () { return new Promise((resolve) => setTimeout(resolve, ms)); });
+const sleep = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 process.env.NODE_ENV = 'node-common-test';
 describe('secret getter tests', () => {
     const testSecrets = {
@@ -44,47 +35,50 @@ describe('secret getter tests', () => {
     };
     beforeEach(() => {
         jest.resetModules();
-        process.env = Object.assign(Object.assign({}, (process.env || {})), testSecrets); // Make a copy
+        process.env = {
+            ...(process.env || {}),
+            ...testSecrets,
+        }; // Make a copy
     });
-    it('test get new refresh token secret when after deprecation timestamp', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('test get new refresh token secret when after deprecation timestamp', async () => {
         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 } = await 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);
         const result = getTokenSecret(token);
         expect(result).toBe(testSecrets.JWT_NEW_SECRET);
-    }));
-    it('test get old refresh token secret when before deprecation timestamp', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('test get old refresh token secret when before deprecation timestamp', async () => {
         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 } = await 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);
         const result = getTokenSecret(token);
         expect(result).toBe(testSecrets.DEPRECATED_JWT_SECRET);
-    }));
-    it('test get old refresh token secret when after deprecation timestamp, but token is from before', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('test get old refresh token secret when after deprecation timestamp, but token is from before', async () => {
         const token = jsonwebtoken_1.default.sign({
             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')));
-        yield sleep(1000);
+        const { getTokenSecret } = await Promise.resolve().then(() => __importStar(require('./secret-getter')));
+        await 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')));
+    });
+    it('test malformed token returns new secret', async () => {
+        const { getTokenSecret } = await 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* () {
+    });
+    it('test malformed token returns new secret even before deprecation time', async () => {
         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 } = await Promise.resolve().then(() => __importStar(require('./secret-getter')));
         const token = 'shit';
         const result = getTokenSecret(token);
         expect(result).toBe(testSecrets.JWT_NEW_SECRET);
-    }));
+    });
 });

package/lib/test-helpers/index.js CHANGED Viewed

@@ -14,14 +14,13 @@ exports.setIdentityNock = (userAttributes) => {
         .reply(200, userAttributes.permissions);
 };
 exports.mockRequestAndUser = (app, userCustomAttributes) => {
-    var _a, _b, _c;
     const agent = supertest_1.default.agent(app);
     const userAttributes = {
         id: userCustomAttributes.id || uuid_1.v4(),
         permissions: {
-            businessModels: ((_a = userCustomAttributes === null || userCustomAttributes === void 0 ? void 0 : userCustomAttributes.permissions) === null || _a === void 0 ? void 0 : _a.businessModels) || {},
-            fleets: ((_b = userCustomAttributes === null || userCustomAttributes === void 0 ? void 0 : userCustomAttributes.permissions) === null || _b === void 0 ? void 0 : _b.fleets) || {},
-            demandSources: ((_c = userCustomAttributes === null || userCustomAttributes === void 0 ? void 0 : userCustomAttributes.permissions) === null || _c === void 0 ? void 0 : _c.demandSources) || {},
+            businessModels: userCustomAttributes?.permissions?.businessModels || {},
+            fleets: userCustomAttributes?.permissions?.fleets || {},
+            demandSources: userCustomAttributes?.permissions?.demandSources || {},
         },
     };
     agent.set('x-af-user-id', userAttributes.id);

package/lib/tracer.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ declare const tracer: {
     currentTrace: any;
     traces: {};
 };
-declare class Trace {
+export declare class Trace {
     id: string;
     type: string;
     context: Map<string, any>;
@@ -12,4 +12,9 @@ declare class Trace {
 export declare const newTrace: (type: any) => Trace;
 export declare const enable: () => asyncHooks.AsyncHook;
 export declare const getCurrentTrace: () => any;
+export declare const traceTypes: {
+    HTTP_REQUEST: string;
+    WEB_SOCKET: string;
+    RABBIT: string;
+};
 export default tracer;

package/lib/tracer.js CHANGED Viewed

@@ -3,7 +3,7 @@ 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;
+exports.traceTypes = exports.getCurrentTrace = exports.enable = exports.newTrace = exports.Trace = void 0;
 const async_hooks_1 = __importDefault(require("async_hooks"));
 const uuid_1 = require("uuid");
 const prevStates = {};
@@ -45,6 +45,7 @@ class Trace {
         this.context = new Map();
     }
 }
+exports.Trace = Trace;
 exports.newTrace = (type) => {
     tracer.currentTrace = new Trace(type);
     tracer.traces[async_hooks_1.default.executionAsyncId()] = tracer.currentTrace;
@@ -52,4 +53,9 @@ exports.newTrace = (type) => {
 };
 exports.enable = () => hook.enable();
 exports.getCurrentTrace = () => tracer.currentTrace || {};
+exports.traceTypes = {
+    HTTP_REQUEST: 'httpRequest',
+    WEB_SOCKET: 'webSocket',
+    RABBIT: 'rabbit',
+};
 exports.default = tracer;

package/lib/user/ApiUser.js CHANGED Viewed

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -34,38 +25,34 @@ class ApiUser {
             this.accountType = accountType;
         }
     }
-    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.accountType = data.accountType;
-            this.privatePermissions = data;
+    async getUserPermissions() {
+        if (!this.id) {
+            return;
+        }
+        if (this.privatePermissions) {
             return this.privatePermissions;
-        });
+        }
+        const { data } = await services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`);
+        this.accountType = data.accountType;
+        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) {
-                this.privatePermissions = cachedResult;
-                return cachedResult;
-            }
-            const data = yield customPermissionLoader(this.id);
-            userCache.set(this.id, data);
-            this.privatePermissions = data;
+    async useCustomPermissionLoader(customPermissionLoader) {
+        if (!this.id) {
+            return;
+        }
+        if (this.privatePermissions) {
             return this.privatePermissions;
-        });
+        }
+        const cachedResult = userCache.get(this.id);
+        if (cachedResult) {
+            this.privatePermissions = cachedResult;
+            return cachedResult;
+        }
+        const data = await customPermissionLoader(this.id);
+        userCache.set(this.id, data);
+        this.privatePermissions = data;
+        return this.privatePermissions;
     }
     get businessModels() {
         return this.getUserProperty('businessModels');
@@ -123,18 +110,16 @@ class ApiUser {
             currentUserTrace.context.set(exports.ELEVATED_PERMISSIONS_HEADER, JSON.stringify(this.elevatedPermissions));
         };
     }
-    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;
+    async getUserPermissionsLegacy() {
+        if (!this.id) {
+            return;
+        }
+        if (this.privatePermissionsLegacy) {
             return this.privatePermissionsLegacy;
-        });
+        }
+        const { data } = await services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload-legacy`);
+        this.privatePermissionsLegacy = data;
+        return this.privatePermissionsLegacy;
     }
     get permissionsLegacy() {
         if (!this.privatePermissionsLegacy) {
@@ -142,31 +127,29 @@ class ApiUser {
         }
         return this.privatePermissionsLegacy;
     }
-    getUserAppPermissions(appId, clientSecret) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.id || !appId || !clientSecret) {
-                return;
-            }
-            const currentAppPermission = this.appPermission[appId];
-            if (currentAppPermission) {
-                return currentAppPermission;
-            }
-            const cachedResult = userCache.get(`${this.id}:${appId}`);
-            if (cachedResult) {
-                this.appPermission[appId] = cachedResult;
-                return cachedResult;
-            }
-            const { data } = yield services_1.AutofleetApiNetwork.post(`/api/v1/apps/${appId}/get-user-payload`, {
-                userId: this.id,
-            }, {
-                headers: {
-                    'x-autofleet-apps-secret': clientSecret,
-                },
-            });
-            userCache.set(this.id, data);
-            this.appPermission[appId] = data;
-            return this.appPermission[appId];
+    async getUserAppPermissions(appId, clientSecret) {
+        if (!this.id || !appId || !clientSecret) {
+            return;
+        }
+        const currentAppPermission = this.appPermission[appId];
+        if (currentAppPermission) {
+            return currentAppPermission;
+        }
+        const cachedResult = userCache.get(`${this.id}:${appId}`);
+        if (cachedResult) {
+            this.appPermission[appId] = cachedResult;
+            return cachedResult;
+        }
+        const { data } = await services_1.AutofleetApiNetwork.post(`/api/v1/apps/${appId}/get-user-payload`, {
+            userId: this.id,
+        }, {
+            headers: {
+                'x-autofleet-apps-secret': clientSecret,
+            },
         });
+        userCache.set(this.id, data);
+        this.appPermission[appId] = data;
+        return this.appPermission[appId];
     }
 }
 exports.default = ApiUser;

package/lib/user/api-user-flows.test.js CHANGED Viewed

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -17,19 +8,19 @@ const express_1 = __importDefault(require("express"));
 const axios_1 = __importDefault(require("axios"));
 const index_1 = require("../index");
 const index_2 = require("./index");
-const generateApp = (addEndpoints, port) => __awaiter(void 0, void 0, void 0, function* () {
+const generateApp = async (addEndpoints, port) => {
     const app = express_1.default();
     addEndpoints(app);
-    const server = yield new Promise((resolve) => {
+    const server = await new Promise((resolve) => {
         const s = app.listen(port, () => {
             console.log('Listen on port', port);
             resolve(s);
         });
     });
     return () => server.close();
-});
+};
 describe('E2E', () => {
-    it('Basic functionality', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('Basic functionality', async () => {
         let server2TraceId = null;
         const [uuid1, uuid2] = [uuid_1.v4(), uuid_1.v4()];
         index_1.enableTracing({
@@ -37,9 +28,9 @@ describe('E2E', () => {
                 headersPrefix: 'x-af-',
             },
         });
-        const closeServer1 = yield generateApp((app) => {
+        const closeServer1 = await generateApp((app) => {
             app.use(index_2.middleware());
-            app.get('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+            app.get('/', async (req, res) => {
                 const user = index_1.getUser();
                 const closeElevation1 = user.elevatePermissions({
                     businessModels: {
@@ -51,15 +42,15 @@ describe('E2E', () => {
                         [uuid2]: ['vehicle:write'],
                     },
                 });
-                const { data: res1 } = yield axios_1.default.post('http://localhost:8082');
+                const { data: res1 } = await axios_1.default.post('http://localhost:8082');
                 closeElevation1();
-                const { data: res2 } = yield axios_1.default.post('http://localhost:8082');
+                const { data: res2 } = await axios_1.default.post('http://localhost:8082');
                 closeElevation2();
                 res.json([res1, res2]);
-            }));
+            });
         }, 8089);
         const server2NumberOfPermissions = [];
-        const closeServer2 = yield generateApp((app) => {
+        const closeServer2 = await generateApp((app) => {
             app.use(index_2.middleware());
             app.post('/', (req, res) => {
                 const user = index_1.getUser();
@@ -77,7 +68,7 @@ describe('E2E', () => {
                 });
             });
         }, 8082);
-        const { data: [res1, res2], headers } = yield axios_1.default.get('http://localhost:8089', {
+        const { data: [res1, res2], headers } = await axios_1.default.get('http://localhost:8089', {
             headers: {
                 'x-af-header': 'testHeader',
                 'x-af-id': 'my-wakanda-id',
@@ -94,17 +85,17 @@ describe('E2E', () => {
         expect(JSON.parse(res1.addedPermissions).businessModels[uuid2]).toBeDefined();
         expect(JSON.parse(res2.addedPermissions).businessModels[uuid1]).not.toBeDefined();
         expect(JSON.parse(res2.addedPermissions).businessModels[uuid2]).toBeDefined();
-    }));
-    it('Should throw in case of invalid UUID', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('Should throw in case of invalid UUID', async () => {
         let error = null;
         index_1.enableTracing({
             outbreakOptions: {
                 headersPrefix: 'x-af-',
             },
         });
-        const closeServer1 = yield generateApp((app) => {
+        const closeServer1 = await generateApp((app) => {
             app.use(index_2.middleware());
-            app.get('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+            app.get('/', async (req, res) => {
                 const user = index_1.getUser();
                 try {
                     const closeElevation1 = user.elevatePermissions({
@@ -112,16 +103,16 @@ describe('E2E', () => {
                             nnn: ['vehicle:write'],
                         },
                     });
-                    yield axios_1.default.post('http://localhost:8082');
+                    await axios_1.default.post('http://localhost:8082');
                     closeElevation1();
                 }
                 catch (e) {
                     error = e;
                 }
                 res.json({ status: 'ok' });
-            }));
+            });
         }, 8089);
-        yield axios_1.default.get('http://localhost:8089', {
+        await axios_1.default.get('http://localhost:8089', {
             headers: {
                 'x-af-header': 'testHeader',
                 'x-af-id': 'my-wakanda-id',
@@ -130,5 +121,5 @@ describe('E2E', () => {
         });
         closeServer1();
         expect(error.message).toEqual('Entity id on elevatePermissions is not a valid UUID, provided: nnn');
-    }));
+    });
 });

package/lib/user/index.js CHANGED Viewed

@@ -18,15 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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 };
 };
@@ -38,7 +29,7 @@ const tracer_1 = require("../tracer");
 const app_auth_1 = require("../app-auth");
 const appDoesNotExist_1 = __importDefault(require("../exceptions/appDoesNotExist"));
 const utils_1 = require("../utils");
-exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+exports.middleware = (options = {}) => async (req, res, next) => {
     try {
         const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, customPermissionLoader, } = options;
         const userId = req.headers['x-af-user-id'];
@@ -52,14 +43,14 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
         const userObject = new ApiUser_1.default(userId, 'user', elevatedPermissionsFromHeader);
         if (eagerLoadUserPermissions) {
             if (customPermissionLoader) {
-                yield userObject.useCustomPermissionLoader(customPermissionLoader);
+                await userObject.useCustomPermissionLoader(customPermissionLoader);
             }
             else {
-                yield userObject.getUserPermissions();
+                await userObject.getUserPermissions();
             }
         }
         if (eagerLoadUserPermissionsLegacy) {
-            yield userObject.getUserPermissionsLegacy();
+            await userObject.getUserPermissionsLegacy();
         }
         req.user = userObject;
         trace.context.set('userObject', userObject);
@@ -73,15 +64,14 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
             error: 'cannot authenticate user',
         });
     }
-});
-exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+};
+exports.middlewareWithDecode = (options = {}) => async (req, res, next) => {
     const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, returnErrorIfNoToken, } = options;
     const trace = tracer_1.newTrace('userPayload');
     let decoded;
     if (req.headers.authorization) {
         try {
-            decoded = yield utils_1.decodeBearer(req.headers.authorization);
+            decoded = await utils_1.decodeBearer(req.headers.authorization);
         }
         catch (e) {
             if (e instanceof jsonwebtoken_1.TokenExpiredError) {
@@ -104,16 +94,16 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
             }
             return;
         }
-        const userId = (_a = decoded === null || decoded === void 0 ? void 0 : decoded.user) === null || _a === void 0 ? void 0 : _a.id;
+        const userId = decoded?.user?.id;
         if (userId) {
             req.headers['X-AF-USER-ID'] = userId;
         }
-        const userObject = new ApiUser_1.default(userId, (_b = decoded === null || decoded === void 0 ? void 0 : decoded.user) === null || _b === void 0 ? void 0 : _b.accountType);
+        const userObject = new ApiUser_1.default(userId, decoded?.user?.accountType);
         if (eagerLoadUserPermissions) {
-            yield userObject.getUserPermissions();
+            await userObject.getUserPermissions();
         }
         if (eagerLoadUserPermissionsLegacy) {
-            yield userObject.getUserPermissionsLegacy();
+            await userObject.getUserPermissionsLegacy();
         }
         req.user = userObject;
         trace.context.set('userObject', userObject);
@@ -129,8 +119,8 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
     }
     // eslint-disable-next-line consistent-return
     return next();
-});
-exports.appMiddleware = (options) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+};
+exports.appMiddleware = (options) => async (req, res, next) => {
     const { appId, clientSecret, } = options;
     const trace = tracer_1.newTrace('userPayload');
     let decoded;
@@ -141,7 +131,7 @@ exports.appMiddleware = (options) => (req, res, next) => __awaiter(void 0, void
         });
     }
     try {
-        decoded = yield app_auth_1.decodeAppBearer(req.headers.authorization, appId);
+        decoded = await app_auth_1.decodeAppBearer(req.headers.authorization, appId);
         if (!decoded) {
             throw new appDoesNotExist_1.default();
         }
@@ -170,7 +160,7 @@ exports.appMiddleware = (options) => (req, res, next) => __awaiter(void 0, void
             errors: ['Server error while parsing token'],
         });
     }
-    const userId = decoded === null || decoded === void 0 ? void 0 : decoded.userId;
+    const userId = decoded?.userId;
     if (userId) {
         req.headers['X-AF-USER-ID'] = userId;
     }
@@ -178,7 +168,7 @@ exports.appMiddleware = (options) => (req, res, next) => __awaiter(void 0, void
     if (appId) {
         req.headers['x-autofleet-apps-secret'] = clientSecret;
         // Won't work until we find a better solution for identity ms
-        yield userObject.getUserAppPermissions(appId, clientSecret);
+        await userObject.getUserAppPermissions(appId, clientSecret);
     }
     req.user = userObject;
     trace.context.set('userObject', userObject);
@@ -186,11 +176,11 @@ exports.appMiddleware = (options) => (req, res, next) => __awaiter(void 0, void
     // Added in order to support outbreak.
     req.headers['x-af-user-permissions'] = userObject;
     return next();
-});
-exports.eagerLoadPermissionsMiddleware = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    yield req.user.getUserPermissions();
+};
+exports.eagerLoadPermissionsMiddleware = async (req, res, next) => {
+    await req.user.getUserPermissions();
     return next();
-});
+};
 exports.getDecodedBearer = (req) => {
     if (req.headers.authorization) {
         return utils_1.decodeBearer(req.headers.authorization);

package/lib/utils.js CHANGED Viewed

@@ -36,13 +36,12 @@ exports.decodeBearer = (bearer, appSecret) => {
     return decoded;
 };
 exports.parsePermissions = (contextId, decodedToken) => {
-    var _a;
     if (!decodedToken) {
         return [];
     }
     const contexts = decodedToken.contexts;
     const activeContext = contexts.find((context) => context.id === contextId);
-    const permissionsValue = `${(_a = activeContext.permissions) === null || _a === void 0 ? void 0 : _a.map((cp) => `${cp},`)}`;
+    const permissionsValue = `${activeContext.permissions?.map((cp) => `${cp},`)}`;
     return {
         key: activeContext.entityId,
         value: permissionsValue,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "2.0.3",
+  "version": "3.0.0-beta.0",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -12,10 +12,6 @@
     "test-auto": "jest --watch --runInBand",
     "linter": "./node_modules/.bin/eslint ."
   },
-  "jest": {
-    "verbose": true,
-    "testURL": "http://localhost/"
-  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@gitlab.com/AutoFleet/zehut.git"
@@ -46,7 +42,7 @@
     "eslint": "^7.13.0",
     "eslint-config-airbnb-typescript": "^12.0.0",
     "eslint-plugin-import": "^2.22.1",
-    "jest": "^22.4.4",
+    "jest": "^24.9.0",
     "ts-jest": "^25.4.0",
     "typescript": "^3.9.5"
   },