chyz 1.0.12-rc.9 → 1.0.13-rc.12

package/BaseChyz.ts

@@ -3,13 +3,15 @@ import {RouteDefinition} from "./model/RouteDefinition";
 import {NextFunction, Request, Response} from "express";
 import {Controller} from "./base/Controller";
 import Utils from "./requiments/Utils";
+import {ModelManager} from "./base";
 
 
 const express = require("express");
 const log4js = require("log4js");
 const fs = require('fs');
-const _ = require('lodash');
+const validate = require('validate.js');
 
+var ip = require('ip');
 var bodyParser = require('body-parser')
 var methodOverride = require('method-override')
 
@@ -21,10 +23,13 @@ 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> = []
     public static components: any = {}
+    public static middlewares: any = {}
+
 
     get logConfig(): any {
         return this._logConfig;
@@ -61,7 +66,6 @@ export default class BaseChyz {
             writable: true
         })
 
-
         Object.defineProperty(BaseChyz.express.request, 'identity', {
             configurable: true,
             enumerable: true,
@@ -82,6 +86,13 @@ export default class BaseChyz {
             this.controllerpath = this.config.controllerpath
         }
 
+
+        /**
+         * Model Register
+         */
+
+        this.loadModels();
+
         /**
          * Express Server
          */
@@ -113,6 +124,14 @@ export default class BaseChyz {
     }
 
 
+    static get validate(): any {
+        return this._validate;
+    }
+
+    static set validate(value: any) {
+        this._validate = value;
+    }
+
     app(config: any = {}): BaseChyz {
 
         /**
@@ -120,18 +139,36 @@ export default class BaseChyz {
          */
         this.config = config;
 
-        this.init();
 
         let components = Utils.findKeyValue(config, "components")
         if (components) {
             for (const componentsKey in components) {
                 let comp = components[componentsKey];
-                BaseChyz.debug("Create Component ", componentsKey)
-                BaseChyz.components[componentsKey] = Utils.createObject(new comp.class, comp);
-                BaseChyz.components[componentsKey]?.init();
+                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)
+                }
+
             }
         }
 
+
+        let middlewares = Utils.findKeyValue(config, "middlewares")
+        if (middlewares) {
+            for (const middlewareKey in middlewares) {
+                let middleware1 = middlewares[middlewareKey];
+                BaseChyz.logs().debug("Create middlewares ", middlewareKey)
+                BaseChyz.middlewares[middlewareKey] = middleware1;
+                // BaseChyz.middlewares[middlewareKey] = Utils.createObject(new middleware1.class, middleware1);
+            }
+        }
+
+
+        this.init();
+
         return this;
     }
 
@@ -140,7 +177,7 @@ export default class BaseChyz {
         return log4js;
     }
 
-    public getLogger(){
+    public getLogger() {
         return this.logProvider().getLogger(this.constructor.name);
     }
 
@@ -151,12 +188,15 @@ export default class BaseChyz {
     public static trace(...args: any[]) {
         BaseChyz.logs().fatal(...arguments)
     }
+
     public static debug(...args: any[]) {
         BaseChyz.logs().debug(...arguments)
     }
+
     public static info(...args: any[]) {
         BaseChyz.logs().info(...arguments)
     }
+
     public static warn(...args: any[]) {
         BaseChyz.logs().warn(...arguments)
     }
@@ -170,8 +210,6 @@ export default class BaseChyz {
     }
 
 
-
-
     public static warning(...args: any[]) {
         BaseChyz.logs().warn(...arguments)
     }
@@ -208,6 +246,36 @@ export default class BaseChyz {
         return BaseChyz.components[key] ?? null
     }
 
+
+    public static getMiddlewares(key: any) {
+        return BaseChyz.middlewares[key] ?? null
+    }
+
+    /**
+     * load model
+     */
+    async loadModels() {
+        let models: any = {}
+        let path = `${this._controllerpath}/../Models`;
+        fs.readdirSync(path).forEach((file: string) => {
+            if (file !== "index.ts") {
+                let model = require(`${path}/${file}`);
+                // @ts-ignore
+                let className = file.split(".")[0] + "Class";
+                if (model[className])
+                    models[className.replace("Class","")] = new model[className];
+            }
+        })
+
+        ModelManager._register(models);
+
+        for (const key of Object.keys(ModelManager)) {
+            if(key!="_register"){
+                ModelManager[key].init();
+            }
+        }
+    }
+
     /**
      * load contoller
      */
@@ -259,10 +327,16 @@ export default class BaseChyz {
                                 await instance[route.methodName](req, res, next);
                                 instance.afterAction(route, req, res);
                             } catch (e) {
-                                BaseChyz.error(e)
-                                // next(e)
-                                res.status(e.statusCode)
-                                res.json({error: {code: e.statusCode, name: e.name, message: e.message}})
+                                if (e instanceof Error) {
+                                    BaseChyz.error(e)
+
+                                    // @ts-ignore
+                                    res.status(e.statusCode || 500)
+                                    // @ts-ignore
+                                    res.json({error: {code: e.statusCode || 500, name: e.name, message: e.message}})
+                                } else {
+                                    res.json(e)
+                                }
                             }
                         })
 
