@riocrypto/common-server 1.0.1216 → 1.0.1218

package/build/middlewares/authorize.js

@@ -19,9 +19,10 @@ const common_1 = require("@riocrypto/common");
 const auth_1 = require("../models/auth");
 const apiKey_1 = require("../services/apiKey");
 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, _d;
+    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");
@@ -67,17 +68,19 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
         }
     }
     if (authorizationTypes.includes(common_1.AuthorizationType.Admin)) {
-        if ((_b = req.cookies) === null || _b === void 0 ? void 0 : _b.adminAccessToken) {
+        if (req.currentAdminAuth) {
+            let admin;
             try {
-                const ADMIN_ACCESS_TOKEN_SECRET = yield secret_manager_client_1.secretManagerClient.getSecretValue("ADMIN_ACCESS_TOKEN_SECRET");
-                if (!ADMIN_ACCESS_TOKEN_SECRET) {
-                    throw new Error("Unable to get ADMIN_ACCESS_TOKEN_SECRET");
-                }
-                const payload = jsonwebtoken_1.default.verify(req.cookies.adminAccessToken, ADMIN_ACCESS_TOKEN_SECRET);
-                req.currentAdminAuth = payload;
+                const Admin = yield (0, admin_1.buildAdmin)(mongoose);
+                admin = yield Admin.findOne({
+                    authIds: { $in: [req.currentAdminAuth.id] },
+                });
             }
             catch (err) {
-                console.log(err);
+                admin = null;
+            }
+            if (admin) {
+                req.admin = admin;
             }
         }
     }
@@ -104,7 +107,7 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
                 console.log(err);
             }
         }
-        else if ((_c = req.cookies) === null || _c === void 0 ? void 0 : _c.accessToken) {
+        else if ((_b = req.cookies) === null || _b === void 0 ? void 0 : _b.accessToken) {
             try {
                 const ACCESS_TOKEN_SECRET = yield secret_manager_client_1.secretManagerClient.getSecretValue("ACCESS_TOKEN_SECRET");
                 if (!ACCESS_TOKEN_SECRET) {
@@ -129,11 +132,14 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
             user = null;
         }
         if (user) {
-            req.user = user;
-        }
-        if (((_d = req.user) === null || _d === void 0 ? void 0 : _d.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.1216",
+  "version": "1.0.1218",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -26,7 +26,7 @@
     "@aws-sdk/client-s3": "^3.297.0",
     "@everapi/currencyapi-js": "^1.0.6",
     "@google-cloud/storage": "^6.9.5",
-    "@riocrypto/common": "^1.0.1112",
+    "@riocrypto/common": "^1.0.1114",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",