diff --git a/launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientEventTest.java b/launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientEventTest.java index b8331b78..cc7ad147 100644 --- a/launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientEventTest.java +++ b/launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientEventTest.java @@ -345,7 +345,7 @@ private LDValue[] getEventsFromLastRequest(MockWebServer server, int expectedCou RecordedRequest r = server.takeRequest(); assertEquals("POST", r.getMethod()); assertEquals("/mobile/events/bulk", r.getPath()); - assertEquals(LDUtil.AUTH_SCHEME + mobileKey, r.getHeader("Authorization")); + assertEquals(mobileKey, r.getHeader("Authorization")); String body = r.getBody().readUtf8(); System.out.println(body); LDValue[] events = GsonHelpers.gsonInstance().fromJson(body, LDValue[].class); diff --git a/launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ComponentsImpl.java b/launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ComponentsImpl.java index 98340280..8c9cc045 100644 --- a/launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ComponentsImpl.java +++ b/launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ComponentsImpl.java @@ -215,7 +215,7 @@ public HttpConfiguration build(ClientContext clientContext) { LDLogger logger = clientContext.getBaseLogger(); // Build the default headers Map headers = new HashMap<>(); - headers.put("Authorization", LDUtil.AUTH_SCHEME + clientContext.getMobileKey()); + headers.put("Authorization", clientContext.getMobileKey()); headers.put("User-Agent", LDUtil.USER_AGENT_HEADER_VALUE); String tagHeader = LDUtil.applicationTagHeader( clientContext.getEnvironmentReporter().getApplicationInfo(), diff --git a/launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/LDUtil.java b/launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/LDUtil.java index 69ef6079..ae8ed1f5 100644 --- a/launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/LDUtil.java +++ b/launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/LDUtil.java @@ -33,7 +33,6 @@ * Various utility functions */ public class LDUtil { - static final String AUTH_SCHEME = "api_key "; static final String USER_AGENT_HEADER_VALUE = LDPackageConsts.SDK_CLIENT_NAME + "/" + BuildConfig.VERSION_NAME; static Callback noOpCallback() { diff --git a/launchdarkly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/HttpConfigurationBuilderTest.java b/launchdarkly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/HttpConfigurationBuilderTest.java index b143c302..d9b20495 100644 --- a/launchdarkly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/HttpConfigurationBuilderTest.java +++ b/launchdarkly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/HttpConfigurationBuilderTest.java @@ -19,7 +19,7 @@ public class HttpConfigurationBuilderTest { private static Map buildBasicHeaders() { Map ret = new HashMap<>(); - ret.put("Authorization", LDUtil.AUTH_SCHEME + MOBILE_KEY); + ret.put("Authorization", MOBILE_KEY); ret.put("User-Agent", LDUtil.USER_AGENT_HEADER_VALUE); ret.put("X-LaunchDarkly-Tags", "application-id/" + LDPackageConsts.SDK_NAME + " application-name/" + LDPackageConsts.SDK_NAME + " application-version/" + BuildConfig.VERSION_NAME + " application-version-name/" + BuildConfig.VERSION_NAME); diff --git a/launchdarkly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/LDConfigTest.java b/launchdarkly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/LDConfigTest.java index 0b74ef32..5db26461 100644 --- a/launchdarkly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/LDConfigTest.java +++ b/launchdarkly-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/LDConfigTest.java @@ -88,7 +88,7 @@ public void headersForEnvironment() { ); assertEquals(3, headers.size()); assertEquals(LDUtil.USER_AGENT_HEADER_VALUE, headers.get("user-agent")); - assertEquals("api_key test-key", headers.get("authorization")); + assertEquals("test-key", headers.get("authorization")); } @Test @@ -106,7 +106,7 @@ public void headersForEnvironmentWithTransform() { null, null, null, null, null, new EnvironmentReporterBuilder().build(), null); expected.put("User-Agent", LDUtil.USER_AGENT_HEADER_VALUE); - expected.put("Authorization", "api_key test-key"); + expected.put("Authorization", "test-key"); expected.put("X-LaunchDarkly-Tags", "application-id/" + LDPackageConsts.SDK_NAME + " application-name/" + LDPackageConsts.SDK_NAME + " application-version/" + BuildConfig.VERSION_NAME + " application-version-name/" + BuildConfig.VERSION_NAME); Map headers = headersToMap( @@ -114,7 +114,7 @@ public void headersForEnvironmentWithTransform() { ); assertEquals(3, headers.size()); - assertEquals("api_key test-key, more", headers.get("authorization")); + assertEquals("test-key, more", headers.get("authorization")); assertEquals("value", headers.get("new")); }