chyz 1.0.13-rc.2 → 1.0.13-rc.23

package/Examples/tsconfig.json

@@ -3,8 +3,9 @@
     "target": "ES6",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+//    "isolatedModules": true,
     "removeComments": true,
-    "esModuleInterop": true,
+//    "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "moduleResolution": "node"
   },

package/README.md

@@ -8,7 +8,6 @@ Klasör Yapısı<br>
 *---Controllers  <br>
 *---Models<br>
 *---Log<br>
-*---Framework<br>
 index.ts<br>
 
 `##Başlangıç<br>
@@ -17,15 +16,23 @@ yarn start
 ## index.ts alanlar düzenlenmeli.
 
 ```typescript
+
+import {BaseChyz} from "../index";
+
 require('dotenv-flow').config();
+import Chyz ,{  DbConnection, BaseChyz} from "chyz/dist/";
+import {AuthManager} from "chyz/dist/rbac/AuthManager"
+import {WebUser} from "chyz/dist/web/WebUser";
+import {User as Identity} from "./Models/User";
 
-import BaseChyz from "chyz/dist/BaseChyz";
-import Chyz, {DbConnection} from "chyz/dist";
-import {WebUser} from "../web/WebUser";
-import {User} from "./Models/User";
 
 let config = {
+    port: process.env.PORT || 8870,
+    controllerpath: "Examples\\Controllers",
     components: {
+        authManager: {
+            class: AuthManager,
+        },
         db: {
             class: DbConnection,
             database: process.env.DBDATABASE,
@@ -35,7 +42,7 @@ let config = {
                 host: process.env.DBHOST,
                 dialect: 'postgres',  /* one of 'mysql' | 'mariadb' | 'postgres' | 'mssql' */
                 // disable logging; default: console.log
-                logging: false
+                logging: (msg: any) => BaseChyz.debug(msg)
             }
         },
         user: {
@@ -43,14 +50,168 @@ let config = {
             'identityClass': User
         }
     }
+
 }
 Chyz.app(config).Start();
 ```
 
+##Controller 
+Basit şekilde kontroller oluşturulabilir.
+```typescript
+/*
+ *
+ * Copyright (c) 2021-2021.. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ *  E-mail: cihan@chy.com.tr
+ *  Github:https://github.com/cihan53/
+ *
+ */
+
+import {AccessControl, BaseChyz, JwtHttpBearerAuth, ModelManager, Request, Response,} from "chyz/dist";
+import {ForbiddenHttpException, Model, NotFoundHttpException, ValidationHttpException} from "chyz/dist/base";
+
+import Utils from 'chyz/dist/requiments/Utils';
+import {controller, get, post} from "chyz/dist/decorator";
+import {Controller} from "chyz/dist/base/Controller";
+import * as Util from "util";
+import {uid} from "uid";
+
+import {User} from "../Models/User";
+import {AuthManager} from "../Lib/AuthManager";
+import {CategoriesClass} from "../Models/Categories";
+
+
+const keygen = require('ssh-keygen');
+const os = require('os');
+const bcrypt = require('bcrypt');
+const JsonWebToken = require("jsonwebtoken");
+const {Op} = require("sequelize");
+
+
+@controller("/api")
+class ApiController extends Controller {
+
+    public myCheck(token) {
+        console.log("myyyyyyyyyyyyyyyyyyyyy")
+    }
+
+    public behaviors(): any[] {
+
+        return [{
+            'authenticator': {
+                "class": JwtHttpBearerAuth,
+                // "auth": this.myCheck
+            },
+            'access': {
+                'class': AccessControl,
+                'only': ['order/list' ],
+                'rules': [
+
+                    {
+                        'allow': true,
+                        'actions': ['order/list' ],
+                        'roles': ['editor'],
+                    }
+                ]
+            }
+        }]
+    }
+
+    @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";
+
+        //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;
+            
+            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( );
+        return res.json(product)
+
+    }
+
+    @get("categories")
+    async Categories(req: Request, res: Response) {
+        let product = await ModelManager.Categories.findAll({
+            include: [
+                {
+                    model: ModelManager.Products.model(),
+                }
+            ]
+        });
+        return res.json(product)
+
+    }
+
+    error(req: Request, res: Response) {
+        BaseChyz.logs().info("Error Sayfası")
+        return res.send("Post Controller")
+    }
+}
+
+module.exports = ApiController
+
+```
+
+
 ## Create Model
 
 Veritabanı işlemleri için model oluşturma, sequelize desteklidir.
 
+Model adı "**Class**" şeklinde bitmeli.
+
+Örnek = "ModelName**Class**" 
+
 ```typescript
 import {Model, DataTypes} from "chyz/base/Model";
 
