@grandlinex/kernel 0.22.0 → 0.23.1

package/dist/actions/ApiAuthTestAction.d.ts

@@ -1,6 +1,6 @@
 import e from 'express';
 import { IBaseKernelModule } from '../lib';
-import { BaseApiAction } from '../classes';
+import { BaseApiAction, JwtToken } from '../classes';
 /**
  * @name ApiAuthTestAction
  *
@@ -23,5 +23,5 @@ import { BaseApiAction } from '../classes';
  */
 export default class ApiAuthTestAction extends BaseApiAction {
     constructor(module: IBaseKernelModule<any, any, any, any>);
-    handler(req: e.Request, res: e.Response, next: () => void): Promise<void>;
+    handler(req: e.Request, res: e.Response, next: () => void, data: JwtToken): Promise<void>;
 }

package/dist/actions/ApiAuthTestAction.js

@@ -79,9 +79,10 @@ var ApiAuthTestAction = /** @class */ (function (_super) {
         _this.handler = _this.handler.bind(_this);
         return _this;
     }
-    ApiAuthTestAction.prototype.handler = function (req, res, next) {
+    ApiAuthTestAction.prototype.handler = function (req, res, next, data) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
+                this.debug(data.userid);
                 res.status(200).send("It work's");
                 return [2 /*return*/];
             });

package/dist/actions/GetTokenAction.js

