@alanszp/express-common-fn 10.0.3 → 12.0.0

package/node_modules/@alanszp/express/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alanszp/express",
-  "version": "10.0.3",
+  "version": "12.0.0",
   "description": "Alan's express utils and middlewares.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -35,15 +35,15 @@
     "typescript": "^4.3.4"
   },
   "dependencies": {
-    "@alanszp/audit": "^10.0.2",
-    "@alanszp/errors": "^10.0.1",
-    "@alanszp/jwt": "^10.0.1",
-    "@alanszp/logger": "^10.0.1",
-    "@alanszp/shared-context": "^10.0.2",
+    "@alanszp/audit": "^12.0.0",
+    "@alanszp/errors": "^12.0.0",
+    "@alanszp/jwt": "^12.0.0",
+    "@alanszp/logger": "^12.0.0",
+    "@alanszp/shared-context": "^12.0.0",
     "@babel/core": "^7.23.9",
     "@paralleldrive/cuid2": "^2.2.2",
     "body-parser": "^1.20.2",
     "lodash": "^4.17.21"
   },
-  "gitHead": "701d6cc7bd3a51a8b297903e7b2fff9c1b830da6"
+  "gitHead": "085a76a387bc0e272e09e9cb1b6f48f814512940"
 }

package/node_modules/@alanszp/express/src/helpers/renderErrorJson.ts

@@ -0,0 +1,29 @@
+import { appIdentifier } from "@alanszp/core";
+import { RenderableView } from "@alanszp/errors";
+
+export function render401Error(requiredChecks: string[]): RenderableView {
+  return {
+    code: "unauthorized_error",
+    message: "Unauthorized Error",
+    context: { requiredChecks },
+    origin: appIdentifier(),
+  };
+}
+
+export function render404Error(): RenderableView {
+  return {
+    code: "not_found",
+    message: "Not Found",
+    context: {},
+    origin: appIdentifier(),
+  };
+}
+
+export function render400Error(message: string): RenderableView {
+  return {
+    code: "bad_request",
+    message,
+    context: {},
+    origin: appIdentifier(),
+  };
+}

package/node_modules/@alanszp/express/src/index.ts

@@ -1,4 +1,3 @@
-export * from "./views/errorView";
 export * from "./types/AuthMethod";
 export * from "./middlewares/auditLog";
 export * from "./middlewares/accessLogger";

package/node_modules/@alanszp/express/src/middlewares/authedForOrg.ts

@@ -1,11 +1,10 @@
-import { NotFoundError, UnauthorizedError } from "@alanszp/errors";
-import { errorView } from "../views/errorView";
 import { NextFunction, Response } from "express";
 import { getRequestLogger } from "../helpers/getRequestLogger";
 import { GenericRequest } from "../types/GenericRequest";
+import { render401Error, render404Error } from "../helpers/renderErrorJson";
 
 function response401(res: Response): void {
-  res.status(401).json(errorView(new UnauthorizedError(["jwt"])));
+  res.status(401).json(render401Error(["jwt"]));
 }
 
 export function authForOrg(
@@ -46,6 +45,6 @@ export function authForOrg(
     logger.info("middleware.authForOrg.error.noOrganization", {
       error,
     });
-    res.status(404).json(errorView(new NotFoundError()));
+    res.status(404).json(render404Error());
   }
 }

package/node_modules/@alanszp/express/src/middlewares/authenticateUser.ts

@@ -1,11 +1,10 @@
 import { JWTUser, verifyJWT, VerifyOptions } from "@alanszp/jwt";
-import { UnauthorizedError } from "@alanszp/errors";
-import { errorView } from "../views/errorView";
 import { NextFunction, Response } from "express";
 import { getRequestLogger } from "../helpers/getRequestLogger";
 import { GenericRequest } from "../types/GenericRequest";
 import { ILogger } from "@alanszp/logger";
 import { compact, isEmpty, omit } from "lodash";
+import { render401Error } from "../helpers/renderErrorJson";
 
 function parseAuthorizationHeader(
   authorization: string | undefined
@@ -89,14 +88,17 @@ const middlewareGetterByAuthType: Record<
           user: "0",
           org: "lara",
         });
