Added ServerUrls.buildEndpoint helper method to build new endpoints u…

…sing the configured key server and protocol
dimagi · Dec 4, 2024 · 445ec10 · 445ec10
1 parent a8bcc43
commit 445ec10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/app/src/org/commcare/connect/network/ApiConnectId.java b/app/src/org/commcare/connect/network/ApiConnectId.java
@@ -65,14 +65,7 @@ public static AuthInfo.TokenAuth retrieveHqTokenApi(Context context, String hqUs
         params.put("username", hqUsername + "@" + HiddenPreferences.getUserDomain());
         params.put("password", connectToken);
 
-        String host;
-        try {
-            host = (new URL(ServerUrls.getKeyServer())).getHost();
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
-        }
-
-        String url = "https://" + host + "/oauth/token/";
+        String url = ServerUrls.buildEndpoint("oauth/token/");
 
         ConnectNetworkHelper.PostResult postResult = ConnectNetworkHelper.postSync(context, url,
                 API_VERSION_NONE, new AuthInfo.NoAuth(), params, true, false);

diff --git a/app/src/org/commcare/preferences/ServerUrls.java b/app/src/org/commcare/preferences/ServerUrls.java
@@ -6,6 +6,9 @@
 import org.commcare.CommCareApplication;
 import org.commcare.dalvik.R;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 /**
  * Created by amstone326 on 11/14/17.
  */
@@ -31,6 +34,15 @@ public static String getDataServerKey() {
                 .getString(R.string.ota_restore_url)) ;
     }
 
+    public static String buildEndpoint(String path) {
+        try {
+            URL originalUrl = new URL(getKeyServer());
+            return new URL(originalUrl, path).toString();
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public static String getKeyServer() {
         return CommCareApplication.instance().getCurrentApp().getAppPreferences()
                 .getString(PREFS_KEY_SERVER_KEY, null);