@@ -86,11 +247,11 @@ export class CustomerCLass extends Model {
     }
 
 }
-const Customer= new CustomerCLass();
-export { Customer };
+ 
 
 ```
 ````typescript
+
 export class ProductsClass extends Model {
     [x: string]: any;
 
@@ -129,8 +290,49 @@ export class ProductsClass extends Model {
     }
 }
 
-const Products = new ProductsClass()
-export {Products}
+/**
+ * 
+ */
+export class CategoriesClass extends Model {
+    [x: string]: any;
+
+    alias() {
+        return "c"
+    }
+
+    tableName() {
+        return 'categories';
+    }
+    attributes() {
+        return {
+            // Model attributes are defined here
+            title: {
+                type: DataTypes.STRING,
+                allowNull: false
+            },
+            properties: {
+                type: DataTypes.STRING,
+                allowNull: false
+            }
+
+        }
+    }
+    relations(): Relation[] {
+        return [
+            {
+                type: "belongsToMany",
+                foreignKey: "category_id",
+                sourceKey: "id",
+                as: 'product',
+                model: ModelManager.Products.model(),
+                through: ModelManager.ProductToCategories.model()
+            }
+        ]
+    }
+
+}
+
+ 
 ````
 
 ## Http POST ve GET verilerini model'e yükleme
@@ -148,9 +350,11 @@ export {Products}
  *  }
  * @type {Customer}
  */
+import {  ModelManager} from "chyz/dist";
 import {Customer} from "./Customer";
+
 //Customer Model Create
-let customer: Customer = Customer;
+let customer: Customer = ModelManager.Customer;
 customer.load(req.body, "Customer");//load customer data
 let cus: any = await customer.save();
 
@@ -166,7 +370,7 @@ Transaction oluşturma
         // get transaction
         transaction = await BaseChyz.getComponent("db").transaction();
         //Customer Model Create
-        let customer: Customer = new Customer();
+        let customer: Customer = ModelManager.Customer;
         customer.load(data, "Customer");//load customer data
         let cus: any = await customer.save({}, {transaction});
         if (!cus) {
@@ -175,9 +379,9 @@ Transaction oluşturma
     } catch (e) {
         if (transaction) {
             await transaction.rollback();
-            BaseChyz.warn("Rollback transaction")
+            BaseChyz.warn("Rollback transaction");
         }
-        ...
+        
     }
 ```
 
@@ -219,6 +423,44 @@ export class User extends Model implements IdentityInterface {
         throw new Error("Method not implemented.");
     }
 
