expresso-macchiato 1.0.0-dev.5 → 1.0.0-dev.7

package/dist/index.d.mts

@@ -503,7 +503,7 @@ declare class Token<Payload extends Record<string, any> = DefaultTokenPayload> {
     private keyStore;
     constructor(tokenPayload: TokenConstructor);
     private getKey;
-    authorize: (req: Request | string) => Promise<Payload>;
+    authorize(req: Request): Promise<Payload>;
     private deriveEncryptionKey;
     generateJWE(payload: Payload): Promise<string>;
     verifyJWE(token: string): Promise<Payload>;

package/dist/index.d.ts

@@ -503,7 +503,7 @@ declare class Token<Payload extends Record<string, any> = DefaultTokenPayload> {
     private keyStore;
     constructor(tokenPayload: TokenConstructor);
     private getKey;
-    authorize: (req: Request | string) => Promise<Payload>;
+    authorize(req: Request): Promise<Payload>;
     private deriveEncryptionKey;
     generateJWE(payload: Payload): Promise<string>;
     verifyJWE(token: string): Promise<Payload>;

package/dist/index.js

@@ -884,25 +884,6 @@ var _nodejose = require('node-jose'); var _nodejose2 = _interopRequireDefault(_n
 var Token = class {
   constructor(tokenPayload) {
     this.keyStore = null;
-    // Metodo per autorizzare una richiesta
-    this.authorize = async (req) => {
-      if (typeof req === "string") {
-        const payload = await this.verifyJWE(req);
-        return payload;
-      } else if (this.TOKEN_COOKIE_NAME) {
-        const rawCookies = _nullishCoalesce(req.headers.cookie, () => ( ""));
-        const cookies = _cookie.parse.call(void 0, rawCookies);
-        const cookieToken = _nullishCoalesce(cookies[this.TOKEN_COOKIE_NAME], () => ( null));
-        if (cookieToken === null) throw new Error("UNAUTH");
-        const payload = await this.verifyJWE(cookieToken);
-        return payload;
-      } else {
-        const token = _nullishCoalesce(_optionalChain([req, 'access', _56 => _56.headers, 'access', _57 => _57.authorization, 'optionalAccess', _58 => _58.split, 'call', _59 => _59("Bearer "), 'optionalAccess', _60 => _60[1]]), () => ( null));
-        if (token === null) throw new Error("UNAUTH");
-        const payload = await this.verifyJWE(token);
-        return payload;
-      }
-    };
     if (!tokenPayload.SECRET_KEY) throw new Error("SECRET_KEY is required if you want to use the Token Class");
     this.SECRET_KEY = tokenPayload.SECRET_KEY;
     this.TOKEN_COOKIE_NAME = tokenPayload.TOKEN_COOKIE_NAME;
@@ -923,6 +904,22 @@ var Token = class {
     }
     return this.keyStore.all({ use: "enc" })[0];
   }
+  // Metodo per autorizzare una richiesta
+  async authorize(req) {
+    if (this.TOKEN_COOKIE_NAME) {
+      const rawCookies = _nullishCoalesce(req.headers.cookie, () => ( ""));
+      const cookies = _cookie.parse.call(void 0, rawCookies);
+      const cookieToken = _nullishCoalesce(cookies[this.TOKEN_COOKIE_NAME], () => ( null));
+      if (cookieToken === null) throw new Error("UNAUTH");
+      const payload = await this.verifyJWE(cookieToken);
+      return payload;
+    } else {
+      const token = _nullishCoalesce(_optionalChain([req, 'access', _56 => _56.headers, 'access', _57 => _57.authorization, 'optionalAccess', _58 => _58.split, 'call', _59 => _59("Bearer "), 'optionalAccess', _60 => _60[1]]), () => ( null));
+      if (token === null) throw new Error("UNAUTH");
+      const payload = await this.verifyJWE(token);
+      return payload;
+    }
+  }
   // Metodo per derivare chiave di cifratura
   deriveEncryptionKey() {
     return _crypto2.default.createHash("sha256").update(this.SECRET_KEY).digest().slice(0, this.KeyLength);

package/dist/index.mjs

@@ -884,25 +884,6 @@ import jose from "node-jose";
 var Token = class {
   constructor(tokenPayload) {
     this.keyStore = null;
-    // Metodo per autorizzare una richiesta
-    this.authorize = async (req) => {
-      if (typeof req === "string") {
-        const payload = await this.verifyJWE(req);
-        return payload;
-      } else if (this.TOKEN_COOKIE_NAME) {
-        const rawCookies = req.headers.cookie ?? "";
-        const cookies = parse(rawCookies);
-        const cookieToken = cookies[this.TOKEN_COOKIE_NAME] ?? null;
-        if (cookieToken === null) throw new Error("UNAUTH");
-        const payload = await this.verifyJWE(cookieToken);
-        return payload;
-      } else {
-        const token = req.headers.authorization?.split("Bearer ")?.[1] ?? null;
-        if (token === null) throw new Error("UNAUTH");
-        const payload = await this.verifyJWE(token);
-        return payload;
-      }
-    };
     if (!tokenPayload.SECRET_KEY) throw new Error("SECRET_KEY is required if you want to use the Token Class");
     this.SECRET_KEY = tokenPayload.SECRET_KEY;
     this.TOKEN_COOKIE_NAME = tokenPayload.TOKEN_COOKIE_NAME;
@@ -923,6 +904,22 @@ var Token = class {
     }
     return this.keyStore.all({ use: "enc" })[0];
   }
+  // Metodo per autorizzare una richiesta
+  async authorize(req) {
+    if (this.TOKEN_COOKIE_NAME) {
+      const rawCookies = req.headers.cookie ?? "";
+      const cookies = parse(rawCookies);
+      const cookieToken = cookies[this.TOKEN_COOKIE_NAME] ?? null;
+      if (cookieToken === null) throw new Error("UNAUTH");
+      const payload = await this.verifyJWE(cookieToken);
+      return payload;
+    } else {
+      const token = req.headers.authorization?.split("Bearer ")?.[1] ?? null;
+      if (token === null) throw new Error("UNAUTH");
+      const payload = await this.verifyJWE(token);
+      return payload;
+    }
+  }
   // Metodo per derivare chiave di cifratura
   deriveEncryptionKey() {
     return crypto.createHash("sha256").update(this.SECRET_KEY).digest().slice(0, this.KeyLength);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expresso-macchiato",
-  "version": "1.0.0-dev.5",
+  "version": "1.0.0-dev.7",
   "author": "Alessio Velluso",
   "license": "MIT",
   "description": "Description",