added support to connect or disconnect VPN for >= mohave

Author: pmitra43

Diff for: lazy-connect

@@ -134,14 +134,15 @@ function _lazy_connect() {
         end tell
       end tell
     end connectVpn
-
     connectVpn("$vpn_name", "$password", "$autofill")
 EOF
 }
 
 function _lazy_connect_mojave() {
   vpn_name=$1
-  osx_vpn_name="${vpn_name/Connect /}, Not Connected"
+  osx_vpn_name_not_connected="${vpn_name/Connect /}, Not Connected"
+  osx_vpn_name_connected="${vpn_name/Connect /}, Connected"
+  osx_vpn_name="${vpn_name/Connect /},"
 
   _lazy_connect_get_totp $2
   local autofill=$3
@@ -162,47 +163,50 @@ function _lazy_connect_mojave() {
   fi
 
   osascript <<EOF
-    on connectVpn(vpnName, password, autofill)
+    on connectOrDisconnectVpn(vpnName, disconnectedVpnName, connectedVpnName, password)
       tell application "System Preferences"
         reveal pane "Network"
         activate
-
         tell application "System Events"
-            tell process "System Preferences"
-                tell window 1
-                    repeat with r in rows of table 1 of scroll area 1
-
-                        if (value of attribute "AXValue" of static text 1 of r as string) is equal to "$osx_vpn_name" then
-                            select r
-                        end if
-                    end repeat
-
-                    tell group 1
-                        click button "Authentication Settings…"
-                    end tell
-
-                    tell sheet 1
-                        set focused of text field 2 to true
-                        set value of text field 2 to "$password"
-                        click button "Ok"
-                    end tell
-
-                    click button "Apply"
-
-            delay 1
-                    tell group 1
-                        click button "Connect"
-            end tell
-
+          tell process "System Preferences"
+            tell window 1
+              repeat with r in rows of table 1 of scroll area 1
+                if (value of attribute "AXValue" of static text 1 of r as string) contains vpnName then
+                  select r
+                  exit repeat
+                end if
+              end repeat
+              if (value of attribute "AXValue" of static text 1 of r as string) is equal to disconnectedVpnName then
+                log "Connecting to vpn " & vpnName
+                tell group 1
+                  click button "Authentication Settings…"
+                end tell
+                tell sheet 1
+                  set focused of text field 2 to true
+                  set value of text field 2 to password
+                  click button "Ok"
+                end tell
+                click button "Apply"
+                delay 1
+                tell group 1
+                  click button "Connect"
                 end tell
+              else if (value of attribute "AXValue" of static text 1 of r as string) is equal to connectedVpnName then
+                log "Disconnecting from vpn " & vpnName
+                tell group 1
+                  click button "Disconnect"
+                end tell
+              else
+                log "Couldn't connect or disconnect the VPN, didn't find any exact match. The network found was: "
+                log (value of attribute "AXValue" of static text 1 of r as string)
+              end if
             end tell
+          end tell
         end tell
-
         quit
-    end tell
-    end connectVpn
-
-    connectVpn("$osx_vpn_name", "$password", "$autofill")
+      end tell
+    end connectOrDisconnectVpn
+    connectOrDisconnectVpn("$osx_vpn_name", "$osx_vpn_name_not_connected", "$osx_vpn_name_connected", "$password")
 EOF
 }