Try basic auth & release builds

* Fix 401 with basic auth * Fix release build
derniercri · Oct 26, 2023 · 14516a8 · 14516a8
1 parent e27b7fe
commit 14516a8
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -96,16 +96,17 @@ repositories {
     maven {
         url "${reactNativePath}/android"
     }
+    maven { url 'https://jitpack.io' }
     mavenCentral()
     google()
 }
 
 dependencies {
-    api project(':gigya-sdk')
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.facebook.react:react-native:+'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet('kotlinVersion')}"
     implementation "androidx.webkit:webkit:${safeExtGet('webkitVersion')}"
+    implementation 'com.github.SAP.gigya-android-sdk:sdk-core:core-v7.0.5'
 }
 
 configurations.maybeCreate("default")

diff --git a/android/gigya-sdk/build.gradle b/android/gigya-sdk/build.gradle
diff --git a/...gya-sdk/gigya-android-sdk-core-v7.0.5.aar → ...id/sdks/gigya-android-sdk-core-v7.0.5.aar b/...gya-sdk/gigya-android-sdk-core-v7.0.5.aar → ...id/sdks/gigya-android-sdk-core-v7.0.5.aar
diff --git a/android/settings.gradle b/android/settings.gradle
diff --git a/android/src/main/java/com/reactnativecommunity/webview/RNCGigya.kt b/android/src/main/java/com/reactnativecommunity/webview/RNCGigya.kt
@@ -10,11 +10,14 @@ import com.gigya.android.sdk.account.models.GigyaAccount
 import com.gigya.android.sdk.session.SessionInfo
 import com.gigya.android.sdk.ui.plugin.IGigyaWebBridge
 
-class RNCGigya(context: Application, apiKey: String, apiDomain: String) {
-  private var gigya: Gigya<GigyaAccount>
+class RNCGigya(context: Application) {
+  private lateinit var gigya: Gigya<GigyaAccount>
 
   init {
     Gigya.setApplication(context)
+  }
+
+  fun prepare(apiKey: String, apiDomain: String) {
     gigya = Gigya.getInstance(GigyaAccount::class.java)
     gigya.init(apiKey, apiDomain)
   }

diff --git a/android/src/main/java/com/reactnativecommunity/webview/RNCWebView.java b/android/src/main/java/com/reactnativecommunity/webview/RNCWebView.java
@@ -67,8 +67,9 @@ public class RNCWebView extends WebView implements LifecycleEventListener {
     protected boolean hasScrollEvent = false;
     protected boolean nestedScrollEnabled = false;
     protected ProgressChangedFilter progressChangedFilter;
+    protected RNCGigya gigya = new RNCGigya(this.getThemedReactContext().getCurrentActivity().getApplication());
 
-    /**
+  /**
      * WebView must be created with an context of the current activity
      * <p>
      * Activity Context is required for creation of dialogs internally by WebView

diff --git a/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewClient.java b/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewClient.java
@@ -87,6 +87,9 @@ public void onPageStarted(WebView webView, String url, Bitmap favicon) {
 
       RNCWebView reactWebView = (RNCWebView) webView;
       reactWebView.callInjectedJavaScriptBeforeContentLoaded();
+      if (gigyaCredentials.sessionToken != null && gigyaCredentials.sessionSecret != null) {
+        reactWebView.gigya.initialize(gigyaCredentials.sessionToken, gigyaCredentials.sessionSecret, reactWebView);
+      }
     }
 
     @Override

diff --git a/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManagerImpl.kt b/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManagerImpl.kt
@@ -281,11 +281,8 @@ class RNCWebViewManagerImpl {
 
                 gigyaCredentials = RNCGigyaCredentials(sessionToken, sessionSecret, apiKey, apiDomain)
 
-                if (sessionToken != null && sessionSecret != null && apiKey != null && apiDomain != null) {
-                    val application = viewWrapper.webView.themedReactContext.currentActivity?.application as Application
-                    val gigya = RNCGigya(application, apiKey, apiDomain)
-
-                    gigya.initialize(sessionToken, sessionSecret, viewWrapper.webView)
+                if (apiKey != null && apiDomain != null) {
+                  viewWrapper.webView.gigya.prepare(apiKey, apiDomain)
                 }
             }
         }