Merge branch 'develop'

Author: mark-prins

client/packages/android/app/src/main/java/org/openmsupply/client/CertWebViewClient.java

@@ -24,7 +24,6 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.security.MessageDigest;
-import java.security.PublicKey;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
@@ -119,7 +118,7 @@ private boolean validateLocalCertificate(SslCertificate targetCert) {
      * It needs to be checked that we know/trust the server before performing the
      * certificate validation.
      */
-    private boolean validateNonLocalCertificate(SslCertificate targetCert, NativeApi.omSupplyServer connectedServer) {
+    private boolean validateNonLocalCertificate(SslCertificate targetCert, NativeApi.FrontEndHost connectedServer) {
         // Calculate SSL fingerprint
         MessageDigest md = null;
         try {
@@ -164,7 +163,7 @@ public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError e
 
         String url = error.getUrl();
         Boolean isDiscovery = url.startsWith(nativeApi.getLocalUrl());
-        NativeApi.omSupplyServer connectedServer = nativeApi.getConnectedServer();
+        NativeApi.FrontEndHost connectedServer = nativeApi.getConnectedServer();
         Boolean isConnectedToServer = connectedServer != null && url.startsWith(connectedServer.getUrl());
 
         // Default behaviour if not connected to a server or not discovery
@@ -200,7 +199,7 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
         // will not only reload, but will open the URL in a browser tab
         // for local URLs we don't want this to happen!
         Uri url = request.getUrl();
-        if(url.toString().startsWith(this.nativeApi.getServerUrl())) {
+        if (url.toString().startsWith(nativeApi.getServerUrl())) {
             return false;
         }
 

client/packages/android/app/src/main/java/org/openmsupply/client/NativeApi.java

@@ -22,23 +22,27 @@
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayDeque;
 import java.util.Deque;
 
+import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLSocketFactory;
 
 @CapacitorPlugin(name = "NativeApi")
 public class NativeApi extends Plugin implements NsdManager.DiscoveryListener {
     private static final String LOG_FILE_NAME = "remote_server.log";
     public static final String OM_SUPPLY = "omSupply";
-    private static final String DEFAULT_URL = "https://localhost:8000/";
+    private static final Integer DEFAULT_PORT = DiscoveryConstants.PORT;
+    private static final String DEFAULT_URL = "https://localhost:" + DEFAULT_PORT + "/";
     private static final String CONFIGURATION_GROUP = "omSupply_preferences";
     DiscoveryConstants discoveryConstants;
     JSArray discoveredServers;
     Deque<NsdServiceInfo> serversToResolve;
-    omSupplyServer connectedServer;
+    FrontEndHost connectedServer;
     NsdManager discoveryManager;
     boolean isDebug;
     boolean isAdvertising;
@@ -73,7 +77,7 @@ public boolean getIsDebug() {
         return isDebug;
     }
 
-    public omSupplyServer getConnectedServer() {
+    public FrontEndHost getConnectedServer() {
         return connectedServer;
     }
 
@@ -243,10 +247,7 @@ public void connectedServer(PluginCall call) {
         call.resolve(connectedServer == null ? null : connectedServer.data);
     }
 
-    @PluginMethod()
-    public void connectToServer(PluginCall call) {
-        omSupplyServer server = new omSupplyServer(call.getData());
-
+    private void onConnectToServer(FrontEndHost server) {
         stopServerDiscovery();
         connectedServer = server;
 
@@ -257,7 +258,38 @@ public void connectToServer(PluginCall call) {
         WebView webView = bridge.getWebView();
         this.serverUrl = url;
         // .post to run on UI thread
-        webView.post(() -> webView.loadUrl(url));
+        webView.post(() -> webView.loadUrl(server.getConnectionUrl()));
+    }
+
+    @PluginMethod()
+    public void connectToServer(PluginCall call) throws MalformedURLException {
+        FrontEndHost server = new FrontEndHost(call.getData());
+        JSObject response = new JSObject();
+
+        try {
+            URL url = new URL(server.getConnectionUrl());
+            HttpURLConnection urlc = (HttpURLConnection) url.openConnection();
+            urlc.setRequestMethod("GET");
+            urlc.connect();
+            int status = urlc.getResponseCode();
+
+            if (status == 200) {
+                onConnectToServer(server);
+                response.put("success", true);
+            } else {
+                response.put("success", false);
+                response.put("error", "Connecting to server: response code="+ status);
+            }
+        } catch (SSLHandshakeException e) {
+            // server is running and responding with an SSL error
+            // which we will ignore, so ok to proceed
+            onConnectToServer(server);
+            response.put("success", true);
+        } catch (IOException e) {
+            response.put("success", false);
+            response.put("error", e.getMessage());
+        }
+        call.resolve(response);
     }
 
     // NsdManager.DiscoveryListener
@@ -410,19 +442,32 @@ public void readLog(PluginCall call) {
         call.resolve(response);
     }
 
-    public class omSupplyServer {
+    /** Helper class to get access to the JS FrontEndHost data */
+    public class FrontEndHost {
         JSObject data;
 
-        public omSupplyServer(JSObject data) {
+        public FrontEndHost(JSObject data) {
             this.data = data;
         }
 
+        /**
+         * Constructs the server's base url string including protocol, ip and port,
+         * e.g. https://127.0.0.1:8000
+         */
         public String getUrl() {
+            return data.getString("protocol") + "://" + data.getString("ip") + ":" + data.getString("port");
+        }
+
+        /**
+         * Constructs the url to be used when connecting to a server,
+         * e.g. https://127.0.0.1:8000/login
+         */
+        public String getConnectionUrl() {
             String path = "";
             if (data.getString("path") != null) {
                 path = "/" + data.getString("path");
             }
-            return data.getString("protocol") + "://" + data.getString("ip") + ":" + data.getString("port") + path;
+            return getUrl()  + path;
         }
 
         public boolean isLocal() {