elseware-nodejs 1.5.0 → 1.5.2

package/dist/index.cjs

@@ -5307,8 +5307,8 @@ var JWTService = class {
   constructor(options) {
     this.accessSecret = options.accessSecret;
     this.refreshSecret = options.refreshSecret;
-    this.accessExpires = options.accessExpires || "15m";
-    this.refreshExpires = options.refreshExpires || "30d";
+    this.accessExpires = this.parseExpires(options.accessExpires, "15m");
+    this.refreshExpires = this.parseExpires(options.refreshExpires, "30d");
     this.nodeEnv = options.nodeEnv || "development";
     this.refreshCookieName = options.refreshCookieName || "refreshJwt";
   }
@@ -5348,14 +5348,18 @@ var JWTService = class {
   // Token Extraction
   // ---------------------------------
   extractToken(req) {
+    let token = null;
     if (req.headers.authorization?.startsWith("Bearer ")) {
-      return req.headers.authorization.split(" ")[1];
+      token = req.headers.authorization.split(" ")[1];
+      return token ? this.normalizeToken(token) : null;
     }
     if (req.cookies?.[this.refreshCookieName]) {
-      return req.cookies[this.refreshCookieName];
+      token = req.cookies[this.refreshCookieName];
+      return token ? this.normalizeToken(token) : null;
     }
     if (req.cookies?.jwt) {
-      return req.cookies.jwt;
+      token = req.cookies.jwt;
+      return token ? this.normalizeToken(token) : null;
     }
     return null;
   }
@@ -5388,6 +5392,25 @@ var JWTService = class {
     this.setRefreshTokenCookie(res, refreshToken);
     return accessToken;
   }
+  // ---------------------------------
+  // Internal Helpers
+  // ---------------------------------
+  normalizeToken(token) {
+    token = token.trim();
+    if (token.startsWith('"') && token.endsWith('"')) {
+      try {
+        return JSON.parse(token);
+      } catch {
+        return token.slice(1, -1);
+      }
+    }
+    return token;
+  }
+  parseExpires(value, fallback) {
+    if (!value) return fallback;
+    if (typeof value === "number") return value;
+    return value;
+  }
 };
 
 // src/utils/time.ts