@@ -277,8 +351,7 @@ export default class BaseChyz {
         BaseChyz.express.use(bodyParser.json())
         BaseChyz.express.use(bodyParser.urlencoded({extended: true})); // support encoded bodies
         BaseChyz.express.use(methodOverride());
-        BaseChyz.express.use(this.errorResponder)
-        BaseChyz.express.use(this.errorHandler)
+        BaseChyz.express.use(methodOverride());
 
 
         // CORS
@@ -293,7 +366,20 @@ export default class BaseChyz {
             next();
         });
 
+        //Middlewares
+        for (const middleware1 of Object.keys(BaseChyz.middlewares)) {
+            if (!Utils.isFunction(middleware1)) {
+                let keycloak = BaseChyz.middlewares[middleware1].keycloak;
+                BaseChyz.express.use(keycloak.middleware(BaseChyz.middlewares[middleware1].config));
+            } else {
+                BaseChyz.express.use(BaseChyz.middlewares[middleware1]);
+            }
+
+        }
+
 
+        BaseChyz.express.use(this.errorResponder)
+        BaseChyz.express.use(this.errorHandler)
     }
 
 
@@ -303,11 +389,11 @@ export default class BaseChyz {
         BaseChyz.express.listen(this._port, () => {
             BaseChyz.info("Express Server Start ")
             BaseChyz.info(`Liten Port ${this._port}`)
+            BaseChyz.info(`http://localhost:${this._port}`)
+            BaseChyz.info(`http://${ip.address()}:${this._port}`)
         })
         return this;
     }
 
 
 }
-
-

package/Examples/Controllers/ApiController.ts

@@ -1,24 +1,25 @@
 /*
- * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ *
+ * Copyright (c) 2021-2021.. Chy Bilgisayar Bilisim
  * Author: Cihan Ozturk
- * E-mail: cihan@chy.com.tr
- * Github:https://github.com/cihan53/
+ *  E-mail: cihan@chy.com.tr
+ *  Github:https://github.com/cihan53/
+ *
  */
 
-import {Controller} from "../../base/Controller";
+import {Controller, ModelManager} from "../../base";
 import BaseChyz from "../../BaseChyz";
 // @ts-ignore
 import {Request, Response} from "express";
-import {get} from "../../decorator/get";
-import {post} from "../../decorator/post";
-import {controller} from "../../decorator/controller";
-import {AccessControl} from "../../filters/AccessControl";
-import {JwtHttpBearerAuth} from "../../filters/auth/JwtHttpBearerAuth";
-import {Order} from "../Models/Order";
-import {Customer} from "../Models/Customer";
-import {ValidationHttpException} from "../../base/ValidationHttpException";
-import {ValidationError} from "sequelize";
+import {get} from "../../decorator";
+import {post} from "../../decorator";
+import {controller} from "../../decorator";
+import {JwtHttpBearerAuth} from "../../filters/auth";
+
+import {ValidationHttpException} from "../../base";
 import {ForbiddenHttpException} from "../../base";
+import {ProductsClass} from "../Models/Products";
+
 
 @controller("/api")
 class ApiController extends Controller {
@@ -34,22 +35,22 @@ class ApiController extends Controller {
                 "class": JwtHttpBearerAuth,
                 // "auth": this.myCheck
             },
-            'access': {
-                'class': AccessControl,
-                'only': ['login', 'logout', 'signup'],
-                'rules': [
-                    {
-                        'allow': true,
-                        'actions': ['login', 'index'],
-                        'roles': ['?'],
-                    },
-                    {
-                        'allow': true,
-                        'actions': ['logout', "logout2"],
-                        'roles': ['@'],
-                    }
-                ]
-            }
+            // 'access': {
+            //     'class': AccessControl,
+            //     'only': ['login', 'logout', 'signup'],
+            //     'rules': [
+            //         {
+            //             'allow': true,
+            //             'actions': ['login', 'index'],
+            //             'roles': ['?'],
+            //         },
+            //         {
+            //             'allow': true,
+            //             'actions': ['logout', "logout2"],
+            //             'roles': ['@'],
+            //         }
+            //     ]
+            // }
         }]
     }
 
