@riocrypto/common-server 1.0.1250 → 1.0.1255

package/build/index.d.ts

@@ -1,10 +1,6 @@
 export * from "./middlewares/error-handler";
 export * from "./middlewares/validate-request";
-export * from "./middlewares/require-auth";
-export * from "./middlewares/verify-admin-api-key";
-export * from "./middlewares/require-admin-api-key";
 export * from "./middlewares/get-order";
-export * from "./middlewares/require-priveleges";
 export * from "./middlewares/authorize";
 export * from "./middlewares/not-sandbox";
 export * from "./services/apiKey";

package/build/index.js

@@ -16,11 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./middlewares/error-handler"), exports);
 __exportStar(require("./middlewares/validate-request"), exports);
-__exportStar(require("./middlewares/require-auth"), exports);
-__exportStar(require("./middlewares/verify-admin-api-key"), exports);
-__exportStar(require("./middlewares/require-admin-api-key"), exports);
 __exportStar(require("./middlewares/get-order"), exports);
-__exportStar(require("./middlewares/require-priveleges"), exports);
 __exportStar(require("./middlewares/authorize"), exports);
 __exportStar(require("./middlewares/not-sandbox"), exports);
 __exportStar(require("./services/apiKey"), exports);

package/build/middlewares/authorize.d.ts

@@ -1,13 +1,15 @@
 import { Request, Response, NextFunction } from "express";
 import { UserDoc } from "../models/user";
 import { Mongoose } from "mongoose";
