From 28e3313a7ca7be48956490f4c6a38b415d99a225 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 21 Jun 2018 13:19:49 +0200
Subject: [PATCH] MOBILE-2431 sso: Make SSO work in Inappbrowser v3

---
 config.xml                   |  2 +-
 src/providers/utils/utils.ts | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/config.xml b/config.xml
index 5fa06d260..e6e17803f 100644
--- a/config.xml
+++ b/config.xml
@@ -104,7 +104,7 @@
     </plugin>
     <plugin name="cordova-plugin-device" spec="1.1.6" />
     <plugin name="cordova-plugin-globalization" spec="1.0.7" />
-    <plugin name="cordova-plugin-inappbrowser" spec="1.7.1" />
+    <plugin name="cordova-plugin-inappbrowser" spec="^3.0.0" />
     <plugin name="cordova-plugin-network-information" spec="1.3.3" />
     <plugin name="cordova-plugin-statusbar" spec="2.2.3" />
     <plugin name="cordova-plugin-whitelist" spec="1.3.2" />
diff --git a/src/providers/utils/utils.ts b/src/providers/utils/utils.ts
index 36ff520d6..20122e7a8 100644
--- a/src/providers/utils/utils.ts
+++ b/src/providers/utils/utils.ts
@@ -756,17 +756,41 @@ export class CoreUtilsProvider {
         this.iabInstance = this.iab.create(url, '_blank', options);
 
         if (this.appProvider.isDesktop() || this.appProvider.isMobile()) {
+            let loadStopSubscription;
+            const loadStartUrls = [];
+
             // Trigger global events when a url is loaded or the window is closed. This is to make it work like in Ionic 1.
             const loadStartSubscription = this.iabInstance.on('loadstart').subscribe((event) => {
                 // Execute the callback in the Angular zone, so change detection doesn't stop working.
                 this.zone.run(() => {
+                    // Store the last loaded URLs (max 10).
+                    loadStartUrls.push(event.url);
+                    if (loadStartUrls.length > 10) {
+                        loadStartUrls.shift();
+                    }
+
                     this.eventsProvider.trigger(CoreEventsProvider.IAB_LOAD_START, event);
                 });
             });
+
+            if (this.platform.is('android')) {
+                // Load stop is needed with InAppBrowser v3. Custom URL schemes no longer trigger load start, simulate it.
+                loadStopSubscription = this.iabInstance.on('loadstop').subscribe((event) => {
+                    // Execute the callback in the Angular zone, so change detection doesn't stop working.
+                    this.zone.run(() => {
+                        if (loadStartUrls.indexOf(event.url) == -1) {
+                            // The URL was stopped but not started, probably a custom URL scheme.
+                            this.eventsProvider.trigger(CoreEventsProvider.IAB_LOAD_START, event);
+                        }
+                    });
+                });
+            }
+
             const exitSubscription = this.iabInstance.on('exit').subscribe((event) => {
                 // Execute the callback in the Angular zone, so change detection doesn't stop working.
                 this.zone.run(() => {
                     loadStartSubscription.unsubscribe();
+                    loadStopSubscription && loadStopSubscription.unsubscribe();
                     exitSubscription.unsubscribe();
                     this.eventsProvider.trigger(CoreEventsProvider.IAB_EXIT, event);
                 });