@riocrypto/common-server 1.0.1217 → 1.0.1219

package/build/helpers/get-user.js

@@ -17,12 +17,15 @@ const user_1 = require("../models/user");
 const mongoose_1 = __importDefault(require("mongoose"));
 const getUser = (req, userId) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
+    console.log("User id is ", userId);
     if (!userId) {
         return req.user;
     }
     else {
+        console.log("chchch");
         const User = (0, user_1.buildUser)(mongoose_1.default);
         const user = yield User.findById(userId);
+        console.log("pp");
         if (req.admin ||
             req.validClusterApiKey ||
             (user === null || user === void 0 ? void 0 : user.id) === ((_a = req.user) === null || _a === void 0 ? void 0 : _a.id) ||

package/build/middlewares/authorize.js

@@ -22,7 +22,7 @@ const secret_manager_client_1 = require("../clients/secret-manager-client");
 const admin_1 = require("../models/admin");
 const admin_auth_1 = require("../models/admin-auth");
 const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
+    var _a, _b;
     if (authorizationTypes.includes(common_1.AuthorizationType.Cluster)) {
         let apiKey = req.header("x-cluster-api-key");
         const CLUSTER_API_KEY = yield secret_manager_client_1.secretManagerClient.getSecretValue("CLUSTER_API_KEY");
@@ -132,11 +132,14 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
             user = null;
         }
         if (user) {
-            req.user = user;
-        }
-        if (((_c = req.user) === null || _c === void 0 ? void 0 : _c.kycStatus) !== common_1.KYCStatus.Approved &&
-            authorizationTypes.includes(common_1.AuthorizationType.User)) {
-            throw new common_1.MissingKYCApprovalError();
+            if (authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC)) {
+                req.user = user;
+            }
+            else {
+                if (user.kycStatus === common_1.KYCStatus.Approved) {
+                    req.user = user;
+                }
+            }
         }
     }
     if (!req.currentAdminAuth &&

package/package.json

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