From aa0e491f1dcc960b55e79d1a81947a7e627bb5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20H=C3=A4usler?= <hfelix@protonmail.ch>
Date: Fri, 26 Jul 2019 05:18:58 +0200
Subject: [PATCH] Validate uploader services (#1183)

---
 src/renderer/prefComponents/imageUploader/index.vue   | 9 ++++++---
 src/renderer/prefComponents/imageUploader/services.js | 8 +++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/renderer/prefComponents/imageUploader/index.vue b/src/renderer/prefComponents/imageUploader/index.vue
index d6e2ebb2..7ad492f4 100644
--- a/src/renderer/prefComponents/imageUploader/index.vue
+++ b/src/renderer/prefComponents/imageUploader/index.vue
@@ -2,8 +2,8 @@
   <div class="pref-image-uploader">
     <h4>Image Uploader</h4>
     <section class="current-uploader">
-      <div v-if="currentUploader !== 'none'">The current image uploader is {{ getServiceNameById(currentUploader) }}.</div>
-      <span v-else>Currently is no uploader selected. Please select an uploader and click on "Set as default".</span>
+      <div v-if="isValidUploaderService(currentUploader)">The current image uploader is {{ getServiceNameById(currentUploader) }}.</div>
+      <span v-else>Currently no uploader is selected. Please select an uploader and click on "Set as default".</span>
     </section>
     <section class="configration">
       <el-tabs v-model="activeTab">
@@ -56,7 +56,7 @@
 
 <script>
 import { shell } from 'electron'
-import services from './services.js'
+import services, { isValidService } from './services.js'
 import legalNoticesCheckbox from './legalNoticesCheckbox'
 
 export default {
@@ -116,6 +116,9 @@ export default {
     })
   },
   methods: {
+    isValidUploaderService (name) {
+      return isValidService(name)
+    },
     getServiceNameById (id) {
       const service = services[id]
       return service ? service.name : id
diff --git a/src/renderer/prefComponents/imageUploader/services.js b/src/renderer/prefComponents/imageUploader/services.js
index 4fe5a307..44f183aa 100644
--- a/src/renderer/prefComponents/imageUploader/services.js
+++ b/src/renderer/prefComponents/imageUploader/services.js
@@ -1,6 +1,10 @@
 // TODO: Remove information from other vue source files into this file.
 
-export default {
+export const isValidService = name => {
+  return name !== 'none' && services.hasOwnProperty(name)
+}
+
+const services = {
   // Dummy service used to opt-in real services.
   none: {
     name: '',
@@ -32,3 +36,5 @@ export default {
     agreedToLegalNotices: false
   }
 }
+
+export default services