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

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";
 
@@ -90,6 +251,7 @@ export class CustomerCLass extends Model {
 
 ```
 ````typescript
+
 export class ProductsClass extends Model {
     [x: string]: any;
 
@@ -128,6 +290,48 @@ export class ProductsClass extends Model {
     }
 }
 
+/**
+ * 
+ */
+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()
+            }
+        ]
+    }
+
+}
+
  
 ````
 
@@ -146,9 +350,11 @@ export class ProductsClass extends Model {
  *  }
  * @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();
 
@@ -164,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) {
@@ -173,9 +379,9 @@ Transaction oluşturma
     } catch (e) {
         if (transaction) {
             await transaction.rollback();
-            BaseChyz.warn("Rollback transaction")
+            BaseChyz.warn("Rollback transaction");
         }
-        ...
+        
     }
 ```
 
@@ -217,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
@@ -240,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/DbConnection.ts

@@ -9,13 +9,15 @@ const {Sequelize} = require("sequelize");
 import {Component} from "./Component";
 import BaseChyz from "../BaseChyz";
 
+const sequelizeCache = require('sequelize-transparent-cache')
+
 export class DbConnection extends Component {
 
     public database!: string;
-    public username!: string
-    public password!: string
-    public options?: object
-    public _transaction:any;
+    public username!: string;
+    public password!: string;
+    public options?: object;
+
 
     private _db: any
 
@@ -32,10 +34,12 @@ export class DbConnection extends Component {
 
             });
 
+
         // await this.connect();
     }
 
 
+
     get db(): any {
         return this._db;
     }
@@ -44,7 +48,7 @@ export class DbConnection extends Component {
         this._db = value;
     }
 
-    public transaction(){
+    public transaction() {
         return this.db.transaction();
     }