-import { AuthorizationType, AuthPayload, AdminAuthPayload } from "@riocrypto/common";
+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 {
         interface Request {
-            currentAuth?: AuthPayload;
-            currentAdminAuth?: AdminAuthPayload;
+            auth?: AuthDoc;
+            adminAuth?: AdminAuthDoc;
             user?: UserDoc;
             admin?: AdminDoc;
             validClusterApiKey?: boolean;

package/build/middlewares/authorize.js

@@ -22,7 +22,7 @@ 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;
+    var _a, _b, _c, _d, _e;
     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");
@@ -36,19 +36,15 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
     if (authorizationTypes.includes(common_1.AuthorizationType.AdminAuth) ||
         authorizationTypes.includes(common_1.AuthorizationType.Admin)) {
         const adminApiKey = req.header("x-admin-api-key");
+        const AdminAuth = yield (0, admin_auth_1.buildAdminAuth)(mongoose);
         if (adminApiKey) {
             try {
                 const hashedAdminApiKey = yield apiKey_1.ApiKey.toHash(adminApiKey);
-                const AdminAuth = yield (0, admin_auth_1.buildAdminAuth)(mongoose);
                 const adminAuth = yield AdminAuth.findOne({
                     "apiKeys.value": hashedAdminApiKey,
                 });
                 if (adminAuth) {
-                    const payload = {
-                        id: adminAuth.id,
-                        email: adminAuth.email,
-                    };
-                    req.currentAdminAuth = payload;
+                    req.adminAuth = adminAuth;
                 }
             }
             catch (err) {
@@ -62,95 +58,108 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
                     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 adminAuth = yield AdminAuth.findById(payload.id);
+                if (adminAuth) {
+                    req.adminAuth = adminAuth;
+                }
             }
             catch (err) { }
         }
     }
     if (authorizationTypes.includes(common_1.AuthorizationType.Admin)) {
-        if (req.currentAdminAuth) {
-            let admin;
-            try {
-                const Admin = yield (0, admin_1.buildAdmin)(mongoose);
-                admin = yield Admin.findOne({
-                    authIds: { $in: [req.currentAdminAuth.id] },
-                });
-            }
-            catch (err) {
-                admin = null;
-            }
+        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] },
+            });
+            console.log("req.adminAuth?.id", (_c = req.adminAuth) === null || _c === void 0 ? void 0 : _c.id);
+            console.log("admin is ", admin);
             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)) {
         const apiKey = req.header("x-api-key");
+        const Auth = yield (0, auth_1.buildAuth)(mongoose);
         if (apiKey) {
             try {
                 const hashedApiKey = yield apiKey_1.ApiKey.toHash(apiKey);
-                const Auth = yield (0, auth_1.buildAuth)(mongoose);
                 const auth = yield Auth.findOne({
                     "apiKeys.value": hashedApiKey,
                 });
                 if (auth) {
-                    const payload = {
-                        id: auth.id,
-                        phoneNumber: auth.phoneNumber,
-                    };
-                    req.currentAuth = payload;
+                    req.auth = auth;
                 }
             }
-            catch (err) {
-                console.log(err);
-            }
+            catch (err) { }
         }
-        else if ((_b = req.cookies) === null || _b === void 0 ? void 0 : _b.accessToken) {
+        else if ((_d = req.cookies) === null || _d === void 0 ? void 0 : _d.accessToken) {
             try {
                 const ACCESS_TOKEN_SECRET = yield secret_manager_client_1.secretManagerClient.getSecretValue("ACCESS_TOKEN_SECRET");
                 if (!ACCESS_TOKEN_SECRET) {
                     throw new common_1.SecretManagerError();
                 }
                 const payload = jsonwebtoken_1.default.verify(req.cookies.accessToken, ACCESS_TOKEN_SECRET);
-                req.currentAuth = payload;
+                const auth = yield Auth.findById(payload.id);
+                if (auth) {
+                    req.auth = auth;
+                }
             }
             catch (err) { }
         }
     }
     if (authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC) ||
         authorizationTypes.includes(common_1.AuthorizationType.User)) {
-        let user;
         try {
             const User = yield (0, user_1.buildUser)(mongoose);
-            user = yield User.findOne({
-                authIds: { $in: [req.currentAuth.id] },
+            const user = yield User.findOne({
+                authIds: { $in: [(_e = req.auth) === null || _e === void 0 ? void 0 : _e.id] },
             });
-        }
-        catch (err) {
-            user = null;
-        }
-        if (user) {
-            if (authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC)) {
-                req.user = user;
-            }
-            else {
-                if (user.kycStatus === common_1.KYCStatus.Approved) {
+            if (user) {
+                if (authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC)) {
                     req.user = user;
                 }
+                else {
+                    if (user.kycStatus === common_1.KYCStatus.Approved) {
+                        req.user = user;
+                    }
+                }
             }
         }
+        catch (err) { }
     }
-    if (!req.currentAdminAuth &&
-        !req.admin &&
-        !req.currentAuth &&
-        !req.user &&
-        !req.validClusterApiKey) {
-        if (!authorizationTypes.includes(common_1.AuthorizationType.Public)) {
-            throw new common_1.NotAuthorizedError();
-        }
+    if (authorizationTypes.includes(common_1.AuthorizationType.Public)) {
+        next();
+        return;
+    }
+    if (authorizationTypes.includes(common_1.AuthorizationType.Cluster) &&
+        req.validClusterApiKey) {
+        next();
+        return;
+    }
+    if (authorizationTypes.includes(common_1.AuthorizationType.Auth) && req.auth) {
+        next();
+        return;
+    }
+    if (authorizationTypes.includes(common_1.AuthorizationType.AdminAuth) &&
+        req.adminAuth) {
+        next();
+        return;
+    }
+    if (authorizationTypes.includes(common_1.AuthorizationType.User) ||
+        (authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC) && req.user)) {
+        next();
+        return;
+    }
+    if (authorizationTypes.includes(common_1.AuthorizationType.Admin) && req.admin) {
+        next();
+        return;
     }
-    next();
+    throw new common_1.NotAuthorizedError();
 });
 exports.authorize = authorize;

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.currentAdminAuth &&
+            !req.admin &&
             (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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1250",
+  "version": "1.0.1255",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -27,7 +27,7 @@
     "@everapi/currencyapi-js": "^1.0.6",
     "@google-cloud/storage": "^6.9.5",
     "@google-cloud/vision": "^4.0.2",
-    "@riocrypto/common": "^1.0.1135",
+    "@riocrypto/common": "^1.0.1136",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",

package/build/middlewares/require-admin-api-key.d.ts

@@ -1,2 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-export declare const requireAdminApiKey: (req: Request, res: Response, next: NextFunction) => void;

package/build/middlewares/require-admin-api-key.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireAdminApiKey = void 0;
-const common_1 = require("@riocrypto/common");
-const requireAdminApiKey = (req, res, next) => {
-    if (!req.validAdminApiKey) {
-        throw new common_1.NotAuthorizedError();
-    }
-    next();
-};
-exports.requireAdminApiKey = requireAdminApiKey;

package/build/middlewares/require-auth.d.ts

@@ -1,2 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-export declare const requireAuth: (req: Request, res: Response, next: NextFunction) => void;

package/build/middlewares/require-auth.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireAuth = void 0;
-const common_1 = require("@riocrypto/common");
-const requireAuth = (req, res, next) => {
-    if (!req.currentAuth) {
-        throw new common_1.NotAuthorizedError();
-    }
-    next();
-};
-exports.requireAuth = requireAuth;

package/build/middlewares/require-priveleges.d.ts

@@ -1,2 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-export declare const requirePriveleges: (req: Request, res: Response, next: NextFunction) => void;

package/build/middlewares/require-priveleges.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.requirePriveleges = void 0;
-const common_1 = require("@riocrypto/common");
-const requirePriveleges = (req, res, next) => {
-    if (req.currentAuth && !req.user) {
-        throw new common_1.MissingUserError();
-    }
-    if (!req.user && !req.currentAdminAuth) {
-        throw new common_1.NotAuthorizedError();
-    }
-    next();
-};
-exports.requirePriveleges = requirePriveleges;

package/build/middlewares/verify-admin-api-key.d.ts

@@ -1,9 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-declare global {
-    namespace Express {
-        interface Request {
-            validAdminApiKey?: boolean;
-        }
-    }
-}
-export declare const verifyAdminApiKey: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/build/middlewares/verify-admin-api-key.js

@@ -1,26 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyAdminApiKey = void 0;
-const secret_manager_client_1 = require("../clients/secret-manager-client");
-const common_1 = require("@riocrypto/common");
-const verifyAdminApiKey = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    let apiKey = req.header("x-api-key");
-    const ADMIN_API_KEY = yield secret_manager_client_1.secretManagerClient.getSecretValue("ADMIN_API_KEY");
-    if (!ADMIN_API_KEY) {
-        throw new common_1.SecretManagerError();
-    }
-    if (apiKey === ADMIN_API_KEY) {
-        req.validAdminApiKey = true;
-    }
-    next();
-});
-exports.verifyAdminApiKey = verifyAdminApiKey;