@autofleet/zehut 1.6.0-beta-0 → 1.6.0-beta-2

package/lib/check-permission.d.ts

@@ -1,4 +1,4 @@
-import ApiUser from './user/ApiUser';
+import ApiUser from './user/api-user';
 export declare const getUser: () => ApiUser;
 export declare const isUserExist: () => boolean;
 export declare const checkFleetPermission: (fleetId: string) => boolean;

package/lib/context-manager/context.js

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

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

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

package/lib/context-manager/index.js

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

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

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

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

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

package/lib/user/index.d.ts

@@ -1,4 +1,4 @@
-import ApiUser from './ApiUser';
+import ApiUser from './api-user';
 export declare const middleware: (options?: {
     eagerLoadUserPermissions?: boolean;
     eagerLoadUserPermissionsLegacy?: boolean;

package/lib/user/index.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
 const jsonwebtoken_1 = require("jsonwebtoken");
-const ApiUser_1 = __importDefault(require("./ApiUser"));
+const api_user_1 = __importDefault(require("./api-user"));
 const utils_1 = require("../utils");
 const context_manager_1 = require("../context-manager");
 exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
@@ -24,7 +24,7 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
         context.set('userObject', {});
     }
     else {
-        const userObject = new ApiUser_1.default(userId);
+        const userObject = new api_user_1.default(userId);
         if (options.eagerLoadUserPermissions) {
             yield userObject.getUserPermissions();
         }
@@ -65,7 +65,7 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
         if (userId) {
             req.headers['X-AF-USER-ID'] = userId;
         }
-        const userObject = new ApiUser_1.default(userId);
+        const userObject = new api_user_1.default(userId);
         if (options.eagerLoadUserPermissions) {
             yield userObject.getUserPermissions();
         }
@@ -94,4 +94,4 @@ exports.getDecodedBearer = (req) => {
     }
     return null;
 };
-exports.default = ApiUser_1.default;
+exports.default = api_user_1.default;

package/package.json

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