chyz 1.0.12-rc.24 → 1.0.12-rc.28

package/dist/web/User.js.map

@@ -1 +1 @@
-{"version":3,"file":"User.js","sourceRoot":"","sources":["../../web/User.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,2DAAmC;AACnC,iDAA4C;AAC5C,2EAAsE;AACtE,2EAAsE;AAGtE,MAAa,IAAK,SAAQ,qBAAS;IAS/B,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ,CAAC,KAAK;QACd,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IAC3B,CAAC;IAEM,IAAI;QACP,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,MAAM,IAAI,+CAAsB,CAAC,kCAAkC,CAAC,CAAC;SACxE;QAGD,IAAI,CAAC,aAAa,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;IAElD,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAE;IACxC,CAAC;IAEM,WAAW,CAAC,SAAS,GAAG,IAAI;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAEM,aAAa;QAEhB,MAAM,IAAI,+CAAsB,CAAC,kBAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACnE,CAAC;IAGD;;;;OAIG;IACO,mBAAmB;IAE7B,CAAC;IAED;;;;OAIG;IACU,kBAAkB,CAAC,KAAU,EAAE,OAAW,IAAI;;YAEvD,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YAChC,IAAI,CAAC,QAAQ,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YACnE,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAC5C,OAAO,IAAI,CAAC,QAAQ,CAAC;aACxB;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAEM,KAAK,CAAC,QAA2B,EAAE,QAAQ,GAAG,CAAC;QAElD,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE;SAEhD;QACD,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAA;IAC7B,CAAC;IAEM,WAAW,CAAC,QAAa,EAAE,WAAoB,EAAE,QAAgB;QAEpE,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU;IAEjB,CAAC;CACJ;AAnFD,oBAmFC"}
+{"version":3,"file":"User.js","sourceRoot":"","sources":["../../web/User.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,2DAAmC;AACnC,iDAA4C;AAC5C,2EAAsE;AACtE,2EAAsE;AAGtE,MAAa,IAAK,SAAQ,qBAAS;IAS/B,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ,CAAC,KAAK;QACd,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IAC3B,CAAC;IAEM,IAAI;QACP,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,MAAM,IAAI,+CAAsB,CAAC,kCAAkC,CAAC,CAAC;SACxE;QAGD,IAAI,CAAC,aAAa,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;IAElD,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC;IACvC,CAAC;IAEM,WAAW,CAAC,SAAS,GAAG,IAAI;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAEM,aAAa;QAEhB,MAAM,IAAI,+CAAsB,CAAC,kBAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACnE,CAAC;IAGD;;;;OAIG;IACO,mBAAmB;IAE7B,CAAC;IAED;;;;OAIG;IACU,kBAAkB,CAAC,KAAU,EAAE,OAAY,IAAI;;YAExD,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YAChC,IAAI,MAAM,CAAC,yBAAyB,EAAE;gBAClC,IAAI,CAAC,QAAQ,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBACnE,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;oBAC5C,OAAO,IAAI,CAAC,QAAQ,CAAC;iBACxB;aACJ;iBAAI;gBACD,kBAAQ,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAA;aACjE;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAEM,KAAK,CAAC,QAA2B,EAAE,QAAQ,GAAG,CAAC;QAElD,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE;SAEhD;QACD,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAA;IAC7B,CAAC;IAEM,WAAW,CAAC,QAAa,EAAE,WAAoB,EAAE,QAAgB;QAEpE,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU;IAEjB,CAAC;CACJ;AAvFD,oBAuFC"}

package/filters/auth/JwtHttpBearerAuth.ts

@@ -21,6 +21,7 @@ export class JwtHttpBearerAuth extends HttpBearerAuth {
     public jwt = 'jwt'
     public auth:any = null;
 
+
     /**
      * @throws InvalidConfigException
      */
@@ -39,17 +40,14 @@ export class JwtHttpBearerAuth extends HttpBearerAuth {
     {
 
         let autHeader = this.getHeaderByKey(request.headers, this.header)
-
         if (autHeader == null || (autHeader = this.patternCheck(autHeader, this.pattern)) == null) {
             return null;
         }
 
         BaseChyz.debug("JSON Web Token.",autHeader);
-
         let identity = null;
         let token = null;
 
-
         token = JsonWebToken.decode(autHeader[1], {complete: true})
         if (!token) {
             BaseChyz.warning("Your request was made with invalid or expired JSON Web Token.");

package/filters/auth/KeyCloakHttpBearerAuth.ts

@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ * E-mail: cihan@chy.com.tr
+ * Github:https://github.com/cihan53/
+ */
+import BaseChyz from "../../BaseChyz";
+import {HttpBearerAuth} from "./HttpBearerAuth";
+import {InvalidConfigException} from "../../base/InvalidConfigException";
+import {UnauthorizedHttpException} from "../../base/UnauthorizedHttpException";
+import {Response, Request} from "express";
+import {User} from "../../web/User";
+
+const JsonWebToken = require("jsonwebtoken");
+
+export class KeyCloakHttpBearerAuth extends HttpBearerAuth {
+    /**
+     * @var string|array<string, mixed>|Jwt application component ID of the JWT handler, configuration array, or JWT handler object
+     * itself. By default it's assumes that component of ID "jwt" has been configured.
+     */
+    public jwt = 'jwt'
+    public auth: any = null;
+    public keycloak: any = null;
+
+
+    /**
+     * @throws InvalidConfigException
+     */
+    public init(): void {
+        super.init();
+
+        if (!this.pattern) {
+            throw new InvalidConfigException('You must provide pattern to use to extract the HTTP authentication value!');
+        }
+
+        this.keycloak = BaseChyz.getMiddlewares("keycloak").keycloak ?? null;
+        this.user = BaseChyz.getComponent("user") ?? null;
+        this.auth = this.KeyCloakCheck;
+
+
+    }
+
+    public async KeyCloakCheck(token: string, request: Request, response: Response,) {
+        if (this.keycloak == null) return false;
+        // return await this.keycloak.protect('realm:user')(request, response, () => true /*next*/)
+        return await this.keycloak.protect()(request, response, () => true /*next*/);
+    }
+
+
+    public async authenticate(user: User, request: Request, response: Response) // BC signature
+    {
+
+        let identity = null;
+        let token = null;
+
+        let autHeader = this.getHeaderByKey(request.headers, this.header)
+        if (autHeader == null || (autHeader = this.patternCheck(autHeader, this.pattern)) == null) {
+            return null;
+        }
+
+        token = JsonWebToken.decode(autHeader[1], {complete: true})
+        if (!token) {
+            BaseChyz.warning("Your request was made with invalid or expired JSON Web Token.");
+            this.fail(response);
+        }
+
+        if (token !== null) {
+            identity = await this.KeyCloakCheck(autHeader[1], request, response)
+            BaseChyz.debug("KeyCloakCheck Result:", identity)
+        }
+
+        if (identity == null || identity == false) this.fail(response)
+
+        return identity;
+
+        /* let autHeader = this.getHeaderByKey(request.headers, this.header)
+         if (autHeader == null || (autHeader = this.patternCheck(autHeader, this.pattern)) == null) {
+             return null;
+         }
+
+         BaseChyz.debug("JSON Web Token.",autHeader);
+         let identity = null;
+         let token = null;
+
+         token = JsonWebToken.decode(autHeader[1], {complete: true})
+         if (!token) {
+             BaseChyz.warning("Your request was made with invalid or expired JSON Web Token.");
+             this.fail(response);
+         }
+
+         if (token !== null) {
+             if (this.auth != null) {
+                 identity = await this.auth(autHeader[1])
+             } else {
+                 identity = await user.loginByAccessToken(autHeader[1], "JwtHttpBearerAuth")
+             }
+         }
+
+         if (identity == null) this.fail(response)
+
+
+
+         return identity;*/
+    }
+
+
+    /**
+     * @throws UnauthorizedHttpException
+     */
+    public fail(response: Response): void {
+        // this.challenge(response)
+        // this.handleFailure(response);
+    }
+
+}

package/index.ts

@@ -1,12 +1,28 @@
 export {Request, Response, NextFunction} from "express";
-export * from "./base";
-export * from "./filters";
-export * from "./filters/auth";
-export * from "./decorator";
-export * from "./requiments/Utils";
+export {
+    ActionFilter,
+    BaseObject,
+    BaseError,
+    Behavior,
+    Component,
+    Configurable,
+    Controller,
+    DbConnection,
+    ForbiddenHttpException,
+    InvalidConfigException,
+    NotFoundHttpException,
+    UnauthorizedHttpException,
+    DataErrorDbException,
+    ValidationHttpException,
+    Model,
+    RestClient
+} from "./base";
+export {AccessControl, AccessRule} from "./filters";
+export {JwtHttpBearerAuth, HttpBearerAuth, HttpHeaderAuth} from "./filters/auth";
+export {controller, get, post} from "./decorator";
+export * as  Utils from "./requiments/Utils";
 export {RouteDefinition} from "./model/RouteDefinition";
 export {User} from "./web/User";
-
 import BaseChyz from "./BaseChyz";
 export {BaseChyz}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chyz",
-  "version": "1.0.12-rc.24",
+  "version": "1.0.12-rc.28",
   "description": "Nodejs MicroServis Framework",
   "main": "dist/index.js",
   "scripts": {
@@ -26,6 +26,7 @@
     "body-parser": "^1.19.0",
     "dotenv-flow": "^3.2.0",
     "express": "^4.17.1",
+    "express-session": "^1.17.2",
     "glob": "^7.1.7",
     "ip": "^1.1.5",
     "jsonwebtoken": "^8.5.1",

package/web/User.ts

@@ -40,7 +40,7 @@ export class User extends Component {
     }
 
     public getIsGuest() {
-        return this.getIdentity() === null ;
+        return this.getIdentity() === null;
     }
 
     public getIdentity(autoRenew = true) {
@@ -67,12 +67,16 @@ export class User extends Component {
      * @param token
      * @param type
      */
-    public async loginByAccessToken(token: any, type:any = null) {
+    public async loginByAccessToken(token: any, type: any = null) {
 
         let $class = this.identityClass;
-        this.identity = await $class.findIdentityByAccessToken(token, type)
-        if (this.identity && this.login(this.identity)) {
-            return this.identity;
+        if ($class.findIdentityByAccessToken) {
+            this.identity = await $class.findIdentityByAccessToken(token, type)
+            if (this.identity && this.login(this.identity)) {
+                return this.identity;
+            }
+        }else{
+            BaseChyz.error("WebUser::findIdentityByAccessToken undefined")
         }
         return null;
     }