Merge branch 'development' of https://bitbucket.org/privatus/desktop-…

…app-ui2 into development

References/Linux/package_scripts/after-remove.sh

@@ -13,25 +13,21 @@ silent() {
   "$@" > /dev/null 2>&1
 }
 
+# STOPPING APPLICATION (same functionality implemented also in 'before-install.sh')
 echo "[+] Checking for 'ivpn-ui' running processes ..."
-ps aux | grep /opt/ivpn/ui/ivpn-ui.AppImage | grep -v grep
+ps aux | grep /opt/ivpn/ui/bin/ivpn-ui | grep -v grep  > /dev/null 2>&1
 if [ $? -eq 0 ]; then
   echo "[!] Detected: IVPN app is running"
-
   echo "[+] Disconnecting (if connected) ..."
   /usr/local/bin/ivpn disconnect || echo "[-] Failed to disconnect"
-
   echo "[+] Disabling firewall (if enabled) ..."
   /usr/local/bin/ivpn firewall -off || echo "[-] Failed to disable firewall"
-
   echo "[+] Killing all 'ivpn-ui' processes ..."
   # We should be careful here: WE SHOULD NOT KILL THIS SCRIPT :)
   # (which also can have 'ivpn-ui' in process description)
-  silent kill -TERM $(ps aux | grep /opt/ivpn/ui/ivpn-ui.AppImage | grep -v grep | awk '{print $2}')
-  silent kill -TERM $(ps aux | grep ivpn-ui | grep /tmp/.mount_ivpn | grep -v grep | awk '{print $2}')
+  silent kill -TERM $(ps aux | grep /opt/ivpn/ui/bin/ivpn-ui | grep -v grep | awk '{print $2}')
   silent sleep 2
-  silent kill -KILL $(ps aux | grep /opt/ivpn/ui/ivpn-ui.AppImage | grep -v grep | awk '{print $2}')
-  silent kill -KILL $(ps aux | grep ivpn-ui | grep /tmp/.mount_ivpn | grep -v grep | awk '{print $2}')
+  silent kill -KILL $(ps aux | grep /opt/ivpn/ui/bin/ivpn-ui | grep -v grep | awk '{print $2}')
 fi
 
 # DEB argument on upgrade - 'upgrade'; RPM - '1'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ivpn-ui",
-  "version": "3.1.5",
+  "version": "3.1.10",
   "description": "IVPN Client",
   "author": "IVPN Limited",
   "license": "GPL-3.0",

src/components/settings/settings-account.vue

@@ -177,7 +177,8 @@ export default {
         console.error(e);
         dialog.showMessageBoxSync(getCurrentWindow(), {
           type: "error",
-          message: "Failed to log out. Please check connectivity.",
+          message: "Failed to log out.",
+          detail: e,
           buttons: ["OK"]
         });
       } finally {

src/daemon-client/index.js

@@ -236,7 +236,17 @@ async function sendRecv(request, waitRespCommandsList, timeoutMs) {
 
   return promise;
 }
-
+function commitNoSession() {
+  const session = {
+    AccountID: "",
+    Session: "",
+    WgPublicKey: "",
+    WgLocalIP: "",
+    WgKeyGenerated: new Date(),
+    WgKeysRegenIntervalSec: 0
+  };
+  commitSession(session);
+}
 function commitSession(sessionRespObj) {
   if (sessionRespObj == null) return;
   const session = {
@@ -602,9 +612,18 @@ async function Logout() {
   await KillSwitchSetIsPersistent(false);
   await EnableFirewall(false);
   await Disconnect();
-  await sendRecv({
-    Command: daemonRequests.SessionDelete
-  });
+  try {
+    await sendRecv({
+      Command: daemonRequests.SessionDelete
+    });
+  } catch (e) {
+    console.error(e);
+  }
+
+  // It can happen that there will be no CONNECTION TO API or error on backend side
+  // In this case the daemon will not logout.
+  // Here we manually removing local session info
+  commitNoSession();
 }
 
 async function AccountStatus() {