EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1359 from albertgasset/MOBILE-2431 

MOBILE-2431 login: Fix SSO with InAppBrowser
main
Juan Leyva 2018-06-21 09:19:34 +02:00 committed by GitHub
parent 83c5465ca5 040a9d8d9c
commit 0edab4f308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/providers/utils/utils.ts
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { Injectable } from '@angular/core';
import { Injectable, NgZone } from '@angular/core';
import { Platform } from 'ionic-angular';
import { InAppBrowser, InAppBrowserObject } from '@ionic-native/in-app-browser';
import { Clipboard } from '@ionic-native/clipboard';
@ -64,7 +64,7 @@ export class CoreUtilsProvider {
private domUtils: CoreDomUtilsProvider, logger: CoreLoggerProvider, private translate: TranslateService,
private platform: Platform, private langProvider: CoreLangProvider, private eventsProvider: CoreEventsProvider,
private fileOpener: FileOpener, private mimetypeUtils: CoreMimetypeUtilsProvider, private webIntent: WebIntent,
private wsProvider: CoreWSProvider) {
private wsProvider: CoreWSProvider, private zone: NgZone) {
this.logger = logger.getInstance('CoreUtilsProvider');
}
@ -758,12 +758,18 @@ export class CoreUtilsProvider {
if (this.appProvider.isDesktop() || this.appProvider.isMobile()) {
// 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) => {
this.eventsProvider.trigger(CoreEventsProvider.IAB_LOAD_START, event);
// Execute the callback in the Angular zone, so change detection doesn't stop working.
this.zone.run(() => {
this.eventsProvider.trigger(CoreEventsProvider.IAB_LOAD_START, event);
});
});
const exitSubscription = this.iabInstance.on('exit').subscribe((event) => {
loadStartSubscription.unsubscribe();
exitSubscription.unsubscribe();
this.eventsProvider.trigger(CoreEventsProvider.IAB_EXIT, event);
// Execute the callback in the Angular zone, so change detection doesn't stop working.
this.zone.run(() => {
loadStartSubscription.unsubscribe();
exitSubscription.unsubscribe();
this.eventsProvider.trigger(CoreEventsProvider.IAB_EXIT, event);
});
});
}