chyz 1.0.13-rc.9 → 1.1.0-rc.2

package/BaseChyz.ts

@@ -6,11 +6,49 @@ import Utils from "./requiments/Utils";
 import {ModelManager} from "./base";
 
 
+const https = require('https');
 const express = require("express");
 const log4js = require("log4js");
 const fs = require('fs');
 const validate = require('validate.js');
 
+/**
+ * Use
+ *  selectedBox: {
+ *     array: {
+ *        id: {
+ *          numericality: {
+ *            onlyInteger: true,
+ *            greaterThan: 0
+ *          }
+ *       }
+ *      }
+ *    },
+ * @param arrayItems
+ * @param itemConstraints
+ */
+validate.validators.array = (arrayItems: any, itemConstraints: any) => {
+    const arrayItemErrors = arrayItems.reduce((errors: any, item: any, index: any) => {
+        const error = validate(item, itemConstraints);
+        if (error) errors[index] = {error: error};
+        return errors;
+    }, {});
+
+    return Utils.isEmpty(arrayItemErrors) ? null : {errors: arrayItemErrors};
+};
+
+
+validate.validators.tokenString = (items: any, itemConstraints: any) => {
+    let arrayItems = items.split(",");
+    const arrayItemErrors = arrayItems.reduce((errors: any, item: any, index: any) => {
+        const error = validate(item, itemConstraints);
+        if (error) errors[index] = {error: error};
+        return errors;
+    }, {});
+
+    return Utils.isEmpty(arrayItemErrors) ? null : {errors: arrayItemErrors};
+};
+
 var ip = require('ip');
 var bodyParser = require('body-parser')
 var methodOverride = require('method-override')
