Skip to content

Commit 66dc3e5

Browse files
author
Martin Frouin
committed
Fix android 401
1 parent d236eb2 commit 66dc3e5

File tree

3 files changed

+8
-30
lines changed

3 files changed

+8
-30
lines changed

android/src/main/java/com/reactnativecommunity/webview/RNCGigya.kt

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,43 +17,21 @@ class RNCGigya(context: Application) {
1717
Gigya.setApplication(context)
1818
}
1919

20-
fun prepare(apiKey: String, apiDomain: String) {
20+
fun initialize(apiKey: String, apiDomain: String, webview: WebView) {
2121
gigya = Gigya.getInstance(GigyaAccount::class.java)
2222
gigya.init(apiKey, apiDomain)
23-
}
24-
25-
fun initialize(sessionToken: String, sessionSecret: String, webview: WebView) {
2623
attachBridge(webview)
27-
logUser(sessionToken = sessionToken, sessionSecret = sessionSecret)
2824
}
2925

30-
private fun logUser(sessionToken: String, sessionSecret: String) {
26+
fun login(sessionToken: String, sessionSecret: String) {
3127
val session = SessionInfo(sessionSecret, sessionToken)
3228
gigya.setSession(session)
3329
}
3430

35-
3631
private fun attachBridge(webview: WebView) {
3732
var webBridge: IGigyaWebBridge<GigyaAccount>? = null
3833

39-
/*
40-
Make sure you enable javascript for your WebView instance.
41-
*/
42-
val webSettings = webview.settings
43-
webSettings.javaScriptEnabled = true
44-
4534
webBridge = gigya.createWebBridge()
4635
webBridge?.attachTo(webview, object: GigyaPluginCallback<GigyaAccount>() {}, null)
47-
48-
/*
49-
Make sure to attach the GigyaWebBridge to your WebViewClient instance.
50-
*/
51-
webview.webViewClient = (object: WebViewClient() {
52-
override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
53-
val uri = request?.url
54-
val uriString = uri.toString()
55-
return webBridge?.invoke(uriString) ?: false
56-
}
57-
})
5836
}
5937
}

android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManagerImpl.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,14 @@ class RNCWebViewManagerImpl {
282282
gigyaCredentials = RNCGigyaCredentials(sessionToken, sessionSecret, apiKey, apiDomain)
283283

284284
if (gigyaCredentials.sessionToken != null && gigyaCredentials.sessionSecret != null && gigyaCredentials.apiKey != null && gigyaCredentials.apiDomain != null) {
285-
viewWrapper.webView.gigya.prepare(
285+
viewWrapper.webView.gigya.initialize(
286286
gigyaCredentials.apiKey,
287-
gigyaCredentials.apiDomain
287+
gigyaCredentials.apiDomain,
288+
viewWrapper.webView
288289
)
289-
viewWrapper.webView.gigya.initialize(
290+
viewWrapper.webView.gigya.login(
290291
gigyaCredentials.sessionToken,
291-
gigyaCredentials.sessionSecret,
292-
viewWrapper.webView
292+
gigyaCredentials.sessionSecret
293293
)
294294
}
295295
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"Martin Frouin <martin.frouin@derniercri.io>"
1111
],
1212
"license": "MIT",
13-
"version": "13.6.7",
13+
"version": "13.6.8",
1414
"homepage": "https://github.com/derniercri/react-native-gigya-webview#readme",
1515
"scripts": {
1616
"android": "react-native run-android",

0 commit comments

Comments
 (0)