@riocrypto/common-server 1.0.668 → 1.0.673

package/build/helpers/get-platform-and-partner-fees.d.ts

@@ -1,6 +1,6 @@
-import { BusinessUser, Country, Fiat, Processor, User } from "@riocrypto/common";
+import { Country, Fiat, Processor, User } from "@riocrypto/common";
 import { Mongoose } from "mongoose";
-export declare const getPlatformAndPartnerFees: (mongoose: Mongoose, amountFiat: number, fiat: Fiat, processor: Processor, country: Country, partnerId?: string, brokerCustomerId?: string, user?: BusinessUser | User) => Promise<{
+export declare const getPlatformAndPartnerFees: (mongoose: Mongoose, amountFiat: number, fiat: Fiat, processor: Processor, country: Country, partnerId?: string, brokerCustomerId?: string, user?: User) => Promise<{
     platformFeeFiat: number;
     platformFeeFiatTax: number;
     partnerFeeFiat: number;

package/build/helpers/get-platform-and-partner-fees.js

@@ -15,7 +15,7 @@ const common_1 = require("@riocrypto/common");
 const kapstar_client_1 = require("../clients/kapstar-client");
 const currency_api_client_1 = require("../clients/currency-api-client");
 const partner_1 = require("../models/partner");
-const business_user_1 = require("../models/business-user");
+const user_1 = require("../models/user");
 const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, country, partnerId, brokerCustomerId, user) => __awaiter(void 0, void 0, void 0, function* () {
     let platformFeeFiat;
     let platformFeeFiatTax = 0;
@@ -73,10 +73,10 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
         partnerFeeFiat = 0;
     }
     if (brokerCustomerId) {
-        const BusinessUser = (0, business_user_1.buildBusinessUser)(mongoose);
-        const brokerCustomer = yield BusinessUser.findById(brokerCustomerId);
+        const User = (0, user_1.buildUser)(mongoose);
+        const brokerCustomer = yield User.findById(brokerCustomerId);
         if (!brokerCustomer) {
-            throw new Error("Business user not found");
+            throw new Error("Broker customer not found");
         }
         if (brokerCustomer === null || brokerCustomer === void 0 ? void 0 : brokerCustomer.platformFeeRanges) {
             for (const range of brokerCustomer.platformFeeRanges) {

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

@@ -1,3 +1,3 @@
 import { Mongoose } from "mongoose";
-import { User as UserType, BusinessUser as BusinessUserType } from "@riocrypto/common";
-export declare const getUserHelper: (id: string, mongoose: Mongoose) => Promise<UserType | BusinessUserType | null>;
+import { User as UserType } from "@riocrypto/common";
+export declare const getUserHelper: (id: string, mongoose: Mongoose) => Promise<UserType | null>;

package/build/helpers/get-user-helper.js

@@ -10,26 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserHelper = void 0;
-const business_user_1 = require("../models/business-user");
 const user_1 = require("../models/user");
 const getUserHelper = (id, mongoose) => __awaiter(void 0, void 0, void 0, function* () {
-    let individualUser;
-    let businessUser;
+    let user;
     const User = (0, user_1.buildUser)(mongoose);
-    const BusinessUser = (0, business_user_1.buildBusinessUser)(mongoose);
     try {
-        individualUser = yield User.findById(id);
+        user = yield User.findById(id);
     }
     catch (error) {
-        individualUser = null;
+        user = null;
     }
-    try {
-        businessUser = yield BusinessUser.findById(id);
-    }
-    catch (error) {
-        businessUser = null;
-    }
-    const user = individualUser || businessUser;
     return user;
 });
 exports.getUserHelper = getUserHelper;

package/build/index.d.ts

@@ -16,7 +16,6 @@ export * from "./services/apiKey";
 export * from "./services/password";
 export * from "./models/admin-auth";
 export * from "./models/auth";
-export * from "./models/business-user";
 export * from "./models/bank-payout";
 export * from "./models/bank-payment";
 export * from "./models/order";

package/build/index.js

@@ -32,7 +32,6 @@ __exportStar(require("./services/apiKey"), exports);
 __exportStar(require("./services/password"), exports);
 __exportStar(require("./models/admin-auth"), exports);
 __exportStar(require("./models/auth"), exports);
-__exportStar(require("./models/business-user"), exports);
 __exportStar(require("./models/bank-payout"), exports);
 __exportStar(require("./models/bank-payment"), exports);
 __exportStar(require("./models/order"), exports);

package/build/middlewares/authorize.d.ts

@@ -1,5 +1,4 @@
 import { Request, Response, NextFunction } from "express";
-import { BusinessUserDoc } from "../models/business-user";
 import { UserDoc } from "../models/user";
 import { Mongoose } from "mongoose";
 import { PartnerDoc } from "../models/partner";
@@ -23,7 +22,7 @@ declare global {
             currentAuth?: AuthPayload;
             currentAdminAuth?: AdminAuthPayload;
             currentPartnerAuth?: PartnerAuthPayload;
-            user?: UserDoc | BusinessUserDoc;
+            user?: UserDoc;
             partner?: PartnerDoc;
             validAdminApiKey?: boolean;
             session?: any;

package/build/middlewares/authorize.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = void 0;
-const business_user_1 = require("../models/business-user");
 const user_1 = require("../models/user");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const partner_1 = require("../models/partner");
@@ -123,95 +122,65 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
         }
     }
     if (authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC)) {
-        let individualUser;
-        let businessUser;
+        let user;
         try {
             const User = yield (0, user_1.buildUser)(mongoose);
-            individualUser = yield User.findOne({
+            user = yield User.findOne({
                 authId: req.currentAuth.id,
                 attributes: { $ne: common_1.UserAttribute.deleted },
             });
         }
         catch (err) {
-            individualUser = null;
+            user = null;
         }
-        try {
-            const BusinessUser = yield (0, business_user_1.buildBusinessUser)(mongoose);
-            businessUser = yield BusinessUser.findOne({
-                authIds: { $in: [req.currentAuth.id] },
-                attributes: { $ne: common_1.UserAttribute.deleted },
-            });
-        }
-        catch (err) {
-            businessUser = null;
-        }
-        const user = individualUser || businessUser;
         if (user) {
             req.user = user;
         }
     }
     if (authorizationTypes.includes(common_1.AuthorizationType.User) ||
         authorizationTypes.includes(common_1.AuthorizationType.UserOptional)) {
-        let individualUser;
-        let businessUser;
+        let user;
         try {
             const User = yield (0, user_1.buildUser)(mongoose);
-            individualUser = yield User.findOne({
+            user = yield User.findOne({
                 authId: req.currentAuth.id,
                 attributes: { $ne: common_1.UserAttribute.deleted },
             });
-            if (!individualUser) {
+            if (!user) {
                 throw new Error();
             }
-            if ((individualUser === null || individualUser === void 0 ? void 0 : individualUser.kycStatus) !== common_1.KYCStatus.Passed) {
+            if ((user === null || user === void 0 ? void 0 : user.kycStatus) !== common_1.KYCStatus.Passed) {
                 missingKYC = true;
                 throw new Error();
             }
         }
         catch (err) {
-            individualUser = null;
+            user = null;
         }
-        try {
-            const BusinessUser = yield (0, business_user_1.buildBusinessUser)(mongoose);
-            businessUser = yield BusinessUser.findOne({
-                authIds: { $in: [req.currentAuth.id] },
-            });
-            if (!businessUser) {
-                throw new Error();
-            }
-            if ((businessUser === null || businessUser === void 0 ? void 0 : businessUser.kycStatus) !== common_1.KYCStatus.businessApproved) {
-                missingKYC = true;
-                throw new Error();
-            }
-        }
-        catch (err) {
-            businessUser = null;
-        }
-        const user = individualUser || businessUser;
         if (user) {
             req.user = user;
         }
     }
     if (authorizationTypes.includes(common_1.AuthorizationType.Broker)) {
-        let brokerBusinessUser;
+        let brokerUser;
         try {
-            const BusinessUser = yield (0, business_user_1.buildBusinessUser)(mongoose);
-            brokerBusinessUser = yield BusinessUser.findOne({
+            const User = yield (0, user_1.buildUser)(mongoose);
+            brokerUser = yield User.findOne({
                 authIds: { $in: [req.currentAuth.id] },
                 attributes: { $in: [common_1.UserAttribute.broker] },
             });
-            if (!brokerBusinessUser) {
+            if (!brokerUser) {
                 throw new Error();
             }
-            if ((brokerBusinessUser === null || brokerBusinessUser === void 0 ? void 0 : brokerBusinessUser.kycStatus) !== common_1.KYCStatus.businessApproved) {
+            if ((brokerUser === null || brokerUser === void 0 ? void 0 : brokerUser.kycStatus) !== common_1.KYCStatus.businessApproved) {
                 missingKYC = true;
                 throw new Error();
             }
         }
         catch (err) {
-            brokerBusinessUser = null;
+            brokerUser = null;
         }
-        const user = brokerBusinessUser;
+        const user = brokerUser;
         if (user) {
             req.user = user;
         }

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

@@ -1,11 +1,10 @@
 import { Request, Response, NextFunction } from "express";
-import { BusinessUserDoc } from "../models/business-user";
 import { UserDoc } from "../models/user";
 import { Mongoose } from "mongoose";
 declare global {
     namespace Express {
         interface Request {
-            user?: UserDoc | BusinessUserDoc;
+            user?: UserDoc;
         }
     }
 }

package/build/middlewares/get-user.js

@@ -10,33 +10,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUser = void 0;
-const business_user_1 = require("../models/business-user");
 const user_1 = require("../models/user");
 const common_1 = require("@riocrypto/common");
 const getUser = (req, res, next, mongoose) => __awaiter(void 0, void 0, void 0, function* () {
-    let individualUser;
-    let businessUser;
+    let user;
     try {
         const User = yield (0, user_1.buildUser)(mongoose);
-        individualUser = yield User.findOne({
+        user = yield User.findOne({
             phoneNumber: req.currentAuth.phoneNumber,
             attributes: { $ne: common_1.UserAttribute.deleted },
         });
     }
     catch (err) {
-        individualUser = null;
+        user = null;
     }
-    try {
-        const BusinessUser = yield (0, business_user_1.buildBusinessUser)(mongoose);
-        businessUser = yield BusinessUser.findOne({
-            phoneNumber: req.currentAuth.phoneNumber,
-            attributes: { $ne: common_1.UserAttribute.deleted },
-        });
-    }
-    catch (err) {
-        businessUser = null;
-    }
-    const user = individualUser || businessUser;
     if (user) {
         req.user = user;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.668",
+  "version": "1.0.673",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -24,7 +24,7 @@
     "@aws-sdk/client-s3": "^3.297.0",
     "@everapi/currencyapi-js": "^1.0.6",
     "@google-cloud/storage": "^6.9.5",
-    "@riocrypto/common": "^1.0.604",
+    "@riocrypto/common": "^1.0.609",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",

package/build/models/business-user.d.ts

@@ -1,53 +0,0 @@
-import { Country, KYCStatus, Language, PlatformFeeRange, USState, UserAttribute, UserType } from "@riocrypto/common";
-import { Mongoose, Model, Document } from "mongoose";
-interface BusinessUserAttrs {
-    authIds?: string[];
-    type: UserType;
-    companyName: string;
-    legalRepresentative: string;
-    phoneNumber: string;
-    email: string;
-    street1: string;
-    street2?: string;
-    city: string;
-    state: USState | string;
-    postalCode: string;
-    country: Country;
-    kycStatus: KYCStatus;
-    COIFile?: string;
-    KYCReportFile?: string;
-    cpf?: string;
-    language?: Language;
-    attributes?: UserAttribute[];
-    brokerId?: string;
-    platformFeeRanges?: PlatformFeeRange[];
-    partnerId?: string;
-}
-interface BusinessUserModel extends Model<BusinessUserDoc> {
-    build(attrs: BusinessUserAttrs): BusinessUserDoc;
-}
-interface BusinessUserDoc extends Document {
-    authIds?: string[];
-    type: UserType;
-    companyName: string;
-    legalRepresentative: string;
-    phoneNumber: string;
-    email: string;
-    street1: string;
-    street2?: string;
-    city: string;
-    state: USState | string;
-    postalCode: string;
-    country: Country;
-    kycStatus: KYCStatus;
-    COIFile?: string;
-    KYCReportFile?: string;
-    cpf?: string;
-    language?: Language;
-    attributes?: UserAttribute[];
-    brokerId?: string;
-    platformFeeRanges?: PlatformFeeRange[];
-    partnerId?: string;
-}
-declare const buildBusinessUser: (mongoose: Mongoose) => BusinessUserModel;
-export { buildBusinessUser, BusinessUserDoc };

package/build/models/business-user.js

@@ -1,116 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildBusinessUser = void 0;
-const buildBusinessUser = (mongoose) => {
-    // if model is already defined, return it
-    if (mongoose.models.BusinessUser) {
-        return mongoose.model("BusinessUser");
-    }
-    const BusinessUserSchema = new mongoose.Schema({
-        authIds: [
-            {
-                type: String,
-            },
-        ],
-        type: {
-            type: String,
-            required: true,
-        },
-        companyName: {
-            type: String,
-            required: true,
-        },
-        legalRepresentative: {
-            type: String,
-            required: true,
-        },
-        phoneNumber: {
-            type: String,
-            required: true,
-        },
-        email: {
-            type: String,
-            required: true,
-        },
-        street1: {
-            type: String,
-            required: true,
-        },
-        street2: {
-            type: String,
-        },
-        city: {
-            type: String,
-            required: true,
-        },
-        state: {
-            type: String,
-            required: true,
-        },
-        postalCode: {
-            type: String,
-            required: true,
-        },
-        country: {
-            type: String,
-            required: true,
-        },
-        language: {
-            type: String,
-        },
-        cpf: {
-            type: String,
-        },
-        attributes: [
-            {
-                type: String,
-            },
-        ],
-        kycStatus: {
-            type: String,
-            required: true,
-        },
-        COIFile: {
-            type: String,
-        },
-        KYCReportFile: {
-            type: String,
-        },
-        brokerId: {
-            type: String,
-        },
-        partnerId: {
-            type: String,
-        },
-        platformFeeRanges: [
-            {
-                min: {
-                    type: Number,
-                    required: true,
-                },
-                max: {
-                    type: Number,
-                    required: true,
-                },
-                fee: {
-                    type: Number,
-                    required: true,
-                },
-            },
-        ],
-    }, {
-        toJSON: {
-            transform(doc, ret) {
-                ret.id = ret._id.valueOf();
-                delete ret._id;
-                delete ret.__v;
-            },
-        },
-    });
-    BusinessUserSchema.statics.build = (attrs) => {
-        return new BusinessUser(attrs);
-    };
-    const BusinessUser = mongoose.model("BusinessUser", BusinessUserSchema);
-    return BusinessUser;
-};
-exports.buildBusinessUser = buildBusinessUser;