@ts-core/oauth 3.0.24 → 3.0.26

package/cjs/OAuthBase.d.ts

@@ -7,7 +7,8 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;
-    popUpMessageParser: IOAuthPopUpParser;
+    popUpOpener: IOAuthPopUpOpener;
+    popUpMessageParser: IOAuthPopUpMessageParser;
     redirectUri: string;
     isRejectWhenPopUpClosed: boolean;
     protected http: TransportHttp;
@@ -19,18 +20,17 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected _popUpCheckCloseTimer: any;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected open(): Promise<IOAuthDto>;
-    protected popUpOpen(): Window;
     protected popUpFocus(): void;
     protected popUpCheckClose: () => void;
     protected getUrlParams(): URLSearchParams;
-    protected abstract getUrl(): string;
-    protected messageHandler: (event: MessageEvent) => void;
-    protected browserInternalMessageHandler: IOAuthPopUpParser;
-    protected getOriginUrl(): string;
-    protected getRedirectUri(): string;
+    protected popUpOpenHandler: () => Window;
+    protected popUpMessageHandler: (event: MessageEvent) => void;
+    abstract getPopUpUrl(): string;
+    getOriginUrl(): string;
+    getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
     abstract getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
-    parsePopUpResult(data: IOAuthPopUpDto): void;
+    parseResponse(data: IOAuthPopUpDto): void;
     getCode(): Promise<IOAuthDto>;
     getToken(): Promise<IOAuthDto>;
     close(): void;
@@ -66,4 +66,5 @@ export declare enum OAuthEvent {
     POPUP_OPENED = "POPUP_OPENED",
     POPUP_CLOSED = "POPUP_CLOSED"
 }
-export type IOAuthPopUpParser = (...params: any[]) => IOAuthPopUpDto;
+export type IOAuthPopUpOpener = <T extends OAuthBase>(item: T, window: Window) => Window;
+export type IOAuthPopUpMessageParser = <T extends OAuthBase>(item: T, event: MessageEvent) => IOAuthPopUpDto;

package/cjs/OAuthBase.js

@@ -13,6 +13,7 @@ exports.OAuthEvent = exports.OAuthBase = void 0;
 const common_1 = require("@ts-core/common");
 const _ = require("lodash");
 const rxjs_1 = require("rxjs");
+const external_1 = require("./external");
 class OAuthBase extends common_1.LoggerWrapper {
     constructor(logger, applicationId, window) {
         super(logger);
@@ -23,30 +24,17 @@ class OAuthBase extends common_1.LoggerWrapper {
                 this.close();
             }
         };
-        this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(event));
-        this.browserInternalMessageHandler = (event) => {
-            if (event.origin !== this.getOriginUrl()) {
-                return null;
-            }
-            let data = event.data;
-            if (!_.isObject(data)) {
-                return null;
-            }
-            if (!common_1.ObjectUtil.hasOwnProperty(data, 'oAuthCodeOrToken') && !common_1.ObjectUtil.hasOwnProperty(data, 'oAuthError')) {
-                return null;
-            }
-            return data;
-        };
+        this.popUpOpenHandler = () => this.popUpOpener(this, this.window);
+        this.popUpMessageHandler = (event) => this.parseResponse(this.popUpMessageParser(this, event));
         this.http = new common_1.TransportHttp(logger, { method: 'get' });
         this.subject = new rxjs_1.Subject();
         this.popUpWidth = 430;
         this.popUpHeight = 520;
         this.popUpTarget = '_blank';
-        this.popUpMessageParser = this.browserInternalMessageHandler;
-        this.isRejectWhenPopUpClosed = true;
         this._urlParams = new Map();
         this.urlParams.set('state', common_1.RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
+        (0, external_1.OAuthBrowserPropertiesSet)(this);
     }
     open() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -55,23 +43,16 @@ class OAuthBase extends common_1.LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = common_1.PromiseHandler.create();
-            this.popUp = this.popUpOpen();
+            this.popUp = this.popUpOpenHandler();
             this.popUpFocus();