@@ -23,7 +61,7 @@ export default class BaseChyz {
     private _port: number = 3001;
     static db: any;
     static routes: any;
-    private static _validate:any=validate;
+    private static _validate: any = validate;
     private _logConfig: any = require('./log/config/log4js.json') ?? {}
     private _controllerpath: string = "Controllers"
     private static controllers: Array<Controller> = []
@@ -48,8 +86,7 @@ export default class BaseChyz {
     }
 
     init() {
-        this.logProvider().level = log4js.levels.ALL;
-        this.logProvider().configure(this._logConfig);
+
 
         /**
          * set request id
@@ -140,16 +177,21 @@ export default class BaseChyz {
         this.config = config;
 
 
+        // logger setting
+        this.logProvider().level = log4js.levels.ALL;
+        this.logProvider().configure(this._logConfig);
+
         let components = Utils.findKeyValue(config, "components")
         if (components) {
             for (const componentsKey in components) {
+
                 let comp = components[componentsKey];
-                BaseChyz.logs().info("Create Component ", componentsKey)
+                BaseChyz.debug("Create Component ", componentsKey)
                 try {
                     BaseChyz.components[componentsKey] = Utils.createObject(new comp.class, comp);
                     BaseChyz.components[componentsKey]?.init();
-                }catch (e) {
-                    console.error(e)
+                } catch (e) {
+                    BaseChyz.error("Create Component ", e)
                 }
 
             }
@@ -166,7 +208,6 @@ export default class BaseChyz {
             }
         }
 
-
         this.init();
 
         return this;
@@ -238,8 +279,8 @@ export default class BaseChyz {
         if (res.headersSent) {
             return next(err)
         }
-        res.status(500)
-        res.json('error', {error: err})
+
+        res.status(500).json({error: err})
     }
 
     public static getComponent(key: any) {
@@ -263,14 +304,14 @@ export default class BaseChyz {
                 // @ts-ignore
                 let className = file.split(".")[0] + "Class";
                 if (model[className])
-                    models[className.replace("Class","")] = new model[className];
+                    models[className.replace("Class", "")] = new model[className];
             }
         })
 
         ModelManager._register(models);
 
         for (const key of Object.keys(ModelManager)) {
-            if(key!="_register"){
+            if (key != "_register") {
                 ModelManager[key].init();
             }
         }
@@ -310,7 +351,7 @@ export default class BaseChyz {
                                 BaseChyz.debug(`Call Request id ${instance.id}`)
                                 await instance.beforeAction(route, req, res)
                                 next()
-                            } catch (e) {
+                            } catch (e: any) {
                                 BaseChyz.error(e);
 
                                 res.status(e.statusCode || 500)
@@ -348,8 +389,8 @@ export default class BaseChyz {
 
     public middleware() {
 
-        BaseChyz.express.use(bodyParser.json())
-        BaseChyz.express.use(bodyParser.urlencoded({extended: true})); // support encoded bodies
+        BaseChyz.express.use(bodyParser.json({limit: '1mb'}));
+        BaseChyz.express.use(bodyParser.urlencoded({limit: '1mb', extended: true})); // support encoded bodies
         BaseChyz.express.use(methodOverride());
         BaseChyz.express.use(methodOverride());
 
@@ -386,12 +427,25 @@ export default class BaseChyz {
     public Start() {
 
         BaseChyz.info("Express Server Starting")
-        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}`)
-        })
+
+        if (this.config?.ssl) {
+            const httpsServer = https.createServer(this.config?.ssl , BaseChyz.express);
+            httpsServer.listen(this._port, () => {
+                BaseChyz.info("Express Server Start ")
+                BaseChyz.info(`Liten Port ${this._port}`)
+                BaseChyz.info(`https://localhost:${this._port}`)
+                BaseChyz.info(`https://${ip.address()}:${this._port}`)
+            })
+        }else{
+            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/Doc/Moel kullanma.md

@@ -0,0 +1,13 @@
+##Model
+
+Model sınıfı "Sequelize" üzerine inşa edildmiştir ( ileriki zamanlarda farklı yöntemlerde eklemeyi planlıyorum)
+
+##public function
+
+###getDb:
+###get sequelize:
+###set sequelize:
+###get errors:
+###set errors:
+###init:
+

package/Examples/Controllers/ApiController.ts

@@ -18,7 +18,8 @@ import {JwtHttpBearerAuth} from "../../filters/auth";
 
 import {ValidationHttpException} from "../../base";
 import {ForbiddenHttpException} from "../../base";
-
+import {ProductsClass} from "../Models/Products";
+import {AccessControl} from "../../filters";
 
 
 @controller("/api")
@@ -35,22 +36,18 @@ 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': ['order/list' ],
+                'rules': [
+
+                    {
+                        'allow': true,
+                        'actions': ['order/list' ],
+                        'roles': ['edis-manager'],
+                    }
+                ]
+            }
         }]
     }
 
@@ -68,9 +65,9 @@ class ApiController extends Controller {
         data.Customer["2fa"] = "true";
 
         //Customer Model Create
-        let customer  = ModelManager.Customer;
+        let customer = ModelManager.Customer.save();
         //Order Model Create
-        let order  = ModelManager.Order;
+        let order = ModelManager.Order;
 
 
         let transaction
@@ -113,20 +110,23 @@ class ApiController extends Controller {
 
     @get("order/list")
     async listOrder(req: Request, res: Response) {
-        let product = await ModelManager.Products.findAll({include: [ModelManager.ProductModels.model()]});
+        const {Products}: { Products: ProductsClass } = ModelManager;
+        let product = await Products.cache().findAll( );
         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/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/SiteController.ts

@@ -26,11 +26,12 @@ 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
             }
         }]
@@ -88,25 +89,33 @@ 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,
-                }, user.authkey, {expiresIn: '1h'});
+                    platform: "admin",
+                    role: [
+                        "admin"
+                    ],
+                    permissions: [
+                        "xxxx",
+
+                    ],
+                }, user.authkey, null);
 
-                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())
         }
 
 
@@ -136,4 +145,5 @@ class SiteController extends Controller {
         return res.send("Post Controller")
     }
 }
-module.exports=SiteController
+
+module.exports = SiteController

package/Examples/Models/AuthAssignment.ts

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ * E-mail: cihan@chy.com.tr
+ * Github:https://github.com/cihan53/
+ */
+
+import {DataTypes, Model, ModelManager, Relation} from "../../base";
+
+export class AuthAssignmentClass extends Model {
+    [x: string]: any;
+
+    tableName() {
+        return 'auth_assignment';
+    }
+    attributes() {
+        return {
+
+            // Model attributes are defined here
+            item_name: {
+                type: DataTypes.STRING,
+                primaryKey:true,
+                allowNull: false
+            },
+            user_id : {
+                type: DataTypes.STRING,
+                allowNull: false
+            }
+
+        }
+    }
+
+    init(){
+        super.init();
+        this.model().removeAttribute('id')
+    }
+
+    relations(): Relation[] {
+        return [
+            {
+                type: "hasMany",
+                foreignKey: "name",
+                sourceKey:'item_name',
+                model: ModelManager.AuthItem.model()
+            }
+        ]
+    }
+
+}
+

package/Examples/Models/AuthItem.ts

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ * E-mail: cihan@chy.com.tr
+ * Github:https://github.com/cihan53/
+ */
+
+
+
+import {DataTypes, Model, ModelManager, Relation} from "../../base";
+
+export class AuthItemClass extends Model {
+    [x: string]: any;
+
+    tableName() {
+        return 'auth_item';
+    }
+
+    attributes() {
+        return {
+            // Model attributes are defined here
+            name: {
+                type: DataTypes.STRING,
+                primaryKey:true,
+                allowNull: false
+            },
+            type: {
+                type: DataTypes.INTEGER,
+                allowNull: false
+            },
+            description: {
+                type: DataTypes.STRING,
+                allowNull: false
+            },
+            rule_name: {
+                type: DataTypes.STRING,
+                allowNull: false
+            }
+
+        }
+    }
+
+    init() {
+        super.init();
+        this.model().removeAttribute('id')
+    }
+
+    // relations(): Relation[] {
+    //     return [
+    //         {
+    //             type: "hasOne",
+    //             foreignKey: "item_name",
+    //             model: ModelManager.AuthAssignment.model()
+    //         }
+    //     ]
+    // }
+
+}
+

package/Examples/Models/AuthItemChild.ts

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ * E-mail: cihan@chy.com.tr
+ * Github:https://github.com/cihan53/
+ */
+
+
+import {DataTypes, Model, ModelManager, Relation} from "../../base";
+
+export class AuthItemChildClass extends Model {
+    [x: string]: any;
+
+    tableName() {
+        return 'auth_item_child';
+    }
+
+    attributes() {
+        return {
+            // Model attributes are defined here
+            parent: {
+                type: DataTypes.STRING,
+                primaryKey: true,
+                allowNull: false
+            },
+            child: {
+                type: DataTypes.STRING,
+                allowNull: false
+            }
+        }
+    }
+
+    init() {
+        super.init();
+        this.model().removeAttribute('id')
+    }
+
+    relations(): Relation[] {
+        return [
+            {
+                type: "hasOne",
+                foreignKey: "item_name",
+                model: ModelManager.AuthAssignment.model()
+            }
+        ]
+    }
+
+}
+

package/Examples/Models/Categories.ts

@@ -5,10 +5,14 @@
  * Github:https://github.com/cihan53/
  */
 import {DataTypes, Model, ModelManager, Relation} from "../../base";
+import {BaseChyz} from "../../index";
 
 export class CategoriesClass extends Model {
     [x: string]: any;
 
+    constructor( ) {
+        super(BaseChyz.getComponent("db2").db);
+    }
     tableName() {
         return 'categories';
     }

package/Examples/Models/KeycloakUser.ts

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