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

package/BaseChyz.ts

@@ -8,8 +8,8 @@ import Utils from "./requiments/Utils";
 const express = require("express");
 const log4js = require("log4js");
 const fs = require('fs');
-const _ = require('lodash');
 
+var ip = require('ip');
 var bodyParser = require('body-parser')
 var methodOverride = require('method-override')
 
@@ -25,6 +25,8 @@ export default class BaseChyz {
     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 +63,6 @@ export default class BaseChyz {
             writable: true
         })
 
-
         Object.defineProperty(BaseChyz.express.request, 'identity', {
             configurable: true,
             enumerable: true,
@@ -120,7 +121,6 @@ export default class BaseChyz {
          */
         this.config = config;
 
-        this.init();
 
         let components = Utils.findKeyValue(config, "components")
         if (components) {
@@ -132,6 +132,21 @@ export default class BaseChyz {
             }
         }
 
+
+        let middlewares = Utils.findKeyValue(config, "middlewares")
+        if (middlewares) {
+            for (const middlewareKey in middlewares) {
+                let middleware1 = middlewares[middlewareKey];
+                BaseChyz.debug("Create middlewares ", middlewareKey)
+                BaseChyz.middlewares[middlewareKey] = middleware1;
+                // BaseChyz.middlewares[middlewareKey] = Utils.createObject(new middleware1.class, middleware1);
+            }
+        }
+
+
+
+        this.init();
+
         return this;
     }
 
@@ -140,7 +155,7 @@ export default class BaseChyz {
         return log4js;
     }
 
-    public getLogger(){
+    public getLogger() {
         return this.logProvider().getLogger(this.constructor.name);
     }
 
@@ -151,12 +166,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 +188,6 @@ export default class BaseChyz {
     }
 
 
-
-
     public static warning(...args: any[]) {
         BaseChyz.logs().warn(...arguments)
     }
@@ -208,6 +224,12 @@ export default class BaseChyz {
         return BaseChyz.components[key] ?? null
     }
 
+
+    public static getMiddlewares(key: any) {
+        return BaseChyz.middlewares[key] ?? null
+    }
+
+
     /**
      * load contoller
      */
@@ -261,8 +283,8 @@ export default class BaseChyz {
                             } catch (e) {
                                 BaseChyz.error(e)
                                 // next(e)
-                                res.status(e.statusCode)
-                                res.json({error: {code: e.statusCode, name: e.name, message: e.message}})
+                                res.status(e.statusCode || 500)
+                                res.json({error: {code: e.statusCode || 500, name: e.name, message: e.message}})
                             }
                         })
 
@@ -277,8 +299,8 @@ 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 +315,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,6 +338,8 @@ 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;
     }
@@ -311,3 +348,8 @@ 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

@@ -1,24 +1,27 @@
 /*
- * 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} 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 {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 {
@@ -34,22 +37,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,9 +70,9 @@ class ApiController extends Controller {
         data.Customer["2fa"] = "true";
 
         //Customer Model Create
-        let customer: Customer = new Customer();
+        let customer: CustomerClass = Customer;
         //Order Model Create
-        let order: Order = new Order();
+        let order: OrderClass = Order;
 
 
         let transaction
@@ -112,6 +115,13 @@ class ApiController extends Controller {
     }
 
 
+    @get("order/list")
+    async listOrder(req: Request, res: Response) {
+        let product = await Products.findAll({include: [ProductModels.model()]});
+        return res.json(product)
+
+    }
+
     error(req: Request, res: Response) {
         BaseChyz.logs().info("Error Sayfası")
         return res.send("Post Controller")

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, Order} from "../Models/Order";
+import {CustomerClass, Customer} 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 = Customer;
+        //Order Model Create
+        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});
+
+            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 {

package/Examples/Controllers/SiteController.ts

@@ -5,15 +5,16 @@
  * Github:https://github.com/cihan53/
  */
 
-import {Controller} from "../../base/Controller";
+import {Controller} 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 {get} from "../../decorator";
+import {post} from "../../decorator";
+import {controller} from "../../decorator";
 import {User} from "../Models/User";
 import {ForbiddenHttpException} from "../../base";
+import {JwtHttpBearerAuth} from "../../filters/auth";
 
 const bcrypt = require('bcrypt');
 const JsonWebToken = require("jsonwebtoken");
@@ -25,6 +26,16 @@ class SiteController extends Controller {
     public myCheck(token) {
         console.log("myyyyyyyyyyyyyyyyyyyyy")
     }
+    public behaviors(): any[] {
+        return [{
+            'authenticator': {
+                "class": JwtHttpBearerAuth,
+                "except":["index","login"]
+                // "auth": this.myCheck
+            }
+        }]
+    }
+
 
     // public behaviors(): any[] {
     //
@@ -66,6 +77,7 @@ class SiteController extends Controller {
         let username = req.body.username;
         let password = req.body.password;
 
+
         let user = await UserModel.findOne({where: {username: username}})
         if (user) {
             BaseChyz.debug("Db found user", username)
@@ -84,7 +96,7 @@ class SiteController extends Controller {
                     user: user.id,
                     ip: ip,
                     agent: source,
-                }, user.salt_text, {expiresIn: '1h'});
+                }, user.authkey, {expiresIn: '1h'});
 
                 BaseChyz.debug("Db user create access token", username,"expiresIn","1h")
                 return res.json({token: token})
