Merge pull request #2914 from benceszasz/bszasz-connectfollow

Dynamic auth server and params
jamorham · Jun 29, 2023 · c4904d6 · c4904d6
2 parents 79d16e8 + fa9da38
commit c4904d6
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/client/CareLinkClient.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/client/CareLinkClient.java
@@ -47,7 +47,6 @@ public class CareLinkClient {
     protected static final String CARELINK_CONNECT_SERVER_EU = "carelink.minimed.eu";
     protected static final String CARELINK_CONNECT_SERVER_US = "carelink.minimed.com";
     protected static final String CARELINK_LANGUAGE_EN = "en";
-    protected static final String CARELINK_LOCALE_EN = "en";
     protected static final String CARELINK_AUTH_TOKEN_COOKIE_NAME = "auth_tmp_token";
     protected static final String CARELINK_TOKEN_VALIDTO_COOKIE_NAME = "c_token_valid_to";
     protected static final int AUTH_EXPIRE_DEADLINE_MINUTES = 1;
@@ -382,19 +381,19 @@ protected Response doLogin(Response loginSessionResponse) throws IOException {
         form = new FormBody.Builder()
                 .add("sessionID", loginSessionResponse.request().url().queryParameter("sessionID"))
                 .add("sessionData", loginSessionResponse.request().url().queryParameter("sessionData"))
-                .add("locale", CARELINK_LOCALE_EN)
+                .add("locale", loginSessionResponse.request().url().queryParameter("locale"))
                 .add("action", "login")
                 .add("username", this.carelinkUsername)
                 .add("password", this.carelinkPassword)
                 .add("actionButton", "Log in")
                 .build();
 
         url = new HttpUrl.Builder()
-                .scheme("https")
-                .host("mdtlogin-ocl.medtronic.com")
-                .addPathSegments("mmcl/auth/oauth/v2/authorize/login")
-                .addQueryParameter("locale", CARELINK_LOCALE_EN)
-                .addQueryParameter("country", this.carelinkCountry)
+                .scheme(loginSessionResponse.request().url().scheme())
+                .host(loginSessionResponse.request().url().host())
+                .addPathSegments(loginSessionResponse.request().url().encodedPath().substring(1))
+                .addQueryParameter("locale", loginSessionResponse.request().url().queryParameter("locale"))
+                .addQueryParameter("country", loginSessionResponse.request().url().queryParameter("countrycode"))
                 .build();
 
         requestBuilder = new Request.Builder()