chyz 1.0.13-rc.20 → 1.0.13-rc.3

package/BaseChyz.ts

@@ -3,13 +3,11 @@ 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 validate = require('validate.js');
 
 var ip = require('ip');
 var bodyParser = require('body-parser')
@@ -23,7 +21,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> = []
@@ -86,13 +83,6 @@ export default class BaseChyz {
             this.controllerpath = this.config.controllerpath
         }
 
-
-        /**
-         * Model Register
-         */
-
-        this.loadModels();
-
         /**
          * Express Server
          */
@@ -124,14 +114,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 +126,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,13 +137,14 @@ 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);
             }
         }
 
 
+
         this.init();
 
         return this;
@@ -251,30 +229,6 @@ export default class BaseChyz {
         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
@@ -334,8 +288,8 @@ export default class BaseChyz {
                                     res.status(e.statusCode || 500)
                                     // @ts-ignore
                                     res.json({error: {code: e.statusCode || 500, name: e.name, message: e.message}})
-                                } else {
-                                    res.json(e)
+                                }else{
+                                    res.json(e )
                                 }
                             }
                         })
@@ -354,6 +308,7 @@ export default class BaseChyz {
         BaseChyz.express.use(methodOverride());
 
 
+
         // CORS
         BaseChyz.express.use(function (req: any, res: Response, next: any) {
             // @ts-ignore
@@ -397,3 +352,10 @@ export default class BaseChyz {
 
 
 }
+
+
+process.on('uncaughtException', err => {
+    BaseChyz.error('There was an uncaught error', err)
+    process.exit(1) //mandatory (as per the Node.js docs)
+})
+

package/Examples/Controllers/ApiController.ts

@@ -7,7 +7,7 @@
  *
  */
 
-import {Controller, ModelManager} from "../../base";
+import {Controller} from "../../base";
 import BaseChyz from "../../BaseChyz";
 // @ts-ignore
 import {Request, Response} from "express";
@@ -18,9 +18,10 @@ import {JwtHttpBearerAuth} from "../../filters/auth";
 
 import {ValidationHttpException} from "../../base";
 import {ForbiddenHttpException} from "../../base";
-import {ProductsClass} from "../Models/Products";
-import {AccessControl} from "../../filters";
-
+import {OrderClass, Order} from "../Models/Order";
+import {CustomerClass, Customer} from "../Models/Customer";
+import {Products} from "../Models/Products";
+import {ProductModels} from "../Models/ProductModels";
 
 @controller("/api")
 class ApiController extends Controller {
@@ -36,18 +37,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,15 +70,17 @@ class ApiController extends Controller {
         data.Customer["2fa"] = "true";
 
         //Customer Model Create
-        let customer = ModelManager.Customer.save();
+        let customer: CustomerClass = Customer;
         //Order Model Create
-        let order = ModelManager.Order;
+        let order: OrderClass = 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});
 
@@ -110,23 +117,7 @@ class ApiController extends Controller {
 
     @get("order/list")
     async listOrder(req: Request, res: Response) {
-        const {Products}: { Products: ProductsClass } = ModelManager;
-        let product = await Products.findAll( );
-        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
-                }
-            ]
-        });
+        let product = await Products.findAll({include: [ProductModels.model()]});
         return res.json(product)
 
     }

package/Examples/Controllers/KeyCloakController.ts

@@ -16,8 +16,8 @@ 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";
+import {OrderClass, Order} from "../Models/Order";
+import {CustomerClass, Customer} from "../Models/Customer";
 
 @controller("/oauth2.0")
 class ApiController extends Controller {
@@ -46,9 +46,9 @@ class ApiController extends Controller {
         data.Customer["2fa"] = "true";
 
         //Customer Model Create
-        let customer: CustomerClass = new CustomerClass();
+        let customer: CustomerClass = Customer;
         //Order Model Create
-        let order: OrderClass = new OrderClass() ;
+        let order: OrderClass = Order ;
 
 
         let transaction

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,7 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-import {DataTypes, Model, ModelManager, Relation} from "../../base";
+import {DataTypes, Model} from "../../base";
 
 export class CategoriesClass extends Model {
     [x: string]: any;
@@ -29,19 +29,8 @@ export class CategoriesClass extends Model {
         }
     }
 
-    relations(): Relation[] {
-        return [
-            {
-                type: "belongsToMany",
-                foreignKey: "category_id",
-                sourceKey: "id",
-                model: ModelManager.Products.model(),
-                through: ModelManager.ProductToCategories.model()
-            }
-        ]
-    }
 
 }
 
-// const Categories = new CategoriesClass();
-// export {Categories};
+const Categories = new CategoriesClass();
+export {Categories};

package/Examples/Models/Customer.ts

@@ -108,8 +108,8 @@ export class CustomerClass extends Model {
 
 }
 
-// const Customer = new CustomerClass();
-// export {Customer};
+const Customer = new CustomerClass();
+export {Customer};
 
 
 

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/Order.ts

@@ -1,5 +1,5 @@
 import {DataTypes, Model, Relation} from "../../base";
-import {OrderItemClass} from "./OrderItem";
+import {OrderItem} from "./OrderItem";
 
 export class OrderClass extends Model {
     [x: string]: any;
@@ -50,15 +50,15 @@ export class OrderClass extends Model {
                 type: "hasOne",
                 sourceKey: "order_id",
                 foreignKey: "id",
-                model: (new OrderItemClass()).model()
+                model: OrderItem.model()
             }
         ]
     }
 }
 
