@grandlinex/kernel 0.31.0 → 0.32.0

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [v0.31.1] - 2023-07-07
+### Added
+- @/token pass the token body to jwt generator function
+### Fixed
+- Deal with code smells 
+
 ## [v0.31.0] - 2023-07-06
 ### Added
 - JTW Token now can be extended with custom payload

package/dist/cjs/actions/GetTokenAction.js

@@ -27,7 +27,7 @@ class GetTokenAction extends index_js_1.BaseApiAction {
             const jwt = await cc.jwtGenerateAccessToken({
                 userid: valid.userId,
                 username,
-            });
+            }, req.body);
             ex.done();
             res.status(200).send({ token: jwt });
         }

package/dist/cjs/classes/BaseAuthProvider.d.ts

@@ -13,11 +13,11 @@ export interface IAuthProvider<T extends JwtExtend> {
     authorizeToken(userid: string, token: string, requestType: string): Promise<AuthResult>;
     validateAccess(token: JwtToken<T>, requestType: string): Promise<boolean>;
     bearerTokenValidation(req: XRequest): Promise<JwtToken<T> | number>;
-    jwtAddData(token: JwtToken<T>): Promise<JwtToken<T>>;
+    jwtAddData(token: JwtToken<T>, extend?: Record<string, any>): Promise<JwtToken<T>>;
 }
 export default abstract class BaseAuthProvider<T extends JwtExtend = JwtExtend> implements IAuthProvider<T> {
     abstract authorizeToken(username: string, token: string, requestType: string): Promise<AuthResult>;
     abstract validateAccess(token: JwtToken<T>, requestType: string): Promise<boolean>;
     abstract bearerTokenValidation(req: XRequest): Promise<JwtToken<T> | number>;
-    jwtAddData(token: JwtToken<T>): Promise<JwtToken<T>>;
+    jwtAddData(token: JwtToken<T>, extend?: Record<string, any>): Promise<JwtToken<T>>;
 }

