fix plugin service

packages/app/src/server/routes/apiv3/plugins.ts

@@ -20,7 +20,7 @@ module.exports = (crowi: Crowi) => {
       return res.apiv3({ plugins: data });
     }
     catch (err) {
-      return res.apiv3Err(err, 400);
+      return res.apiv3Err(err);
     }
   });
 
@@ -34,7 +34,7 @@ module.exports = (crowi: Crowi) => {
       return res.apiv3({});
     }
     catch (err) {
-      return res.apiv3Err(err, 400);
+      return res.apiv3Err(err);
     }
   });
 
@@ -48,7 +48,7 @@ module.exports = (crowi: Crowi) => {
       return res.apiv3({ isEnabled: pluginIsEnabled });
     }
     catch (err) {
-      return res.apiv3Err(err, 400);
+      return res.apiv3Err(err);
     }
   });
 
@@ -62,7 +62,7 @@ module.exports = (crowi: Crowi) => {
       return res.apiv3({ isEnabled: pluginIsEnabled });
     }
     catch (err) {
-      return res.apiv3Err(err, 400);
+      return res.apiv3Err(err);
     }
   });
 
@@ -76,7 +76,7 @@ module.exports = (crowi: Crowi) => {
       return res.apiv3();
     }
     catch (err) {
-      return res.apiv3Err(err, 400);
+      return res.apiv3Err(err);
     }
   });
 

packages/app/src/server/service/plugin.ts

@@ -4,7 +4,6 @@ import path from 'path';
 
 // eslint-disable-next-line no-restricted-imports
 import axios from 'axios';
-import ObjectID from 'bson-objectid';
 import mongoose from 'mongoose';
 import streamToPromise from 'stream-to-promise';
 import unzipper from 'unzipper';
@@ -179,17 +178,24 @@ export class PluginService {
    */
   async getPluginIsEnabled(targetPluginId: string): Promise<boolean> {
     const ObjectID = mongoose.Types.ObjectId;
-    const isValidObjectId = (id) => {
+    const id = new ObjectID(targetPluginId);
+
+    const isValidObjectId = (id: string) => {
       return ObjectID.isValid(id) && (new ObjectID(id).toString() === id);
     };
 
-    if (isValidObjectId(targetPluginId)) {
-      const GrowiPlugin = mongoose.model<GrowiPlugin>('GrowiPlugin');
-      const growiPlugins = await GrowiPlugin.find({ _id: new ObjectID(targetPluginId).toString() });
-      return growiPlugins[0].isEnabled;
+    if (!isValidObjectId(targetPluginId)) {
+      throw new Error('This is invalid value.');
     }
 
-    throw new Error('Invalid id');
+    const GrowiPlugin = mongoose.model<GrowiPlugin>('GrowiPlugin');
+    const growiPlugins = await GrowiPlugin.findById(id);
+
+    if (growiPlugins == null) {
+      throw new Error('No plugin found for this ID.');
+    }
+
+    return growiPlugins.isEnabled;
   }
 
   /**
@@ -197,20 +203,31 @@ export class PluginService {
    */
   async switchPluginIsEnabled(targetPluginId: string): Promise<boolean> {
     const ObjectID = mongoose.Types.ObjectId;
-    const isValidObjectId = (id) => {
+    const id = new ObjectID(targetPluginId);
+
+    const isValidObjectId = (id: string) => {
       return ObjectID.isValid(id) && (new ObjectID(id).toString() === id);
     };
 
-    if (isValidObjectId(targetPluginId)) {
-      const GrowiPlugin = mongoose.model<GrowiPlugin>('GrowiPlugin');
-      const growiPlugins = await GrowiPlugin.find({ _id: new ObjectID(targetPluginId).toString() });
-      await growiPlugins[0].update(
-        { isEnabled: !growiPlugins[0].isEnabled },
-      );
-      return growiPlugins[0].isEnabled;
+    if (!isValidObjectId(targetPluginId)) {
+      throw new Error('This is invalid value.');
+    }
+
+    const GrowiPlugin = mongoose.model<GrowiPlugin>('GrowiPlugin');
+    const growiPlugins = await GrowiPlugin.findById(id);
+
+    if (growiPlugins == null) {
+      throw new Error('No plugin found for this ID.');
+    }
+
+    try {
+      await growiPlugins.update({ isEnabled: !growiPlugins.isEnabled });
+    }
+    catch (err) {
+      throw new Error('Plugin status switching failed.');
     }
 
-    throw new Error('Invalid id');
+    return growiPlugins.isEnabled;
   }
 
   /**
@@ -218,20 +235,32 @@ export class PluginService {
    */
   async pluginDeleted(targetPluginId: string): Promise<void> {
     const ObjectID = mongoose.Types.ObjectId;
-    const isValidObjectId = (id) => {
+    const id = new ObjectID(targetPluginId);
+
+    const isValidObjectId = (id: string) => {
       return ObjectID.isValid(id) && (new ObjectID(id).toString() === id);
     };
+    const deleteFile = (path: fs.PathLike) => fs.unlink(path, (err) => { return err });
 
-    if (isValidObjectId(targetPluginId)) {
-      const GrowiPlugin = mongoose.model<GrowiPlugin>('GrowiPlugin');
-      const growiPlugins = await GrowiPlugin.find({ _id: new ObjectID(targetPluginId).toString() });
-      growiPlugins[0].remove();
-      const deleteZipFile = (path: fs.PathLike) => fs.unlink(path, (err) => { return err });
-      deleteZipFile(growiPlugins[0].installedPath);
-      return;
+    if (!isValidObjectId(targetPluginId)) {
+      throw new Error('This is invalid value.');
+    }
+
+    const GrowiPlugin = mongoose.model<GrowiPlugin>('GrowiPlugin');
+    const growiPlugins = await GrowiPlugin.findByIdAndRemove(id);
+
+    if (growiPlugins == null) {
+      throw new Error('No plugin found for this ID.');
     }
 
-    throw new Error('Invalid id');
+    try {
+      deleteFile(growiPlugins.installedPath);
+    }
+    catch (err) {
+      throw new Error('Plugin repository deleting failed.');
+    }
+
+    return;
   }
 
 }

packages/app/src/stores/plugin.tsx

@@ -12,8 +12,7 @@ const pluginsFetcher = () => {
       return data;
     }
     catch (err) {
-      // TODO: Error handling
-      console.log('err', err);
+      throw new Error(err);
     }
   };
 };
@@ -30,8 +29,7 @@ const pluginFetcher = (id: string) => {
       return data;
     }
     catch (err) {
-      // TODO: Error handling
-      console.log('pluginFetcher', err);
+      throw new Error(err);
     }
   };
 };