-// const Order = new OrderClass()
-// export {Order};
-//
+const Order = new OrderClass()
+export {Order};
+
 
 
 

package/Examples/Models/OrderItem.ts

@@ -20,8 +20,8 @@ export class OrderItemClass extends Model {
     }
 
 }
-// const OrderItem = new OrderItemClass()
-// export { OrderItem };
+const OrderItem = new OrderItemClass()
+export { OrderItem };
 
 
 

package/Examples/Models/ProductModels.ts

@@ -4,7 +4,8 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-import {DataTypes, ModelManager, Model, Relation} from "../../base";
+import {DataTypes, Model, Relation} from "../../base";
+import {Products} from "./Products";
 
 export class ProductModelsClass extends Model {
     [x: string]: any;
@@ -39,11 +40,11 @@ export class ProductModelsClass extends Model {
                 type: "hasOne",
                 foreignKey: "id",
                 sourceKey: "category_id",
-                model: ModelManager.Products.model()
+                model: Products.model()
             }
         ]
     }
 }
 
-// const ProductModels = new ProductModelsClass();
-// export {ProductModels}
+const ProductModels = new ProductModelsClass();
+export {ProductModels}

package/Examples/Models/ProductToCategories.ts

@@ -4,7 +4,7 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-import {DataTypes, ModelManager, Model, Relation} from "../../base";
+import {DataTypes, Model} from "../../base";
 
 export class ProductToCategoriesClass extends Model {
     [x: string]: any;
@@ -21,7 +21,7 @@ export class ProductToCategoriesClass extends Model {
                 type: DataTypes.INTEGER,
                 allowNull: false
             },
-            category_id: {
+            categories_id: {
                 type: DataTypes.INTEGER,
                 allowNull: false
             }
@@ -29,18 +29,7 @@ export class ProductToCategoriesClass extends Model {
         }
     }
 
-    // relations(): Relation[] {
-    //     return [
-    //         {
-    //             type: "hasMany",
-    //             foreignKey: "category_id",
-    //             sourceKey: "id",
-    //             model: ModelManager.Categories.model(),
-    //         }
-    //     ]
-    // }
-
 }
 
-// const ProductToCategories = new ProductToCategoriesClass()
-// export {ProductToCategories}
+const ProductToCategories = new ProductToCategoriesClass()
+export {ProductToCategories}

package/Examples/Models/Products.ts

@@ -4,8 +4,8 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-import {DataTypes, ModelManager, Model, Relation} from "../../base";
-
+import {DataTypes, Model, Relation} from "../../base";
+import {ProductModels} from "./ProductModels";
 
 export class ProductsClass extends Model {
     [x: string]: any;
@@ -36,15 +36,14 @@ export class ProductsClass extends Model {
     relations(): Relation[] {
         return [
             {
-                type: "belongsToMany",
-                foreignKey: "product_id",
-                sourceKey: "id",
-                model: ModelManager.Categories.model(),
-                through: ModelManager.ProductToCategories.model()
+                type: "hasOne",
+                foreignKey: "id",
+                sourceKey: "model_id",
+                model: ProductModels.model()
             }
         ]
     }
 }
 
-// const Products = new ProductsClass()
-// export {Products}
+const Products = new ProductsClass()
+export {Products}

package/Examples/Models/Stocks.ts

@@ -56,5 +56,5 @@ export class StocksClass extends Model {
     }
 }
 
-// const Stocks = new StocksClass();
-// export {Stocks}
+const Stocks = new StocksClass();
+export {Stocks}

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/Models/UserPermission.ts

@@ -33,5 +33,5 @@ export class UserPermissionClass extends Model {
     }
 }
 
-// const UserPermission = new UserPermissionClass();
-// export {UserPermission}
+const UserPermission = new UserPermissionClass();
+export {UserPermission}

package/Examples/index.ts

@@ -7,22 +7,16 @@
 
 
 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,