package/dist/cjs/classes/BaseAuthProvider.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class BaseAuthProvider {
-    async jwtAddData(token) {
+    async jwtAddData(token, extend) {
         return token;
     }
 }

package/dist/cjs/classes/timing/ServerTiming.js

@@ -18,7 +18,7 @@ class ServerTiming {
         return content;
     }
     completeElement(e) {
-        const cur = this.map.get(e.chanel) || [];
+        const cur = this.map.get(e.chanel) ?? [];
         cur.push(e);
         this.map.set(e.chanel, cur);
     }

package/dist/cjs/lib/express.d.ts

@@ -1,6 +1,6 @@
 import express from 'express';
 export type XRequest = express.Request & {
-    rawBody?: string | null | undefined;
+    rawBody?: string | null;
 };
 export type XResponse = express.Response;
 export type XNextFc = express.NextFunction;

package/dist/cjs/lib/index.d.ts

@@ -8,7 +8,7 @@ export interface ICClient<T extends JwtExtend = JwtExtend> extends ICoreCClient
     setAuthProvider(provider: IAuthProvider<T>): boolean;
     jwtVerifyAccessToken(token: string): Promise<JwtToken<T> | number>;
     jwtDecodeAccessToken(token: string): jwt.JwtPayload | null;
-    jwtGenerateAccessToken(data: JwtToken<T>, expire?: string | number): Promise<string>;
+    jwtGenerateAccessToken(data: JwtToken<T>, extend?: Record<string, any>, expire?: string | number): Promise<string>;
     apiTokenValidation(username: string, token: string, requestType: string): Promise<{
         valid: boolean;
         userId: string | null;

package/dist/cjs/modules/crypto/CryptoClient.d.ts

@@ -10,7 +10,7 @@ export default class CryptoClient<T extends JwtExtend = JwtExtend> extends CoreC
     setAuthProvider(provider: IAuthProvider<T>): boolean;
     jwtVerifyAccessToken(token: string): Promise<JwtToken<T> | number>;
     jwtDecodeAccessToken(token: string): JwtToken<T> | null;
-    jwtGenerateAccessToken(data: JwtToken<T>, expire?: string | number): Promise<string>;
+    jwtGenerateAccessToken(data: JwtToken<T>, extend?: Record<string, any>, expire?: string | number): Promise<string>;
     apiTokenValidation(username: string, token: string, requestType: string): Promise<{
         valid: boolean;
         userId: string | null;

package/dist/cjs/modules/crypto/CryptoClient.js

@@ -59,10 +59,10 @@ class CryptoClient extends core_1.CoreCryptoClient {
         const mod = jwt.default || jwt;
         return mod.decode(token, { json: true });
     }
-    async jwtGenerateAccessToken(data, expire) {
+    async jwtGenerateAccessToken(data, extend, expire) {
         let sData;
         if (this.authProvider) {
-            sData = await this.authProvider.jwtAddData(data);
+            sData = await this.authProvider.jwtAddData(data, extend);
         }
         else {
             sData = data;
@@ -103,7 +103,7 @@ class CryptoClient extends core_1.CoreCryptoClient {
             return this.authProvider.bearerTokenValidation(req);
         }
         const authHeader = req.headers.authorization;
-        const token = authHeader && authHeader.split(' ')[1];
+        const token = authHeader?.split(' ')?.[1];
         if (!token) {
             return 401;
         }

package/dist/mjs/actions/GetTokenAction.js

@@ -25,7 +25,7 @@ export default class GetTokenAction extends BaseApiAction {
             const jwt = await cc.jwtGenerateAccessToken({
                 userid: valid.userId,
                 username,
-            });
+            }, req.body);
             ex.done();
             res.status(200).send({ token: jwt });
         }

package/dist/mjs/classes/BaseAuthProvider.d.ts

@@ -13,11 +13,11 @@ export interface IAuthProvider<T extends JwtExtend> {
     authorizeToken(userid: string, token: string, requestType: string): Promise<AuthResult>;
     validateAccess(token: JwtToken<T>, requestType: string): Promise<boolean>;
     bearerTokenValidation(req: XRequest): Promise<JwtToken<T> | number>;
-    jwtAddData(token: JwtToken<T>): Promise<JwtToken<T>>;
+    jwtAddData(token: JwtToken<T>, extend?: Record<string, any>): Promise<JwtToken<T>>;
 }
 export default abstract class BaseAuthProvider<T extends JwtExtend = JwtExtend> implements IAuthProvider<T> {
     abstract authorizeToken(username: string, token: string, requestType: string): Promise<AuthResult>;
     abstract validateAccess(token: JwtToken<T>, requestType: string): Promise<boolean>;
     abstract bearerTokenValidation(req: XRequest): Promise<JwtToken<T> | number>;
-    jwtAddData(token: JwtToken<T>): Promise<JwtToken<T>>;
+    jwtAddData(token: JwtToken<T>, extend?: Record<string, any>): Promise<JwtToken<T>>;
 }

package/dist/mjs/classes/BaseAuthProvider.js

@@ -1,5 +1,5 @@
 export default class BaseAuthProvider {
-    async jwtAddData(token) {
+    async jwtAddData(token, extend) {
         return token;
     }
 }

package/dist/mjs/classes/timing/ServerTiming.js

@@ -13,7 +13,7 @@ export default class ServerTiming {
         return content;
     }
     completeElement(e) {
-        const cur = this.map.get(e.chanel) || [];
+        const cur = this.map.get(e.chanel) ?? [];
         cur.push(e);
         this.map.set(e.chanel, cur);
     }

package/dist/mjs/lib/express.d.ts

@@ -1,6 +1,6 @@
 import express from 'express';
 export type XRequest = express.Request & {
-    rawBody?: string | null | undefined;
+    rawBody?: string | null;
 };
 export type XResponse = express.Response;
 export type XNextFc = express.NextFunction;

package/dist/mjs/lib/index.d.ts

@@ -8,7 +8,7 @@ export interface ICClient<T extends JwtExtend = JwtExtend> extends ICoreCClient
     setAuthProvider(provider: IAuthProvider<T>): boolean;
     jwtVerifyAccessToken(token: string): Promise<JwtToken<T> | number>;
     jwtDecodeAccessToken(token: string): jwt.JwtPayload | null;
-    jwtGenerateAccessToken(data: JwtToken<T>, expire?: string | number): Promise<string>;
+    jwtGenerateAccessToken(data: JwtToken<T>, extend?: Record<string, any>, expire?: string | number): Promise<string>;
     apiTokenValidation(username: string, token: string, requestType: string): Promise<{
         valid: boolean;
         userId: string | null;

package/dist/mjs/modules/crypto/CryptoClient.d.ts

@@ -10,7 +10,7 @@ export default class CryptoClient<T extends JwtExtend = JwtExtend> extends CoreC
     setAuthProvider(provider: IAuthProvider<T>): boolean;
     jwtVerifyAccessToken(token: string): Promise<JwtToken<T> | number>;
     jwtDecodeAccessToken(token: string): JwtToken<T> | null;
-    jwtGenerateAccessToken(data: JwtToken<T>, expire?: string | number): Promise<string>;
+    jwtGenerateAccessToken(data: JwtToken<T>, extend?: Record<string, any>, expire?: string | number): Promise<string>;
     apiTokenValidation(username: string, token: string, requestType: string): Promise<{
         valid: boolean;
         userId: string | null;

package/dist/mjs/modules/crypto/CryptoClient.js

@@ -34,10 +34,10 @@ export default class CryptoClient extends CoreCryptoClient {
         const mod = jwt.default || jwt;
         return mod.decode(token, { json: true });
     }
-    async jwtGenerateAccessToken(data, expire) {
+    async jwtGenerateAccessToken(data, extend, expire) {
         let sData;
         if (this.authProvider) {
-            sData = await this.authProvider.jwtAddData(data);
+            sData = await this.authProvider.jwtAddData(data, extend);
         }
         else {
             sData = data;
@@ -78,7 +78,7 @@ export default class CryptoClient extends CoreCryptoClient {
             return this.authProvider.bearerTokenValidation(req);
         }
         const authHeader = req.headers.authorization;
-        const token = authHeader && authHeader.split(' ')[1];
+        const token = authHeader?.split(' ')?.[1];
         if (!token) {
             return 401;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grandlinex/kernel",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "description": "GrandLineX is an out-of-the-box server framework on top of ExpressJs.",
   "type": "module",
   "exports": {
@@ -46,7 +46,7 @@
   },
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@grandlinex/core": "0.31.0",
+    "@grandlinex/core": "0.32.0",
     "axios": "1.4.0",
     "body-parser": "1.20.2",
     "express": "4.18.2",