@riocrypto/common-server 1.0.1577 → 1.0.1579

package/build/validators/require-admin-auth-if-defined.d.ts

@@ -1,3 +1,2 @@
-import { User } from "@riocrypto/common";
 import { CustomValidator } from "express-validator";
-export declare const requireAdminAuthIfDefined: (user: User) => CustomValidator;
+export declare const requireAdminAuthIfDefined: CustomValidator;

package/build/validators/require-admin-auth-if-defined.js

@@ -1,15 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireAdminAuthIfDefined = void 0;
-const common_1 = require("@riocrypto/common");
-const requireAdminAuthIfDefined = (user) => (value, { req, path }) => {
+const requireAdminAuthIfDefined = (value, { req, path }) => {
+    console.log("path", path);
+    console.log("value", value);
+    console.log("current value", getValueByPath(req.userToUpdate, path));
     if (value !== undefined &&
         value !== "" &&
         !req.adminAuth &&
         // @ts-ignore
-        (user[path] !== undefined || user[path] !== "")) {
-        throw new common_1.AdminOnlyError();
+        getValueByPath(req.userToUpdate, path) !== undefined &&
+        getValueByPath(req.userToUpdate, path) !== "" &&
+        // @ts-ignore
+        getValueByPath(req.userToUpdate, path) !== value) {
+        return false;
     }
     return true;
 };
 exports.requireAdminAuthIfDefined = requireAdminAuthIfDefined;
+function getValueByPath(obj, path) {
+    const keys = path.split(".");
+    let current = obj;
+    for (let key of keys) {
+        // @ts-ignore
+        if (!current[key]) {
+            return undefined;
+        }
+        // @ts-ignore
+        current = current[key];
+    }
+    return current;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1577",
+  "version": "1.0.1579",
   "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.1406",
+    "@riocrypto/common": "^1.0.1407",
     "@types/express": "^4.17.13",
     "axios": "^1.6.0",
     "ccxt": "^3.0.30",