@riocrypto/common 1.0.432 → 1.0.433

package/build/middlewares/authorize.js

@@ -27,7 +27,7 @@ const missing_security_question_error_1 = require("../errors/missing-security-qu
 const admin_only_error_1 = require("../errors/admin-only-error");
 const not_broker_error_1 = require("../errors/not-broker-error");
 const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     let missingKYC = false;
     if (authorizationTypes.includes(authorization_type_1.AuthorizationType.Auth) ||
         authorizationTypes.includes(authorization_type_1.AuthorizationType.UserNoKYC) ||
@@ -126,22 +126,25 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
         }
     }
     if (authorizationTypes.includes(authorization_type_1.AuthorizationType.Broker)) {
-        let businessUser;
-        const BusinessUser = yield (0, business_user_1.buildBusinessUser)(mongoose);
-        businessUser = yield BusinessUser.findOne({
-            authId: req.currentAuth.id,
-        });
-        if (!businessUser) {
-            throw new Error();
-        }
-        if ((businessUser === null || businessUser === void 0 ? void 0 : businessUser.kycStatus) !== kyc_status_1.KYCStatus.businessApproved) {
-            missingKYC = true;
-            throw new Error();
-        }
-        if ((_g = businessUser.attributes) === null || _g === void 0 ? void 0 : _g.includes(user_attribute_1.UserAttribute.broker)) {
-            throw new not_broker_error_1.NotBrokerError();
+        let brokerBusinessUser;
+        try {
+            const BusinessUser = yield (0, business_user_1.buildBusinessUser)(mongoose);
+            brokerBusinessUser = yield BusinessUser.findOne({
+                authId: req.currentAuth.id,
+                attributes: { $e: user_attribute_1.UserAttribute.broker },
+            });
+            if (!brokerBusinessUser) {
+                throw new Error();
+            }
+            if ((brokerBusinessUser === null || brokerBusinessUser === void 0 ? void 0 : brokerBusinessUser.kycStatus) !== kyc_status_1.KYCStatus.businessApproved) {
+                missingKYC = true;
+                throw new Error();
+            }
+        }
+        catch (err) {
+            brokerBusinessUser = null;
         }
-        const user = businessUser;
+        const user = brokerBusinessUser;
         if (user) {
             req.user = user;
         }
@@ -155,14 +158,17 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
         }
         if ((authorizationTypes.includes(authorization_type_1.AuthorizationType.User) ||
             authorizationTypes.includes(authorization_type_1.AuthorizationType.UserNoKYC)) &&
-            ((_h = req.cookies) === null || _h === void 0 ? void 0 : _h.jwt)) {
+            ((_g = req.cookies) === null || _g === void 0 ? void 0 : _g.jwt)) {
             throw new missing_user_error_1.MissingUserError();
         }
         if (authorizationTypes.includes(authorization_type_1.AuthorizationType.Admin) &&
             authorizationTypes.length === 1 &&
-            ((_j = req.cookies) === null || _j === void 0 ? void 0 : _j.jwt)) {
+            ((_h = req.cookies) === null || _h === void 0 ? void 0 : _h.jwt)) {
             throw new admin_only_error_1.AdminOnlyError();
         }
+        if (!req.user && authorizationTypes.includes(authorization_type_1.AuthorizationType.Broker)) {
+            throw new not_broker_error_1.NotBrokerError();
+        }
         throw new not_authorized_error_1.NotAuthorizedError();
     }
     next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common",
-  "version": "1.0.432",
+  "version": "1.0.433",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",