@riocrypto/common-server 1.0.1214 → 1.0.1216

package/build/helpers/get-user.d.ts

@@ -0,0 +1,3 @@
+import { Request } from "express";
+import { UserDoc } from "../models/user";
+export declare const getUser: (req: Request, userId?: string) => Promise<UserDoc | undefined | null>;

package/build/helpers/get-user.js

@@ -0,0 +1,37 @@
+"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.getUser = void 0;
+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;
+    if (!userId) {
+        return req.user;
+    }
+    else {
+        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;
+        }
+        else {
+            return null;
+        }
+    }
+});
+exports.getUser = getUser;

package/build/index.d.ts

@@ -64,5 +64,5 @@ export * from "./helpers/get-network-fees";
 export * from "./helpers/calculate-aggregate-volume-and-revenue";
 export * from "./helpers/calculate-weekly-volume-and-revenue";
 export * from "./helpers/get-exchange-rates";
-export * from "./helpers/can-access-user";
+export * from "./helpers/get-user";
 export * from "./helpers/unescape";

package/build/index.js

@@ -80,5 +80,5 @@ __exportStar(require("./helpers/get-network-fees"), exports);
 __exportStar(require("./helpers/calculate-aggregate-volume-and-revenue"), exports);
 __exportStar(require("./helpers/calculate-weekly-volume-and-revenue"), exports);
 __exportStar(require("./helpers/get-exchange-rates"), exports);
-__exportStar(require("./helpers/can-access-user"), exports);
+__exportStar(require("./helpers/get-user"), exports);
 __exportStar(require("./helpers/unescape"), exports);

package/build/middlewares/authorize.js

@@ -23,7 +23,7 @@ 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;
     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();

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.1214",
+  "version": "1.0.1216",
   "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.1112",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",

package/build/helpers/can-access-user.d.ts

@@ -1,3 +0,0 @@
-import { User } from "@riocrypto/common";
-import { Request } from "express";
-export declare const canAccessUser: (userToAccess: User, req: Request) => boolean;

package/build/helpers/can-access-user.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.canAccessUser = void 0;
-const canAccessUser = (userToAccess, req) => {
-    var _a, _b;
-    if (!req.admin &&
-        userToAccess.id !== ((_a = req.user) === null || _a === void 0 ? void 0 : _a.id) &&
-        userToAccess.brokerId !== ((_b = req.user) === null || _b === void 0 ? void 0 : _b.id)) {
-        return false;
-    }
-    else {
-        return true;
-    }
-};
-exports.canAccessUser = canAccessUser;