@autofleet/zehut 3.0.1-beta3 → 3.0.2

package/lib/app-auth.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClientSecret = exports.decodeAppBearer = void 0;
 const services_1 = require("./services");
-exports.decodeAppBearer = async (bearer, appId) => {
+const decodeAppBearer = async (bearer, appId) => {
     const { data: decoded } = await services_1.AutofleetApiNetwork.post('/api/v1/auth', { bearer, appId });
     return decoded;
 };
-exports.getClientSecret = async (appId) => {
+exports.decodeAppBearer = decodeAppBearer;
+const getClientSecret = async (appId) => {
     const { data: secret } = await services_1.AutofleetApiNetwork.get(`/api/v1/auth/client-secret/${appId}`);
     return secret;
 };
+exports.getClientSecret = getClientSecret;

package/lib/check-permission.js

@@ -2,29 +2,34 @@
 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 = () => tracer_1.getCurrentTrace()?.context?.get('userObject');
-exports.isUserExist = () => {
-    const u = exports.getUser();
+const getUser = () => (0, tracer_1.getCurrentTrace)()?.context?.get('userObject');
+exports.getUser = getUser;
+const isUserExist = () => {
+    const u = (0, exports.getUser)();
     return u && u.id;
 };
-exports.checkFleetPermission = (fleetId) => {
-    if (exports.isUserExist()) {
-        const user = exports.getUser();
+exports.isUserExist = isUserExist;
+const checkFleetPermission = (fleetId) => {
+    if ((0, exports.isUserExist)()) {
+        const user = (0, exports.getUser)();
         return !user || Object.keys(user.permissions.fleets).includes(fleetId);
     }
     return true;
 };
-exports.checkBusinessModelPermission = (businessModelId) => {
-    if (exports.isUserExist()) {
-        const user = exports.getUser();
+exports.checkFleetPermission = checkFleetPermission;
+const checkBusinessModelPermission = (businessModelId) => {
+    if ((0, exports.isUserExist)()) {
+        const user = (0, exports.getUser)();
         return !user || Object.keys(user.permissions.businessModels).includes(businessModelId);
     }
     return true;
 };
-exports.checkDemandSourcePermission = (demandSourceId) => {
-    if (exports.isUserExist()) {
-        const user = exports.getUser();
+exports.checkBusinessModelPermission = checkBusinessModelPermission;
+const checkDemandSourcePermission = (demandSourceId) => {
+    if ((0, exports.isUserExist)()) {
+        const user = (0, exports.getUser)();
         return !user || Object.keys(user.permissions.demandSources).includes(demandSourceId);
     }
     return true;
 };
+exports.checkDemandSourcePermission = checkDemandSourcePermission;

package/lib/errors.d.ts

@@ -1,5 +1,5 @@
 import ApiUser from './user';
 export declare class UnauthorizedAccessError extends Error {
     user: ApiUser;
-    constructor(user: any, message: any);
+    constructor(user?: any, message?: string);
 }

package/lib/errors.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnauthorizedAccessError = void 0;
 // eslint-disable-next-line import/prefer-default-export
 class UnauthorizedAccessError extends Error {
-    constructor(user = null, message) {
+    constructor(user = null, message = 'UnauthorizedAccessError') {
         super(message);
         this.name = 'UnauthorizedAccessError';
         this.user = user;

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -52,7 +56,7 @@ const enableTracing = ({ outbreakOptions = {} } = {}) => {
         headersPrefix: 'x-af',
         ...outbreakOptions,
     });
-    tracer_1.enable();
+    (0, tracer_1.enable)();
 };
 exports.enableTracing = enableTracing;
 exports.default = {

package/lib/secret-getter.js

@@ -8,15 +8,15 @@ const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const moment_1 = __importDefault(require("moment"));
 const { DEPRECATED_JWT_SECRET, JWT_NEW_SECRET, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET, DEPRECATION_UNIX_TIMESTAMP, } = process.env;
 const getRelevantSecret = (token, deprecatedSecret, newSecret) => {
-    const deprecationTime = moment_1.default(parseInt(DEPRECATION_UNIX_TIMESTAMP, 10) * 1000);
+    const deprecationTime = (0, moment_1.default)(parseInt(DEPRECATION_UNIX_TIMESTAMP, 10) * 1000);
     try {
         let unixTime;
         if (token) {
             const { iat } = jsonwebtoken_1.default.decode(token);
-            unixTime = moment_1.default(iat * 1000);
+            unixTime = (0, moment_1.default)(iat * 1000);
         }
         else {
-            unixTime = moment_1.default();
+            unixTime = (0, moment_1.default)();
         }
         return unixTime.isBefore(deprecationTime) ? deprecatedSecret : newSecret;
     }
@@ -24,5 +24,7 @@ const getRelevantSecret = (token, deprecatedSecret, newSecret) => {
         return newSecret;
     }
 };
-exports.getRefreshTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET);
-exports.getTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_JWT_SECRET, JWT_NEW_SECRET);
+const getRefreshTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET);
+exports.getRefreshTokenSecret = getRefreshTokenSecret;
+const getTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_JWT_SECRET, JWT_NEW_SECRET);
+exports.getTokenSecret = getTokenSecret;

package/lib/secret-getter.test.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -24,7 +28,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const moment_1 = __importDefault(require("moment"));
-const sleep = async (ms) => 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 = {
@@ -41,28 +47,28 @@ describe('secret getter tests', () => {
         }; // Make a copy
     });
     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();
+        process.env.DEPRECATION_UNIX_TIMESTAMP = (0, moment_1.default)().subtract(1, 'days').unix().toString();
         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),
+            exp: (0, 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', async () => {
-        process.env.DEPRECATION_UNIX_TIMESTAMP = moment_1.default().add(1, 'days').unix().toString();
+        process.env.DEPRECATION_UNIX_TIMESTAMP = (0, moment_1.default)().add(1, 'days').unix().toString();
         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),
+            exp: (0, 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', async () => {
         const token = jsonwebtoken_1.default.sign({
-            exp: moment_1.default().unix() + (60 * 60 * 24 * 365),
+            exp: (0, 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();
+        process.env.DEPRECATION_UNIX_TIMESTAMP = (0, moment_1.default)().add(10, 'seconds').unix().toString();
         const { getTokenSecret } = await Promise.resolve().then(() => __importStar(require('./secret-getter')));
         await sleep(1000);
         const result = getTokenSecret(token);
@@ -75,7 +81,7 @@ describe('secret getter tests', () => {
         expect(result).toBe(testSecrets.JWT_NEW_SECRET);
     });
     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();
+        process.env.DEPRECATION_UNIX_TIMESTAMP = (0, moment_1.default)().add(10, 'day').unix().toString();
         const { getTokenSecret } = await Promise.resolve().then(() => __importStar(require('./secret-getter')));
         const token = 'shit';
         const result = getTokenSecret(token);

package/lib/test-helpers/index.d.ts

@@ -1,5 +1,5 @@
 import { AccountType, PartialUserPayload } from '../user/ApiUser';
-export declare type UserCustomAttributes = {
+export type UserCustomAttributes = {
     id?: string;
     accountType?: AccountType;
     elevatedPermissions?: PartialUserPayload;

package/lib/test-helpers/index.js

@@ -8,15 +8,16 @@ const supertest_1 = __importDefault(require("supertest"));
 const nock_1 = __importDefault(require("nock"));
 const http_1 = __importDefault(require("http"));
 const uuid_1 = require("uuid");
-exports.setIdentityNock = (userAttributes) => {
-    nock_1.default(`http://${process.env.IDENTITY_MS_SERVICE_HOST}`)
+const setIdentityNock = (userAttributes) => {
+    (0, nock_1.default)(`http://${process.env.IDENTITY_MS_SERVICE_HOST}`)
         .get(`/api/v1/users/${userAttributes.id}/authorization-payload`)
         .reply(200, userAttributes.permissions);
 };
-exports.mockRequestAndUser = (app, userCustomAttributes) => {
+exports.setIdentityNock = setIdentityNock;
+const mockRequestAndUser = (app, userCustomAttributes) => {
     const agent = supertest_1.default.agent(app);
     const userAttributes = {
-        id: userCustomAttributes.id || uuid_1.v4(),
+        id: userCustomAttributes.id || (0, uuid_1.v4)(),
         permissions: {
             businessModels: userCustomAttributes?.permissions?.businessModels || {},
             fleets: userCustomAttributes?.permissions?.fleets || {},
@@ -24,10 +25,11 @@ exports.mockRequestAndUser = (app, userCustomAttributes) => {
         },
     };
     agent.set('x-af-user-id', userAttributes.id);
-    exports.setIdentityNock(userAttributes);
+    (0, exports.setIdentityNock)(userAttributes);
     const agentObject = {};
     http_1.default.METHODS.forEach((method) => {
         agentObject[method.toLowerCase()] = (path) => agent[method.toLowerCase()](path).set('x-af-user-id', userAttributes.id);
     });
     return agentObject;
 };
+exports.mockRequestAndUser = mockRequestAndUser;

package/lib/tracer.js

@@ -40,19 +40,22 @@ const hook = async_hooks_1.default.createHook({
 });
 class Trace {
     constructor(type) {
-        this.id = uuid_1.v1();
+        this.id = (0, uuid_1.v1)();
         this.type = type;
         this.context = new Map();
     }
 }
 exports.Trace = Trace;
-exports.newTrace = (type) => {
+const 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.newTrace = newTrace;
+const enable = () => hook.enable();
+exports.enable = enable;
+const getCurrentTrace = () => tracer.currentTrace || {};
+exports.getCurrentTrace = getCurrentTrace;
 exports.traceTypes = {
     HTTP_REQUEST: 'httpRequest',
     WEB_SOCKET: 'webSocket',

package/lib/user/ApiUser.d.ts

@@ -1,4 +1,4 @@
-export declare type AccountType = 'client' | 'user' | 'service';
+export type AccountType = 'client' | 'user' | 'service';
 interface EntityPermissions {
     [key: string]: string[];
 }
@@ -7,6 +7,7 @@ export interface UserPayload {
     businessModels: EntityPermissions;
     fleets: EntityPermissions;
     demandSources: EntityPermissions;
+    accountType?: AccountType;
     contexts?: EntityPermissions;
     createdAt?: string;
 }
@@ -17,7 +18,7 @@ export interface PartialUserPayload {
     vehicles?: EntityPermissions;
     drivers?: EntityPermissions;
 }
-export declare type CustomPermissionLoader = (string: any) => Promise<UserPayload>;
+export type CustomPermissionLoader = (string: any) => Promise<UserPayload>;
 export default class ApiUser {
     id: string | undefined;
     privatePermissions: UserPayload | undefined;

package/lib/user/ApiUser.js

@@ -32,7 +32,11 @@ class ApiUser {
         if (this.privatePermissions) {
             return this.privatePermissions;
         }
-        const { data } = await services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`);
+        let data = userCache.get(this.id);
+        if (!data) {
+            ({ data } = await services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`));
+            userCache.set(this.id, data);
+        }
         this.accountType = data.accountType;
         this.privatePermissions = data;
         return this.privatePermissions;
@@ -76,7 +80,7 @@ class ApiUser {
             demandSources: {},
         };
         [...this.privateElevatedPermissionsHash.values()].forEach((p) => {
-            permissions = merge_deep_1.default(permissions, p);
+            permissions = (0, merge_deep_1.default)(permissions, p);
         });
         return permissions;
     }
@@ -84,20 +88,20 @@ class ApiUser {
         if (!this.privatePermissions) {
             throw new Error('Cannot get permissions without calling (async) getUserPermissions before');
         }
-        const permissions = merge_deep_1.default(this.privatePermissions, this.elevatedPermissions);
+        const permissions = (0, merge_deep_1.default)(this.privatePermissions, this.elevatedPermissions);
         return permissions;
     }
     elevatePermissions(addedPermissions) {
-        const elevationId = uuid_1.v4();
+        const elevationId = (0, uuid_1.v4)();
         // Validate that the added permissions are valid UUIDs
         Object.keys(addedPermissions).forEach((entityType) => {
             Object.keys(addedPermissions[entityType]).forEach((entityId) => {
-                if (!uuid_1.validate(entityId)) {
+                if (!(0, uuid_1.validate)(entityId)) {
                     throw new Error(`Entity id on elevatePermissions is not a valid UUID, provided: ${entityId}`);
                 }
             });
         });
-        const currentUserTrace = outbreak_1.getCurrentContext();
+        const currentUserTrace = (0, outbreak_1.getCurrentContext)();
         if (!currentUserTrace) {
             throw new Error('Cannot find current user cross services trace');
         }

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

@@ -9,7 +9,7 @@ const axios_1 = __importDefault(require("axios"));
 const index_1 = require("../index");
 const index_2 = require("./index");
 const generateApp = async (addEndpoints, port) => {
-    const app = express_1.default();
+    const app = (0, express_1.default)();
     addEndpoints(app);
     const server = await new Promise((resolve) => {
         const s = app.listen(port, () => {
@@ -22,16 +22,16 @@ const generateApp = async (addEndpoints, port) => {
 describe('E2E', () => {
     it('Basic functionality', async () => {
         let server2TraceId = null;
-        const [uuid1, uuid2] = [uuid_1.v4(), uuid_1.v4()];
-        index_1.enableTracing({
+        const [uuid1, uuid2] = [(0, uuid_1.v4)(), (0, uuid_1.v4)()];
+        (0, index_1.enableTracing)({
             outbreakOptions: {
                 headersPrefix: 'x-af-',
             },
         });
         const closeServer1 = await generateApp((app) => {
-            app.use(index_2.middleware());
+            app.use((0, index_2.middleware)());
             app.get('/', async (req, res) => {
-                const user = index_1.getUser();
+                const user = (0, index_1.getUser)();
                 const closeElevation1 = user.elevatePermissions({
                     businessModels: {
                         [uuid1]: ['vehicle:write'],
@@ -51,9 +51,9 @@ describe('E2E', () => {
         }, 8089);
         const server2NumberOfPermissions = [];
         const closeServer2 = await generateApp((app) => {
-            app.use(index_2.middleware());
+            app.use((0, index_2.middleware)());
             app.post('/', (req, res) => {
-                const user = index_1.getUser();
+                const user = (0, index_1.getUser)();
                 user.privatePermissions = {
                     businessModels: {},
                     fleets: {},
@@ -72,7 +72,7 @@ describe('E2E', () => {
             headers: {
                 'x-af-header': 'testHeader',
                 'x-af-id': 'my-wakanda-id',
-                'x-af-user-id': uuid_1.v4(),
+                'x-af-user-id': (0, uuid_1.v4)(),
             },
         });
         closeServer1();
@@ -88,15 +88,15 @@ describe('E2E', () => {
     });
     it('Should throw in case of invalid UUID', async () => {
         let error = null;
-        index_1.enableTracing({
+        (0, index_1.enableTracing)({
             outbreakOptions: {
                 headersPrefix: 'x-af-',
             },
         });
         const closeServer1 = await generateApp((app) => {
-            app.use(index_2.middleware());
+            app.use((0, index_2.middleware)());
             app.get('/', async (req, res) => {
-                const user = index_1.getUser();
+                const user = (0, index_1.getUser)();
                 try {
                     const closeElevation1 = user.elevatePermissions({
                         businessModels: {
@@ -116,7 +116,7 @@ describe('E2E', () => {
             headers: {
                 'x-af-header': 'testHeader',
                 'x-af-id': 'my-wakanda-id',
-                'x-af-user-id': uuid_1.v4(),
+                'x-af-user-id': (0, uuid_1.v4)(),
             },
         });
         closeServer1();

package/lib/user/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -29,11 +33,11 @@ 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 = {}) => async (req, res, next) => {
+const middleware = (options = {}) => async (req, res, next) => {
     try {
         const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, customPermissionLoader, } = options;
         const userId = req.headers['x-af-user-id'];
-        const trace = tracer_1.newTrace('userPayload');
+        const trace = (0, tracer_1.newTrace)('userPayload');
         if (!userId) {
             return next();
         }
@@ -65,13 +69,14 @@ exports.middleware = (options = {}) => async (req, res, next) => {
         });
     }
 };
-exports.middlewareWithDecode = (options = {}) => async (req, res, next) => {
+exports.middleware = middleware;
+const middlewareWithDecode = (options = {}) => async (req, res, next) => {
     const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, returnErrorIfNoToken, } = options;
-    const trace = tracer_1.newTrace('userPayload');
+    const trace = (0, tracer_1.newTrace)('userPayload');
     let decoded;
     if (req.headers.authorization) {
         try {
-            decoded = await utils_1.decodeBearer(req.headers.authorization);
+            decoded = await (0, utils_1.decodeBearer)(req.headers.authorization);
         }
         catch (e) {
             if (e instanceof jsonwebtoken_1.TokenExpiredError) {
@@ -120,9 +125,10 @@ exports.middlewareWithDecode = (options = {}) => async (req, res, next) => {
     // eslint-disable-next-line consistent-return
     return next();
 };
-exports.appMiddleware = (options) => async (req, res, next) => {
+exports.middlewareWithDecode = middlewareWithDecode;
+const appMiddleware = (options) => async (req, res, next) => {
     const { appId, clientSecret, } = options;
-    const trace = tracer_1.newTrace('userPayload');
+    const trace = (0, tracer_1.newTrace)('userPayload');
     let decoded;
     if (!req.headers.authorization) {
         res.status(401);
@@ -131,7 +137,7 @@ exports.appMiddleware = (options) => async (req, res, next) => {
         });
     }
     try {
-        decoded = await app_auth_1.decodeAppBearer(req.headers.authorization, appId);
+        decoded = await (0, app_auth_1.decodeAppBearer)(req.headers.authorization, appId);
         if (!decoded) {
             throw new appDoesNotExist_1.default();
         }
@@ -172,28 +178,32 @@ exports.appMiddleware = (options) => async (req, res, next) => {
     }
     req.user = userObject;
     trace.context.set('userObject', userObject);
-    trace.context.set('accessToken', utils_1.getAuthFromBearer(req.headers.authorization));
+    trace.context.set('accessToken', (0, utils_1.getAuthFromBearer)(req.headers.authorization));
     // Added in order to support outbreak.
     req.headers['x-af-user-permissions'] = userObject;
     return next();
 };
-exports.eagerLoadPermissionsMiddleware = async (req, res, next) => {
+exports.appMiddleware = appMiddleware;
+const eagerLoadPermissionsMiddleware = async (req, res, next) => {
     await req.user.getUserPermissions();
     return next();
 };
-exports.getDecodedBearer = (req) => {
+exports.eagerLoadPermissionsMiddleware = eagerLoadPermissionsMiddleware;
+const getDecodedBearer = (req) => {
     if (req.headers.authorization) {
-        return utils_1.decodeBearer(req.headers.authorization);
+        return (0, utils_1.decodeBearer)(req.headers.authorization);
     }
     return null;
 };
-exports.createOrSetRabbitTrace = async (trace, userId) => {
+exports.getDecodedBearer = getDecodedBearer;
+const createOrSetRabbitTrace = async (trace, userId) => {
     const userObject = new ApiUser_1.default(userId);
     await userObject.getUserPermissions();
     if (!trace) {
         // eslint-disable-next-line no-param-reassign
-        trace = tracer_1.newTrace(tracer_1.traceTypes.RABBIT);
+        trace = (0, tracer_1.newTrace)(tracer_1.traceTypes.RABBIT);
     }
     trace.context.set('userObject', userObject);
 };
+exports.createOrSetRabbitTrace = createOrSetRabbitTrace;
 exports.default = ApiUser_1.default;

package/lib/utils.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -29,13 +33,15 @@ const CONTEXT_MAP_PROPS = {
     business: 'businessModels',
     demand: 'demandSources',
 };
-exports.getAuthFromBearer = (bearer) => bearer.replace('Bearer ', '');
-exports.decodeBearer = (bearer, appSecret) => {
-    const token = exports.getAuthFromBearer(bearer);
-    const decoded = jwt.verify(token, appSecret || secret_getter_1.getTokenSecret(token));
+const getAuthFromBearer = (bearer) => bearer.replace('Bearer ', '');
+exports.getAuthFromBearer = getAuthFromBearer;
+const decodeBearer = (bearer, appSecret) => {
+    const token = (0, exports.getAuthFromBearer)(bearer);
+    const decoded = jwt.verify(token, appSecret || (0, secret_getter_1.getTokenSecret)(token));
     return decoded;
 };
-exports.parsePermissions = (contextId, decodedToken) => {
+exports.decodeBearer = decodeBearer;
+const parsePermissions = (contextId, decodedToken) => {
     if (!decodedToken) {
         return [];
     }
@@ -47,7 +53,8 @@ exports.parsePermissions = (contextId, decodedToken) => {
         value: permissionsValue,
     };
 };
-exports.getEntitiesFromContext = (contextId, decodedToken) => {
+exports.parsePermissions = parsePermissions;
+const getEntitiesFromContext = (contextId, decodedToken) => {
     if (!decodedToken) {
         return [];
     }
@@ -58,7 +65,7 @@ exports.getEntitiesFromContext = (contextId, decodedToken) => {
     const attributes = {};
     contexts.forEach((context) => {
         const prop = CONTEXT_MAP_PROPS[context.subSystem || 'business'];
-        const permissions = exports.parsePermissions(context.id, decodedToken);
+        const permissions = (0, exports.parsePermissions)(context.id, decodedToken);
         // eslint-disable-next-line no-unused-expressions
         attributes[prop]
             ? attributes[prop][permissions.key] = permissions.value
@@ -66,7 +73,8 @@ exports.getEntitiesFromContext = (contextId, decodedToken) => {
     });
     return attributes;
 };
-exports.getContextAttributes = (contextId, decodedToken) => {
+exports.getEntitiesFromContext = getEntitiesFromContext;
+const getContextAttributes = (contextId, decodedToken) => {
     if (!decodedToken) {
         return [];
     }
@@ -88,3 +96,4 @@ exports.getContextAttributes = (contextId, decodedToken) => {
     });
     return attributes;
 };
+exports.getContextAttributes = getContextAttributes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "3.0.1-beta3",
+  "version": "3.0.2",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,6 @@
   "dependencies": {
     "@autofleet/network": "^1.4.2",
     "@autofleet/outbreak": "0.2.1",
-    "@types/jest": "^22.0.0",
     "axios": "^0.27.2",
     "express": "^4.18.1",
     "jsonwebtoken": "^8.5.1",
@@ -38,13 +37,16 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@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": "^24.9.0",
-    "ts-jest": "^25.4.0",
-    "typescript": "^3.9.5"
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
+    "@types/jest": "^29.5.4",
+    "@types/node": "^16.14.2",
+    "eslint": "^8.48.0",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-plugin-import": "^2.28.1",
+    "jest": "^29.6.4",
+    "ts-jest": "^29.1.1",
+    "typescript": "^4.9.5"
   },
   "files": [
     "lib/**/*"