-        return Promise.resolve({
-          id: "0",
-          employeeReference: "0",
-          organizationReference: "lara",
-          roles: [],
-          segmentReference: null,
-          permissions: [],
-        });
+        return Promise.resolve(
+          new JWTUser({
+            id: "0",
+            employeeReference: "0",
+            organizationReference: "lara",
+            roles: [],
+            segmentReference: null,
+            // This will be changed in the near future to grab all permissions.
+            permissions: "MA==", // 0 in base64
+          })
+        );
       } else {
         return null;
       }
@@ -140,13 +142,11 @@ export function createAuthContext<Options extends AuthOptions>(
           res
             .status(401)
             .json(
-              errorView(
-                new UnauthorizedError([
-                  authAttempts.includes(null)
-                    ? `Token invalid for methods ${authMethods}`
-                    : `Token not set for methods ${authMethods}`,
-                ])
-              )
+              render401Error([
+                authAttempts.includes(null)
+                  ? `Token invalid for methods ${authMethods}`
+                  : `Token not set for methods ${authMethods}`,
+              ])
             );
           return;
         }
@@ -164,7 +164,7 @@ export function createAuthContext<Options extends AuthOptions>(
           methods: AuthMethods,
           error,
         });
-        res.status(401).json(errorView(new UnauthorizedError(authMethods)));
+        res.status(401).json(render401Error(authMethods));
       }
     };
   };

package/node_modules/@alanszp/express/src/middlewares/createContext.test.ts

@@ -8,7 +8,7 @@ import {
   mockRequestWithBody,
   mockResponse,
 } from "../test/mocks/expressMocks";
-import { appIdentifier } from "../helpers/appIdentifier";
+import { appIdentifier } from "@alanszp/core";
 jest.mock("@alanszp/shared-context");
 
 const logger = createMockLogger({});

package/node_modules/@alanszp/express/src/middlewares/createContext.ts

@@ -2,7 +2,7 @@ import { createId } from "@paralleldrive/cuid2";
 import { NextFunction, Response } from "express";
 import { ILogger } from "@alanszp/logger";
 import { Audit } from "@alanszp/audit";
-import { appIdentifier } from "../helpers/appIdentifier";
+import { appIdentifier } from "@alanszp/core";
 import { GenericRequest } from "../types/GenericRequest";
 import { SharedContext } from "@alanszp/shared-context";
 import { compact } from "lodash";

package/node_modules/@alanszp/express/src/middlewares/hasRoles.ts

@@ -1,11 +1,9 @@
-import { UnauthorizedError } from "@alanszp/errors";
-import { errorView } from "../views/errorView";
 import { NextFunction, Response } from "express";
-import { jwtUserHasRoles } from "@alanszp/jwt";
 import { GenericRequest } from "../types/GenericRequest";
