ISSUE-40 fix robovm google sign in

mk-5 · Mar 13, 2021 · f5d918f · f5d918f
1 parent 3769b33
commit f5d918f
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -61,7 +61,7 @@ allprojects {
         mavenCentral()
         jcenter()
         google()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven { url "https://oss.sonatype.org/content/repositories/releases/" }
     }
 }

diff --git a/e2e/build.gradle b/e2e/build.gradle
@@ -32,7 +32,7 @@ allprojects {
         aiVersion = '1.8.0'
         gdxFireappVersion = 'latest'
 
-        altPodsVersion = '1.13.0-SNAPSHOT'
+        altPodsVersion = '1.14.0-SNAPSHOT'
     }
 
     repositories {

diff --git a/e2e/core/src/pl/mk5/gdx/fireapp/e2e/tests/AuthGoogleSignInTest.java b/e2e/core/src/pl/mk5/gdx/fireapp/e2e/tests/AuthGoogleSignInTest.java
@@ -36,12 +36,13 @@ public void action() {
                     public void accept(GdxFirebaseUser gdxFirebaseUser) {
                         success();
                     }
-                }).fail(new BiConsumer<String, Throwable>() {
-            @Override
-            public void accept(String s, Throwable throwable) {
-                success();
-            }
-        });
+                })
+                .fail(new BiConsumer<String, Throwable>() {
+                    @Override
+                    public void accept(String s, Throwable throwable) {
+                        throw new RuntimeException(throwable);
+                    }
+                });
     }
 
     @Override

diff --git a/e2e/ios/Info.plist.xml b/e2e/ios/Info.plist.xml
@@ -50,5 +50,16 @@
     <string>LaunchScreen</string>
     <key>CFBundleIconName</key>
     <string>AppIcon</string>
+    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleURLName</key>
+            <string>com.googleusercontent.apps.986869852439-gh3esg1muvvjm4u5l44s1tnsqkef80s5</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>com.googleusercontent.apps.986869852439-gh3esg1muvvjm4u5l44s1tnsqkef80s5</string>
+            </array>
+        </dict>
+    </array>
 </dict>
 </plist>
diff --git a/gdx-fireapp-ios/build.gradle b/gdx-fireapp-ios/build.gradle
@@ -27,21 +27,49 @@ dependencies {
     testImplementation libs.powermock.api
     testImplementation libs.powermock.xstream
 
-    implementation "io.github.dkimitsa.robovm:robopods-firebase-database-ios:$altPodsVersion"
-    implementation "io.github.dkimitsa.robovm:robopods-firebase-core-ios:$altPodsVersion"
-    implementation "io.github.dkimitsa.robovm:robopods-firebase-analytics-ios:$altPodsVersion"
-    implementation "io.github.dkimitsa.robovm:robopods-firebase-auth-ios:$altPodsVersion"
-    implementation "io.github.dkimitsa.robovm:robopods-firebase-storage-ios:$altPodsVersion"
-    implementation "io.github.dkimitsa.robovm:robopods-firebase-google-signin-ios:$altPodsVersion"
-    implementation "io.github.dkimitsa.robovm:robopods-firebase-crashlytics-ios:$altPodsVersion"
-
-    external "io.github.dkimitsa.robovm:robopods-firebase-database-ios:$altPodsVersion"
-    external "io.github.dkimitsa.robovm:robopods-firebase-core-ios:$altPodsVersion"
-    external "io.github.dkimitsa.robovm:robopods-firebase-analytics-ios:$altPodsVersion"
-    external "io.github.dkimitsa.robovm:robopods-firebase-auth-ios:$altPodsVersion"
-    external "io.github.dkimitsa.robovm:robopods-firebase-storage-ios:$altPodsVersion"
-    external "io.github.dkimitsa.robovm:robopods-firebase-google-signin-ios:$altPodsVersion"
-    external "io.github.dkimitsa.robovm:robopods-firebase-crashlytics-ios:$altPodsVersion"
+    implementation("io.github.dkimitsa.robovm:robopods-firebase-database-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    implementation("io.github.dkimitsa.robovm:robopods-firebase-core-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    implementation("io.github.dkimitsa.robovm:robopods-firebase-analytics-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    implementation("io.github.dkimitsa.robovm:robopods-firebase-auth-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    implementation("io.github.dkimitsa.robovm:robopods-firebase-storage-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    implementation("io.github.dkimitsa.robovm:robopods-firebase-google-signin-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    implementation("io.github.dkimitsa.robovm:robopods-firebase-crashlytics-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+
+    external("io.github.dkimitsa.robovm:robopods-firebase-database-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    external("io.github.dkimitsa.robovm:robopods-firebase-core-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    external("io.github.dkimitsa.robovm:robopods-firebase-analytics-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    external("io.github.dkimitsa.robovm:robopods-firebase-auth-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    external("io.github.dkimitsa.robovm:robopods-firebase-storage-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    external("io.github.dkimitsa.robovm:robopods-firebase-google-signin-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
+    external("io.github.dkimitsa.robovm:robopods-firebase-crashlytics-ios:$altPodsVersion") {
+        exclude group: 'com.mobidevelop.robovm'
+    }
 }
 
 ext {

diff --git a/gdx-fireapp-ios/src/pl/mk5/gdx/fireapp/ios/auth/GoogleAuthProvider.java b/gdx-fireapp-ios/src/pl/mk5/gdx/fireapp/ios/auth/GoogleAuthProvider.java
@@ -30,6 +30,7 @@
 import org.robovm.pods.firebase.googlesignin.GIDGoogleUser;
 import org.robovm.pods.firebase.googlesignin.GIDSignIn;
 import org.robovm.pods.firebase.googlesignin.GIDSignInDelegate;
+import org.robovm.pods.firebase.googlesignin.GIDSignInDelegateAdapter;
 
 import pl.mk5.gdx.fireapp.GdxFIRAuth;
 import pl.mk5.gdx.fireapp.auth.GdxFirebaseUser;
@@ -38,8 +39,8 @@
 class GoogleAuthProvider {
 
     private boolean initialized;
-    private Array<FuturePromise<GdxFirebaseUser>> signInPromises = new Array<>();
-    private Array<FuturePromise<Void>> disconnectPromises = new Array<>();
+    private final Array<FuturePromise<GdxFirebaseUser>> signInPromises = new Array<>();
+    private final Array<FuturePromise<Void>> disconnectPromises = new Array<>();
 
     synchronized boolean isInitialized() {
         return initialized;
@@ -50,9 +51,7 @@ synchronized void initializeOnce() {
             GIDSignIn.sharedInstance().setClientID(FIRApp.defaultApp().getOptions().getClientID());
             GIDSignDelegate delegate = new GIDSignDelegate();
             GIDSignIn.sharedInstance().setDelegate(delegate);
-            UIViewController viewController = GIDSignIn.sharedInstance().getPresentingViewController();
-//            GIDSignIn.sharedInstance().setDelegate(viewController);
-            ((IOSApplication) Gdx.app).getUIViewController().addChildViewController(viewController);
+            GIDSignIn.sharedInstance().setPresentingViewController(((IOSApplication) Gdx.app).getUIViewController());
         }
         initialized = true;
     }
@@ -65,7 +64,7 @@ synchronized void addDisconnectPromise(FuturePromise<Void> promise) {
         disconnectPromises.add(promise);
     }
 
-    class GIDSignDelegate implements GIDSignInDelegate {
+    class GIDSignDelegate extends GIDSignInDelegateAdapter {
 
         @Override
         public void didSignIn(GIDSignIn signIn, GIDGoogleUser user, NSError error) {