@@ -67,17 +68,15 @@ class ApiController extends Controller {
         data.Customer["2fa"] = "true";
 
         //Customer Model Create
-        let customer: Customer = new Customer();
+        let customer = ModelManager.Customer.save();
         //Order Model Create
-        let order: Order = new Order();
+        let order = ModelManager.Order;
 
 
         let transaction
         try {
             // get transaction
             transaction = await BaseChyz.getComponent("db").transaction();
-
-
             customer.load(data, "Customer");//load customer data
             let cus: any = await customer.save({}, {transaction});
 
@@ -112,6 +111,29 @@ class ApiController extends Controller {
     }
 
 
+    @get("order/list")
+    async listOrder(req: Request, res: Response) {
+        const {Products}: { Products: ProductsClass } = ModelManager;
+        let product = await 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: [
+                {
+                    model: ModelManager.Products.model(),
+                    // as: 'product',
+                    // through: { attributes: [] } // Hide unwanted `PlayerGameTeam` nested object from results
+                }
+            ]
+        });
+        return res.json(product)
+
+    }
+
     error(req: Request, res: Response) {
         BaseChyz.logs().info("Error Sayfası")
         return res.send("Post Controller")

package/Examples/Controllers/BasicApiController.ts

@@ -0,0 +1,121 @@
+/*
+ *
+ * Copyright (c) 2021-2021.. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ *  E-mail: cihan@chy.com.tr
+ *  Github:https://github.com/cihan53/
+ *
+ */
+
+import {Controller, ForbiddenHttpException, ModelManager, ValidationHttpException} from "../../base";
+import BaseChyz from "../../BaseChyz";
+// @ts-ignore
+import {Request, Response} from "express";
+import {controller, get, post} from "../../decorator";
+import {ProductsClass} from "../Models/Products";
+import {HttpBasicAuth} from "../../filters/auth/HttpBasicAuth";
+
+
+@controller("/basic/api")
+class ApiController extends Controller {
+
+
+
+    public behaviors(): any[] {
+
+        return [{
+            'authenticator': {
+                "class": HttpBasicAuth,
+                // "auth": this.myCheck
+            }
+        }]
+    }
+
+    @get("/")
+    Index(req: Request, res: Response) {
+
+        BaseChyz.logs().info("Site Controller Burası", this.id)
+        return res.json({message: "index sayfası"})
+    }
+
+    @post("orderCreate")
+    async Login(req: Request, res: Response) {
+        let data = req.body;
+        data.Customer.status = "true";
+        data.Customer["2fa"] = "true";
+
+        //Customer Model Create
+        let customer = ModelManager.Customer.save();
+        //Order Model Create
+        let order = ModelManager.Order;
+
+
+        let transaction
+        try {
+            // get transaction
+            transaction = await BaseChyz.getComponent("db").transaction();
+            customer.load(data, "Customer");//load customer data
+            let cus: any = await customer.save({}, {transaction});
+
+            if (!cus) {
+                throw new ValidationHttpException(customer.errors);
+            }
+
+            data.Order.customer_id = cus.id;
+            // data.Order.total = 0;
+            // data.Order.status = true;
+            order.load(data, "Order");
+            let res1 = await order.save({}, {transaction});
+            if (!res1) {
+                throw new ValidationHttpException(order.errors);
+            }
+
+            // commit
+            await transaction.commit();
+
+        } catch (e) {
+            if (transaction) {
+                await transaction.rollback();
+                BaseChyz.warn("Rollback transaction")
+            }
+
+            if (e instanceof ValidationHttpException)
+                throw new ValidationHttpException(e.message)
+            else
+                throw new ForbiddenHttpException(e.message)
+        }
+        return res.send("Post Controller")
+    }
+
+
+    @get("order/list")
+    async listOrder(req: Request, res: Response) {
+        const {Products}: { Products: ProductsClass } = ModelManager;
+        let product = await 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: [
+                {
+                    model: ModelManager.Products.model(),
+                    // as: 'product',
+                    // through: { attributes: [] } // Hide unwanted `PlayerGameTeam` nested object from results
+                }
+            ]
+        });
+        return res.json(product)
+
+    }
+
+
+    error(req: Request, res: Response) {
+        BaseChyz.logs().info("Error Sayfası")
+        return res.send("Post Controller")
+    }
+}
+
+module.exports = ApiController

