Merge branch 'master' into kris/add_restore_ui

src/account/DevicesPage.vue

@@ -43,7 +43,7 @@
                                 <div v-if="errors.has('deviceQRcode')" class="invalid-feedback d-block">{{ errors.first('deviceQRcode') }}</div>
                             </div>
                             <div v-else-if="vpnConfBase64 && messages['device_type_vpn_'+device.deviceType] === 'download_conf'">
-                                <button v-if="vpnConfBase64" @click="util.downloadURI('data:text/plain;base64,'+vpnConfBase64, 'vpn.conf')">{{messages.message_device_vpn_download_conf}}</button>
+                                <button v-if="vpnConfBase64" @click="util.downloadURI('data:text/plain;base64,'+vpnConfBase64, vpnConfFileName)">{{messages.message_device_vpn_download_conf}}</button>
                                 <div v-if="errors.has('deviceVpnConf')" class="invalid-feedback d-block">{{ errors.first('deviceVpnConf') }}</div>
                             </div>
                             <div v-else>
@@ -153,13 +153,21 @@
                 displayVpnConfig: {},
                 displayDeviceHelp: {},
                 config: config,
-                loadingImgSrc: loadingImgSrc
+                loadingImgSrc: loadingImgSrc,
+                util: util
             };
         },
         computed: {
             ...mapState('devices', ['deviceTypes', 'devices', 'device', 'qrCodeImageBase64', 'vpnConfBase64']),
             ...mapState('system', ['messages', 'appLinks', 'configs']),
             ...mapGetters('devices', ['loading']),
+            vpnConfFileName: function () {
+                if (this.configs && this.configs.networkUuid) {
+                    return 'bubble-'+this.configs.networkUuid.split('-')[0]+'-vpn.conf';
+                } else {
+                    return 'vpn.conf';
+                }
+            },
             addDeviceReady: function () {
                 return this.deviceName !== null && this.deviceName !== '' && this.deviceType !== null  && this.deviceType !== '';
             },

src/account/NetworkPage.vue

@@ -2,7 +2,7 @@
 <template>
     <div v-if="network">
         <h4 v-if="network.state === 'running' && configs && configs.networkUuid && network.uuid !== configs.networkUuid">
-            <a :href="'https://'+network.name+'.'+network.domainName">{{network.nickname}}</a> - <i>{{messages['msg_network_state_'+network.state]}}</i>
+            <a target="_blank" rel="noopener noreferrer" :href="networkAppLoginUrl">{{network.nickname}}</a> - <i>{{messages['msg_network_state_'+network.state]}}</i>
         </h4>
         <h4 v-else>{{network.nickname}} - <i>{{messages['msg_network_state_'+network.state]}}</i></h4>
 
@@ -214,6 +214,9 @@
             },
             addableDeviceWidth: function () {
                 return 100.0/this.addableDeviceTypes.length
+            },
+            networkAppLoginUrl: function () {
+                return 'https://'+this.network.name+'.'+this.network.domainName+'/appLogin?session='+util.currentUser().token+'&uri=/';
             }
         },
         methods: {