b23-lib 1.1.0 → 1.1.1

package/dist/index.d.mts

@@ -238,27 +238,28 @@ declare const Schema: {
 declare class AuthUtility {
     private secretToken;
     private maxTokenAge;
-    constructor({ secret, maxTokenAge }: {
-        secret: string;
-        maxTokenAge: string;
+    private anonymousPrivateKey;
+    private anonymousPublicKey;
+    constructor({ secret, maxTokenAge, anonymousPrivateKey, anonymousPublicKey }: {
+        secret?: string;
+        maxTokenAge?: string;
+        anonymousPrivateKey?: string;
+        anonymousPublicKey?: string;
     });
-    createToken(id: string, additionalData: object): Promise<string>;
+    createAnonymousToken(id: string, additionalData?: object): Promise<string>;
+    verifyAnonymousToken(token: string): Promise<jose.JWTPayload>;
+    createToken(id: string, additionalData?: object): Promise<string>;
     verifyToken(token: string): Promise<jose.JWTPayload>;
-    AuthMiddleware(): (req: any, res: any, next: any) => Promise<void>;
+    AuthMiddleware(allowAnonymous: boolean): (req: any, res: any, next: any) => Promise<void>;
 }
 
-declare const ResponseUtility: {
-    handleException: (functionName: string, error: any, res: any) => void;
-    generateResponse: (status: number, data?: any, error?: string) => {
-        status: number;
-        data: any;
-        error: string | undefined;
-    };
-    generateError: (status: number, error: string, knownError?: Boolean, logError?: boolean) => {
-        status: number;
-        error: string;
-        knownError: Boolean;
-        logError: boolean;
+declare const _default: {
+    isUUID: (value: string) => boolean;
+    generateUUID: (value?: string, namespace?: string) => string;
+    generateSearchId: (key: string, variantId: string) => string;
+    getKeyfromSearchId: (searchId: string) => {
+        key: string;
+        variantId: string;
     };
 };
 
@@ -276,4 +277,4 @@ declare const Logger: {
     logInvalidPayload: (functionName: string, errorMessage: string) => void;
 };
 
-export { AuthUtility as Auth, DynamoDBUtility as DynamoDB, Fetch, Logger, ResponseUtility, Schema };
+export { AuthUtility as Auth, DynamoDBUtility as DynamoDB, Fetch, Logger, _default as ResponseUtility, Schema, _default as Utils };

package/dist/index.d.ts

@@ -238,27 +238,28 @@ declare const Schema: {
 declare class AuthUtility {
     private secretToken;
     private maxTokenAge;
-    constructor({ secret, maxTokenAge }: {
-        secret: string;
-        maxTokenAge: string;
+    private anonymousPrivateKey;
+    private anonymousPublicKey;
+    constructor({ secret, maxTokenAge, anonymousPrivateKey, anonymousPublicKey }: {
+        secret?: string;
+        maxTokenAge?: string;
+        anonymousPrivateKey?: string;
+        anonymousPublicKey?: string;
     });
-    createToken(id: string, additionalData: object): Promise<string>;
+    createAnonymousToken(id: string, additionalData?: object): Promise<string>;
+    verifyAnonymousToken(token: string): Promise<jose.JWTPayload>;
+    createToken(id: string, additionalData?: object): Promise<string>;
     verifyToken(token: string): Promise<jose.JWTPayload>;
-    AuthMiddleware(): (req: any, res: any, next: any) => Promise<void>;
+    AuthMiddleware(allowAnonymous: boolean): (req: any, res: any, next: any) => Promise<void>;
 }
 
-declare const ResponseUtility: {
-    handleException: (functionName: string, error: any, res: any) => void;
-    generateResponse: (status: number, data?: any, error?: string) => {
-        status: number;
-        data: any;
-        error: string | undefined;
-    };
-    generateError: (status: number, error: string, knownError?: Boolean, logError?: boolean) => {
-        status: number;
-        error: string;
-        knownError: Boolean;
-        logError: boolean;
+declare const _default: {
+    isUUID: (value: string) => boolean;
+    generateUUID: (value?: string, namespace?: string) => string;
+    generateSearchId: (key: string, variantId: string) => string;
+    getKeyfromSearchId: (searchId: string) => {
+        key: string;
+        variantId: string;
     };
 };
 
@@ -276,4 +277,4 @@ declare const Logger: {
     logInvalidPayload: (functionName: string, errorMessage: string) => void;
 };
 
-export { AuthUtility as Auth, DynamoDBUtility as DynamoDB, Fetch, Logger, ResponseUtility, Schema };
+export { AuthUtility as Auth, DynamoDBUtility as DynamoDB, Fetch, Logger, _default as ResponseUtility, Schema, _default as Utils };

package/dist/index.js

@@ -34,8 +34,9 @@ __export(src_exports, {
   DynamoDB: () => Dynamodb_default,
   Fetch: () => fetch_default,
   Logger: () => Logger_default,
-  ResponseUtility: () => response_default,
-  Schema: () => Schema_default
+  ResponseUtility: () => Utils_default,
+  Schema: () => Schema_default,
+  Utils: () => Utils_default
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -414,8 +415,11 @@ var import_util2 = __toESM(require("util"));
 
 // src/enums/ErrorTypes.ts
 var ErrorTypes_default = Object.freeze({
+  INVALID_UUID: "Invalid UUID",
   INVALID_TOKEN: "Invalid Token",
   TOKEN_EXPIRED: "Token Expired",
+  INVALID_AUTH_TYPE: "Invalid Authorization Type",
+  ANONYMOUS_SESSION_NOT_ALLOWED: "Anonymous Session Not Allowed",
   INTERNAL_SERVER_ERROR: "Internal Server Error"
 });
 
@@ -437,6 +441,31 @@ var Logger = {
 };
 var Logger_default = Logger;
 
+// src/Utils/index.ts
+var import_uuid = require("uuid");
+var Utils_default = {
+  isUUID: (value) => {
+    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+    return uuidRegex.test(value);
+  },
+  generateUUID: (value, namespace) => {
+    if (namespace && value) {
+      return (0, import_uuid.v5)(value, namespace);
+    }
+    return (0, import_uuid.v4)();
+  },
+  generateSearchId: (key, variantId) => {
+    return `${key}#${variantId}`;
+  },
+  getKeyfromSearchId: (searchId) => {
+    const [key, variantId] = searchId.split("#");
+    return {
+      key,
+      variantId
+    };
+  }
+};
+
 // src/Utils/response.ts
 var ResponseUtility = {
   handleException: (functionName, error, res) => {
@@ -473,14 +502,35 @@ var ResponseUtility = {
 var response_default = ResponseUtility;
 
 // src/Auth/index.ts
+var import_assert = __toESM(require("assert"));
 var AuthUtility = class {
   secretToken;
   maxTokenAge;
-  constructor({ secret, maxTokenAge = "30 days" }) {
+  anonymousPrivateKey;
+  anonymousPublicKey;
+  constructor({ secret = "", maxTokenAge = "30 days", anonymousPrivateKey = "", anonymousPublicKey = "" }) {
     this.secretToken = secret;
     this.maxTokenAge = maxTokenAge;
+    this.anonymousPrivateKey = anonymousPrivateKey;
+    this.anonymousPublicKey = anonymousPublicKey;
+  }
+  async createAnonymousToken(id, additionalData) {
+    (0, import_assert.default)(Utils_default.isUUID(id), ErrorTypes_default.INVALID_UUID);
+    const payload = {
+      id,
+      ...additionalData
+    };
+    const privateKey = await (0, import_jose.importPKCS8)(this.anonymousPrivateKey, "RS256");
+    const token = await new import_jose.SignJWT(payload).setProtectedHeader({ alg: "RS256" }).setExpirationTime(this.maxTokenAge).setIssuedAt().sign(privateKey);
+    return token;
+  }
+  async verifyAnonymousToken(token) {
+    const publicKey = await (0, import_jose.importSPKI)(this.anonymousPublicKey, "RS256");
+    const jwt = await (0, import_jose.jwtVerify)(token, publicKey, { clockTolerance: 30, maxTokenAge: this.maxTokenAge });
+    return jwt.payload;
   }
   async createToken(id, additionalData) {
+    (0, import_assert.default)(Utils_default.isUUID(id), ErrorTypes_default.INVALID_UUID);
     const payload = {
       id,
       ...additionalData
@@ -491,18 +541,37 @@ var AuthUtility = class {
   }
   async verifyToken(token) {
     const secretKey = Buffer.from(this.secretToken, "hex");
-    const jwt = await (0, import_jose.jwtDecrypt)(token, secretKey, { maxTokenAge: this.maxTokenAge });
+    const jwt = await (0, import_jose.jwtDecrypt)(token, secretKey, { clockTolerance: 30, maxTokenAge: this.maxTokenAge });
     return jwt.payload;
   }
-  AuthMiddleware() {
+  AuthMiddleware(allowAnonymous) {
     return async (req, res, next) => {
       try {
-        const token = req.get("Authorization")?.split(" ")?.[1];
+        const [authType, token] = req.get("Authorization")?.split(" ");
         if (!token) {
           throw new Error(ErrorTypes_default.INVALID_TOKEN);
         }
-        const payload = await this.verifyToken(token);
-        res.locals.auth = payload;
+        let payload;
+        switch (authType) {
+          case "Anon":
+            if (!allowAnonymous) {
+              throw response_default.generateError(403, ErrorTypes_default.ANONYMOUS_SESSION_NOT_ALLOWED, true, true);
+            }
+            payload = await this.verifyAnonymousToken(token);
+            break;
+          case "User":
+            payload = await this.verifyToken(token);
+            break;
+          case "System":
+            break;
+          default:
+            throw response_default.generateError(403, ErrorTypes_default.INVALID_AUTH_TYPE, true, true);
+        }
+        res.locals.auth = {
+          authType,
+          token,
+          ...payload
+        };
         next();
       } catch (error) {
         Logger_default.logError("AuthMiddleware", import_util2.default.inspect(error));
@@ -565,5 +634,6 @@ var fetch_default = Fetch;
   Fetch,
   Logger,
   ResponseUtility,
-  Schema
+  Schema,
+  Utils
 });

package/dist/index.mjs

@@ -383,13 +383,16 @@ var Schema = {
 var Schema_default = Schema;
 
 // src/Auth/index.ts
-import { EncryptJWT, jwtDecrypt } from "jose";
+import { EncryptJWT, importPKCS8, importSPKI, jwtDecrypt, jwtVerify, SignJWT } from "jose";
 import util2 from "util";
 
 // src/enums/ErrorTypes.ts
 var ErrorTypes_default = Object.freeze({
+  INVALID_UUID: "Invalid UUID",
   INVALID_TOKEN: "Invalid Token",
   TOKEN_EXPIRED: "Token Expired",
+  INVALID_AUTH_TYPE: "Invalid Authorization Type",
+  ANONYMOUS_SESSION_NOT_ALLOWED: "Anonymous Session Not Allowed",
   INTERNAL_SERVER_ERROR: "Internal Server Error"
 });
 
@@ -411,6 +414,31 @@ var Logger = {
 };
 var Logger_default = Logger;
 
+// src/Utils/index.ts
+import { v4 as uuidv4, v5 as uuidv5 } from "uuid";
+var Utils_default = {
+  isUUID: (value) => {
+    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+    return uuidRegex.test(value);
+  },
+  generateUUID: (value, namespace) => {
+    if (namespace && value) {
+      return uuidv5(value, namespace);
+    }
+    return uuidv4();
+  },
+  generateSearchId: (key, variantId) => {
+    return `${key}#${variantId}`;
+  },
+  getKeyfromSearchId: (searchId) => {
+    const [key, variantId] = searchId.split("#");
+    return {
+      key,
+      variantId
+    };
+  }
+};
+
 // src/Utils/response.ts
 var ResponseUtility = {
   handleException: (functionName, error, res) => {
@@ -447,14 +475,35 @@ var ResponseUtility = {
 var response_default = ResponseUtility;
 
 // src/Auth/index.ts
+import assert from "assert";
 var AuthUtility = class {
   secretToken;
   maxTokenAge;
-  constructor({ secret, maxTokenAge = "30 days" }) {
+  anonymousPrivateKey;
+  anonymousPublicKey;
+  constructor({ secret = "", maxTokenAge = "30 days", anonymousPrivateKey = "", anonymousPublicKey = "" }) {
     this.secretToken = secret;
     this.maxTokenAge = maxTokenAge;
+    this.anonymousPrivateKey = anonymousPrivateKey;
+    this.anonymousPublicKey = anonymousPublicKey;
+  }
+  async createAnonymousToken(id, additionalData) {
+    assert(Utils_default.isUUID(id), ErrorTypes_default.INVALID_UUID);
+    const payload = {
+      id,
+      ...additionalData
+    };
+    const privateKey = await importPKCS8(this.anonymousPrivateKey, "RS256");
+    const token = await new SignJWT(payload).setProtectedHeader({ alg: "RS256" }).setExpirationTime(this.maxTokenAge).setIssuedAt().sign(privateKey);
+    return token;
+  }
+  async verifyAnonymousToken(token) {
+    const publicKey = await importSPKI(this.anonymousPublicKey, "RS256");
+    const jwt = await jwtVerify(token, publicKey, { clockTolerance: 30, maxTokenAge: this.maxTokenAge });
+    return jwt.payload;
   }
   async createToken(id, additionalData) {
+    assert(Utils_default.isUUID(id), ErrorTypes_default.INVALID_UUID);
     const payload = {
       id,
       ...additionalData
@@ -465,18 +514,37 @@ var AuthUtility = class {
   }
   async verifyToken(token) {
     const secretKey = Buffer.from(this.secretToken, "hex");
-    const jwt = await jwtDecrypt(token, secretKey, { maxTokenAge: this.maxTokenAge });
+    const jwt = await jwtDecrypt(token, secretKey, { clockTolerance: 30, maxTokenAge: this.maxTokenAge });
     return jwt.payload;
   }
-  AuthMiddleware() {
+  AuthMiddleware(allowAnonymous) {
     return async (req, res, next) => {
       try {
-        const token = req.get("Authorization")?.split(" ")?.[1];
+        const [authType, token] = req.get("Authorization")?.split(" ");
         if (!token) {
           throw new Error(ErrorTypes_default.INVALID_TOKEN);
         }
-        const payload = await this.verifyToken(token);
-        res.locals.auth = payload;
+        let payload;
+        switch (authType) {
+          case "Anon":
+            if (!allowAnonymous) {
+              throw response_default.generateError(403, ErrorTypes_default.ANONYMOUS_SESSION_NOT_ALLOWED, true, true);
+            }
+            payload = await this.verifyAnonymousToken(token);
+            break;
+          case "User":
+            payload = await this.verifyToken(token);
+            break;
+          case "System":
+            break;
+          default:
+            throw response_default.generateError(403, ErrorTypes_default.INVALID_AUTH_TYPE, true, true);
+        }
+        res.locals.auth = {
+          authType,
+          token,
+          ...payload
+        };
         next();
       } catch (error) {
         Logger_default.logError("AuthMiddleware", util2.inspect(error));
@@ -537,6 +605,7 @@ export {
   Dynamodb_default as DynamoDB,
   fetch_default as Fetch,
   Logger_default as Logger,
-  response_default as ResponseUtility,
-  Schema_default as Schema
+  Utils_default as ResponseUtility,
+  Schema_default as Schema,
+  Utils_default as Utils
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "b23-lib",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "This repo hold common classes, type and util functiona",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@aws-sdk/client-dynamodb": "^3.620.0",
     "@aws-sdk/util-dynamodb": "^3.620.0",
-    "jose": "^5.9.6",
+    "jose": "^5.6.3",
     "util": "^0.12.5"
   },
   "devDependencies": {