@riocrypto/common-server 1.0.1215 → 1.0.1217

package/build/helpers/get-user.js

@@ -24,6 +24,7 @@ const getUser = (req, userId) => __awaiter(void 0, void 0, void 0, function* ()
         const User = (0, user_1.buildUser)(mongoose_1.default);
         const user = yield User.findById(userId);
         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) ||
             (user === null || user === void 0 ? void 0 : user.brokerId) === ((_b = req.user) === null || _b === void 0 ? void 0 : _b.id)) {
             return user;

package/build/middlewares/authorize.js

@@ -19,11 +19,12 @@ 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, _c;
     if (authorizationTypes.includes(common_1.AuthorizationType.Cluster)) {
-        let apiKey = req.header("x-api-key");
+        let apiKey = req.header("x-cluster-api-key");
         const CLUSTER_API_KEY = yield secret_manager_client_1.secretManagerClient.getSecretValue("CLUSTER_API_KEY");
         if (!CLUSTER_API_KEY) {
             throw new common_1.SecretManagerError();
@@ -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) {
@@ -131,7 +134,7 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
         if (user) {
             req.user = user;
         }
-        if (((_d = req.user) === null || _d === void 0 ? void 0 : _d.kycStatus) !== common_1.KYCStatus.Approved &&
+        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();
         }

package/build/models/order.d.ts

@@ -21,7 +21,6 @@ interface OrderAttrs {
     fees: Fees;
     actualFees?: Fees;
     price: number;
-    actualPrice?: number;
     depositAddress?: string;
     depositTxId?: string;
     withdrawalTxId?: string;
@@ -37,7 +36,6 @@ interface OrderAttrs {
     partner?: Partner;
     imported?: boolean;
     managedWallet?: boolean;
-    amountFixed?: number;
     exchangeRateOrders?: ExchangeRateOrder[];
     autoFXDisabled?: boolean;
     USBankTransferMethod?: "wire" | "ach_push";
@@ -63,7 +61,6 @@ interface OrderDoc extends Document {
     fees: Fees;
     actualFees?: Fees;
     price: number;
-    actualPrice: number;
     depositAddress?: string;
     depositTxId?: string;
     withdrawalTxId?: string;
@@ -79,7 +76,6 @@ interface OrderDoc extends Document {
     partner?: Partner;
     imported?: boolean;
     managedWallet?: boolean;
-    amountFixed?: number;
     exchangeRateOrders?: ExchangeRateOrder[];
     autoFXDisabled?: boolean;
     USBankTransferMethod?: "wire" | "ach_push";

package/build/models/order.js

@@ -111,9 +111,6 @@ const buildOrder = (mongoose) => {
             type: Number,
             required: true,
         },
-        actualPrice: {
-            type: Number,
-        },
         brokerId: {
             type: String,
         },
@@ -154,9 +151,6 @@ const buildOrder = (mongoose) => {
         managedWallet: {
             type: Boolean,
         },
-        amountFixed: {
-            type: Number,
-        },
         autoFXDisabled: {
             type: Boolean,
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1215",
+  "version": "1.0.1217",
   "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.1111",
+    "@riocrypto/common": "^1.0.1114",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",