@riocrypto/common-server 1.0.568 → 1.0.570

package/build/middlewares/authorize.d.ts

@@ -13,11 +13,16 @@ interface AdminAuthPayload {
     id: string;
     email: string;
 }
+interface PartnerAuthPayload {
+    id: string;
+    email: string;
+}
 declare global {
     namespace Express {
         interface Request {
             currentAuth?: AuthPayload;
             currentAdminAuth?: AdminAuthPayload;
+            currentPartnerAuth?: PartnerAuthPayload;
             user?: UserDoc | BusinessUserDoc;
             partner?: PartnerDoc;
             validAdminApiKey?: boolean;

package/build/middlewares/authorize.js

@@ -22,7 +22,7 @@ const auth_1 = require("../models/auth");
 const apiKey_1 = require("../services/apiKey");
 const secret_manager_client_1 = require("../clients/secret-manager-client");
 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, _h, _j;
     let missingKYC = false;
     if (authorizationTypes.includes(common_1.AuthorizationType.AdminAPI)) {
         let apiKey = req.header("x-api-key");
@@ -38,8 +38,7 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
         authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC) ||
         authorizationTypes.includes(common_1.AuthorizationType.User) ||
         authorizationTypes.includes(common_1.AuthorizationType.UserOptional) ||
-        authorizationTypes.includes(common_1.AuthorizationType.Broker) ||
-        authorizationTypes.includes(common_1.AuthorizationType.Partner)) {
+        authorizationTypes.includes(common_1.AuthorizationType.Broker)) {
         const apiKey = req.header("x-api-key");
         if (apiKey) {
             try {
@@ -99,11 +98,24 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
             catch (err) { }
         }
     }
+    if (authorizationTypes.includes(common_1.AuthorizationType.PartnerAuth)) {
+        if ((_g = req.cookies) === null || _g === void 0 ? void 0 : _g.partnerAccessToken) {
+            try {
+                const PARTNER_ACCESS_TOKEN_SECRET = yield secret_manager_client_1.secretManagerClient.getSecretValue("PARTNER_ACCESS_TOKEN_SECRET");
+                if (!PARTNER_ACCESS_TOKEN_SECRET) {
+                    throw new Error("Unable to get PARTNER_ACCESS_TOKEN_SECRET");
+                }
+                const payload = jsonwebtoken_1.default.verify(req.cookies.partnerAccessToken, PARTNER_ACCESS_TOKEN_SECRET);
+                req.currentPartnerAuth = payload;
+            }
+            catch (err) { }
+        }
+    }
     if (authorizationTypes.includes(common_1.AuthorizationType.Partner) &&
-        req.currentAuth) {
+        req.currentPartnerAuth) {
         const Partner = yield (0, partner_1.buildPartner)(mongoose);
         const partner = yield Partner.findOne({
-            authId: req.currentAuth.id,
+            authId: req.currentPartnerAuth.id,
         });
         if (partner) {
             req.partner = partner;
@@ -207,6 +219,7 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
     // if no auth
     (!req.currentAdminAuth &&
         !req.currentAuth &&
+        !req.currentPartnerAuth &&
         !req.user &&
         !req.partner &&
         !req.validAdminApiKey) ||
@@ -229,12 +242,12 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
         }
         if ((authorizationTypes.includes(common_1.AuthorizationType.User) ||
             authorizationTypes.includes(common_1.AuthorizationType.UserNoKYC)) &&
-            ((_g = req.cookies) === null || _g === void 0 ? void 0 : _g.accessToken)) {
+            ((_h = req.cookies) === null || _h === void 0 ? void 0 : _h.accessToken)) {
             throw new common_1.MissingUserError();
         }
         if (authorizationTypes.includes(common_1.AuthorizationType.Admin) &&
             authorizationTypes.length === 1 &&
-            ((_h = req.cookies) === null || _h === void 0 ? void 0 : _h.accessToken)) {
+            ((_j = req.cookies) === null || _j === void 0 ? void 0 : _j.accessToken)) {
             throw new common_1.AdminOnlyError();
         }
         if (!req.user && authorizationTypes.includes(common_1.AuthorizationType.Broker)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.568",
+  "version": "1.0.570",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -23,7 +23,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.297.0",
     "@google-cloud/storage": "^6.9.5",
-    "@riocrypto/common": "^1.0.554",
+    "@riocrypto/common": "^1.0.556",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",