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

package/dist/filters/AccessControl.js

@@ -30,7 +30,6 @@ class AccessControl extends ActionFilter_1.ActionFilter {
     constructor() {
         super(...arguments);
         this.user = null;
-        this.denyCallback = null;
     }
     init() {
         var _a;
@@ -53,26 +52,15 @@ class AccessControl extends ActionFilter_1.ActionFilter {
             // @ts-ignore
             user.identity = (_b = request.identity) !== null && _b !== void 0 ? _b : null;
             for (const rulesKey in this.rules) {
-                let rule = this.rules[rulesKey];
-                if ((allow = yield rule.allows(action, user, request))) {
+                if ((allow = this.rules[rulesKey].allows(action, user, request))) {
                     return true;
                 }
                 else if (allow === false) {
-                    if (this.denyCallback != null) {
-                        rule.denyCallback.apply(rule, action);
-                    }
-                    else {
-                        this.denyAccess(user);
-                    }
+                    this.denyAccess(user);
                     return false;
                 }
             }
-            if (this.denyCallback != null) {
-                this.denyCallback.apply(null, action);
-            }
-            else {
-                this.denyAccess(user);
-            }
+            this.denyAccess(user);
             return false;
         });
     }

package/dist/filters/AccessControl.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccessControl.js","sourceRoot":"","sources":["../../filters/AccessControl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,2DAAmC;AACnC,2EAAsE;AACtE,uDAAkD;AAClD,6CAAwC;AACxC,4CAAuC;AACvC,gEAAwC;AAGxC,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAG1B,MAAa,aAAc,SAAQ,2BAAY;IAA/C;;QAEW,SAAI,GAAQ,IAAI,CAAC;QAEjB,iBAAY,GAAQ,IAAI,CAAC;IAuDpC,CAAC;IArDU,IAAI;;QACP,KAAK,CAAC,IAAI,EAAE,CAAA;QAEZ,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE;YACxB,IAAI,CAAC,IAAI,GAAG,MAAA,eAAK,CAAC,SAAS,CAAC,kBAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,mCAAI,IAAI,iBAAO,EAAE,CAAC;SAC/E;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,KAAa,EAAE,EAAE;YAC5C,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE;gBACvB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,YAAY,CAAC,IAAI,uBAAU,EAAE,EAAE,IAAI,CAAC,CAAC;aAClE;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAGY,YAAY,CAAC,MAAW,EAAE,OAAgB;;;YACnD,IAAI,KAAK,CAAC;YACV,aAAa;YACb,IAAI,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,CAAC,IAAI,CAAC;YACrC,aAAa;YACb,IAAI,CAAC,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,IAAI,CAAC;YAEzC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,KAAK,EAAE;gBAE/B,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAChC,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE;oBACpD,OAAO,IAAI,CAAC;iBACf;qBAAM,IAAI,KAAK,KAAK,KAAK,EAAE;oBACxB,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE;wBAC3B,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;qBACzC;yBAAM;wBACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;qBACzB;oBACD,OAAO,KAAK,CAAC;iBAChB;aACJ;YAGD,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE;gBAC3B,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aACzC;iBAAM;gBACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACzB;YAED,OAAO,KAAK,CAAC;;KAChB;IAEM,UAAU,CAAC,IAAa;QAC3B,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;YACxC,IAAI,CAAC,aAAa,EAAE,CAAC;SACxB;;YAAM,MAAM,IAAI,+CAAsB,CAAC,kBAAQ,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC;IACvG,CAAC;CAEJ;AA3DD,sCA2DC"}
+{"version":3,"file":"AccessControl.js","sourceRoot":"","sources":["../../filters/AccessControl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,2DAAmC;AACnC,2EAAsE;AACtE,uDAAkD;AAClD,6CAAwC;AACxC,4CAAuC;AACvC,gEAAwC;AAGxC,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAG1B,MAAa,aAAc,SAAQ,2BAAY;IAA/C;;QAEW,SAAI,GAAQ,IAAI,CAAC;IA4C5B,CAAC;IAzCU,IAAI;;QACP,KAAK,CAAC,IAAI,EAAE,CAAA;QAEZ,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE;YACxB,IAAI,CAAC,IAAI,GAAG,MAAA,eAAK,CAAC,SAAS,CAAC,kBAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,mCAAI,IAAI,iBAAO,EAAE,CAAC;SAC/E;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAQ,EAAE,KAAY,EAAE,EAAE;YAC1C,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE;gBACvB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,YAAY,CAAC,IAAI,uBAAU,EAAE,EAAE,IAAI,CAAC,CAAC;aAClE;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAGY,YAAY,CAAC,MAAU,EAAE,OAAe;;;YACjD,IAAI,KAAK,CAAC;YACV,aAAa;YACb,IAAI,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,CAAC,IAAI,CAAC;YACrC,aAAa;YACb,IAAI,CAAC,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,IAAI,CAAC;YAEzC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,KAAK,EAAE;gBAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE;oBAC9D,OAAO,IAAI,CAAC;iBACf;qBAAM,IAAI,KAAK,KAAK,KAAK,EAAE;oBACxB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBAEtB,OAAO,KAAK,CAAC;iBAChB;aACJ;YACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,KAAK,CAAC;;KAChB;IAEM,UAAU,CAAC,IAAa;QAC3B,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;YACxC,IAAI,CAAC,aAAa,EAAE,CAAC;SACxB;;YAAM,MAAM,IAAI,+CAAsB,CAAC,kBAAQ,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC;IACvG,CAAC;CAEJ;AA9CD,sCA8CC"}

package/dist/filters/AccessRule.js

@@ -1,77 +1,25 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessRule = void 0;
 var _ = require('lodash');
 const Component_1 = require("../base/Component");
 const InvalidConfigException_1 = require("../base/InvalidConfigException");
-const Utils_1 = __importDefault(require("../requiments/Utils"));
 class AccessRule extends Component_1.Component {
-    constructor() {
-        super(...arguments);
-        /**
-         * @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
-         */
-        this.roleParams = [];
-    }
     allows(action, user, request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.matchAction(action)
-                && (yield this.matchRole(user))) {
-                return this.allow;
-            }
-            //     if (this.matchAction($action)
-            //         && this.matchRole($user)
-            // && this.matchIP($request->getUserIP())
-            // && this.matchVerb($request->getMethod())
-            // && this.matchController($action->controller)
-            // && this.matchCustom($action)
-            // ) {
-            //     return $this->allow ? true : false;
-            // }
-            return null;
-        });
+        if (this.matchAction(action)
+            && this.matchRole(user)) {
+            return this.allow;
+        }
+        //     if (this.matchAction($action)
+        //         && this.matchRole($user)
+        // && this.matchIP($request->getUserIP())
+        // && this.matchVerb($request->getMethod())
+        // && this.matchController($action->controller)
+        // && this.matchCustom($action)
+        // ) {
+        //     return $this->allow ? true : false;
+        // }
+        return null;
     }
     /**
      * @param Action $action the action
@@ -98,42 +46,33 @@ class AccessRule extends Component_1.Component {
         return false;
     }
     matchRole(user) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let items = Utils_1.default.isEmpty(this.roles) ? [] : this.roles;
-            if (!Utils_1.default.isEmpty(this.permissions)) {
-                items = Utils_1.default.merge(items, this.permissions);
-            }
-            if (Utils_1.default.isEmpty(items)) {
-                return true;
-            }
-            if (!user) {
-                throw new InvalidConfigException_1.InvalidConfigException('The user application component must be available to specify roles in AccessRule.');
-            }
-            let roleParams = [];
-            for (const itemsKey in items) {
-                let item = items[itemsKey];
-                if (item === '?') {
-                    if (user.getIsGuest()) {
-                        return true;
-                    }
-                }
-                else if (item === '@') {
-                    if (!user.getIsGuest()) {
-                        return true;
-                    }
+        let items = _.isEmpty(this.roles) ? [] : this.roles;
+        if (!_.isEmpty(this.permissions)) {
+            items = _.merge(items, this.permissions);
+        }
+        if (_.isEmpty(items)) {
+            return true;
+        }
+        if (user === false) {
+            throw new InvalidConfigException_1.InvalidConfigException('The user application component must be available to specify roles in AccessRule.');
+        }
+        for (const itemsKey in items) {
+            let item = items[itemsKey];
+            if (item === '?') {
+                if (user.getIsGuest()) {
+                    return true;
                 }
-                else {
-                    //roleparams
-                    if (!Utils_1.default.isEmpty(this.roleParams)) {
-                        roleParams = !Utils_1.default.isArray(this.roleParams) ? this.roleParams.apply(this) : this.roleParams;
-                    }
-                    if (yield user.can(item, this.roleParams)) {
-                        return true;
-                    }
+            }
+            else if (item === '@') {
+                if (!user.getIsGuest()) {
+                    return true;
                 }
             }
-            return false;
-        });
+            else {
+                //roleparams
+            }
+        }
+        return false;
     }
 }
 exports.AccessRule = AccessRule;

package/dist/filters/AccessRule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccessRule.js","sourceRoot":"","sources":["../../filters/AccessRule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AccessRule.js","sourceRoot":"","sources":["../../filters/AccessRule.ts"],"names":[],"mappings":";;;AAQA,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC1B,iDAA4C;AAC5C,2EAAsE;AAGtE,MAAa,UAAW,SAAQ,qBAAS;IAwC9B,MAAM,CAAC,MAAU,EAAE,IAAY,EAAE,OAAe;QACnD,IACI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;eACrB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EACzB;YACE,OAAO,IAAI,CAAC,KAAK,CAAA;SACpB;QACD,oCAAoC;QACpC,mCAAmC;QACnC,yCAAyC;QACzC,2CAA2C;QAC3C,+CAA+C;QAC/C,+BAA+B;QAC/B,MAAM;QACN,0CAA0C;QAC1C,IAAI;QAEJ,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;OAGG;IACO,WAAW,CAAC,MAAU;QAC5B,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;IAED;;;OAGG;IACO,eAAe,CAAC,UAAc;QACpC,uCAAuC;QACvC,uBAAuB;QACvB,QAAQ;QACR,EAAE;QACF,wCAAwC;QACxC,iDAAiD;QACjD,wDAAwD;QACxD,uBAAuB;QACvB,QAAQ;QACR,IAAI;QAEJ,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,SAAS,CAAC,IAAQ;QACxB,IAAI,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QAEpD,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAC9B,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;SAC5C;QAED,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAClB,OAAO,IAAI,CAAC;SACf;QAGD,IAAI,IAAI,KAAK,KAAK,EAAE;YAChB,MAAM,IAAI,+CAAsB,CAAC,kFAAkF,CAAC,CAAC;SACxH;QAED,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE;YAC1B,IAAI,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC3B,IAAI,IAAI,KAAK,GAAG,EAAE;gBACd,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;oBACnB,OAAO,IAAI,CAAC;iBACf;aACJ;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE;gBACrB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE;oBACpB,OAAO,IAAI,CAAC;iBACf;aACJ;iBAAM;gBACH,YAAY;aACf;SACJ;QAGD,OAAO,KAAK,CAAC;IACjB,CAAC;CAGJ;AA3HD,gCA2HC"}

package/dist/filters/auth/HttpBasicAuth.js

@@ -5,69 +5,4 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpBasicAuth = void 0;
-const AuthMethod_1 = require("./AuthMethod");
-const base_1 = require("../../base");
-const BaseChyz_1 = __importDefault(require("../../BaseChyz"));
-class HttpBasicAuth extends AuthMethod_1.AuthMethod {
-    constructor() {
-        super(...arguments);
-        /**
-         * @var string the HTTP header name
-         */
-        this.header = 'Authorization';
-        /**
-         * @var string a pattern to use to extract the HTTP authentication value
-         */
-        this.pattern = /^Basic\s+(.*?)$/;
-    }
-    /**
-     * @throws InvalidConfigException
-     */
-    init() {
-        var _a;
-        super.init();
-        if (!this.pattern) {
-            throw new base_1.InvalidConfigException('You must provide pattern to use to extract the HTTP authentication value!');
-        }
-        this.user = (_a = BaseChyz_1.default.getComponent("user")) !== null && _a !== void 0 ? _a : null;
-    }
-    authenticate(user, request, response) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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 = yield user.loginByAccessToken(basicauth, "HttpBasicAuth");
-            if (identity === null) {
-                this.challenge(response);
-                this.handleFailure(response);
-            }
-            return identity;
-            return null;
-        });
-    }
-    /**
-     * @throws UnauthorizedHttpException
-     */
-    fail(response) {
-        this.challenge(response);
-        this.handleFailure(response);
-    }
-}
-exports.HttpBasicAuth = HttpBasicAuth;
 //# sourceMappingURL=HttpBasicAuth.js.map

