chyz 1.0.13-rc.20 → 1.0.13-rc.6

package/BaseChyz.ts

@@ -9,7 +9,6 @@ import {ModelManager} from "./base";
 const express = require("express");
 const log4js = require("log4js");
 const fs = require('fs');
-const validate = require('validate.js');
 
 var ip = require('ip');
 var bodyParser = require('body-parser')
@@ -23,7 +22,6 @@ export default class BaseChyz {
     private _port: number = 3001;
     static db: any;
     static routes: any;
-    private static _validate:any=validate;
     private _logConfig: any = require('./log/config/log4js.json') ?? {}
     private _controllerpath: string = "Controllers"
     private static controllers: Array<Controller> = []
@@ -124,14 +122,6 @@ export default class BaseChyz {
     }
 
 
-    static get validate(): any {
-        return this._validate;
-    }
-
-    static set validate(value: any) {
-        this._validate = value;
-    }
-
     app(config: any = {}): BaseChyz {
 
         /**
@@ -144,14 +134,9 @@ export default class BaseChyz {
         if (components) {
             for (const componentsKey in components) {
                 let comp = components[componentsKey];
-                BaseChyz.logs().info("Create Component ", componentsKey)
-                try {
-                    BaseChyz.components[componentsKey] = Utils.createObject(new comp.class, comp);
-                    BaseChyz.components[componentsKey]?.init();
-                }catch (e) {
-                    console.error(e)
-                }
-
+                BaseChyz.debug("Create Component ", componentsKey)
+                BaseChyz.components[componentsKey] = Utils.createObject(new comp.class, comp);
+                BaseChyz.components[componentsKey]?.init();
             }
         }
 
@@ -160,7 +145,7 @@ export default class BaseChyz {
         if (middlewares) {
             for (const middlewareKey in middlewares) {
                 let middleware1 = middlewares[middlewareKey];
-                BaseChyz.logs().debug("Create middlewares ", middlewareKey)
+                BaseChyz.debug("Create middlewares ", middlewareKey)
                 BaseChyz.middlewares[middlewareKey] = middleware1;
                 // BaseChyz.middlewares[middlewareKey] = Utils.createObject(new middleware1.class, middleware1);
             }

package/Examples/Controllers/ApiController.ts

@@ -18,8 +18,7 @@ import {JwtHttpBearerAuth} from "../../filters/auth";
 
 import {ValidationHttpException} from "../../base";
 import {ForbiddenHttpException} from "../../base";
-import {ProductsClass} from "../Models/Products";
-import {AccessControl} from "../../filters";
+
 
 
 @controller("/api")
@@ -36,18 +35,22 @@ class ApiController extends Controller {
                 "class": JwtHttpBearerAuth,
                 // "auth": this.myCheck
             },
-            'access': {
-                'class': AccessControl,
-                'only': ['order/list' ],
-                'rules': [
-
-                    {
-                        'allow': true,
-                        'actions': ['order/list' ],
-                        'roles': ['edis-manager'],
-                    }
-                ]
-            }
+            // 'access': {
+            //     'class': AccessControl,
+            //     'only': ['login', 'logout', 'signup'],
+            //     'rules': [
+            //         {
+            //             'allow': true,
+            //             'actions': ['login', 'index'],
+            //             'roles': ['?'],
+            //         },
+            //         {
+            //             'allow': true,
+            //             'actions': ['logout', "logout2"],
+            //             'roles': ['@'],
+            //         }
+            //     ]
+            // }
         }]
     }
 
@@ -65,9 +68,9 @@ class ApiController extends Controller {
         data.Customer["2fa"] = "true";
 
         //Customer Model Create
-        let customer = ModelManager.Customer.save();
+        let customer  = ModelManager.Customer;
         //Order Model Create
-        let order = ModelManager.Order;
+        let order  = ModelManager.Order;
 
 
         let transaction
@@ -110,23 +113,20 @@ class ApiController extends Controller {
 
     @get("order/list")
     async listOrder(req: Request, res: Response) {
-        const {Products}: { Products: ProductsClass } = ModelManager;
-        let product = await Products.findAll( );
+        let product = await ModelManager.Products.findAll({include: [ModelManager.ProductModels.model()]});
         return res.json(product)
 
     }
 
     @get("categories")
     async Categories(req: Request, res: Response) {
-        let product = await ModelManager.Categories.findAll({
-            include: [
+        let product = await ModelManager.Categories.findAll( {include:[
                 {
                     model: ModelManager.Products.model(),
                     // as: 'product',
                     // through: { attributes: [] } // Hide unwanted `PlayerGameTeam` nested object from results
                 }
-            ]
-        });
+            ]} );
         return res.json(product)
 
     }

package/Examples/Controllers/SiteController.ts

@@ -26,12 +26,11 @@ class SiteController extends Controller {
     public myCheck(token) {
         console.log("myyyyyyyyyyyyyyyyyyyyy")
     }
-
     public behaviors(): any[] {
         return [{
             'authenticator': {
                 "class": JwtHttpBearerAuth,
-                "except": ["index", "login"]
+                "except":["index","login"]
                 // "auth": this.myCheck
             }
         }]
@@ -89,33 +88,25 @@ class SiteController extends Controller {
                 // @ts-ignore
                 let xForwardedFor = (req.headers['x-forwarded-for'] || '').replace(/:\d+$/, '');
                 let ip = xForwardedFor || req.socket.remoteAddress;
-                var source: string = req.headers['user-agent'] || '';
+                var source: string  = req.headers['user-agent'] || '';
                 if (req.headers['x-ucbrowser-ua']) {  //special case of UC Browser
-                    source = req.headers['x-ucbrowser-ua'] + "";
+                    source = req.headers['x-ucbrowser-ua']+"";
                 }
                 token = await JsonWebToken.sign({
                     user: user.id,
                     ip: ip,
                     agent: source,
-                    platform: "admin",
-                    role: [
-                        "admin"
-                    ],
-                    permissions: [
-                        "xxxx",
-
-                    ],
-                }, user.authkey, null);
+                }, user.authkey, {expiresIn: '1h'});
 
-                BaseChyz.debug("Db user create access token", username, "expiresIn", "1h")
+                BaseChyz.debug("Db user create access token", username,"expiresIn","1h")
                 return res.json({token: token})
             } else {
                 let error: any = new ForbiddenHttpException(BaseChyz.t('You are not allowed to perform this action.'))
-                res.status(500).json(error.toJSON())
+                res.status(500).json( error.toJSON())
             }
         } else {
             let error: any = new ForbiddenHttpException(BaseChyz.t('You are not allowed to perform this action.'))
-            res.status(500).json(error.toJSON())
+            res.status(500).json( error.toJSON())
         }
 
 
@@ -145,5 +136,4 @@ class SiteController extends Controller {
         return res.send("Post Controller")
     }
 }
-
-module.exports = SiteController
+module.exports=SiteController

package/Examples/Models/Categories.ts

@@ -4,7 +4,8 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-import {DataTypes, Model, ModelManager, Relation} from "../../base";
+import {DataTypes, ModelManager, Model, Relation} from "../../base";
+import {ProductToCategoriesClass} from "./ProductToCategories";
 
 export class CategoriesClass extends Model {
     [x: string]: any;

package/Examples/Models/KeycloakUser.ts

@@ -61,10 +61,6 @@ export class KeycloakUser implements IdentityInterface {
         return null;
         // return keycloak.protect('realm:user');
     }
-
-    can(permissionName: string, params: any[], allowCaching: boolean): boolean | null {
-        return undefined;
-    }
 }
 
 

package/Examples/Models/User.ts

@@ -28,11 +28,6 @@ export class User extends Model implements IdentityInterface {
         throw new Error("Method not implemented.");
     }
 
-    can(permissionName: string, params: any[], allowCaching: boolean): boolean | null {
-        throw new Error("Method not implemented.");
-    }
-
-
     getAuthKey(): string {
         throw new Error("Method not implemented.");
     }
@@ -76,8 +71,8 @@ export class User extends Model implements IdentityInterface {
     }
 
     async findIdentityByAccessToken(token, type) {
-
         let decoded = JsonWebToken.decode(token, {complete: true})
+
         if(!decoded.payload.user) {
             return null;
         }
@@ -102,6 +97,4 @@ export class User extends Model implements IdentityInterface {
     }
 
 
-
-
 }

package/Examples/index.ts

@@ -7,22 +7,17 @@
 
 
 import {BaseChyz} from "../index";
-
 require('dotenv-flow').config();
 import Chyz from "../Chyz";
 import {WebUser} from "../web/WebUser";
 import {User} from "./Models/User";
 import {DbConnection} from "../base";
-import {AuthManager} from "../rbac/AuthManager";
 
 
 let config = {
     port: process.env.PORT,
     controllerpath: "C:\\PROJELER\\github\\Chy-Nodejs-Framework\\Examples\\Controllers",
     components: {
-        authManager: {
-            class: AuthManager,
-        },
         db: {
             class: DbConnection,
             database: process.env.DBDATABASE,