-            this.window.addEventListener('message', this.messageHandler, false);
+            this.window.addEventListener('message', this.popUpMessageHandler, false);
             this.subject.next(new common_1.ObservableData(OAuthEvent.POPUP_OPENED, this.popUp));
             this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, common_1.DateUtil.MILLISECONDS_SECOND / 5);
             return this.promise.promise;
         });
     }
-    popUpOpen() {
-        let window = this.window;
-        let top = (window.screen.height - this.popUpHeight) / 2;
-        let left = (window.screen.width - this.popUpWidth) / 2;
-        let item = window.open(this.getUrl(), this.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
-        return item;
-    }
     popUpFocus() {
-        if (this.isPopUpOpened) {
+        if (this.isPopUpOpened && _.isFunction(this.popUp.focus)) {
             this.popUp.focus();
         }
     }
@@ -89,7 +70,7 @@ class OAuthBase extends common_1.LoggerWrapper {
     getRedirectUri() {
         return !_.isNil(this.redirectUri) ? this.redirectUri : `${this.getOriginUrl()}/oauth`;
     }
-    parsePopUpResult(data) {
+    parseResponse(data) {
         if (_.isNil(data)) {
             return;
         }
@@ -116,7 +97,7 @@ class OAuthBase extends common_1.LoggerWrapper {
         });
     }
     close() {
-        this.window.removeEventListener('message', this.messageHandler, false);
+        this.window.removeEventListener('message', this.popUpMessageHandler, false);
         this.popUpCheckCloseTimer = null;
         if (_.isNil(this.popUp)) {
             return;

package/cjs/external/browser.d.ts

@@ -0,0 +1,2 @@
+import { OAuthBase } from '../OAuthBase';
+export declare const OAuthBrowserPropertiesSet: (item: OAuthBase) => void;

package/cjs/external/browser.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthBrowserPropertiesSet = void 0;
+const _ = require("lodash");
+const common_1 = require("@ts-core/common");
+const OAuthBrowserPropertiesSet = (item) => {
+    item.popUpOpener = popUpOpener;
+    item.popUpMessageParser = popUpMessageParser;
+    item.isRejectWhenPopUpClosed = true;
+};
+exports.OAuthBrowserPropertiesSet = OAuthBrowserPropertiesSet;
+function popUpOpener(item, window) {
+    let top = (window.screen.height - item.popUpHeight) / 2;
+    let left = (window.screen.width - item.popUpWidth) / 2;
+    return window.open(item.getPopUpUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
+}
+function popUpMessageParser(item, event) {
+    if (event.origin !== item.getOriginUrl()) {
+        return null;
+    }
+    let data = event.data;
+    if (!_.isObject(data)) {
+        return null;
+    }
+    if (!common_1.ObjectUtil.hasOwnProperty(data, 'oAuthCodeOrToken') && !common_1.ObjectUtil.hasOwnProperty(data, 'oAuthError')) {
+        return null;
+    }
+    return data;
+}

package/cjs/external/cordovaInAppBrowserPlugin.d.ts

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

package/cjs/external/cordovaInAppBrowserPlugin.js

@@ -0,0 +1,55 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthCordovaInAppBrowserPluginPropertiesSet = void 0;
+const OAuthBase_1 = require("../OAuthBase");
+const rxjs_1 = require("rxjs");
+const _ = require("lodash");
+const common_1 = require("@ts-core/common");
+const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, method) => {
+    item.redirectUri = redirectUri;
+    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 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.d.ts

@@ -0,0 +1,2 @@
+import { OAuthBase } from '../OAuthBase';
+export declare const OAuthCordovaOAuthPluginPropertiesSet: (item: OAuthBase, packageName: string) => void;

package/cjs/external/cordovaOAuthPlugin.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthCordovaOAuthPluginPropertiesSet = void 0;
+const OAuthParser_1 = require("../OAuthParser");
+const _ = require("lodash");
+const OAuthCordovaOAuthPluginPropertiesSet = (item, packageName) => {
+    item.popUpTarget = 'oauth:cordova';
+    item.popUpOpener = popUpOpener;
+    item.popUpMessageParser = popUpMessageParser;
+    item.redirectUri = `${packageName}://oauth_callback`;
+    item.isRejectWhenPopUpClosed = false;
+};
+exports.OAuthCordovaOAuthPluginPropertiesSet = OAuthCordovaOAuthPluginPropertiesSet;
+function popUpOpener(item, window) {
+    let top = (window.screen.height - item.popUpHeight) / 2;
+    let left = (window.screen.width - item.popUpWidth) / 2;
+    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 = { close: () => { fake.closed = true; }, closed: false };
+    return fake;
+}
+function popUpMessageParser(item, event) {
+    let data = event.data;
+    let prefix = 'oauth::';
+    return _.isString(data) && data.includes(prefix) ? OAuthParser_1.OAuthParser.parse(JSON.parse(data.substring(prefix.length)), '') : null;
+}

package/cjs/external/index.d.ts

@@ -0,0 +1,3 @@
+export * from './browser';
+export * from './cordovaOAuthPlugin';
+export * from './cordovaInAppBrowserPlugin';

package/cjs/external/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./browser"), exports);
+__exportStar(require("./cordovaOAuthPlugin"), exports);
+__exportStar(require("./cordovaInAppBrowserPlugin"), exports);

package/cjs/go/GoAuth.d.ts

@@ -3,7 +3,7 @@ import { IOAuthDto, IOAuthToken, OAuthBase } from '../OAuthBase';
 import { ILogger } from '@ts-core/common';
 export declare class GoAuth<T extends GoUser = GoUser> extends OAuthBase<T> {
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    protected getUrl(): string;
+    getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/cjs/go/GoAuth.js

@@ -17,7 +17,7 @@ class GoAuth extends OAuthBase_1.OAuthBase {
         super(logger, applicationId, window);
         this.urlParams.set('scope', 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email');
     }
-    getUrl() {
+    getPopUpUrl() {
         return `https://accounts.google.com/o/oauth2/v2/auth?${this.getUrlParams().toString()}`;
     }
     getProfile(token) {

package/cjs/ma/MaAuth.d.ts

@@ -4,7 +4,7 @@ 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;
-    protected getUrl(): string;
+    getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/cjs/ma/MaAuth.js

@@ -24,7 +24,7 @@ class MaAuth extends OAuthBase_1.OAuthBase {
         item.append('state', common_1.RandomUtil.randomString(43));
         return item;
     }
-    getUrl() {
+    getPopUpUrl() {
         return `https://oauth.mail.ru/login?${this.getUrlParams().toString()}`;
     }
     getProfile(token) {

package/cjs/public-api.d.ts

@@ -9,5 +9,6 @@ export * from './ya/YaUser';
 export * from './ya/YaAuth';
 export * from './ma/MaAuth';
 export * from './ma/MaUser';
-export * from './external/backend';
-export * from './external/cordova';
+export * from './external/browser';
+export * from './external/cordovaOAuthPlugin';
+export * from './external/cordovaInAppBrowserPlugin';

package/cjs/public-api.js

@@ -25,5 +25,6 @@ __exportStar(require("./ya/YaUser"), exports);
 __exportStar(require("./ya/YaAuth"), exports);
 __exportStar(require("./ma/MaAuth"), exports);
 __exportStar(require("./ma/MaUser"), exports);
-__exportStar(require("./external/backend"), exports);
-__exportStar(require("./external/cordova"), exports);
+__exportStar(require("./external/browser"), exports);
+__exportStar(require("./external/cordovaOAuthPlugin"), exports);
+__exportStar(require("./external/cordovaInAppBrowserPlugin"), exports);

package/cjs/vk/VkAuth.d.ts

@@ -5,7 +5,7 @@ export declare class VkAuth<T extends VkUser = VkUser> extends OAuthBase<T> {
     v: string;
     private email;
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    protected getUrl(): string;
+    getPopUpUrl(): string;
     getProfile(token: string, fields?: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/cjs/vk/VkAuth.js

@@ -20,7 +20,7 @@ class VkAuth extends OAuthBase_1.OAuthBase {
         this.v = '5.131';
         this.urlParams.set('scope', 'status,email');
     }
-    getUrl() {
+    getPopUpUrl() {
         return `https://oauth.vk.com/authorize?${this.getUrlParams().toString()}`;
     }
     getProfile(token, fields) {

package/cjs/ya/YaAuth.d.ts

@@ -1,7 +1,7 @@
 import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { YaUser } from "./YaUser";
 export declare class YaAuth<T extends YaUser = YaUser> extends OAuthBase<T> {
-    protected getUrl(): string;
+    getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/cjs/ya/YaAuth.js

@@ -15,7 +15,7 @@ const OAuthBase_1 = require("../OAuthBase");
 const YaUser_1 = require("./YaUser");
 const _ = require("lodash");
 class YaAuth extends OAuthBase_1.OAuthBase {
-    getUrl() {
+    getPopUpUrl() {
         return `https://oauth.yandex.ru/authorize?${this.getUrlParams().toString()}`;
     }
     getProfile(token) {

package/esm/OAuthBase.d.ts

@@ -7,7 +7,8 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;
-    popUpMessageParser: IOAuthPopUpParser;
+    popUpOpener: IOAuthPopUpOpener;
+    popUpMessageParser: IOAuthPopUpMessageParser;
     redirectUri: string;
     isRejectWhenPopUpClosed: boolean;
     protected http: TransportHttp;
@@ -19,18 +20,17 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected _popUpCheckCloseTimer: any;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected open(): Promise<IOAuthDto>;
-    protected popUpOpen(): Window;
     protected popUpFocus(): void;
     protected popUpCheckClose: () => void;
     protected getUrlParams(): URLSearchParams;
-    protected abstract getUrl(): string;
-    protected messageHandler: (event: MessageEvent) => void;
-    protected browserInternalMessageHandler: IOAuthPopUpParser;
-    protected getOriginUrl(): string;
-    protected getRedirectUri(): string;
+    protected popUpOpenHandler: () => Window;
+    protected popUpMessageHandler: (event: MessageEvent) => void;
+    abstract getPopUpUrl(): string;
+    getOriginUrl(): string;
+    getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
     abstract getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
-    parsePopUpResult(data: IOAuthPopUpDto): void;
+    parseResponse(data: IOAuthPopUpDto): void;
     getCode(): Promise<IOAuthDto>;
     getToken(): Promise<IOAuthDto>;
     close(): void;
@@ -66,4 +66,5 @@ export declare enum OAuthEvent {
     POPUP_OPENED = "POPUP_OPENED",
     POPUP_CLOSED = "POPUP_CLOSED"
 }
-export type IOAuthPopUpParser = (...params: any[]) => IOAuthPopUpDto;
+export type IOAuthPopUpOpener = <T extends OAuthBase>(item: T, window: Window) => Window;
+export type IOAuthPopUpMessageParser = <T extends OAuthBase>(item: T, event: MessageEvent) => IOAuthPopUpDto;

package/esm/OAuthBase.js

@@ -7,9 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { PromiseHandler, DateUtil, ObservableData, LoggerWrapper, TransportHttp, RandomUtil, ObjectUtil } from "@ts-core/common";
+import { PromiseHandler, DateUtil, ObservableData, LoggerWrapper, TransportHttp, RandomUtil } from "@ts-core/common";
 import * as _ from 'lodash';
 import { filter, map, Subject } from "rxjs";
+import { OAuthBrowserPropertiesSet } from "./external";
 export class OAuthBase extends LoggerWrapper {
     constructor(logger, applicationId, window) {
         super(logger);
@@ -20,30 +21,17 @@ export class OAuthBase extends LoggerWrapper {
                 this.close();
             }
         };
-        this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(event));
-        this.browserInternalMessageHandler = (event) => {
-            if (event.origin !== this.getOriginUrl()) {
-                return null;
-            }
-            let data = event.data;
-            if (!_.isObject(data)) {
-                return null;
-            }
-            if (!ObjectUtil.hasOwnProperty(data, 'oAuthCodeOrToken') && !ObjectUtil.hasOwnProperty(data, 'oAuthError')) {
-                return null;
-            }
-            return data;
-        };
+        this.popUpOpenHandler = () => this.popUpOpener(this, this.window);
+        this.popUpMessageHandler = (event) => this.parseResponse(this.popUpMessageParser(this, event));
         this.http = new TransportHttp(logger, { method: 'get' });
         this.subject = new Subject();
         this.popUpWidth = 430;
         this.popUpHeight = 520;
         this.popUpTarget = '_blank';
-        this.popUpMessageParser = this.browserInternalMessageHandler;
-        this.isRejectWhenPopUpClosed = true;
         this._urlParams = new Map();
         this.urlParams.set('state', RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
+        OAuthBrowserPropertiesSet(this);
     }
     open() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52,23 +40,16 @@ export class OAuthBase extends LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = PromiseHandler.create();
-            this.popUp = this.popUpOpen();
+            this.popUp = this.popUpOpenHandler();
             this.popUpFocus();
-            this.window.addEventListener('message', this.messageHandler, false);
+            this.window.addEventListener('message', this.popUpMessageHandler, false);
             this.subject.next(new ObservableData(OAuthEvent.POPUP_OPENED, this.popUp));
             this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, DateUtil.MILLISECONDS_SECOND / 5);
             return this.promise.promise;
         });
     }
-    popUpOpen() {
-        let window = this.window;
-        let top = (window.screen.height - this.popUpHeight) / 2;
-        let left = (window.screen.width - this.popUpWidth) / 2;
-        let item = window.open(this.getUrl(), this.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
-        return item;
-    }
     popUpFocus() {
-        if (this.isPopUpOpened) {
+        if (this.isPopUpOpened && _.isFunction(this.popUp.focus)) {
             this.popUp.focus();
         }
     }
@@ -86,7 +67,7 @@ export class OAuthBase extends LoggerWrapper {
     getRedirectUri() {
         return !_.isNil(this.redirectUri) ? this.redirectUri : `${this.getOriginUrl()}/oauth`;
     }
-    parsePopUpResult(data) {
+    parseResponse(data) {
         if (_.isNil(data)) {
             return;
         }
@@ -113,7 +94,7 @@ export class OAuthBase extends LoggerWrapper {
         });
     }
     close() {
-        this.window.removeEventListener('message', this.messageHandler, false);
+        this.window.removeEventListener('message', this.popUpMessageHandler, false);
         this.popUpCheckCloseTimer = null;
         if (_.isNil(this.popUp)) {
             return;

package/esm/external/browser.d.ts

@@ -0,0 +1,2 @@
+import { OAuthBase } from '../OAuthBase';
+export declare const OAuthBrowserPropertiesSet: (item: OAuthBase) => void;

package/esm/external/browser.js

@@ -0,0 +1,25 @@
+import * as _ from 'lodash';
+import { ObjectUtil } from '@ts-core/common';
+export const OAuthBrowserPropertiesSet = (item) => {
+    item.popUpOpener = popUpOpener;
+    item.popUpMessageParser = popUpMessageParser;
+    item.isRejectWhenPopUpClosed = true;
+};
+function popUpOpener(item, window) {
+    let top = (window.screen.height - item.popUpHeight) / 2;
+    let left = (window.screen.width - item.popUpWidth) / 2;
+    return window.open(item.getPopUpUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
+}
+function popUpMessageParser(item, event) {
+    if (event.origin !== item.getOriginUrl()) {
+        return null;
+    }
+    let data = event.data;
+    if (!_.isObject(data)) {
+        return null;
+    }
+    if (!ObjectUtil.hasOwnProperty(data, 'oAuthCodeOrToken') && !ObjectUtil.hasOwnProperty(data, 'oAuthError')) {
+        return null;
+    }
+    return data;
+}

package/esm/external/cordovaInAppBrowserPlugin.d.ts

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

package/esm/external/cordovaInAppBrowserPlugin.js

@@ -0,0 +1,51 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { OAuthBase } from '../OAuthBase';
+import { takeUntil } from 'rxjs';
+import * as _ from 'lodash';
+import { ExtendedError } from '@ts-core/common';
+export const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, method) => {
+    item.redirectUri = redirectUri;
+    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 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.d.ts

@@ -0,0 +1,2 @@
+import { OAuthBase } from '../OAuthBase';
+export declare const OAuthCordovaOAuthPluginPropertiesSet: (item: OAuthBase, packageName: string) => void;

package/esm/external/cordovaOAuthPlugin.js

@@ -0,0 +1,24 @@
+import { OAuthParser } from '../OAuthParser';
+import * as _ from 'lodash';
+export const OAuthCordovaOAuthPluginPropertiesSet = (item, packageName) => {
+    item.popUpTarget = 'oauth:cordova';
+    item.popUpOpener = popUpOpener;
+    item.popUpMessageParser = popUpMessageParser;
+    item.redirectUri = `${packageName}://oauth_callback`;
+    item.isRejectWhenPopUpClosed = 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(item.getPopUpUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
+    if (!_.isNil(popUp)) {
+        return popUp;
+    }
+    let fake = { close: () => { fake.closed = true; }, closed: false };
+    return fake;
+}
+function popUpMessageParser(item, event) {
+    let data = event.data;
+    let prefix = 'oauth::';
+    return _.isString(data) && data.includes(prefix) ? OAuthParser.parse(JSON.parse(data.substring(prefix.length)), '') : null;
+}

package/esm/external/index.d.ts

@@ -0,0 +1,3 @@
+export * from './browser';
+export * from './cordovaOAuthPlugin';
+export * from './cordovaInAppBrowserPlugin';

package/esm/external/index.js

@@ -0,0 +1,3 @@
+export * from './browser';
+export * from './cordovaOAuthPlugin';
+export * from './cordovaInAppBrowserPlugin';

package/esm/go/GoAuth.d.ts

@@ -3,7 +3,7 @@ import { IOAuthDto, IOAuthToken, OAuthBase } from '../OAuthBase';
 import { ILogger } from '@ts-core/common';
 export declare class GoAuth<T extends GoUser = GoUser> extends OAuthBase<T> {
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    protected getUrl(): string;
+    getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/esm/go/GoAuth.js

@@ -14,7 +14,7 @@ export class GoAuth extends OAuthBase {
         super(logger, applicationId, window);
         this.urlParams.set('scope', 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email');
     }
-    getUrl() {
+    getPopUpUrl() {
         return `https://accounts.google.com/o/oauth2/v2/auth?${this.getUrlParams().toString()}`;
     }
     getProfile(token) {

package/esm/ma/MaAuth.d.ts

@@ -4,7 +4,7 @@ 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;
-    protected getUrl(): string;
+    getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/esm/ma/MaAuth.js

@@ -21,7 +21,7 @@ export class MaAuth extends OAuthBase {
         item.append('state', RandomUtil.randomString(43));
         return item;
     }
-    getUrl() {
+    getPopUpUrl() {
         return `https://oauth.mail.ru/login?${this.getUrlParams().toString()}`;
     }
     getProfile(token) {

package/esm/public-api.d.ts

@@ -9,5 +9,6 @@ export * from './ya/YaUser';
 export * from './ya/YaAuth';
 export * from './ma/MaAuth';
 export * from './ma/MaUser';
-export * from './external/backend';
-export * from './external/cordova';
+export * from './external/browser';
+export * from './external/cordovaOAuthPlugin';
+export * from './external/cordovaInAppBrowserPlugin';

package/esm/public-api.js

@@ -9,5 +9,6 @@ export * from './ya/YaUser';
 export * from './ya/YaAuth';
 export * from './ma/MaAuth';
 export * from './ma/MaUser';
-export * from './external/backend';
-export * from './external/cordova';
+export * from './external/browser';
+export * from './external/cordovaOAuthPlugin';
+export * from './external/cordovaInAppBrowserPlugin';

package/esm/vk/VkAuth.d.ts

@@ -5,7 +5,7 @@ export declare class VkAuth<T extends VkUser = VkUser> extends OAuthBase<T> {
     v: string;
     private email;
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    protected getUrl(): string;
+    getPopUpUrl(): string;
     getProfile(token: string, fields?: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/esm/vk/VkAuth.js

@@ -17,7 +17,7 @@ export class VkAuth extends OAuthBase {
         this.v = '5.131';
         this.urlParams.set('scope', 'status,email');
     }
-    getUrl() {
+    getPopUpUrl() {
         return `https://oauth.vk.com/authorize?${this.getUrlParams().toString()}`;
     }
     getProfile(token, fields) {

package/esm/ya/YaAuth.d.ts

@@ -1,7 +1,7 @@
 import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { YaUser } from "./YaUser";
 export declare class YaAuth<T extends YaUser = YaUser> extends OAuthBase<T> {
-    protected getUrl(): string;
+    getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/esm/ya/YaAuth.js

@@ -12,7 +12,7 @@ import { OAuthBase } from "../OAuthBase";
 import { YaUser } from "./YaUser";
 import * as _ from 'lodash';
 export class YaAuth extends OAuthBase {
-    getUrl() {
+    getPopUpUrl() {
         return `https://oauth.yandex.ru/authorize?${this.getUrlParams().toString()}`;
     }
     getProfile(token) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ts-core/oauth",
-    "version": "3.0.24",
+    "version": "3.0.26",
     "description": "Classes and utils for oauth",
     "main": "./cjs/public-api.js",
     "module": "./esm/public-api.js",
@@ -17,7 +17,7 @@
     },
     "license": "ISC",
     "dependencies": {
-        "@ts-core/common": "^3.0.8"
+        "@ts-core/common": "~3.0.14"
     },
     "devDependencies": {
         "@types/node": "^14.14.31",

package/cjs/external/backend.d.ts

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

package/cjs/external/backend.js

@@ -1,28 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OAuthBackendPropertiesSet = void 0;
-const OAuthBase_1 = require("../OAuthBase");
-const common_1 = require("@ts-core/common");
-const rxjs_1 = require("rxjs");
-const _ = require("lodash");
-const OAuthBackendPropertiesSet = (item, redirectUri, method, timeout = common_1.DateUtil.MILLISECONDS_SECOND) => {
-    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.parsePopUpResult(data);
-    }));
-};
-exports.OAuthBackendPropertiesSet = OAuthBackendPropertiesSet;

package/cjs/external/cordova.d.ts

@@ -1,2 +0,0 @@
-import { OAuthBase } from '../OAuthBase';
-export declare const OAuthCordovaPropertiesSet: (item: OAuthBase, packageName: string) => void;

package/cjs/external/cordova.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OAuthCordovaPropertiesSet = void 0;
-const OAuthParser_1 = require("../OAuthParser");
-const _ = require("lodash");
-const OAuthCordovaPropertiesSet = (item, packageName) => {
-    item.redirectUri = `${packageName}://oauth_callback`;
-    item.isRejectWhenPopUpClosed = false;
-    item.popUpTarget = 'oauth:cordova';
-    item.popUpMessageParser = cordovaPopUpMessageParser;
-};
-exports.OAuthCordovaPropertiesSet = OAuthCordovaPropertiesSet;
-function cordovaPopUpMessageParser(event) {
-    let data = event.data;
-    let prefix = 'oauth::';
-    return _.isString(data) && data.includes(prefix) ? OAuthParser_1.OAuthParser.parse(JSON.parse(data.substring(prefix.length)), '') : null;
-}

package/esm/external/backend.d.ts

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

package/esm/external/backend.js

@@ -1,24 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { OAuthBase } from '../OAuthBase';
-import { DateUtil } from '@ts-core/common';
-import { delay, takeUntil } from 'rxjs';
-import * as _ from 'lodash';
-export const OAuthBackendPropertiesSet = (item, redirectUri, method, timeout = DateUtil.MILLISECONDS_SECOND) => {
-    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.parsePopUpResult(data);
-    }));
-};

package/esm/external/cordova.d.ts

@@ -1,2 +0,0 @@
-import { OAuthBase } from '../OAuthBase';
-export declare const OAuthCordovaPropertiesSet: (item: OAuthBase, packageName: string) => void;

package/esm/external/cordova.js

@@ -1,13 +0,0 @@
-import { OAuthParser } from '../OAuthParser';
-import * as _ from 'lodash';
-export const OAuthCordovaPropertiesSet = (item, packageName) => {
-    item.redirectUri = `${packageName}://oauth_callback`;
-    item.isRejectWhenPopUpClosed = false;
-    item.popUpTarget = 'oauth:cordova';
-    item.popUpMessageParser = cordovaPopUpMessageParser;
-};
-function cordovaPopUpMessageParser(event) {
-    let data = event.data;
-    let prefix = 'oauth::';
-    return _.isString(data) && data.includes(prefix) ? OAuthParser.parse(JSON.parse(data.substring(prefix.length)), '') : null;
-}