+import { render401Error } from "../helpers/renderErrorJson";
 
 function response401(res: Response): void {
-  res.status(401).json(errorView(new UnauthorizedError(["permissions"])));
+  res.status(401).json(render401Error(["permissions"]));
 }
 
 export function hasRoles(
@@ -17,7 +15,7 @@ export function hasRoles(
       return response401(res);
     }
 
-    if (jwtUserHasRoles(jwtUser, roles)) {
+    if (jwtUser.hasRoles(roles)) {
       return next();
     }
 

package/node_modules/@alanszp/express/src/middlewares/jsonBodyParser.ts

@@ -1,8 +1,7 @@
 import { json, OptionsJson } from "body-parser";
 import { NextFunction, Response } from "express";
-import { BadRequestError } from "@alanszp/errors";
-import { errorView } from "../views/errorView";
 import { GenericRequest } from "../types/GenericRequest";
+import { render400Error } from "../helpers/renderErrorJson";
 
 export function jsonBodyParser(options?: OptionsJson) {
   const bodyParser = json({ limit: "1mb", ...options });
@@ -14,10 +13,10 @@ export function jsonBodyParser(options?: OptionsJson) {
     try {
       bodyParser(req, res, (error?: unknown) => {
         if (!error) return next();
-        res.status(400).json(errorView(new BadRequestError("Malformed JSON")));
+        res.status(400).json(render400Error("Malformed JSON"));
       });
     } catch (error: unknown) {
-      res.status(400).json(errorView(new BadRequestError("Malformed JSON")));
+      res.status(400).json(render400Error("Malformed JSON"));
     }
   };
 }

package/node_modules/@alanszp/express/src/middlewares/returnInternalServerError.ts

@@ -1,6 +1,5 @@
 import { ErrorRequestHandler, NextFunction, Response } from "express";
 import { InternalServerError } from "@alanszp/errors";
-import { errorView } from "../views/errorView";
 import { GenericRequest } from "../types/GenericRequest";
 import { ILogger } from "@alanszp/logger";
 
@@ -11,6 +10,6 @@ export type GetInternalServerErrorMiddleware = (
 export const returnInternalServerError: GetInternalServerErrorMiddleware =
   (getLogger: () => ILogger) =>
   (error: unknown, req: GenericRequest, res: Response, _next: NextFunction) => {
-    res.status(500).json(errorView(new InternalServerError(error)));
+    res.status(500).json(new InternalServerError(error).toView());
     getLogger().error("error_to_client", { error });
   };

package/node_modules/@alanszp/express/src/middlewares/returnNotFound.ts

@@ -1,12 +1,11 @@
 import { NextFunction, Response } from "express";
-import { NotFoundError } from "@alanszp/errors";
-import { errorView } from "../views/errorView";
 import { GenericRequest } from "../types/GenericRequest";
+import { render404Error } from "../helpers/renderErrorJson";
 
 export function returnNotFound(
   _req: GenericRequest,
   res: Response,
   _next: NextFunction
 ): void {
-  res.status(404).json(errorView(new NotFoundError()));
+  res.status(404).json(render404Error());
 }

package/node_modules/@alanszp/express/src/test/mocks/jwtUserMocks.ts

@@ -1,19 +1,19 @@
 import { JWTUser } from "@alanszp/jwt";
 
-export const userJwtUserMock: JWTUser = {
+export const userJwtUserMock: JWTUser = new JWTUser({
   id: "1",
   employeeReference: "1",
   organizationReference: "test",
   roles: [],
-  permissions: [],
+  permissions: "MA==",
   segmentReference: null,
-};
+});
 
-export const laraJwtUserMock: JWTUser = {
+export const laraJwtUserMock: JWTUser = new JWTUser({
   id: "0",
   employeeReference: "0",
   organizationReference: "lara",
   roles: [],
-  permissions: [],
+  permissions: "MA==",
   segmentReference: null,
-};
+});

package/node_modules/@alanszp/jwt/dist/JWTUser.d.ts

@@ -0,0 +1,31 @@
+import { IJWTUser, JWTPayload } from "./types";
+export declare class JWTUser implements IJWTUser {
+    id: string;
+    employeeReference: string | null;
+    organizationReference: string;
+    originalOrganizationReference: string | null;
+    roles: string[];
+    permissions: string;
+    segmentReference: string | null;
+    constructor({ id, employeeReference, organizationReference, roles, permissions, segmentReference, }: IJWTUser);
+    static fromPayload(payload: JWTPayload): JWTUser;
+    toTokenPayload(): JWTPayload;
+    /**
+     * Old way of checking for a role
+     * Will be replaced by permission checks
+     * @param role - role code to check
+     */
+    hasRole(role: string): boolean;
+    /**
+     * Old way of checking for roles
+     * Will be replaced by permission checks
+     */
+    hasRoles(validateRoles: string | string[]): boolean;
+    /**
+     * Check if user has permission to perform an action
+     * @note - not implemented, will be implemented in the next release
+     * @param permissionCode - permission code to check
+     * @returns boolean
+     */
+    hasPermission(_permissionCode: string): boolean;
+}

package/node_modules/@alanszp/jwt/dist/JWTUser.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JWTUser = void 0;
+class JWTUser {
+    constructor({ id, employeeReference, organizationReference, roles, permissions, segmentReference, }) {
+        this.id = id;
+        this.employeeReference = employeeReference;
+        this.organizationReference = organizationReference;
+        this.roles = roles;
+        this.permissions = permissions;
+        this.segmentReference = segmentReference;
+    }
+    static fromPayload(payload) {
+        return new JWTUser({
+            id: payload.sub,
+            employeeReference: payload.ref,
+            organizationReference: payload.org,
+            roles: payload.rls,
+            permissions: payload.prms,
+            segmentReference: payload.seg || null,
+        });
+    }
+    toTokenPayload() {
+        return {
+            sub: this.id,
+            ref: this.employeeReference,
+            org: this.organizationReference,
+            rls: this.roles,
+            prms: this.permissions,
+            seg: this.segmentReference,
+        };
+    }
+    /**
+     * Old way of checking for a role
+     * Will be replaced by permission checks
+     * @param role - role code to check
+     */
+    hasRole(role) {
+        return this.roles.includes(role);
+    }
+    /**
+     * Old way of checking for roles
+     * Will be replaced by permission checks
+     */
+    hasRoles(validateRoles) {
+        if (typeof validateRoles === "string") {
+            return this.hasRole(validateRoles);
+        }
+        return validateRoles.some((role) => this.hasRole(role));
+    }
+    /**
+     * Check if user has permission to perform an action
+     * @note - not implemented, will be implemented in the next release
+     * @param permissionCode - permission code to check
+     * @returns boolean
+     */
+    hasPermission(_permissionCode) {
+        throw new Error("Not implemented");
+    }
+}
+exports.JWTUser = JWTUser;
+//# sourceMappingURL=JWTUser.js.map

package/node_modules/@alanszp/jwt/dist/JWTUser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"JWTUser.js","sourceRoot":"","sources":["../src/JWTUser.ts"],"names":[],"mappings":";;;AAEA,MAAa,OAAO;IAelB,YAAY,EACV,EAAE,EACF,iBAAiB,EACjB,qBAAqB,EACrB,KAAK,EACL,WAAW,EACX,gBAAgB,GACP;QACT,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QACnD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,OAAmB;QACpC,OAAO,IAAI,OAAO,CAAC;YACjB,EAAE,EAAE,OAAO,CAAC,GAAG;YACf,iBAAiB,EAAE,OAAO,CAAC,GAAG;YAC9B,qBAAqB,EAAE,OAAO,CAAC,GAAG;YAClC,KAAK,EAAE,OAAO,CAAC,GAAG;YAClB,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,gBAAgB,EAAE,OAAO,CAAC,GAAG,IAAI,IAAI;SACtC,CAAC,CAAC;IACL,CAAC;IAEM,cAAc;QACnB,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,GAAG,EAAE,IAAI,CAAC,iBAAiB;YAC3B,GAAG,EAAE,IAAI,CAAC,qBAAqB;YAC/B,GAAG,EAAE,IAAI,CAAC,KAAK;YACf,IAAI,EAAE,IAAI,CAAC,WAAW;YACtB,GAAG,EAAE,IAAI,CAAC,gBAAgB;SAC3B,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,OAAO,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED;;;OAGG;IACI,QAAQ,CAAC,aAAgC;QAC9C,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;YACrC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;SACpC;QACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,eAAuB;QAC1C,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;CACF;AAlFD,0BAkFC"}

package/node_modules/@alanszp/jwt/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./types";
+export * from "./JWTUser";
 export * from "./jwt";

package/node_modules/@alanszp/jwt/dist/index.js

@@ -11,5 +11,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
+__exportStar(require("./JWTUser"), exports);
 __exportStar(require("./jwt"), exports);
 //# sourceMappingURL=index.js.map

package/node_modules/@alanszp/jwt/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,wCAAsB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,wCAAsB"}

package/node_modules/@alanszp/jwt/dist/jwt.d.ts

@@ -1,12 +1,11 @@
 /// <reference types="node" />
 import { KeyObject } from "crypto";
-import type { JWTPayload, JWTUser, SignOptions, VerifyOptions } from "./types";
+import type { SignOptions, VerifyOptions } from "./types";
+import { JWTUser } from "./JWTUser";
 export declare const JWT_ALGORITHM = "RS512";
 export declare function privateKeyFromPem(key: string): KeyObject;
 export declare function publicKeyFromPem(key: string): KeyObject;
 export declare function withDefaultSignOptions(options?: Partial<SignOptions>): SignOptions;
 export declare function withDefaultVerifyOptions(options?: Partial<VerifyOptions>): VerifyOptions;
 export declare function generateJWT(privateKey: KeyObject | string, user: JWTUser, options?: Partial<SignOptions>): Promise<string>;
-export declare function createTokenPayload(user: JWTUser): JWTPayload;
 export declare function verifyJWT(publicKey: KeyObject | string, token: string, options?: Partial<VerifyOptions>): Promise<JWTUser>;
-export declare function jwtUserHasRoles(jwtUser: JWTUser, roles: string | string[]): boolean;

package/node_modules/@alanszp/jwt/dist/jwt.js

@@ -9,9 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jwtUserHasRoles = exports.verifyJWT = exports.createTokenPayload = exports.generateJWT = exports.withDefaultVerifyOptions = exports.withDefaultSignOptions = exports.publicKeyFromPem = exports.privateKeyFromPem = exports.JWT_ALGORITHM = void 0;
+exports.verifyJWT = exports.generateJWT = exports.withDefaultVerifyOptions = exports.withDefaultSignOptions = exports.publicKeyFromPem = exports.privateKeyFromPem = exports.JWT_ALGORITHM = void 0;
 const crypto_1 = require("crypto");
 const jose_1 = require("jose");
+const JWTUser_1 = require("./JWTUser");
 exports.JWT_ALGORITHM = "RS512";
 function privateKeyFromPem(key) {
     return (0, crypto_1.createPrivateKey)({
@@ -39,7 +40,7 @@ function generateJWT(privateKey, user, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const key = typeof privateKey === "string" ? privateKeyFromPem(privateKey) : privateKey;
         const opts = withDefaultSignOptions(options);
-        return new jose_1.SignJWT(createTokenPayload(user))
+        return new jose_1.SignJWT(user.toTokenPayload())
             .setProtectedHeader({ alg: exports.JWT_ALGORITHM })
             .setIssuedAt()
             .setIssuer(opts.issuer)
@@ -49,17 +50,6 @@ function generateJWT(privateKey, user, options) {
     });
 }
 exports.generateJWT = generateJWT;
-function createTokenPayload(user) {
-    return {
-        sub: user.id,
-        ref: user.employeeReference,
-        org: user.organizationReference,
-        rls: user.roles,
-        prms: user.permissions,
-        seg: user.segmentReference,
-    };
-}
-exports.createTokenPayload = createTokenPayload;
 function verifyJWT(publicKey, token, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const key = typeof publicKey === "string" ? publicKeyFromPem(publicKey) : publicKey;
@@ -70,20 +60,8 @@ function verifyJWT(publicKey, token, options) {
             audience: opts.audience,
         });
         const payload = verify.payload;
-        return {
-            id: payload.sub,
-            employeeReference: payload.ref,
-            organizationReference: payload.org,
-            roles: payload.rls,
-            permissions: payload.prms,
-            segmentReference: payload.seg || null,
-        };
+        return JWTUser_1.JWTUser.fromPayload(payload);
     });
 }
 exports.verifyJWT = verifyJWT;
-function jwtUserHasRoles(jwtUser, roles) {
-    const validateRoles = typeof roles === "string" ? [roles] : roles;
-    return validateRoles.some((role) => jwtUser.roles.includes(role));
-}
-exports.jwtUserHasRoles = jwtUserHasRoles;
 //# sourceMappingURL=jwt.js.map

package/node_modules/@alanszp/jwt/dist/jwt.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../src/jwt.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAsE;AACtE,+BAA0C;AAE1C,uCAAoC;AAEvB,QAAA,aAAa,GAAG,OAAO,CAAC;AAErC,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,OAAO,IAAA,yBAAgB,EAAC;QACtB,GAAG;QACH,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;AACL,CAAC;AALD,8CAKC;AAED,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,OAAO,IAAA,wBAAe,EAAC;QACrB,GAAG;QACH,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;AACL,CAAC;AALD,4CAKC;AAED,SAAgB,sBAAsB,CACpC,OAA8B;IAE9B,uBACE,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,KAAK,EACf,UAAU,EAAE,KAAK,IACd,OAAO,EACV;AACJ,CAAC;AATD,wDASC;AAED,SAAgB,wBAAwB,CACtC,OAAgC;IAEhC,uBACE,MAAM,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,EAC3B,QAAQ,EAAE,KAAK,IACZ,OAAO,EACV;AACJ,CAAC;AARD,4DAQC;AAED,SAAsB,WAAW,CAC/B,UAA8B,EAC9B,IAAa,EACb,OAA8B;;QAE9B,MAAM,GAAG,GACP,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;QAE9E,MAAM,IAAI,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAE7C,OAAO,IAAI,cAAO,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;aACtC,kBAAkB,CAAC,EAAE,GAAG,EAAE,qBAAa,EAAE,CAAC;aAC1C,WAAW,EAAE;aACb,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;aACtB,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC;aAC1B,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC;aAClC,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;CAAA;AAjBD,kCAiBC;AAED,SAAsB,SAAS,CAC7B,SAA6B,EAC7B,KAAa,EACb,OAAgC;;QAEhC,MAAM,GAAG,GACP,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1E,MAAM,IAAI,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAE/C,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAS,EAAC,KAAK,EAAE,GAAG,EAAE;YACzC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,UAAU,EAAE,CAAC,qBAAa,CAAC;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,CAAC,OAAqB,CAAC;QAE7C,OAAO,iBAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;CAAA;AAnBD,8BAmBC"}

package/node_modules/@alanszp/jwt/dist/types.d.ts

@@ -4,15 +4,15 @@ export interface JWTPayload extends LibPayload {
     ref: string | null;
     org: string;
     rls: string[];
-    prms: string[];
+    prms: string;
     seg: string | null;
 }
-export interface JWTUser {
+export interface IJWTUser {
     id: string;
     employeeReference: string | null;
     organizationReference: string;
     roles: string[];
-    permissions: string[];
+    permissions: string;
     segmentReference: string | null;
 }
 export interface SignOptions {

package/node_modules/@alanszp/jwt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alanszp/jwt",
-  "version": "10.0.1",
+  "version": "12.0.0",
   "description": "Alan's jwt validator & signer.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -25,5 +25,6 @@
   },
   "dependencies": {
     "jose": "^5.2.2"
-  }
+  },
+  "gitHead": "085a76a387bc0e272e09e9cb1b6f48f814512940"
 }

