diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/transport/MetamaskInjector.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/transport/MetamaskInjector.kt index a55917ac..86ffa6e7 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/transport/MetamaskInjector.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/transport/MetamaskInjector.kt @@ -7,6 +7,7 @@ import io.novafoundation.nova.feature_dapp_impl.web3.states.ExtensionsStore import io.novafoundation.nova.feature_dapp_impl.web3.webview.Web3Injector import io.novafoundation.nova.feature_dapp_impl.web3.webview.WebViewScriptInjector import io.novafoundation.nova.feature_dapp_impl.web3.webview.WebViewWeb3JavaScriptInterface +import io.novafoundation.nova.feature_dapp_impl.web3.webview.jsInterfaceFullName private const val JS_INTERFACE_NAME = "Metamask" @@ -45,7 +46,7 @@ class MetamaskInjector( window.ethereum = new pezkuwi.Provider($providerConfigJson); window.web3 = new pezkuwi.Web3(window.ethereum); pezkuwi.postMessage = (jsonString) => { - Pezkuwi_Metamask.onNewMessage(JSON.stringify(jsonString)) + ${jsInterfaceFullName(JS_INTERFACE_NAME)}.onNewMessage(JSON.stringify(jsonString)) }; """.trimIndent() diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/PolkadotJsInjector.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/PolkadotJsInjector.kt index 4309268b..cf737bdd 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/PolkadotJsInjector.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/PolkadotJsInjector.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_dapp_impl.web3.webview.WebViewScriptInject import io.novafoundation.nova.feature_dapp_impl.web3.webview.WebViewWeb3JavaScriptInterface // should be in tact with javascript_interface_bridge.js -private const val JS_INTERFACE_NAME = "PolkadotJs" +internal const val POLKADOT_JS_INTERFACE_NAME = "PolkadotJs" class PolkadotJsInjector( private val jsInterface: WebViewWeb3JavaScriptInterface, @@ -16,7 +16,7 @@ class PolkadotJsInjector( ) : Web3Injector { override fun initialInject(into: WebView) { - webViewScriptInjector.injectJsInterface(into, jsInterface, JS_INTERFACE_NAME) + webViewScriptInjector.injectJsInterface(into, jsInterface, POLKADOT_JS_INTERFACE_NAME) } override fun injectForPage(into: WebView, extensionStore: ExtensionsStore) { diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/webview/WebViewScriptInjector.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/webview/WebViewScriptInjector.kt index 7cea2a60..b5e1e99d 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/webview/WebViewScriptInjector.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/webview/WebViewScriptInjector.kt @@ -6,6 +6,9 @@ import io.novafoundation.nova.common.resources.ResourceManager private const val JAVASCRIPT_INTERFACE_PREFIX = "Pezkuwi" +// The name a page's scripts call the native interface by; bundled bridge scripts must use this exact name. +internal fun jsInterfaceFullName(interfaceName: String) = "${JAVASCRIPT_INTERFACE_PREFIX}_$interfaceName" + class WebViewScriptInjector( private val resourceManager: ResourceManager ) { @@ -21,9 +24,7 @@ class WebViewScriptInjector( jsInterface: WebViewWeb3JavaScriptInterface, interfaceName: String ) { - val fullName = "${JAVASCRIPT_INTERFACE_PREFIX}_$interfaceName" - - into.addJavascriptInterface(jsInterface, fullName) + into.addJavascriptInterface(jsInterface, jsInterfaceFullName(interfaceName)) } fun injectScript( diff --git a/feature-dapp-impl/src/main/res/raw/javascript_interface_bridge.js b/feature-dapp-impl/src/main/res/raw/javascript_interface_bridge.js index 1938dcc1..71227250 100644 --- a/feature-dapp-impl/src/main/res/raw/javascript_interface_bridge.js +++ b/feature-dapp-impl/src/main/res/raw/javascript_interface_bridge.js @@ -9,6 +9,6 @@ window.addEventListener("message", ({ data, source }) => { if (data.origin === "dapp-request") { // should be in tact with PolkadotJsExtension.kt - Nova_PolkadotJs.onNewMessage(dataJson) + Pezkuwi_PolkadotJs.onNewMessage(dataJson) } }); \ No newline at end of file diff --git a/feature-dapp-impl/src/test/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/PolkadotJsBridgeTest.kt b/feature-dapp-impl/src/test/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/PolkadotJsBridgeTest.kt new file mode 100644 index 00000000..74a1a4e3 --- /dev/null +++ b/feature-dapp-impl/src/test/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/PolkadotJsBridgeTest.kt @@ -0,0 +1,19 @@ +package io.novafoundation.nova.feature_dapp_impl.web3.polkadotJs + +import io.novafoundation.nova.feature_dapp_impl.web3.webview.jsInterfaceFullName +import org.junit.Assert.assertTrue +import org.junit.Test +import java.io.File + +class PolkadotJsBridgeTest { + + // A bridge calling a name the WebView never registered throws inside the page's message listener, + // so every polkadot-js request (enable, accounts, signing) is dropped without a word. + @Test + fun `bridge script calls the interface the injector registers`() { + val bridge = File("src/main/res/raw/javascript_interface_bridge.js").readText() + + val call = "${jsInterfaceFullName(POLKADOT_JS_INTERFACE_NAME)}.onNewMessage(" + assertTrue("bridge must call $call", bridge.contains(call)) + } +}