package/dist/filters/auth/HttpBasicAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpBasicAuth.js","sourceRoot":"","sources":["../../../filters/auth/HttpBasicAuth.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;AAMH,6CAAwC;AACxC,qCAAkD;AAClD,8DAAsC;AAEtC,MAAa,aAAc,SAAQ,uBAAU;IAA7C;;QAEI;;WAEG;QACI,WAAM,GAAG,eAAe,CAAC;QAGhC;;WAEG;QAEI,YAAO,GAAG,iBAAiB,CAAC;IA+CvC,CAAC;IA5CG;;OAEG;IACI,IAAI;;QACP,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,IAAI,6BAAsB,CAAC,2EAA2E,CAAC,CAAC;SACjH;QAED,IAAI,CAAC,IAAI,GAAG,MAAA,kBAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,mCAAI,IAAI,CAAC;IACtD,CAAC;IAGK,YAAY,CAAC,IAAa,EAAE,OAAe,EAAE,QAAiB;;YAGhE,IAAI,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YACjE,IAAI,SAAS,IAAI,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,EAAE;gBACvF,OAAO,IAAI,CAAC;aACf;YAED,IAAI,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAEvC,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACzE,IAAI,QAAQ,KAAK,IAAI,EAAE;gBACnB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACzB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;aAChC;YAED,OAAO,QAAQ,CAAC;YAGhB,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAGD;;OAEG;IACI,IAAI,CAAC,QAAiB;QACzB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACxB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;CACJ;AA3DD,sCA2DC"}
+{"version":3,"file":"HttpBasicAuth.js","sourceRoot":"","sources":["../../../filters/auth/HttpBasicAuth.ts"],"names":[],"mappings":";AAAA;;;;;GAKG"}

