Ensure plugin and provider exist when resolving remote_values, fixes #…

…1624
ubports · Mar 7, 2021 · a9a4fa7 · a9a4fa7
1 parent 9b0bdb1
commit a9a4fa7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/core/plugins/index.js b/src/core/plugins/index.js
@@ -78,9 +78,17 @@ class PluginIndex {
     });
   }
 
+  /**
+   * resolves remote values
+   * @returns {Promise}
+   */
   remote_value(option) {
     return Promise.resolve(this.parsePluginId(option.remote_values))
-      .then(([p, f]) => this.plugins[p][`remote_values__${f}`](option))
+      .then(([p, f]) =>
+        this.plugins[p] && this.plugins[p][`remote_values__${f}`]
+          ? this.plugins[p][`remote_values__${f}`](option)
+          : []
+      )
       .then(values => (option.values = values));
   }
 

diff --git a/src/core/plugins/index.spec.js b/src/core/plugins/index.spec.js
@@ -67,6 +67,20 @@ describe("PluginIndex", () => {
           pluginIndex.plugins.systemimage.remote_values__channels.mockRestore();
         });
     });
+    it("should resolve empty on invalid plugin", () => {
+      return pluginIndex
+        .remote_value({ remote_values: { "systemimage:invalid": { a: "b" } } })
+        .then(r => {
+          expect(r).toEqual([]);
+        });
+    });
+    it("should resolve empty on invalid provider", () => {
+      return pluginIndex
+        .remote_value({ remote_values: { "invalid:invalid": { a: "b" } } })
+        .then(r => {
+          expect(r).toEqual([]);
+        });
+    });
   });
   describe("getPluginArray()", () => {
     it("should return plugin array", () =>