@@ -106,7 +118,7 @@ class SiteController extends Controller {
         // @ts-ignore
         let identity = req.user ?? BaseChyz.getComponent("user").getIdentity();
         // console.log("logout2", identity.id)
-        console.log(identity)
+        //console.log(identity)
 
         BaseChyz.logs().info("Logout Controller")
         return res.send("Logout Controller")

package/Examples/Models/Categories.ts

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ * E-mail: cihan@chy.com.tr
+ * Github:https://github.com/cihan53/
+ */
+import {DataTypes, Model} from "../../base";
+
+export class CategoriesClass extends Model {
+    [x: string]: any;
+
+    tableName() {
+        return 'categories';
+    }
+
+
+    attributes() {
+        return {
+            // Model attributes are defined here
+            title: {
+                type: DataTypes.STRING,
+                allowNull: false
+            },
+            properties: {
+                type: DataTypes.STRING,
+                allowNull: false
+            }
+
+        }
+    }
+
+
+}
+
+const Categories = new CategoriesClass();
+export {Categories};

package/Examples/Models/Customer.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 import {DataTypes, Model} from "../../base";
 
-export class Customer extends Model {
+export class CustomerClass extends Model {
     [x: string]: any;
 
     public tableName() {
@@ -15,21 +15,21 @@ export class Customer extends Model {
                 allowNull: false,
                 validate: {
                     notEmpty: true,
-                    is: ["^[a-z0-9A-Z]+$",'i'],
+                    is: ["^[a-z0-9A-Z]+$", 'i'],
                     len: [4, 255],
                 }
             },
             firstname: {
                 type: DataTypes.STRING,
                 validate: {
-                    is: ["^[a-z0-9A-Z]+$",'i'],
+                    is: ["^[a-z0-9A-Z]+$", 'i'],
                     len: [4, 255],
                 }
             },
             lastname: {
                 type: DataTypes.STRING,
                 validate: {
-                    is: ["^[a-z0-9A-Z]+$",'i'],
+                    is: ["^[a-z0-9A-Z]+$", 'i'],
                     len: [4, 255],
                 }
             },
@@ -50,7 +50,7 @@ export class Customer extends Model {
             gsm_phone: {
                 type: DataTypes.STRING,
                 validate: {
-                    is: ["^[0-9 +]+$",'i'],
+                    is: ["^[0-9 +]+$", 'i'],
                 }
             },
             country: {
@@ -62,20 +62,20 @@ export class Customer extends Model {
             address: {
                 type: DataTypes.STRING,
                 validate: {
-                    is: ["^[\\w'\\-,.[0-9_\\/\\\\+=\"()<>;:\\[\\] şŞçÇöÖğĞıİüÜ  ]{2,}$","i"],
+                    is: ["^[\\w'\\-,.[0-9_\\/\\\\+=\"()<>;:\\[\\] şŞçÇöÖğĞıİüÜ  ]{2,}$", "i"],
                 }
             },
             taxoffice: {
                 type: DataTypes.STRING,
                 validate: {
-                    is: ["^[\\w'\\-,.[0-9_\\/\\\\+=\"()<>;:\\[\\] şŞçÇöÖğĞıİüÜ  ]{2,}$","i"],
+                    is: ["^[\\w'\\-,.[0-9_\\/\\\\+=\"()<>;:\\[\\] şŞçÇöÖğĞıİüÜ  ]{2,}$", "i"],
                 }
             },
             taxnumber: {
                 unique: true,
                 type: DataTypes.STRING,
                 validate: {
-                    is:["^[0-9]+$",'i'],
+                    is: ["^[0-9]+$", 'i'],
                 }
             },
             username: {
@@ -108,6 +108,8 @@ export class Customer extends Model {
 
 }
 
+const Customer = new CustomerClass();
+export {Customer};
 
 
 

package/Examples/Models/KeycloakUser.ts

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ * E-mail: cihan@chy.com.tr
+ * Github:https://github.com/cihan53/
+ */
+
+import {IdentityInterface} from "../../web/IdentityInterface";
+import {DataTypes, Model} from "../../base";
+import BaseChyz from "../../BaseChyz";
+
+const JsonWebToken = require("jsonwebtoken");
+
+export class KeycloakUser implements IdentityInterface {
+
+    [x: string]: any;
+
+
+    findIdentity(id: number) {
+        throw new Error("Method not implemented.");
+    }
+
+    getId(): number {
+        throw new Error("Method not implemented.");
+    }
+
+    getAuthKey(): string {
+        throw new Error("Method not implemented.");
+    }
+
+    validateAuthKey(authKey: string): boolean {
+        throw new Error("Method not implemented.");
+    }
+
+    public attributes() {
+        return {
+            // Model attributes are defined here
+            username: {
+                type: DataTypes.STRING,
+                allowNull: false
+            },
+            password: {
+                type: DataTypes.STRING,
+                allowNull: false
+            },
+            user_role: {
+                type: DataTypes.STRING,
+                allowNull: false
+            },
+            salt_text: {
+                type: DataTypes.STRING
+                // allowNull defaults to true
+            }
+        }
+    }
+
+    async findIdentityByAccessToken(token, type) {
+        console.log(token,type)
+        // console.log(this)
+        // console.log(BaseChyz)
+        return null;
+        // return keycloak.protect('realm:user');
+    }
+}
+
+