Merge pull request #6 from stnby/fix-prepareallowedips

Fix allowed_ips and networks splitting by comma
suquant · Mar 18, 2022 · 6bf2576 · 6bf2576
2 parents 24238b0 + 6ceffa7
commit 6bf2576
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/components/Modal/components/device.vue b/src/components/Modal/components/device.vue
@@ -63,7 +63,7 @@ export default class DeviceModal extends Vue {
     })
 
     if(Object.keys(savedItem).includes('networks')) {
-      savedItem.networks = savedItem.networks.split(',')
+      savedItem.networks = savedItem.networks.replace(/\s+/g, '').split(',').filter(Boolean)
     }
 
     await deviceApi.createDevice(savedItem)

diff --git a/src/components/Modal/components/peer.vue b/src/components/Modal/components/peer.vue
@@ -69,7 +69,7 @@ export default class DeviceModal extends Vue {
 
     const newPeer = {
       ...newPeerData,
-      allowed_ips: Object.keys(newPeerData).includes('allowed_ips') ? newPeerData.allowed_ips.split(',') : null
+      allowed_ips: Object.keys(newPeerData).includes('allowed_ips') ? newPeerData.allowed_ips.replace(/\s+/g, '').split(',').filter(Boolean) : null
     }
 
     await deviceApi.createDevicePeer(this.$route.params.id, newPeer)

diff --git a/src/views/dashboard/peerItem.vue b/src/views/dashboard/peerItem.vue
@@ -143,10 +143,7 @@ export default class peerItem extends Vue {
   }
 
   private static prepareAllowedIps(item: string): string[] | string {
-    if (item.length > 0) {
-      return item.split(',').map((item: string) => item.replace(/\n|\r/g, ''))
-    }
-    return []
+    return item.replace(/\s+/g, '').split(',').filter(Boolean)
   }
 
   private async deletePeer(): Promise<void> {