dff-util 1.1.1 → 1.1.2

package/dist/main/jwt-util.d.ts

@@ -5,20 +5,20 @@
  * @param expiresIn
  * @returns
  */
-export declare const JwtEncode: (data: any, secret: string, expiresIn?: number) => Promise<string>;
+export declare const JwtEncode: (data: any, secret: string, expiresIn?: number) => string;
 /**
  * Verify JWT token with secret
  * @param token
  * @param secret
  * @returns
  */
-export declare const JwtVerify: (token: string, secret: string) => Promise<import("jose").JWTPayload>;
+export declare const JwtVerify: (token: string, secret: string) => any;
 /**
  * Decode JWT Token without verification
  * @param token
  * @returns
  */
-export declare const JwtDecode: (token: string) => import("jose").JWTPayload;
+export declare const JwtDecode: (token: string) => import("jwt-decode").JwtPayload;
 /**
  * Check if token is expired or not
  * @param token

package/dist/main/jwt-util.js

@@ -1,16 +1,11 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JwtValid = exports.JwtDecode = exports.JwtVerify = exports.JwtEncode = void 0;
-const jose_1 = require("jose");
+const jwt_encode_1 = __importDefault(require("jwt-encode"));
+const jwt_decode_1 = require("jwt-decode");
 /**
  * Encode JWT Token with secret key, expiresIn in seconds (86400 = 1 day) default
  * @param data
@@ -18,14 +13,18 @@ const jose_1 = require("jose");
  * @param expiresIn
  * @returns
  */
-const JwtEncode = (data_1, secret_1, ...args_1) => __awaiter(void 0, [data_1, secret_1, ...args_1], void 0, function* (data, secret, expiresIn = 86400) {
-    const secretKey = new TextEncoder().encode(secret);
-    const token = yield new jose_1.SignJWT(data)
-        .setProtectedHeader({ alg: 'HS256' })
-        .setExpirationTime(`${expiresIn}s`)
-        .sign(secretKey);
-    return token;
-});
+const JwtEncode = (data, secret, expiresIn = 86400) => {
+    try {
+        const exp = Math.floor(Date.now() / 1000) + expiresIn;
+        const payload = Object.assign(Object.assign({}, data), { exp });
+        const token = (0, jwt_encode_1.default)(payload, secret);
+        return token;
+    }
+    catch (err) {
+        console.error('Error encoding JWT:', err);
+        throw new Error('Error encoding JWT');
+    }
+};
 exports.JwtEncode = JwtEncode;
 /**
  * Verify JWT token with secret
@@ -33,24 +32,32 @@ exports.JwtEncode = JwtEncode;
  * @param secret
  * @returns
  */
-const JwtVerify = (token, secret) => __awaiter(void 0, void 0, void 0, function* () {
+const JwtVerify = (token, secret) => {
     if (token) {
         try {
             token = token.replace(/jwt |JWT |Bearer |bearer |BEARER /g, '');
-            const secretKey = new TextEncoder().encode(secret);
-            const { payload } = yield (0, jose_1.jwtVerify)(token, secretKey, {
-                algorithms: ['HS256'],
-            });
-            return payload;
+            const decoded = (0, jwt_decode_1.jwtDecode)(token);
+            const currentTime = Math.floor(Date.now() / 1000);
+            // Check if token is expired
+            if (decoded.exp && decoded.exp < currentTime) {
+                throw new Error('Token has expired');
+            }
+            // Since `jwt-encode` doesn't provide signature verification, manually check if the payload matches.
+            const regeneratedToken = (0, jwt_encode_1.default)(decoded, secret);
+            if (token !== regeneratedToken) {
+                throw new Error('Token is not valid');
+            }
+            return decoded;
         }
         catch (err) {
-            throw { name: 'error', message: 'Token is not valid' };
+            console.error('Invalid JWT:', err);
+            throw new Error('Token is not valid');
         }
     }
     else {
-        throw { name: 'error', message: 'Auth token is not supplied' };
+        throw new Error('Auth token is not supplied');
     }
-});
+};
 exports.JwtVerify = JwtVerify;
 /**
  * Decode JWT Token without verification
@@ -61,15 +68,16 @@ const JwtDecode = (token) => {
     if (token) {
         try {
             token = token.replace(/jwt |JWT |Bearer |bearer |BEARER /g, '');
-            return (0, jose_1.decodeJwt)(token);
+            const decoded = (0, jwt_decode_1.jwtDecode)(token);
+            return decoded;
         }
         catch (err) {
-            console.error(err);
-            throw { name: 'error', message: 'Token is not valid' };
+            console.error('Error decoding JWT:', err);
+            throw new Error('Token is not valid');
         }
     }
     else {
-        throw { name: 'error', message: 'Auth token is not supplied' };
+        throw new Error('Auth token is not supplied');
     }
 };
 exports.JwtDecode = JwtDecode;
@@ -83,12 +91,9 @@ const JwtValid = (token) => {
         if (!token) {
             return false;
         }
-        const payload = (0, jose_1.decodeJwt)(token);
+        const decoded = (0, jwt_decode_1.jwtDecode)(token);
         const currentTime = Math.floor(Date.now() / 1000);
-        if (payload.exp && payload.exp < currentTime) {
-            return false;
-        }
-        return true;
+        return !(decoded.exp && decoded.exp < currentTime);
     }
     catch (error) {
         console.error('Invalid JWT:', error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dff-util",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -17,13 +17,15 @@
   "license": "ISC",
   "description": "DesignForFeature Utilities",
   "devDependencies": {
+    "@types/jwt-encode": "^1.0.3",
     "@types/node": "^22.10.5",
     "@types/randomstring": "^1.3.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.2"
   },
   "dependencies": {
-    "jose": "^5.9.6",
+    "jwt-decode": "^4.0.0",
+    "jwt-encode": "^1.0.1",
     "randomstring": "1.3.0"
   }
 }