package/dist/filters/auth/JwtHttpBearerAuth.js

@@ -50,7 +50,7 @@ class JwtHttpBearerAuth extends HttpBearerAuth_1.HttpBearerAuth {
             if (autHeader == null || (autHeader = this.patternCheck(autHeader, this.pattern)) == null) {
                 return null;
             }
-            // BaseChyz.debug("JSON Web Token.",autHeader);
+            BaseChyz_1.default.debug("JSON Web Token.", autHeader);
             let identity = null;
             let token = null;
             token = JsonWebToken.decode(autHeader[1], { complete: true });

package/dist/filters/auth/JwtHttpBearerAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"JwtHttpBearerAuth.js","sourceRoot":"","sources":["../../../filters/auth/JwtHttpBearerAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,8DAAsC;AACtC,qDAAgD;AAChD,8EAAyE;AAKzE,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7C,MAAa,iBAAkB,SAAQ,+BAAc;IAArD;;QACI;;;WAGG;QACI,QAAG,GAAG,KAAK,CAAA;QACX,SAAI,GAAO,IAAI,CAAC;IA0D3B,CAAC;IAvDG;;OAEG;IACI,IAAI;;QACP,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,IAAI,+CAAsB,CAAC,2EAA2E,CAAC,CAAC;SACjH;QAED,IAAI,CAAC,IAAI,GAAG,MAAA,kBAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,mCAAI,IAAI,CAAC;IACtD,CAAC;IAGY,YAAY,CAAC,IAAY,EAAE,OAAe,EAAE,QAAiB;;YAGtE,IAAI,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YACjE,IAAI,SAAS,IAAI,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,EAAE;gBACvF,OAAO,IAAI,CAAC;aACf;YAED,+CAA+C;YAC/C,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAI,KAAK,GAAG,IAAI,CAAC;YAEjB,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAA;YAC3D,IAAI,CAAC,KAAK,EAAE;gBACR,kBAAQ,CAAC,OAAO,CAAC,+DAA+D,CAAC,CAAC;gBAClF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACvB;YAED,IAAI,KAAK,KAAK,IAAI,EAAE;gBAChB,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;oBACnB,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC3C;qBAAM;oBACH,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAA;iBAC9E;aACJ;YAED,IAAI,QAAQ,IAAI,IAAI;gBAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAGzC,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAGD;;OAEG;IACI,IAAI,CAAC,QAAiB;QACzB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACxB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;CAEJ;AAhED,8CAgEC"}
+{"version":3,"file":"JwtHttpBearerAuth.js","sourceRoot":"","sources":["../../../filters/auth/JwtHttpBearerAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,8DAAsC;AACtC,qDAAgD;AAChD,8EAAyE;AAKzE,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7C,MAAa,iBAAkB,SAAQ,+BAAc;IAArD;;QACI;;;WAGG;QACI,QAAG,GAAG,KAAK,CAAA;QACX,SAAI,GAAO,IAAI,CAAC;IA0D3B,CAAC;IAvDG;;OAEG;IACI,IAAI;;QACP,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,IAAI,+CAAsB,CAAC,2EAA2E,CAAC,CAAC;SACjH;QAED,IAAI,CAAC,IAAI,GAAG,MAAA,kBAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,mCAAI,IAAI,CAAC;IACtD,CAAC;IAGY,YAAY,CAAC,IAAY,EAAE,OAAe,EAAE,QAAiB;;YAGtE,IAAI,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YACjE,IAAI,SAAS,IAAI,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,EAAE;gBACvF,OAAO,IAAI,CAAC;aACf;YAED,kBAAQ,CAAC,KAAK,CAAC,iBAAiB,EAAC,SAAS,CAAC,CAAC;YAC5C,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAI,KAAK,GAAG,IAAI,CAAC;YAEjB,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAA;YAC3D,IAAI,CAAC,KAAK,EAAE;gBACR,kBAAQ,CAAC,OAAO,CAAC,+DAA+D,CAAC,CAAC;gBAClF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACvB;YAED,IAAI,KAAK,KAAK,IAAI,EAAE;gBAChB,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;oBACnB,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC3C;qBAAM;oBACH,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAA;iBAC9E;aACJ;YAED,IAAI,QAAQ,IAAI,IAAI;gBAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAGzC,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAGD;;OAEG;IACI,IAAI,CAAC,QAAiB;QACzB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACxB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;CAEJ;AAhED,8CAgEC"}

package/dist/filters/auth/index.js

@@ -13,5 +13,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./JwtHttpBearerAuth"), exports);
 __exportStar(require("./HttpBearerAuth"), exports);
 __exportStar(require("./HttpHeaderAuth"), exports);
-__exportStar(require("./HttpBasicAuth"), exports);
 //# sourceMappingURL=index.js.map

package/dist/filters/auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../filters/auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmC;AACnC,mDAAgC;AAChC,mDAAgC;AAChC,kDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../filters/auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmC;AACnC,mDAAgC;AAChC,mDAAgC"}

package/dist/package.json

@@ -1,11 +1,12 @@
 {
   "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 ",
     "test": "echo \"Error: no test specified\" && exit 1",
     "postversion": "git push && git push --tags"
   },
@@ -36,8 +37,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/dist/web/WebUser.js

@@ -23,18 +23,7 @@ const BaseChyz_1 = __importDefault(require("../BaseChyz"));
 const Component_1 = require("../base/Component");
 const ForbiddenHttpException_1 = require("../base/ForbiddenHttpException");
 const InvalidConfigException_1 = require("../base/InvalidConfigException");
-const Utils_1 = __importDefault(require("../requiments/Utils"));
 class WebUser extends Component_1.Component {
-    constructor() {
-        super(...arguments);
-        /**
-         * @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
-         */
-        this.accessChecker = null;
-    }
     get identity() {
         return this._identity;
     }
@@ -94,73 +83,6 @@ class WebUser extends Component_1.Component {
     }
     afterLogin() {
     }
-    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;
-    // }
-    can(permissionName, params = [], allowCaching = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let access;
-            let accessChecker;
-            if ((accessChecker = this.getAccessChecker()) == null)
-                return false;
-            access = yield accessChecker.checkAccess(this.getId(), permissionName, params);
-            if (allowCaching && Utils_1.default.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
-     */
-    getAuthManager() {
-        return BaseChyz_1.default.getComponent('authManager');
-    }
-    /**
-     * Returns the access checker used for checking access.
-     * @return CheckAccessInterface
-     */
-    getAccessChecker() {
-        return this.accessChecker !== null ? this.accessChecker : this.getAuthManager();
-    }
 }
 exports.WebUser = WebUser;
 //# sourceMappingURL=WebUser.js.map

package/dist/web/WebUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebUser.js","sourceRoot":"","sources":["../../web/WebUser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WebUser.js","sourceRoot":"","sources":["../../web/WebUser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,2DAAmC;AACnC,iDAA4C;AAC5C,2EAAsE;AACtE,2EAAsE;AAGtE,MAAa,OAAQ,SAAQ,qBAAS;IASlC,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ,CAAC,KAAK;QACd,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IAC3B,CAAC;IAEM,IAAI;QACP,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,MAAM,IAAI,+CAAsB,CAAC,kCAAkC,CAAC,CAAC;SACxE;QAGD,IAAI,CAAC,aAAa,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;IAElD,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC;IACvC,CAAC;IAEM,WAAW,CAAC,SAAS,GAAG,IAAI;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAEM,aAAa;QAEhB,MAAM,IAAI,+CAAsB,CAAC,kBAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACnE,CAAC;IAGD;;;;OAIG;IACO,mBAAmB;IAE7B,CAAC;IAED;;;;OAIG;IACU,kBAAkB,CAAC,KAAU,EAAE,OAAY,IAAI;;YAExD,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YAChC,IAAI,MAAM,CAAC,yBAAyB,EAAE;gBAClC,IAAI,CAAC,QAAQ,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBACnE,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;oBAC5C,OAAO,IAAI,CAAC,QAAQ,CAAC;iBACxB;aACJ;iBAAI;gBACD,kBAAQ,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAA;aACjE;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAEM,KAAK,CAAC,QAA2B,EAAE,QAAQ,GAAG,CAAC;QAElD,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE;SAEhD;QACD,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAA;IAC7B,CAAC;IAEM,WAAW,CAAC,QAAa,EAAE,WAAoB,EAAE,QAAgB;QAEpE,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU;IAEjB,CAAC;CACJ;AAvFD,0BAuFC"}

package/filters/AccessControl.ts

@@ -19,7 +19,6 @@ export class AccessControl extends ActionFilter {
 
     public user: any = null;
     public rules: any;
-    public denyCallback: any = null;
 
     public init() {
         super.init()
@@ -28,7 +27,7 @@ export class AccessControl extends ActionFilter {
             this.user = Utils.cloneDeep(BaseChyz.getComponent("user")) ?? new WebUser();
         }
 
-        this.rules.forEach((rule: any, index: number) => {
+        this.rules.forEach((rule:any, index:number) => {
             if (rule === Object(rule)) {
                 this.rules[index] = Utils.createObject(new AccessRule(), rule);
             }
@@ -36,7 +35,7 @@ export class AccessControl extends ActionFilter {
     }
 
 
-    public async beforeAction(action: any, request: Request) {
+    public async beforeAction(action:any, request:Request) {
         let allow;
         // @ts-ignore
         let user = request.user ?? this.user;
@@ -44,27 +43,15 @@ export class AccessControl extends ActionFilter {
         user.identity = request.identity ?? null;
 
         for (const rulesKey in this.rules) {
-
-            let rule = this.rules[rulesKey];
-            if ((allow = await rule.allows(action, user, request))) {
+            if ((allow = this.rules[rulesKey].allows(action, user, request))) {
                 return true;
             } else if (allow === false) {
-                if (this.denyCallback != null) {
-                    rule.denyCallback.apply(rule, action);
-                } else {
-                    this.denyAccess(user);
-                }
+                this.denyAccess(user);
+
                 return false;
             }
         }
-
-
-        if (this.denyCallback != null) {
-            this.denyCallback.apply(null, action);
-        } else {
-            this.denyAccess(user);
-        }
-
+        this.denyAccess(user);
         return false;
     }