Skip to content

Commit d810b04

Browse files
committed
update handshake to include new methods
1 parent 9a53001 commit d810b04

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed

subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionsContentScopeJsMessageHandler.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ class SubscriptionsContentScopeJsMessageHandler @Inject constructor() : ContentS
4141
override val methods: List<String> = listOf(
4242
"handshake",
4343
"subscriptionDetails",
44+
"getAuthAccessToken",
45+
"getFeatureConfig",
4446
)
4547
}
4648
}

subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionsJSHelper.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ class RealSubscriptionsJSHelper @Inject constructor(
3838
): JsCallbackData? = when (method) {
3939
METHOD_HANDSHAKE -> id?.let {
4040
val jsonPayload = JSONObject().apply {
41-
put(AVAILABLE_MESSAGES, JSONArray().put(SUBSCRIPTION_DETAILS))
41+
put(AVAILABLE_MESSAGES, JSONArray().apply {
42+
put(SUBSCRIPTION_DETAILS)
43+
put(GET_AUTH_ACCESS_TOKEN)
44+
put(GET_FEATURE_CONFIG)
45+
})
4246
put(PLATFORM, ANDROID)
4347
}
4448
return JsCallbackData(jsonPayload, featureName, method, id)
@@ -71,8 +75,12 @@ class RealSubscriptionsJSHelper @Inject constructor(
7175
companion object {
7276
private const val METHOD_HANDSHAKE = "handshake"
7377
private const val METHOD_SUBSCRIPTION_DETAILS = "subscriptionDetails"
78+
private const val METHOD_GET_AUTH_ACCESS_TOKEN = "getAuthAccessToken"
79+
private const val METHOD_GET_FEATURE_CONFIG = "getFeatureConfig"
7480
private const val AVAILABLE_MESSAGES = "availableMessages"
7581
private const val SUBSCRIPTION_DETAILS = "subscriptionDetails"
82+
private const val GET_AUTH_ACCESS_TOKEN = "getAuthAccessToken"
83+
private const val GET_FEATURE_CONFIG = "getFeatureConfig"
7684
private const val PLATFORM = "platform"
7785
private const val ANDROID = "android"
7886
private const val IS_SUBSCRIBED = "isSubscribed"

subscriptions/subscriptions-impl/src/test/java/com/duckduckgo/subscriptions/impl/messaging/RealSubscriptionsJSHelperTest.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ class RealSubscriptionsJSHelperTest {
6060
val result = testee.processJsCallbackMessage(featureName, method, id, null)
6161

6262
val jsonPayload = JSONObject().apply {
63-
put("availableMessages", JSONArray().put("subscriptionDetails"))
63+
put("availableMessages", JSONArray().apply {
64+
put("subscriptionDetails")
65+
put("getAuthAccessToken")
66+
put("getFeatureConfig")
67+
})
6468
put("platform", "android")
6569
}
6670

subscriptions/subscriptions-impl/src/test/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionsContentScopeJsMessageHandlerTest.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ class SubscriptionsContentScopeJsMessageHandlerTest {
4040
@Test
4141
fun `only contains valid methods`() = runTest {
4242
val methods = handler.methods
43-
assertTrue(methods.size == 2)
44-
assertTrue(methods.first() == "handshake")
45-
assertTrue(methods.last() == "subscriptionDetails")
43+
assertTrue(methods.size == 4)
44+
assertTrue(methods.contains("handshake"))
45+
assertTrue(methods.contains("subscriptionDetails"))
46+
assertTrue(methods.contains("getAuthAccessToken"))
47+
assertTrue(methods.contains("getFeatureConfig"))
4648
}
4749

4850
private val callback = object : JsMessageCallback() {

0 commit comments

Comments
 (0)