@ts-core/oauth 3.0.25 → 3.0.27

package/cjs/OAuthBase.js

@@ -52,7 +52,7 @@ class OAuthBase extends common_1.LoggerWrapper {
         });
     }
     popUpFocus() {
-        if (this.isPopUpOpened) {
+        if (this.isPopUpOpened && _.isFunction(this.popUp.focus)) {
             this.popUp.focus();
         }
     }

package/cjs/external/cordovaInAppBrowserPlugin.d.ts

@@ -1,3 +1,3 @@
 import { IOAuthPopUpDto, OAuthBase } from '../OAuthBase';
-export declare const OAuthCordovaInAppBrowserPluginPropertiesSet: (item: OAuthBase, redirectUri: string, method: IOAuthBackendMethod, timeout?: number) => void;
+export declare const OAuthCordovaInAppBrowserPluginPropertiesSet: (item: OAuthBase, redirectUri: string, method: IOAuthBackendMethod) => void;
 export type IOAuthBackendMethod = (state: string) => Promise<IOAuthPopUpDto>;

package/cjs/external/cordovaInAppBrowserPlugin.js

@@ -11,25 +11,45 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuthCordovaInAppBrowserPluginPropertiesSet = void 0;
 const OAuthBase_1 = require("../OAuthBase");
-const common_1 = require("@ts-core/common");
 const rxjs_1 = require("rxjs");
 const _ = require("lodash");
-const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, method, timeout = common_1.DateUtil.MILLISECONDS_SECOND) => {
-    item.popUpOpener = popUpOpener;
+const common_1 = require("@ts-core/common");
+const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, method) => {
     item.redirectUri = redirectUri;
-    item.isRejectWhenPopUpClosed = false;
-    item.popUpClosed.pipe((0, rxjs_1.delay)(timeout), (0, rxjs_1.takeUntil)(item.destroyed)).subscribe(() => __awaiter(void 0, void 0, void 0, function* () {
-        let data = yield method(item.state);
-        if (_.isEmpty(data)) {
-            data = { oAuthError: OAuthBase_1.OAuthBase.ERROR_WINDOW_CLOSED, oAuthCodeOrToken: null };
-        }
-        item.parseResponse(data);
+    item.popUpOpener = popUpOpener;
+    item.popUpOpened.pipe((0, rxjs_1.takeUntil)(item.destroyed)).subscribe((popUp) => __awaiter(void 0, void 0, void 0, function* () {
+        let popUpClosedHandler = () => {
+            popUp.removeEventListener('exit', popUpClosedHandler);
+            popUp.removeEventListener('loadstop', popUpLoadedHandler);
+            item.close();
+        };
+        let popUpLoadedHandler = (event) => __awaiter(void 0, void 0, void 0, function* () {
+            if (!event.url.includes(item.redirectUri)) {
+                return;
+            }
+            let data = null;
+            try {
+                data = yield method(item.state);
+                if (_.isEmpty(data)) {
+                    data = { oAuthError: OAuthBase_1.OAuthBase.ERROR_WINDOW_CLOSED, oAuthCodeOrToken: null };
+                }
+            }
+            catch (error) {
+                data = { oAuthError: error.toString(), oAuthCodeOrToken: null };
+            }
+            item.parseResponse(data);
+        });
+        popUp.addEventListener('exit', popUpClosedHandler, false);
+        popUp.addEventListener('loadstop', popUpLoadedHandler, false);
     }));
 };
 exports.OAuthCordovaInAppBrowserPluginPropertiesSet = OAuthCordovaInAppBrowserPluginPropertiesSet;
 function popUpOpener(item, window) {
     let top = (window.screen.height - item.popUpHeight) / 2;
     let left = (window.screen.width - item.popUpWidth) / 2;
-    let popUp = window.open(this.getUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
-    return popUp;
+    let cordova = window['cordova'];
+    if (_.isNil(cordova) || _.isNil(cordova.InAppBrowser)) {
+        throw new common_1.ExtendedError(`Cordova InAppBrowser undefined, please check installed plugins`);
+    }
+    return cordova.InAppBrowser.open(item.getPopUpUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
 }

package/cjs/external/cordovaOAuthPlugin.js

@@ -14,11 +14,11 @@ exports.OAuthCordovaOAuthPluginPropertiesSet = OAuthCordovaOAuthPluginProperties
 function popUpOpener(item, window) {
     let top = (window.screen.height - item.popUpHeight) / 2;
     let left = (window.screen.width - item.popUpWidth) / 2;
-    let popUp = window.open(this.getUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
+    let popUp = window.open(item.getPopUpUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
     if (!_.isNil(popUp)) {
         return popUp;
     }
-    let fake = { focus: () => { }, close: () => { fake.closed = true; }, closed: false };
+    let fake = { close: () => { fake.closed = true; }, closed: false };
     return fake;
 }
 function popUpMessageParser(item, event) {

package/cjs/ma/MaAuth.d.ts

@@ -3,7 +3,6 @@ import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { MaUser } from "./MaUser";
 export declare class MaAuth<T extends MaUser = MaUser> extends OAuthBase<T> {
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    protected getUrlParams(): URLSearchParams;
     getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;

package/cjs/ma/MaAuth.js

@@ -18,11 +18,7 @@ class MaAuth extends OAuthBase_1.OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
         this.urlParams.set('scope', 'userinfo');
-    }
-    getUrlParams() {
-        let item = super.getUrlParams();
-        item.append('state', common_1.RandomUtil.randomString(43));
-        return item;
+        this.urlParams.set('state', common_1.RandomUtil.randomString(43));
     }
     getPopUpUrl() {
         return `https://oauth.mail.ru/login?${this.getUrlParams().toString()}`;

package/esm/OAuthBase.js

@@ -49,7 +49,7 @@ export class OAuthBase extends LoggerWrapper {
         });
     }
     popUpFocus() {
-        if (this.isPopUpOpened) {
+        if (this.isPopUpOpened && _.isFunction(this.popUp.focus)) {
             this.popUp.focus();
         }
     }

package/esm/external/cordovaInAppBrowserPlugin.d.ts

@@ -1,3 +1,3 @@
 import { IOAuthPopUpDto, OAuthBase } from '../OAuthBase';
-export declare const OAuthCordovaInAppBrowserPluginPropertiesSet: (item: OAuthBase, redirectUri: string, method: IOAuthBackendMethod, timeout?: number) => void;
+export declare const OAuthCordovaInAppBrowserPluginPropertiesSet: (item: OAuthBase, redirectUri: string, method: IOAuthBackendMethod) => void;
 export type IOAuthBackendMethod = (state: string) => Promise<IOAuthPopUpDto>;

package/esm/external/cordovaInAppBrowserPlugin.js

@@ -8,24 +8,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { OAuthBase } from '../OAuthBase';
-import { DateUtil } from '@ts-core/common';
-import { delay, takeUntil } from 'rxjs';
+import { takeUntil } from 'rxjs';
 import * as _ from 'lodash';
-export const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, method, timeout = DateUtil.MILLISECONDS_SECOND) => {
-    item.popUpOpener = popUpOpener;
+import { ExtendedError } from '@ts-core/common';
+export const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, method) => {
     item.redirectUri = redirectUri;
-    item.isRejectWhenPopUpClosed = false;
-    item.popUpClosed.pipe(delay(timeout), takeUntil(item.destroyed)).subscribe(() => __awaiter(void 0, void 0, void 0, function* () {
-        let data = yield method(item.state);
-        if (_.isEmpty(data)) {
-            data = { oAuthError: OAuthBase.ERROR_WINDOW_CLOSED, oAuthCodeOrToken: null };
-        }
-        item.parseResponse(data);
+    item.popUpOpener = popUpOpener;
+    item.popUpOpened.pipe(takeUntil(item.destroyed)).subscribe((popUp) => __awaiter(void 0, void 0, void 0, function* () {
+        let popUpClosedHandler = () => {
+            popUp.removeEventListener('exit', popUpClosedHandler);
+            popUp.removeEventListener('loadstop', popUpLoadedHandler);
+            item.close();
+        };
+        let popUpLoadedHandler = (event) => __awaiter(void 0, void 0, void 0, function* () {
+            if (!event.url.includes(item.redirectUri)) {
+                return;
+            }
+            let data = null;
+            try {
+                data = yield method(item.state);
+                if (_.isEmpty(data)) {
+                    data = { oAuthError: OAuthBase.ERROR_WINDOW_CLOSED, oAuthCodeOrToken: null };
+                }
+            }
+            catch (error) {
+                data = { oAuthError: error.toString(), oAuthCodeOrToken: null };
+            }
+            item.parseResponse(data);
+        });
+        popUp.addEventListener('exit', popUpClosedHandler, false);
+        popUp.addEventListener('loadstop', popUpLoadedHandler, false);
     }));
 };
 function popUpOpener(item, window) {
     let top = (window.screen.height - item.popUpHeight) / 2;
     let left = (window.screen.width - item.popUpWidth) / 2;
-    let popUp = window.open(this.getUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
-    return popUp;
+    let cordova = window['cordova'];
+    if (_.isNil(cordova) || _.isNil(cordova.InAppBrowser)) {
+        throw new ExtendedError(`Cordova InAppBrowser undefined, please check installed plugins`);
+    }
+    return cordova.InAppBrowser.open(item.getPopUpUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
 }

package/esm/external/cordovaOAuthPlugin.js

@@ -10,11 +10,11 @@ export const OAuthCordovaOAuthPluginPropertiesSet = (item, packageName) => {
 function popUpOpener(item, window) {
     let top = (window.screen.height - item.popUpHeight) / 2;
     let left = (window.screen.width - item.popUpWidth) / 2;
-    let popUp = window.open(this.getUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
+    let popUp = window.open(item.getPopUpUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
     if (!_.isNil(popUp)) {
         return popUp;
     }
-    let fake = { focus: () => { }, close: () => { fake.closed = true; }, closed: false };
+    let fake = { close: () => { fake.closed = true; }, closed: false };
     return fake;
 }
 function popUpMessageParser(item, event) {

package/esm/ma/MaAuth.d.ts

@@ -3,7 +3,6 @@ import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { MaUser } from "./MaUser";
 export declare class MaAuth<T extends MaUser = MaUser> extends OAuthBase<T> {
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    protected getUrlParams(): URLSearchParams;
     getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;

package/esm/ma/MaAuth.js

@@ -15,11 +15,7 @@ export class MaAuth extends OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
         this.urlParams.set('scope', 'userinfo');
-    }
-    getUrlParams() {
-        let item = super.getUrlParams();
-        item.append('state', RandomUtil.randomString(43));
-        return item;
+        this.urlParams.set('state', RandomUtil.randomString(43));
     }
     getPopUpUrl() {
         return `https://oauth.mail.ru/login?${this.getUrlParams().toString()}`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ts-core/oauth",
-    "version": "3.0.25",
+    "version": "3.0.27",
     "description": "Classes and utils for oauth",
     "main": "./cjs/public-api.js",
     "module": "./esm/public-api.js",