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

package/filters/AccessRule.ts

@@ -10,72 +10,35 @@ var _ = require('lodash');
 import {Component} from "../base/Component";
 import {InvalidConfigException} from "../base/InvalidConfigException";
 import {Request, Response} from "express";
-import Utils from "../requiments/Utils";
 
 export class AccessRule extends Component {
 
     /**
      * @var bool whether this is an 'allow' rule or 'deny' rule.
      */
-    public allow: any;
+    public allow:any;
     /**
      * @var array list of action IDs that this rule applies to. The comparison is case-sensitive.
      * If not set or empty, it means this rule applies to all actions.
      */
-    public actions: any;
+    public actions:any;
 
     /**
      *  @var array list of the controller IDs that this rule applies to.
      */
-    public controllers: any;
+    public controllers:any;
 
     /**
      * - `?`: matches a guest user (not authenticated yet)
      * - `@`: matches an authenticated user
      */
 
-    public roles: any;
+    public roles:any;
 
     /**
      * @var array list of RBAC (Role-Based Access Control) permissions that this rules applies to.
      */
-    public permissions: any;
-
-    /**
-     * @var array|Closure parameters to pass to the [[User::can()]] function for evaluating
-     * user permissions in [[$roles]].
-     *
-     * If this is an array, it will be passed directly to [[User::can()]]. For example for passing an
-     * ID from the current request, you may use the following:
-     *
-     * ```php
-     * ['postId' => Yii::$app->request->get('id')]
-     * ```
-     *
-     * You may also specify a closure that returns an array. This can be used to
-     * evaluate the array values only if they are needed, for example when a model needs to be
-     * loaded like in the following code:
-     *
-     * ```php
-     * 'rules' => [
-     *     [
-     *         'allow' => true,
-     *         'actions' => ['update'],
-     *         'roles' => ['updatePost'],
-     *         'roleParams' => function($rule) {
-     *             return ['post' => Post::findOne(Yii::$app->request->get('id'))];
-     *         },
-     *     ],
-     * ],
-     * ```
-     *
-     * A reference to the [[AccessRule]] instance will be passed to the closure as the first parameter.
-     *
-     * @see roles
-     * @since 2.0.12
-     */
-    public roleParams: any = [];
-
+    public permissions:any;
 
     /**
      * @var array list of user IP addresses that this rule applies to. An IP address
@@ -85,13 +48,13 @@ export class AccessRule extends Component {
      * 20-bit private network block in RFC1918.
      * If not set or empty, it means this rule applies to all IP addresses.
      */
-    public ips: any;
+    public ips:any;
 
 
-    public async allows(action: any, user: WebUser, request: Request) {
+    public allows(action:any, user:WebUser, request:Request) {
         if (
             this.matchAction(action)
-            && await this.matchRole(user)
+            && this.matchRole(user)
         ) {
             return this.allow
         }
@@ -112,7 +75,7 @@ export class AccessRule extends Component {
      * @param Action $action the action
      * @return bool whether the rule applies to the action
      */
-    protected matchAction(action: any) {
+    protected matchAction(action:any) {
         return _.isEmpty(this.actions) || this.actions.includes(action.id);
     }
 
@@ -120,7 +83,7 @@ export class AccessRule extends Component {
      * @param Controller $controller the controller
      * @return bool whether the rule applies to the controller
      */
-    protected matchController(controller: any) {
+    protected matchController(controller:any) {
         //     if (empty($this->controllers)) {
         //         return true;
         //     }
@@ -135,23 +98,22 @@ export class AccessRule extends Component {
         return false;
     }
 
-    protected async matchRole(user: WebUser) {
-        let items = Utils.isEmpty(this.roles) ? [] : this.roles;
+    protected matchRole(user:any) {
+        let items = _.isEmpty(this.roles) ? [] : this.roles;
 
-        if (!Utils.isEmpty(this.permissions)) {
-            items = Utils.merge(items, this.permissions);
+        if (!_.isEmpty(this.permissions)) {
+            items = _.merge(items, this.permissions);
         }
 
-        if (Utils.isEmpty(items)) {
+        if (_.isEmpty(items)) {
             return true;
         }
 
 
-        if (!user) {
+        if (user === false) {
             throw new InvalidConfigException('The user application component must be available to specify roles in AccessRule.');
         }
 
-        let roleParams: any = [];
         for (const itemsKey in items) {
             let item = items[itemsKey];
             if (item === '?') {
@@ -164,13 +126,6 @@ export class AccessRule extends Component {
                 }
             } else {
                 //roleparams
-                if (!Utils.isEmpty(this.roleParams)) {
-                    roleParams = !Utils.isArray(this.roleParams) ? this.roleParams.apply(this) : this.roleParams;
-                }
-
-                if (await user.can(item, this.roleParams)) {
-                    return true;
-                }
             }
         }
 

package/filters/auth/HttpBasicAuth.ts

@@ -5,71 +5,3 @@
  * Github:https://github.com/cihan53/
  */
 
-import {HttpHeaderAuth} from "./HttpHeaderAuth";
-import {Request, Response} from "express";
-import {WebUser} from "../../web/WebUser";
-import Utils from "../../requiments/Utils";
-import {AuthMethod} from "./AuthMethod";
-import {InvalidConfigException} from "../../base";
-import BaseChyz from "../../BaseChyz";
-
-export class HttpBasicAuth extends AuthMethod {
-
-    /**
-     * @var string the HTTP header name
-     */
-    public header = 'Authorization';
-
-
-    /**
-     * @var string a pattern to use to extract the HTTP authentication value
-     */
-
-    public pattern = /^Basic\s+(.*?)$/;
-
-
-    /**
-     * @throws InvalidConfigException
-     */
-    public init(): void {
-        super.init();
-
-        if (!this.pattern) {
-            throw new InvalidConfigException('You must provide pattern to use to extract the HTTP authentication value!');
-        }
-
-        this.user = BaseChyz.getComponent("user") ?? null;
-    }
-
-
-    async authenticate(user: WebUser, request:Request, response:Response) {
-
-
-        let autHeader = this.getHeaderByKey(request.headers, this.header)
-        if (autHeader == null || (autHeader = this.patternCheck(autHeader, this.pattern)) == null) {
-            return null;
-        }
-
-        let basicauth = autHeader[1].split(":")
-
-        let identity = await user.loginByAccessToken(basicauth, "HttpBasicAuth");
-        if (identity === null) {
-            this.challenge(response);
-            this.handleFailure(response);
-        }
-
-        return identity;
-
-
-        return null;
-    }
-
-
-    /**
-     * @throws UnauthorizedHttpException
-     */
-    public fail(response:Response): void {
-        this.challenge(response)
-        this.handleFailure(response);
-    }
-}

package/filters/auth/JwtHttpBearerAuth.ts

@@ -44,7 +44,7 @@ export class JwtHttpBearerAuth extends HttpBearerAuth {
             return null;
         }
 
-        // BaseChyz.debug("JSON Web Token.",autHeader);
+        BaseChyz.debug("JSON Web Token.",autHeader);
         let identity = null;
         let token = null;
 

package/filters/auth/index.ts

@@ -1,4 +1,3 @@
 export * from "./JwtHttpBearerAuth"
 export * from "./HttpBearerAuth"
 export * from "./HttpHeaderAuth"
-export * from "./HttpBasicAuth"

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "chyz",
-  "version": " 1.0.13-rc.20",
-  "description": "Nodejs Micro service Framework",
+  "version": "1.0.13-rc.3",
+  "description": "Nodejs MicroServis Framework",
+  "main": "index.js",
   "scripts": {
-    "dev": "nodemon -t --trace-warnings index.ts",
+    "dev": "nodemon index.ts",
     "debug": "ts-node index.ts",
-    "build": "rmdir /S /Q .\\dist && npx tsc && xcopy .\\log .\\dist\\log /e /i /h /Y && copy .\\package.json .\\dist\\package.json",
+    "build": "rmdir /S /Q .\\dist && npx tsc && xcopy .\\log .\\dist\\log /e /i /h /Y && copy .\\package.json .\\dist\\package.json && copy .\\README.md .\\dist\\README.md ",
+    "publish": "cd dist && npm publish",
     "test": "echo \"Error: no test specified\" && exit 1",
     "postversion": "git push && git push --tags"
   },
@@ -36,8 +38,7 @@
     "pg": "^8.7.1",
     "pg-hstore": "^2.3.4",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.6.5",
-    "validate.js": "^0.13.1"
+    "sequelize": "^6.6.5"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",

package/web/IdentityInterface.ts

@@ -59,10 +59,4 @@ export interface IdentityInterface {
      */
     validateAuthKey(authKey: string): (boolean | null);
 
-
-    /**
-     *
-     */
-    can(permissionName:string, params: any[]  , allowCaching: boolean  ): (boolean | null);
-
 }

package/web/WebUser.ts

@@ -9,8 +9,6 @@ import {Component} from "../base/Component";
 import {ForbiddenHttpException} from "../base/ForbiddenHttpException";
 import {InvalidConfigException} from "../base/InvalidConfigException";
 import {IdentityInterface} from "./IdentityInterface";
-import Utils from "../requiments/Utils";
-import {AuthManager} from "../rbac/AuthManager";
 
 export class WebUser extends Component {
 
@@ -19,13 +17,6 @@ export class WebUser extends Component {
      */
     public identityClass: any;
     private _identity: any;
-    /**
-     * @var CheckAccessInterface|string|array The access checker object to use for checking access or the application
-     * component ID of the access checker.
-     * If not set the application auth manager will be used.
-     * @since 2.0.9
-     */
-    public accessChecker: any = null;
 
 
     get identity() {
@@ -84,7 +75,7 @@ export class WebUser extends Component {
             if (this.identity && this.login(this.identity)) {
                 return this.identity;
             }
-        } else {
+        }else{
             BaseChyz.error("WebUser::findIdentityByAccessToken undefined")
         }
         return null;
@@ -106,82 +97,4 @@ export class WebUser extends Component {
     public afterLogin() {
 
     }
-
-    public getId() {
-        let identity = this.getIdentity();
-        return identity !== null ? identity.getId() : null;
-    }
-
-    /**
-     * Checks if the user can perform the operation as specified by the given permission.
-     *
-     * Note that you must configure "authManager" application component in order to use this method.
-     * Otherwise it will always return false.
-     *
-     * @param string $permissionName the name of the permission (e.g. "edit post") that needs access check.
-     * @param array $params name-value pairs that would be passed to the rules associated
-     * with the roles and permissions assigned to the user.
-     * @param bool $allowCaching whether to allow caching the result of access check.
-     * When this parameter is true (default), if the access check of an operation was performed
-     * before, its result will be directly returned when calling this method to check the same
-     * operation. If this parameter is false, this method will always call
-     * [[\yii\rbac\CheckAccessInterface::checkAccess()]] to obtain the up-to-date access result. Note that this
-     * caching is effective only within the same request and only works when `$params = []`.
-     * @return bool whether the user can perform the operation as specified by the given permission.
-     */
-    // public function can($permissionName, $params = [], $allowCaching = true)
-    // {
-    //     if ($allowCaching && empty($params) && isset($this->_access[$permissionName])) {
-    //         return $this->_access[$permissionName];
-    //     }
-    //     if (($accessChecker = $this->getAccessChecker()) === null) {
-    //         return false;
-    //     }
-    //     $access = $accessChecker->checkAccess($this->getId(), $permissionName, $params);
-    //     if ($allowCaching && empty($params)) {
-    //         $this->_access[$permissionName] = $access;
-    //     }
-    //
-    //     return $access;
-    // }
-
-    public async can(permissionName: string, params = [], allowCaching = true) {
-
-        let access;
-        let accessChecker: AuthManager;
-        if ((accessChecker = this.getAccessChecker()) == null)
-            return false;
-
-
-        access = await accessChecker.checkAccess(this.getId(), permissionName, params);
-
-        if (allowCaching && Utils.isEmpty(params)) {
-            // this._access[$permissionName] = $access;
-        }
-
-        return access;
-
-    }
-
-    /**
-     * 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.
-     * @return \yii\rbac\ManagerInterface
-     * @since 2.0.6
-     */
-    protected getAuthManager(): AuthManager {
-        return BaseChyz.getComponent('authManager');
-    }
-
-    /**
-     * Returns the access checker used for checking access.
-     * @return CheckAccessInterface
-     */
-    protected getAccessChecker():AuthManager {
-        return this.accessChecker !== null ? this.accessChecker : this.getAuthManager();
-    }
-
-
 }

package/Doc/Moel kullanma.md

@@ -1,13 +0,0 @@
-##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/BasicApiController.ts

@@ -1,121 +0,0 @@
-/*
- *
- * 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/Models/AuthAssignment.ts

@@ -1,50 +0,0 @@
-/*
- * 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

@@ -1,59 +0,0 @@
-/*
- * 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

@@ -1,49 +0,0 @@
-/*
- * 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()
-            }
-        ]
-    }
-
-}
-