@xuda.io/drive_module 1.1.791 → 1.1.793

package/index.js

@@ -505,67 +505,31 @@ exports.get_drive_file_info = async function (req, job_id, headers) {
 
     const app_id_master = await _common.get_project_app_id(app_id, true);
 
-    switch (drive_type) {
-      case "studio": {
-        const target_dir = path.join(_conf[`studio_drive_path`], app_id_master);
-        doc_id = file_path.replace(target_dir, "");
-        doc_ret = await db_module.get_app_couch_doc(app_id_master, doc_id);
-        break;
-      }
-
-      case "workspace": {
-        if (
-          type === "file" &&
-          !file_path.includes(app_id) &&
-          !file_path.includes(app_id_master)
-        ) {
-          throw new Error("file_path unauthorized");
-        }
-        const app_id_reference = await _common.get_project_app_id(app_id);
-        doc_id = path.basename(file_path);
-        doc_ret = await db_module.get_app_couch_doc(app_id_reference, doc_id);
-        break;
-      }
-
-      case "user": {
-        doc_id = path.basename(file_path);
-        doc_ret = await db_module.get_couch_doc("xuda_drive", doc_id);
-        break;
-      }
-      default:
-        break;
-    }
-
     var statsObj = {};
-    if (doc_ret.code > -1) {
-      doc = doc_ret.data;
 
-      delete doc._id;
-      delete doc._rev;
+    delete doc._id;
+    delete doc._rev;
 
-      delete doc.docType;
-      delete doc.stat;
-      if (doc.bucket) {
-        doc.regions = Object.entries(doc.bucket).length;
-      }
+    delete doc.docType;
+    delete doc.stat;
+    if (doc.bucket) {
+      doc.regions = Object.entries(doc.bucket).length;
+    }
 
-      delete doc.bucket;
-      if (doc.uid) {
-        let ret = await db_module.get_couch_doc("xuda_accounts", doc.uid);
-        doc.account_info = ret.data.account_info;
-      }
-      if (req.drive_type === "workspace") {
-        const app_id_master = await _common.get_project_app_id(app_id, true);
-        const ret = await db_module.get_app_obj(app_id_master);
+    delete doc.bucket;
+    if (doc.uid) {
+      let ret = await db_module.get_couch_doc("xuda_accounts", doc.uid);
+      doc.account_info = ret.data.account_info;
+    }
+    if (req.drive_type === "workspace") {
+      const app_id_master = await _common.get_project_app_id(app_id, true);
+      const ret = await db_module.get_app_obj(app_id_master);
 
-        if (ret.code < 0) {
-          return ret;
-        }
-        const app_obj = ret.data;
-        doc.app_name = app_obj.app_name;
+      if (ret.code < 0) {
+        return ret;
       }
-    } else if (drive_type === "studio") {
-      statsObj = fs.statSync(file_path);
+      const app_obj = ret.data;
+      doc.app_name = app_obj.app_name;
     }
 
     return {
@@ -2666,11 +2630,20 @@ const get_drive_doc = async function (
 
     case "workspace": {
       const app_id_reference = await _common.get_project_app_id(app_id);
+
       doc_ret = await db_module.get_app_couch_doc(
         app_id_reference,
         check_existing_file_ret.duplicates[0]._id
       );
 
+      if (
+        doc_ret?.data?.type === "file" &&
+        !file_path.includes(app_id) &&
+        !file_path.includes(app_id_master)
+      ) {
+        throw new Error("file_path unauthorized");
+      }
+
       break;
     }
     default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/drive_module",
-  "version": "1.1.791",
+  "version": "1.1.793",
   "description": "Xuda Drive Server Module",
   "main": "index.js",
   "dependencies": {