package/Examples/Controllers/KeyCloakController.ts

@@ -0,0 +1,100 @@
+/*
+ *
+ * Copyright (c) 2021-2021.. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ *  E-mail: cihan@chy.com.tr
+ *  Github:https://github.com/cihan53/
+ *
+ */
+
+import {Controller} from "../../base/Controller";
+import BaseChyz from "../../BaseChyz";
+// @ts-ignore
+import {Request, Response} from "express";
+import {get,post,controller} from "../../decorator";
+
+import {ValidationHttpException,ForbiddenHttpException} from "../../base";
+import {KeyCloakHttpBearerAuth} from "../../filters/auth/KeyCloakHttpBearerAuth";
+
+import {OrderClass} from "../Models/Order";
+import {CustomerClass} from "../Models/Customer";
+
+@controller("/oauth2.0")
+class ApiController extends Controller {
+
+    public behaviors(): any[] {
+
+        return [{
+            'authenticator': {
+                "class": KeyCloakHttpBearerAuth,
+                // "auth": this.myCheck
+            }
+        }]
+    }
+
+    @get("/")
+    Index(req: Request, res: Response) {
+
+        BaseChyz.logs().info("Site Controller Burası", this.id)
+        return res.json({message: "index sayfası"})
+    }
+
+    @post("orderCreate")
+    async Login(req: Request, res: Response) {
+        let data = req.body;
+        data.Customer.status = "true";
+        data.Customer["2fa"] = "true";
+
+        //Customer Model Create
+        let customer: CustomerClass = new CustomerClass();
+        //Order Model Create
+        let order: OrderClass = new OrderClass() ;
+
+
+        let transaction
+        try {
+            // get transaction
+            transaction = await BaseChyz.getComponent("db").transaction();
+
+
+            customer.load(data, "Customer");//load customer data
+            let cus: any = await customer.save({}, {transaction});
+
+            if (!cus) {
+                throw new ValidationHttpException(customer.errors);
+            }
+
+            data.Order.customer_id = cus.id;
+            // data.Order.total = 0;
+            // data.Order.status = true;
+            order.load(data, "Order");
+            let res1 = await order.save({}, {transaction});
+            if (!res1) {
+                throw new ValidationHttpException(order.errors);
+            }
+
+            // commit
+            await transaction.commit();
+
+        } catch (e) {
+            if (transaction) {
+                await transaction.rollback();
+                BaseChyz.warn("Rollback transaction")
+            }
+
+            if (e instanceof ValidationHttpException)
+                throw new ValidationHttpException(e.message)
+            else
+                throw new ForbiddenHttpException(e.message)
+        }
+        return res.send("Post Controller")
+    }
+
+
+    error(req: Request, res: Response) {
+        BaseChyz.logs().info("Error Sayfası")
+        return res.send("Post Controller")
+    }
+}
+
+module.exports = ApiController

package/Examples/Controllers/PublicController.ts

@@ -1,8 +1,10 @@
 /*
- * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ *
+ * Copyright (c) 2021-2021.. Chy Bilgisayar Bilisim
  * Author: Cihan Ozturk
- * E-mail: cihan@chy.com.tr
- * Github:https://github.com/cihan53/
+ *  E-mail: cihan@chy.com.tr
+ *  Github:https://github.com/cihan53/
+ *
  */
 
 import {Controller} from "../../base/Controller";
@@ -10,11 +12,7 @@ import BaseChyz from "../../BaseChyz";
 // @ts-ignore
 import {Request, Response} from "express";
 import {get} from "../../decorator/get";
-import {post} from "../../decorator/post";
 import {controller} from "../../decorator/controller";
-import {AccessControl} from "../../filters/AccessControl";
-import {JwtHttpBearerAuth} from "../../filters/auth/JwtHttpBearerAuth";
-import Utils from "../../requiments/Utils";
 
 @controller("/public")
 class PublicController extends Controller {