@@ -98,7 +98,7 @@ var GetTokenAction = /** @class */ (function (_super) {
     }
     GetTokenAction.prototype.handler = function (req, res, next) {
         return __awaiter(this, void 0, void 0, function () {
-            var cc, _a, username, token, jwt;
+            var cc, _a, username, token, valid, jwt;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -114,8 +114,10 @@ var GetTokenAction = /** @class */ (function (_super) {
                         _a = req.body, username = _a.username, token = _a.token;
                         return [4 /*yield*/, cc.apiTokenValidation(username, token, 'api')];
                     case 1:
-                        if (_b.sent()) {
+                        valid = _b.sent();
+                        if (valid.valid && valid.userId) {
                             jwt = cc.jwtGenerateAccessToken({
+                                userid: valid.userId,
                                 username: username,
                             });
                             res.status(200).send({ token: jwt });

package/dist/classes/BaseAuthProvider.d.ts

@@ -1,16 +1,23 @@
 import { Request } from 'express';
-export interface JwtToken {
+export interface JwtTokenData {
+    username: string;
+    userid: string;
+}
+export interface JwtToken extends JwtTokenData {
     exp: number;
     iat: number;
-    username: string;
 }
+export declare type AuthResult = {
+    valid: boolean;
+    userId: string | null;
+};
 export interface IAuthProvider {
-    authorizeToken(username: string, token: any, requestType: string): Promise<boolean>;
+    authorizeToken(userid: string, token: string, requestType: string): Promise<AuthResult>;
     validateAccess(token: JwtToken, requestType: string): Promise<boolean>;
     bearerTokenValidation(req: Request): Promise<JwtToken | null>;
 }
 export default abstract class BaseAuthProvider implements IAuthProvider {
-    abstract authorizeToken(username: string, token: any, requestType: string): Promise<boolean>;
+    abstract authorizeToken(username: string, token: string, requestType: string): Promise<AuthResult>;
     abstract validateAccess(token: JwtToken, requestType: string): Promise<boolean>;
     abstract bearerTokenValidation(req: Request): Promise<JwtToken | null>;
 }

package/dist/classes/index.d.ts

@@ -4,4 +4,5 @@ import BaseEndpoint from './BaseEndpoint';
 import BaseKernelModule from './BaseKernelModule';
 import BaseApiAction from './BaseApiAction';
 import BaseAuthProvider from './BaseAuthProvider';
+export * from './BaseAuthProvider';
 export { BaseLoopService, BaseAuthProvider, BaseKernelModule, BaseService, BaseApiAction, BaseEndpoint, BaseElement, BaseCache, BaseAction, BaseClient, BaseBridge, };

package/dist/classes/index.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -21,3 +35,4 @@ var BaseApiAction_1 = __importDefault(require("./BaseApiAction"));
 exports.BaseApiAction = BaseApiAction_1.default;
 var BaseAuthProvider_1 = __importDefault(require("./BaseAuthProvider"));
 exports.BaseAuthProvider = BaseAuthProvider_1.default;
+__exportStar(require("./BaseAuthProvider"), exports);

package/dist/lib/index.d.ts

@@ -9,7 +9,10 @@ export interface ICClient extends ICoreCClient {
     jwtGenerateAccessToken(data: {
         username: string;
     }): string;
-    apiTokenValidation(username: string, token: string, requestType: string): Promise<boolean>;
+    apiTokenValidation(username: string, token: string, requestType: string): Promise<{
+        valid: boolean;
+        userId: string | null;
+    }>;
     permissionValidation(token: JwtToken, requestType: string): Promise<boolean>;
     bearerTokenValidation(req: Request): Promise<JwtToken | null>;
 }

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

@@ -1,17 +1,19 @@
 import { Request } from 'express';
 import { CoreCryptoClient } from '@grandlinex/core';
 import { ICClient, IKernel } from '../../lib';
-import { IAuthProvider, JwtToken } from '../../classes/BaseAuthProvider';
+import { IAuthProvider, JwtToken, JwtTokenData } from '../../classes/BaseAuthProvider';
 export default class CryptoClient extends CoreCryptoClient implements ICClient {
     protected authProvider: IAuthProvider | null;
     protected kernel: IKernel;
+    protected expiresIn: string;
     constructor(key: string, kernel: IKernel);
     setAuthProvider(provider: IAuthProvider): boolean;
     jwtVerifyAccessToken(token: string): Promise<JwtToken | null>;
-    jwtGenerateAccessToken(data: {
-        username: string;
-    }): string;
-    apiTokenValidation(username: string, token: string, requestType: string): Promise<boolean>;
+    jwtGenerateAccessToken(data: JwtTokenData): string;
+    apiTokenValidation(username: string, token: string, requestType: string): Promise<{
+        valid: boolean;
+        userId: string | null;
+    }>;
     permissionValidation(token: JwtToken, requestType: string): Promise<boolean>;
     bearerTokenValidation(req: Request): Promise<JwtToken | null>;
 }

package/dist/modules/crypto/CryptoClient.js

@@ -62,6 +62,7 @@ var CryptoClient = /** @class */ (function (_super) {
         var _this = _super.call(this, kernel, key) || this;
         _this.kernel = kernel;
         _this.authProvider = null;
+        _this.expiresIn = kernel.getConfigStore().get('JWT_EXPIRE') || '1 days';
         return _this;
     }
     CryptoClient.prototype.setAuthProvider = function (provider) {
@@ -85,7 +86,7 @@ var CryptoClient = /** @class */ (function (_super) {
         });
     };
     CryptoClient.prototype.jwtGenerateAccessToken = function (data) {
-        return jsonwebtoken_1.default.sign(data, this.AesKey, { expiresIn: '1 days' });
+        return jsonwebtoken_1.default.sign(data, this.AesKey, { expiresIn: this.expiresIn });
     };
     CryptoClient.prototype.apiTokenValidation = function (username, token, requestType) {
         return __awaiter(this, void 0, void 0, function () {
@@ -96,9 +97,18 @@ var CryptoClient = /** @class */ (function (_super) {
                 }
                 store = this.kernel.getConfigStore();
                 if (!store.has('SERVER_PASSWORD')) {
-                    return [2 /*return*/, false];
+                    return [2 /*return*/, { valid: false, userId: null }];
                 }
-                return [2 /*return*/, token === store.get('SERVER_PASSWORD') && username === 'admin'];
+                if (token === store.get('SERVER_PASSWORD') && username === 'admin') {
+                    return [2 /*return*/, {
+                            valid: true,
+                            userId: 'admin',
+                        }];
+                }
+                return [2 /*return*/, {
+                        valid: false,
+                        userId: null,
+                    }];
             });
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grandlinex/kernel",
-  "version": "0.22.0",
+  "version": "0.23.1",
   "description": "GrandLineX is an out-of-the-box server framework on top of ExpressJs.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
   },
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@grandlinex/core": "^0.22.0",
+    "@grandlinex/core": "^0.23.2",
     "axios": "^0.24.0",
     "body-parser": "^1.19.1",
     "express": "^4.17.2",