@riocrypto/common-server 1.0.1495 → 1.0.1499

package/build/helpers/get-user.js

@@ -19,7 +19,7 @@ const getUser = (mongoose, req, userId) => __awaiter(void 0, void 0, void 0, fun
     else {
         const User = (0, user_1.buildUser)(mongoose);
         const user = yield User.findById(userId);
-        if (req.admin ||
+        if (req.adminAuth ||
             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)) {

package/build/index.d.ts

@@ -9,7 +9,6 @@ export * from "./services/apiKey";
 export * from "./services/password";
 export * from "./services/logger";
 export * from "./models/admin-auth";
-export * from "./models/admin";
 export * from "./models/auth";
 export * from "./models/bank-payout";
 export * from "./models/bank-payment";

package/build/index.js

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

package/build/middlewares/authorize.d.ts

@@ -3,7 +3,6 @@ import { UserDoc } from "../models/user";
 import { Mongoose } from "mongoose";
 import { AuthorizationType } from "@riocrypto/common";
 import { AuthDoc } from "../models/auth";
-import { AdminDoc } from "../models/admin";
 import { AdminAuthDoc } from "../models/admin-auth";
 declare global {
     namespace Express {
@@ -11,7 +10,6 @@ declare global {
             auth?: AuthDoc;
             adminAuth?: AdminAuthDoc;
             user?: UserDoc;
-            admin?: AdminDoc;
             validClusterApiKey?: boolean;
         }
     }

package/build/middlewares/authorize.js

@@ -19,10 +19,9 @@ 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, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g;
     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");
@@ -33,8 +32,7 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
             req.validClusterApiKey = true;
         }
     }
-    if (authorizationTypes.includes(common_1.AuthorizationType.AdminAuth) ||
-        authorizationTypes.includes(common_1.AuthorizationType.Admin)) {
+    if (authorizationTypes.includes(common_1.AuthorizationType.AdminAuth)) {
         const adminApiKey = req.header("x-admin-api-key");
         const AdminAuth = yield (0, admin_auth_1.buildAdminAuth)(mongoose);
         if (adminApiKey) {
@@ -66,21 +64,6 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
             catch (err) { }
         }
     }
-    if (authorizationTypes.includes(common_1.AuthorizationType.Admin)) {
-        if (req.adminAuth) {
-            let admin;
-            try {
-                const Admin = yield (0, admin_1.buildAdmin)(mongoose);
-                admin = yield Admin.findOne({
-                    authIds: { $in: [(_b = req.adminAuth) === null || _b === void 0 ? void 0 : _b.id] },
-                });
-                if (admin) {
-                    req.admin = admin;
-                }
-            }
-            catch (err) { }
-        }
-    }
     if (authorizationTypes.includes(common_1.AuthorizationType.Auth) ||
         authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC) ||
         authorizationTypes.includes(common_1.AuthorizationType.User)) {
@@ -98,7 +81,7 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
             }
             catch (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) {
@@ -119,15 +102,15 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
             try {
                 const User = yield (0, user_1.buildUser)(mongoose);
                 const user = yield User.findOne({
-                    authIds: { $in: [(_d = req.auth) === null || _d === void 0 ? void 0 : _d.id] },
+                    authIds: { $in: [(_c = req.auth) === null || _c === void 0 ? void 0 : _c.id] },
                 });
                 if (user) {
                     if (authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC)) {
                         req.user = user;
                     }
                     else {
-                        if (((_f = (_e = user.onboarding) === null || _e === void 0 ? void 0 : _e.MX) === null || _f === void 0 ? void 0 : _f.status) === common_1.OnboardingStatus.Approved ||
-                            ((_h = (_g = user.onboarding) === null || _g === void 0 ? void 0 : _g.PE) === null || _h === void 0 ? void 0 : _h.status) === common_1.OnboardingStatus.Approved) {
+                        if (((_e = (_d = user.onboarding) === null || _d === void 0 ? void 0 : _d.MX) === null || _e === void 0 ? void 0 : _e.status) === common_1.OnboardingStatus.Approved ||
+                            ((_g = (_f = user.onboarding) === null || _f === void 0 ? void 0 : _f.PE) === null || _g === void 0 ? void 0 : _g.status) === common_1.OnboardingStatus.Approved) {
                             req.user = user;
                         }
                     }
@@ -160,7 +143,8 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
         next();
         return;
     }
-    if (authorizationTypes.includes(common_1.AuthorizationType.Admin) && req.admin) {
+    if (authorizationTypes.includes(common_1.AuthorizationType.AdminAuth) &&
+        req.adminAuth) {
         next();
         return;
     }

package/build/middlewares/get-order.js

@@ -51,7 +51,7 @@ const getOrder = (req, res, next, mongoose, onlyBankOrders) => __awaiter(void 0,
         const User = yield (0, user_1.buildUser)(mongoose);
         const user = yield User.findById(order.userId);
         if (req.order.userId !== ((_a = req.user) === null || _a === void 0 ? void 0 : _a.toJSON().id) &&
-            !req.admin &&
+            !req.adminAuth &&
             (user === null || user === void 0 ? void 0 : user.brokerId) !== ((_b = req.user) === null || _b === void 0 ? void 0 : _b.toJSON().id)) {
             throw new common_1.NotAuthorizedError();
         }

package/build/middlewares/require-min-admin-role.js

@@ -19,11 +19,12 @@ const adminRoleOrder = [
 ];
 const requireMinAdminRole = (req, res, next, minRole) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    if (!req.admin) {
+    if (!req.adminAuth) {
         throw new common_1.AdminOnlyError();
     }
     else {
-        if (adminRoleOrder.indexOf((_a = req.admin) === null || _a === void 0 ? void 0 : _a.role) < adminRoleOrder.indexOf(minRole)) {
+        if (adminRoleOrder.indexOf((_a = req.adminAuth) === null || _a === void 0 ? void 0 : _a.role) <
+            adminRoleOrder.indexOf(minRole)) {
             throw new common_1.GenericInputError(`Insufficient permissions. This endpoint requires at least the ${minRole} role. Contact Javier to change your access role.`);
         }
         next();

package/build/middlewares/require-min-role.js

@@ -18,7 +18,7 @@ const authRoleOrder = [
 ];
 const requireMinRole = (req, res, next, minRole) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    if (!req.admin && !req.validClusterApiKey) {
+    if (!req.adminAuth && !req.validClusterApiKey) {
         if (authRoleOrder.indexOf((_a = req.auth) === null || _a === void 0 ? void 0 : _a.role) < authRoleOrder.indexOf(minRole)) {
             throw new common_1.GenericInputError(`Insufficient permissions. This endpoint requires at least the ${minRole} role. Contact your account owner to change your access role.`);
         }

package/build/middlewares/set-trace.js

@@ -21,9 +21,8 @@ const setTrace = (req, res, next) => __awaiter(void 0, void 0, void 0, function*
             phoneNumber: (_b = req.auth) === null || _b === void 0 ? void 0 : _b.phoneNumber,
         });
     }
-    else if (req.admin) {
+    else if (req.adminAuth) {
         (0, node_opentelemetry_1.setTraceAttributes)({
-            adminId: req.admin.id,
             adminAuthId: (_c = req.adminAuth) === null || _c === void 0 ? void 0 : _c.id,
             email: (_d = req.adminAuth) === null || _d === void 0 ? void 0 : _d.email,
         });

package/build/models/admin-auth.d.ts

@@ -1,16 +1,31 @@
-import { APIKey } from "@riocrypto/common";
+import { APIKey, AdminTaskType } from "@riocrypto/common";
 import { Mongoose, Model, Document } from "mongoose";
+import { AdminRole } from "@riocrypto/common/build/types/admin-role";
 interface AdminAuthAttrs {
-    email: string;
     password: string;
+    name: string;
+    email: string;
+    slackWebhookUrl: string;
+    acceptingTasks?: boolean;
+    assignedTaskTypes: AdminTaskType[];
+    privileges: string[];
+    userAuthId?: string;
+    role: AdminRole;
     previousPasswords?: string[];
     authenticatorSecret?: string;
     apiKeys?: APIKey[];
     isDisabled?: boolean;
 }
 interface AdminAuthDoc extends Document {
-    email: string;
     password: string;
+    name: string;
+    email: string;
+    slackWebhookUrl: string;
+    acceptingTasks?: boolean;
+    assignedTaskTypes: AdminTaskType[];
+    privileges: string[];
+    userAuthId?: string;
+    role: AdminRole;
     previousPasswords?: string[];
     authenticatorSecret?: string;
     apiKeys?: APIKey[];

package/build/models/admin-auth.js

@@ -31,6 +31,35 @@ const buildAdminAuth = (mongoose) => {
                 required: false,
             },
         ],
+        name: {
+            type: String,
+            required: true,
+        },
+        role: {
+            type: String,
+        },
+        slackWebhookUrl: {
+            type: String,
+            required: true,
+        },
+        privileges: [
+            {
+                type: String,
+                required: true,
+            },
+        ],
+        acceptingTasks: {
+            type: Boolean,
+        },
+        assignedTaskTypes: [
+            {
+                type: String,
+                required: true,
+            },
+        ],
+        userAuthId: {
+            type: String,
+        },
         authenticatorSecret: {
             type: String,
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1495",
+  "version": "1.0.1499",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -28,7 +28,7 @@
     "@google-cloud/storage": "^6.9.5",
     "@google-cloud/vision": "^4.0.2",
     "@hyperdx/node-opentelemetry": "^0.4.2",
-    "@riocrypto/common": "^1.0.1336",
+    "@riocrypto/common": "^1.0.1338",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",

package/build/models/admin.d.ts

@@ -1,33 +0,0 @@
-import { AdminTaskType } from "@riocrypto/common";
-import { AdminRole } from "@riocrypto/common/build/types/admin-role";
-import { Mongoose, Model, Document } from "mongoose";
-interface AdminAttrs {
-    createdAt: Date;
-    adminAuthIds?: string[];
-    name: string;
-    email: string;
-    slackWebhookUrl: string;
-    acceptingTasks?: boolean;
-    assignedTaskTypes: AdminTaskType[];
-    privileges: string[];
-    userAuthId?: string;
-    role: AdminRole;
-}
-interface AdminModel extends Model<AdminDoc> {
-    build(attrs: AdminAttrs): AdminDoc;
-}
-interface AdminDoc extends Document {
-    _id: string;
-    createdAt: Date;
-    adminAuthIds?: string[];
-    name: string;
-    email: string;
-    slackWebhookUrl: string;
-    acceptingTasks?: boolean;
-    assignedTaskTypes: AdminTaskType[];
-    privileges: string[];
-    userAuthId?: string;
-    role: AdminRole;
-}
-declare const buildAdmin: (mongoose: Mongoose) => AdminModel;
-export { buildAdmin, AdminDoc };

package/build/models/admin.js

@@ -1,67 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAdmin = void 0;
-const buildAdmin = (mongoose) => {
-    // if model is already defined, return it
-    if (mongoose.models.Admin) {
-        return mongoose.model("Admin");
-    }
-    const AdminSchema = new mongoose.Schema({
-        adminAuthIds: [
-            {
-                type: String,
-            },
-        ],
-        createdAt: {
-            type: mongoose.Schema.Types.Date,
-            required: true,
-        },
-        name: {
-            type: String,
-            required: true,
-        },
-        email: {
-            type: String,
-            required: true,
-        },
-        role: {
-            type: String,
-        },
-        slackWebhookUrl: {
-            type: String,
-            required: true,
-        },
-        privileges: [
-            {
-                type: String,
-                required: true,
-            },
-        ],
-        acceptingTasks: {
-            type: Boolean,
-        },
-        assignedTaskTypes: [
-            {
-                type: String,
-                required: true,
-            },
-        ],
-        userAuthId: {
-            type: String,
-        },
-    }, {
-        toJSON: {
-            transform(doc, ret) {
-                ret.id = ret._id.valueOf();
-                delete ret._id;
-                delete ret.__v;
-            },
-        },
-    });
-    AdminSchema.statics.build = (attrs) => {
-        return new Admin(attrs);
-    };
-    const Admin = mongoose.model("Admin", AdminSchema);
-    return Admin;
-};
-exports.buildAdmin = buildAdmin;