+    /**
+     * Returns auth manager associated with the user component.
+     *
+     * By default this is the `authManager` application component.
+     * You may override this method to return a different auth manager instance if needed.
+     */
+    protected getAuthManager() {
+        return BaseChyz.getComponent("authManager");
+    }
+
+    /**
+     * Returns the access checker used for checking access.
+     * @return CheckAccessInterface
+     */
+    protected getAccessChecker() {
+        return this.accessChecker !== null ? this.accessChecker : this.getAuthManager();
+    }
+    
+    /**
+     *
+     * @param permissionName
+     * @param params
+     * @param allowCaching
+     */
+    public async can(permissionName, params: any[] = [], allowCaching: boolean = true) {
+        let accessChecker;
+        if ((accessChecker = this.getAccessChecker()) === null) {
+            return false;
+        }
+
+        let access = await accessChecker.checkAccess(this.getId(), permissionName, params);
+        this._access[permissionName] = access;
+        if (allowCaching && Utils.isEmpty(params)) {
+
+        }
+        return access;
+    }
+
     public attributes() {
         return {
             // Model attributes are defined here
@@ -242,16 +484,25 @@ export class User extends Model implements IdentityInterface {
     }
 
     async findIdentityByAccessToken(token, type) {
+        
+        
         let decoded = JsonWebToken.decode(token, {complete: true})
+        if (!decoded.payload.user) {
+            return null;
+        }
         let identity = await this.findOne({where: {id: parseInt(decoded.payload.user)}});
         if(identity){
             BaseChyz.debug("Find Identity By AccessToken: User Found", decoded.payload)
             try {
                 JsonWebToken.verify(token, identity.salt_text);
+                this.setIdentity(identity);
                 BaseChyz.debug("Find Identity By AccessToken: User Verify Success")
-                return identity;
+                return this;
             } catch(err) {
-                BaseChyz.debug("Find Identity By AccessToken: User Verify Failed")
+                if (err.name == "TokenExpiredError")
+                    BaseChyz.debug("Find Identity By AccessToken: Token Expired")
+                else
+                    BaseChyz.debug("Find Identity By AccessToken: User Verify Failed")
                 return null;
             }
         }

package/base/ActionFilter.ts

@@ -41,7 +41,7 @@ export class ActionFilter extends Behavior {
         } else {
             onlyMatch = false;
             for (const onlyKey of this.only) {
-                if (Utils.matchWildcard(action, onlyKey)) {
+                if (Utils.matchWildcard(action.id, onlyKey)) {
                     onlyMatch = true;
                     break;
                 }

package/base/BaseError.ts

@@ -5,15 +5,17 @@
  * Github:https://github.com/cihan53/
  */
 
+import Utils from "../requiments/Utils";
+
 export class BaseError extends Error {
     private statusCode: number;
 
     constructor(message: string,statusCode=500) {
         super(message);
-        this.message=message;
+        this.message= Utils.isString(message)?message: JSON.stringify(message);
         this.name = this.constructor.name // good practice
         this.statusCode = statusCode // error code for responding to client
-        Error.captureStackTrace(this)
+        //Error.captureStackTrace(this)
     }
 
     toString(){

package/base/InvalidArgumentException.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ * E-mail: cihan@chy.com.tr
+ * Github:https://github.com/cihan53/
+ */
+
+
+
+import {BaseError} from "./BaseError";
+
+export class InvalidArgumentException extends BaseError {
+    constructor ( public message: string) {
+        super(message,500);
+    }
+}

package/base/Model.ts

@@ -9,20 +9,29 @@ import BaseChyz from "../BaseChyz";
 import Utils from "../requiments/Utils";
 import {Component} from "./Component";
 import {InvalidConfigException} from "./InvalidConfigException";
-import {DatabaseError, DataTypes, ExclusionConstraintError, ForeignKeyConstraintError, Model as SModel, TimeoutError, UniqueConstraintError, ValidationError,} from "sequelize";
+import {
+    DatabaseError,
+    DataTypes,
+    ExclusionConstraintError,
+    ForeignKeyConstraintError,
+    Model as SModel,
+    TimeoutError,
+    UniqueConstraintError,
+    ValidationError,
+} from "sequelize";
 import {Exception} from "./db/Exception";
 
 export {DataTypes, NOW} from "sequelize";
 
-export interface Relation{
-    type:  "hasOne"  | "hasMany" | "belongsToMany" | "belongsTo",
-    allowNull?:boolean,
-    sourceKey:string,
-    model:SModel,
-    foreignKey:string,
-    name?:string,
-    through?:string,
-    as?:string
+export interface Relation {
+    type: "hasOne" | "hasMany" | "belongsToMany" | "belongsTo",
+    allowNull?: boolean,
+    sourceKey?: string,
+    model: SModel,
+    foreignKey: string,
+    name?: string,
+    through?: any,
+    as?: string
 }
 
 /**
@@ -80,7 +89,8 @@ export interface Relation{
  */
 
 export class Model extends Component {
-    _sequelize: any ;
+    _sequelize: any;
+    _register: any;
     private _tableName: string;
     private _model: any;
     private _attributes: any = {};
@@ -89,58 +99,29 @@ export class Model extends Component {
 
     constructor(sequelize?: IDBDatabase) {
         super();
-        this._tableName = this.constructor.name;
+        this._tableName = this.alias();
+
+        BaseChyz.debug("Model constructor", this._tableName)
         // this._sequelize = BaseChyz.getComponent("db").db;
         if (sequelize != null)
             this._sequelize = sequelize;
         else
-            this._sequelize = BaseChyz.getComponent("db").db;
+            this._sequelize = this.getDb();
 
         if (!Utils.isEmpty(this.attributes())) {
-            this._model = this._sequelize.define(this.constructor.name, this.attributes(), {
+
+            this._model = this._sequelize.define(this._tableName, this.attributes(), {
                 tableName: this.tableName(),
-                timestamps: false
+                timestamps: false,
+                createdAt: false,
+                updateAt: false
             });
 
-
-
-            /**
-             * init buraya
-             */
-
-            for (const relation of this.relations()) {
-                let m = relation.model;
-
-                if(relation.type=="hasOne"  ){
-                    // @ts-ignore
-                    delete relation.model
-                    this.model().hasOne(m, relation );
-                }
-
-                if(relation.type=="hasMany" ){
-                    // @ts-ignore
-                    delete relation.model;
-                    this.model().hasMany(m, relation );
-                }
-
-                if(relation.type=="belongsTo"  ){
-                    // @ts-ignore
-                    delete relation.model;
-                    this.model().belongsTo(m, relation );
-                }
-
-                if(relation.type=="belongsToMany"  ){
-                    // @ts-ignore
-                    delete relation.model;
-                    this.model().belongsToMany(m, relation );
-                }
-            }
-
         } else {
             throw new InvalidConfigException(BaseChyz.t("Invalid model configuration, is not emty attributes"))
         }
 
-        this.init();
+        // this.init();
 
     }
 
@@ -151,8 +132,7 @@ export class Model extends Component {
      * You may override this method if you want to use a different database connection.
      * @return Connection the database connection used by this AR class.
      */
-    public static getDb()
-    {
+    public  getDb() {
         return BaseChyz.getComponent("db").db
     }
 
@@ -178,9 +158,45 @@ export class Model extends Component {
 
     public init() {
         BaseChyz.debug("Model init....", this.constructor.name)
+        /**
+         * init buraya
+         */
+        BaseChyz.debug("Relation init....", this.constructor.name)
+        for (const relation of this.relations()) {
+            let m = relation.model;
+
+            if (relation.type == "hasOne") {
+                // @ts-ignore
+                delete relation.model
+                this.model().hasOne(m, relation);
+            }
+            //
+            if (relation.type == "hasMany") {
+                // @ts-ignore
+                delete relation.model;
+                this.model().hasMany(m, relation);
+            }
+
+            if (relation.type == "belongsTo") {
+                // @ts-ignore
+                delete relation.model;
+                this.model().belongsTo(m, relation);
+            }
+
+            if (relation.type == "belongsToMany") {
+                // @ts-ignore
+                delete relation.model;
+                this.model().belongsToMany(m, relation);
+            }
+        }
+
     }
 
 
+    public alias() {
+        return this.constructor.name;
+    }
+
     public tableName() {
         return this._tableName;
     }
@@ -203,7 +219,7 @@ export class Model extends Component {
         let result: any;
         try {
             result = await this.model().create(p, options)
-        } catch (e) {
+        } catch (e: any) {
             BaseChyz.debug(`Model[${this.constructor.name}].create`, e)
             if (e instanceof ValidationError) {
                 let validationErrorItems = e.errors;
@@ -237,7 +253,7 @@ export class Model extends Component {
         let result: any;
         try {
             result = await this.model().bulkCreate(p, options)
-        } catch (e) {
+        } catch (e: any) {
             BaseChyz.debug(`Model[${this.constructor.name}].bulkCreate`, e)
             if (e instanceof ValidationError) {
                 let validationErrorItems = e.errors;
@@ -291,6 +307,14 @@ export class Model extends Component {
         return this._model.findAll(...arguments)
     }
 
+    /**
+     * return {count : number , rows: any}
+     * @param args
+     */
+    public findAndCountAll(...args: any[]) {
+        return this._model.findAndCountAll(...arguments)
+    }
+
 
     public validate() {
 
@@ -348,7 +372,9 @@ export class Model extends Component {
      *
      * ]
      */
-    public relations():Relation[]{
+    public relations(): Relation[] {
         return []
     }
+
+
 }

package/base/ModelManager.ts

@@ -0,0 +1,19 @@
+import {Model} from "./Model"
+
+/*
+ *
+ * Copyright (c) 2021.. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ *  E-mail: cihan@chy.com.tr
+ *  Github:https://github.com/cihan53/
+ *
+ */
+interface ObjectConstructor {
+    _register(o: Model): void;
+}
+
+export const ModelManager: any = {
+    _register(map: Model) {
+        Object.assign(this, map)
+    }
+}

package/base/RestClient.ts

@@ -13,12 +13,12 @@ import {Component} from "./Component";
 const axios = require('axios')
 
 export class RestClient extends Component {
-    public post(url: string, args: any[]) {
-        return axios.post(url, args)
+    public post(url: string, args: any[],headers:any={}) {
+        return axios.post(url, args,headers)
     }
 
-    public get(url: string, args: any[]) {
-        return axios.post(url, args)
+    public get(url: string, args: any[],headers:any={}) {
+        return axios.get(url, args ,headers )
     }
 
     public Rest(params: any) {

package/base/ValidationHttpException.ts

@@ -9,6 +9,6 @@ import {BaseError} from "./BaseError";
 
 export class ValidationHttpException extends BaseError {
     constructor ( public message: string) {
-        super(message,401);
+        super(message,403);
     }
 }