package/node_modules/@alanszp/jwt/src/JWTUser.ts

@@ -0,0 +1,85 @@
+import { IJWTUser, JWTPayload } from "./types";
+
+export class JWTUser implements IJWTUser {
+  id: string;
+
+  employeeReference: string | null;
+
+  organizationReference: string;
+
+  originalOrganizationReference: string | null;
+
+  roles: string[];
+
+  permissions: string;
+
+  segmentReference: string | null;
+
+  constructor({
+    id,
+    employeeReference,
+    organizationReference,
+    roles,
+    permissions,
+    segmentReference,
+  }: IJWTUser) {
+    this.id = id;
+    this.employeeReference = employeeReference;
+    this.organizationReference = organizationReference;
+    this.roles = roles;
+    this.permissions = permissions;
+    this.segmentReference = segmentReference;
+  }
+
+  static fromPayload(payload: JWTPayload): JWTUser {
+    return new JWTUser({
+      id: payload.sub,
+      employeeReference: payload.ref,
+      organizationReference: payload.org,
+      roles: payload.rls,
+      permissions: payload.prms,
+      segmentReference: payload.seg || null,
+    });
+  }
+
+  public toTokenPayload(): JWTPayload {
+    return {
+      sub: this.id,
+      ref: this.employeeReference,
+      org: this.organizationReference,
+      rls: this.roles,
+      prms: this.permissions,
+      seg: this.segmentReference,
+    };
+  }
+
+  /**
+   * Old way of checking for a role
+   * Will be replaced by permission checks
+   * @param role - role code to check
+   */
+  public hasRole(role: string): boolean {
+    return this.roles.includes(role);
+  }
+
+  /**
+   * Old way of checking for roles
+   * Will be replaced by permission checks
+   */
+  public hasRoles(validateRoles: string | string[]): boolean {
+    if (typeof validateRoles === "string") {
+      return this.hasRole(validateRoles);
+    }
+    return validateRoles.some((role) => this.hasRole(role));
+  }
+
+  /**
+   * Check if user has permission to perform an action
+   * @note - not implemented, will be implemented in the next release
+   * @param permissionCode - permission code to check
+   * @returns boolean
+   */
+  public hasPermission(_permissionCode: string): boolean {
+    throw new Error("Not implemented");
+  }
+}

package/node_modules/@alanszp/jwt/src/index.ts

@@ -1,2 +1,3 @@
 export * from "./types";
+export * from "./JWTUser";
 export * from "./jwt";