@ts-core/oauth 3.0.30 → 3.1.1

package/cjs/keycloak/KeycloakAuth.js

@@ -13,21 +13,20 @@ exports.KeycloakAuth = void 0;
 const common_1 = require("@ts-core/common");
 const OAuthBase_1 = require("../OAuthBase");
 const KeycloakUser_1 = require("./KeycloakUser");
-const url_1 = require("url");
 const _ = require("lodash");
 class KeycloakAuth extends OAuthBase_1.OAuthBase {
     constructor(logger, settings, window) {
         super(logger, settings.applicationId, window);
         this._settings = settings;
-        this.urlParams.set('scope', 'openid');
-        this.urlParams.set('state', common_1.RandomUtil.randomString(10));
-        this.urlParams.set('response_mode', 'query');
+        this.params.set('scope', 'openid');
+        this.params.set('state', common_1.RandomUtil.randomString(10));
+        this.params.set('response_mode', 'query');
     }
     getBaseUrl() {
         return `${this.settings.url}/realms/${this.settings.realm}/protocol/openid-connect`;
     }
-    getPopUpUrl() {
-        return `${this.getBaseUrl()}/auth?${this.getUrlParams().toString()}`;
+    popUpUrl() {
+        return `${this.getBaseUrl()}/auth?${this.getParams().toString()}`;
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -39,7 +38,7 @@ class KeycloakAuth extends OAuthBase_1.OAuthBase {
     getTokenByCode(dto, secret) {
         return __awaiter(this, void 0, void 0, function* () {
             let item = yield this.http.call(`${this.getBaseUrl()}/token`, {
-                data: new url_1.URLSearchParams({
+                data: new URLSearchParams({
                     code: dto.codeOrToken,
                     client_id: this.applicationId,
                     client_secret: secret,

package/cjs/ma/MaAuth.d.ts

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

package/cjs/ma/MaAuth.js

@@ -17,11 +17,11 @@ const _ = require("lodash");
 class MaAuth extends OAuthBase_1.OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
-        this.urlParams.set('scope', 'userinfo');
-        this.urlParams.set('state', common_1.RandomUtil.randomString(43));
+        this.params.set('scope', 'userinfo');
+        this.params.set('state', common_1.RandomUtil.randomString(43));
     }
-    getPopUpUrl() {
-        return `https://oauth.mail.ru/login?${this.getUrlParams().toString()}`;
+    popUpUrl() {
+        return `https://oauth.mail.ru/login?${this.getParams().toString()}`;
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {

package/cjs/public-api.d.ts

@@ -1,5 +1,6 @@
-export * from './OAuthBase';
+export * from './PopUpBase';
 export * from './OAuthUser';
+export * from './OAuthBase';
 export * from './OAuthParser';
 export * from './go/GoUser';
 export * from './go/GoAuth';

package/cjs/public-api.js

@@ -14,8 +14,9 @@ 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("./OAuthBase"), exports);
+__exportStar(require("./PopUpBase"), exports);
 __exportStar(require("./OAuthUser"), exports);
+__exportStar(require("./OAuthBase"), exports);
 __exportStar(require("./OAuthParser"), exports);
 __exportStar(require("./go/GoUser"), exports);
 __exportStar(require("./go/GoAuth"), 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);
-    getPopUpUrl(): string;
+    popUpUrl(): string;
     getProfile(token: string, fields?: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/cjs/vk/VkAuth.js

@@ -18,10 +18,10 @@ class VkAuth extends OAuthBase_1.OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
         this.v = '5.131';
-        this.urlParams.set('scope', 'status,email');
+        this.params.set('scope', 'status,email');
     }
-    getPopUpUrl() {
-        return `https://oauth.vk.com/authorize?${this.getUrlParams().toString()}`;
+    popUpUrl() {
+        return `https://oauth.vk.com/authorize?${this.getParams().toString()}`;
     }
     getProfile(token, fields) {
         return __awaiter(this, void 0, void 0, function* () {

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

package/cjs/ya/YaAuth.js

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

package/esm/OAuthBase.d.ts

@@ -1,56 +1,32 @@
-import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, TransportHttp } from "@ts-core/common";
-import { Observable, Subject } from "rxjs";
-export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
+import { ILogger, TransportHttp, ExtendedError } from "@ts-core/common";
+import { PopUpBase } from "./PopUpBase";
+export declare abstract class OAuthBase<T = any> extends PopUpBase<IOAuthDto> {
     protected applicationId: string;
-    protected window?: Window;
-    static ERROR_WINDOW_CLOSED: string;
-    popUpWidth: number;
-    popUpHeight: number;
-    popUpTarget: string;
-    popUpOpener: IOAuthPopUpOpener;
-    popUpMessageParser: IOAuthPopUpMessageParser;
     redirectUri: string;
-    isRejectWhenPopUpClosed: boolean;
     protected http: TransportHttp;
-    protected subject: Subject<ObservableData<OAuthEvent, Window>>;
-    protected popUp: Window;
-    protected promise: PromiseHandler<IOAuthDto>;
     protected responseType: string;
-    protected _urlParams: Map<string, string>;
-    protected _popUpCheckCloseTimer: any;
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    protected open(): Promise<IOAuthDto>;
-    protected popUpFocus(): void;
-    protected popUpCheckClose: () => void;
-    protected getUrlParams(): URLSearchParams;
-    protected popUpOpenHandler: () => Window;
-    protected popUpMessageHandler: (event: MessageEvent) => void;
-    abstract getPopUpUrl(): string;
-    getOriginUrl(): string;
-    getRedirectUri(): string;
+    protected getRedirectUri(): string;
+    protected getParams(): URLSearchParams;
+    protected parseMessageData(item: any): IOAuthDto;
+    protected isMessageError(item: any): boolean;
+    protected parseMessageError(item: any): ExtendedError;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
     abstract getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
-    parseResponse(data: IOAuthPopUpDto): void;
     getCode(): Promise<IOAuthDto>;
     getToken(): Promise<IOAuthDto>;
-    close(): void;
+    parse(item: any): void;
     destroy(): void;
-    protected get isPopUpOpened(): boolean;
-    protected get popUpCheckCloseTimer(): any;
-    protected set popUpCheckCloseTimer(value: any);
-    get urlParams(): Map<string, string>;
     get state(): string;
-    get events(): Observable<ObservableData<OAuthEvent, Window>>;
-    get popUpClosed(): Observable<Window>;
-    get popUpOpened(): Observable<Window>;
 }
 export interface IOAuthDto {
     codeOrToken: string;
     redirectUri: string;
 }
 export interface IOAuthPopUpDto {
-    oAuthError: string;
-    oAuthCodeOrToken: string;
+    oauthError?: string;
+    oauthCodeOrToken?: string;
+    oauthErrorDescription?: string;
 }
 export interface IOAuthToken {
     expiresIn: number;
@@ -63,9 +39,3 @@ export interface IOAuthToken {
     refreshToken?: string;
     refreshExpiresIn?: string;
 }
-export declare enum OAuthEvent {
-    POPUP_OPENED = "POPUP_OPENED",
-    POPUP_CLOSED = "POPUP_CLOSED"
-}
-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,79 +7,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { PromiseHandler, DateUtil, ObservableData, LoggerWrapper, TransportHttp, RandomUtil } from "@ts-core/common";
+import { TransportHttp, RandomUtil, ExtendedError } from "@ts-core/common";
 import * as _ from 'lodash';
-import { filter, map, Subject } from "rxjs";
-import { OAuthBrowserPropertiesSet } from "./external";
-export class OAuthBase extends LoggerWrapper {
+import { Subject } from "rxjs";
+import { PopUpBase } from "./PopUpBase";
+import { OAuthBrowserPropertiesSet } from "./public-api";
+export class OAuthBase extends PopUpBase {
     constructor(logger, applicationId, window) {
-        super(logger);
+        super(logger, window);
         this.applicationId = applicationId;
-        this.window = window;
-        this.popUpCheckClose = () => {
-            if (!this.isPopUpOpened) {
-                this.close();
-            }
-        };
-        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._urlParams = new Map();
-        this.urlParams.set('state', RandomUtil.randomString());
-        this.urlParams.set('display', 'popup');
+        this.params.set('state', RandomUtil.randomString());
+        this.params.set('display', 'popup');
         OAuthBrowserPropertiesSet(this);
     }
-    open() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!_.isNil(this.promise)) {
-                this.popUpFocus();
-                return this.promise.promise;
-            }
-            this.promise = PromiseHandler.create();
-            this.popUp = this.popUpOpenHandler();
-            this.popUpFocus();
-            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;
-        });
-    }
-    popUpFocus() {
-        if (this.isPopUpOpened && _.isFunction(this.popUp.focus)) {
-            this.popUp.focus();
-        }
+    getRedirectUri() {
+        return !_.isNil(this.redirectUri) ? this.redirectUri : `${this.originUrl}/oauth`;
     }
-    getUrlParams() {
-        let item = new URLSearchParams();
+    getParams() {
+        let item = super.getParams();
         item.append('client_id', this.applicationId);
         item.append('redirect_uri', this.getRedirectUri());
         item.append('response_type', this.responseType);
-        this.urlParams.forEach((value, key) => item.append(key, value));
         return item;
     }
-    getOriginUrl() {
-        return this.window.location.origin;
+    parseMessageData(item) {
+        return {
+            codeOrToken: item.oauthCodeOrToken,
+            redirectUri: this.getRedirectUri()
+        };
     }
-    getRedirectUri() {
-        return !_.isNil(this.redirectUri) ? this.redirectUri : `${this.getOriginUrl()}/oauth`;
+    isMessageError(item) {
+        return !_.isNil(item.oauthError);
     }
-    parseResponse(data) {
-        if (_.isNil(data)) {
-            return;
-        }
-        if (!_.isEmpty(data.oAuthCodeOrToken)) {
-            this.promise.resolve({ redirectUri: this.getRedirectUri(), codeOrToken: data.oAuthCodeOrToken });
-            this.promise = null;
-        }
-        if (!_.isEmpty(data.oAuthError)) {
-            this.promise.reject(data.oAuthError);
-            this.promise = null;
-        }
-        this.close();
+    parseMessageError(item) {
+        return new ExtendedError(item.oauthError, item.oauthErrorDescription);
     }
     getCode() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -93,75 +56,20 @@ export class OAuthBase extends LoggerWrapper {
             return this.open();
         });
     }
-    close() {
-        this.window.removeEventListener('message', this.popUpMessageHandler, false);
-        this.popUpCheckCloseTimer = null;
-        if (_.isNil(this.popUp)) {
-            return;
-        }
-        this.subject.next(new ObservableData(OAuthEvent.POPUP_CLOSED, this.popUp));
-        this.popUp.close();
-        this.popUp = null;
-        if (this.isRejectWhenPopUpClosed && !_.isNil(this.promise)) {
-            this.promise.reject(OAuthBase.ERROR_WINDOW_CLOSED);
-            this.promise = null;
-        }
+    parse(item) {
+        super.popUpMessageParse(item);
     }
     destroy() {
         if (this.isDestroyed) {
             return;
         }
         super.destroy();
-        this.close();
-        if (!_.isNil(this.promise)) {
-            this.promise.reject(OAuthBase.ERROR_WINDOW_CLOSED);
-            this.promise = null;
-        }
-        if (!_.isNil(this.urlParams)) {
-            this.urlParams.clear();
-            this._urlParams = null;
-        }
         if (!_.isNil(this.http)) {
             this.http.destroy();
             this.http = null;
         }
-        if (!_.isNil(this.subject)) {
-            this.subject.complete();
-            this.subject = null;
-        }
-    }
-    get isPopUpOpened() {
-        return !_.isNil(this.popUp) && !this.popUp.closed;
-    }
-    get popUpCheckCloseTimer() {
-        return this._popUpCheckCloseTimer;
-    }
-    set popUpCheckCloseTimer(value) {
-        if (value === this._popUpCheckCloseTimer) {
-            return;
-        }
-        clearInterval(this._popUpCheckCloseTimer);
-        this._popUpCheckCloseTimer = value;
-    }
-    get urlParams() {
-        return this._urlParams;
     }
     get state() {
-        return !_.isNil(this.urlParams) ? this.urlParams.get('state') : null;
-    }
-    get events() {
-        return !_.isNil(this.subject) ? this.subject.asObservable() : null;
-    }
-    get popUpClosed() {
-        return this.events.pipe(filter(item => item.type === OAuthEvent.POPUP_CLOSED), map(item => item.data));
-    }
-    get popUpOpened() {
-        return this.events.pipe(filter(item => item.type === OAuthEvent.POPUP_OPENED), map(item => item.data));
+        return !_.isNil(this.params) ? this.params.get('state') : null;
     }
 }
-OAuthBase.ERROR_WINDOW_CLOSED = 'WINDOW_CLOSED';
-export var OAuthEvent;
-(function (OAuthEvent) {
-    OAuthEvent["POPUP_OPENED"] = "POPUP_OPENED";
-    OAuthEvent["POPUP_CLOSED"] = "POPUP_CLOSED";
-})(OAuthEvent || (OAuthEvent = {}));

package/esm/OAuthParser.js

@@ -6,18 +6,21 @@ export class OAuthParser {
         if (!_.isEmpty(fragment)) {
             new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
         }
-        let oAuthError = null;
-        let oAuthCodeOrToken = null;
+        let oauthError = null;
+        let oauthCodeOrToken = null;
         for (let key in item) {
             let value = item[key];
             if (OAuthParser.NAMES.includes(key)) {
-                oAuthCodeOrToken = value;
+                oauthCodeOrToken = value;
             }
             else if (OAuthParser.ERRORS.includes(key)) {
-                oAuthError = value;
+                oauthError = value;
             }
-            if (!_.isEmpty(oAuthCodeOrToken) || !_.isEmpty(oAuthError)) {
-                return { oAuthCodeOrToken, oAuthError };
+            if (!_.isEmpty(oauthCodeOrToken)) {
+                return { oauthCodeOrToken };
+            }
+            else if (!_.isEmpty(oauthError)) {
+                return { oauthErrorDescription: item.error_description, oauthError };
             }
         }
         ;
@@ -25,4 +28,4 @@ export class OAuthParser {
     }
 }
 OAuthParser.NAMES = ['code', 'access_token'];
-OAuthParser.ERRORS = ['error_description', 'error'];
+OAuthParser.ERRORS = ['error', 'error_description'];

package/esm/PopUpBase.d.ts

@@ -0,0 +1,45 @@
+import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, ExtendedError } from "@ts-core/common";
+import { Observable, Subject } from "rxjs";
+export declare abstract class PopUpBase<U> extends LoggerWrapper {
+    static ERROR_WINDOW_CLOSED: string;
+    popUpWidth: number;
+    popUpHeight: number;
+    popUpTarget: string;
+    popUpOpener: IPopUpOpener;
+    popUpMessageEventParser: IPopUpMessageEventParser;
+    protected popUp: Window;
+    protected window: Window;
+    protected subject: Subject<ObservableData<PopUpEvent, Window>>;
+    protected promise: PromiseHandler<U, ExtendedError>;
+    protected _params: Map<string, string>;
+    protected _popUpCheckCloseTimer: any;
+    isRejectWhenPopUpClosed: boolean;
+    constructor(logger: ILogger, window?: Window);
+    protected popUpFocus(): void;
+    protected popUpCheckClose: () => void;
+    protected getParams(): URLSearchParams;
+    protected popUpMessageHandler(event: MessageEvent): void;
+    protected popUpMessageParse(item: any): void;
+    protected popUpMessageHandlerProxy: (event: MessageEvent) => void;
+    protected abstract isMessageError(item: any): boolean;
+    protected abstract parseMessageData(item: any): U;
+    protected abstract parseMessageError(item: any): ExtendedError;
+    open(...params: any[]): Promise<U>;
+    close(): void;
+    destroy(): void;
+    abstract popUpUrl(): string;
+    protected get isPopUpOpened(): boolean;
+    protected get popUpCheckCloseTimer(): any;
+    protected set popUpCheckCloseTimer(value: any);
+    get originUrl(): string;
+    get params(): Map<string, string>;
+    get events(): Observable<ObservableData<PopUpEvent, Window>>;
+    get closed(): Observable<Window>;
+    get opened(): Observable<Window>;
+}
+export type IPopUpOpener = <T extends PopUpBase<U>, U>(popUp: T, window: Window) => Window;
+export type IPopUpMessageEventParser = (event: MessageEvent) => any;
+export declare enum PopUpEvent {
+    OPENED = "OPENED",
+    CLOSED = "CLOSED"
+}

package/esm/PopUpBase.js

@@ -0,0 +1,141 @@
+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 { PromiseHandler, DateUtil, ObservableData, LoggerWrapper, ExtendedError } from "@ts-core/common";
+import { filter, map, Subject } from "rxjs";
+import { popUpOpener } from "./external";
+import * as _ from 'lodash';
+export class PopUpBase extends LoggerWrapper {
+    constructor(logger, window) {
+        super(logger);
+        this.popUpCheckClose = () => {
+            if (!this.isPopUpOpened) {
+                this.close();
+            }
+        };
+        this.popUpMessageHandlerProxy = (event) => this.popUpMessageHandler(event);
+        this.window = window;
+        this.subject = new Subject();
+        this._params = new Map();
+        this.popUpWidth = 430;
+        this.popUpHeight = 520;
+        this.popUpTarget = '_blank';
+        this.popUpOpener = popUpOpener;
+        this.isRejectWhenPopUpClosed = true;
+    }
+    popUpFocus() {
+        if (this.isPopUpOpened && _.isFunction(this.popUp.focus)) {
+            this.popUp.focus();
+        }
+    }
+    getParams() {
+        let item = new URLSearchParams();
+        this.params.forEach((value, key) => item.append(key, value));
+        return item;
+    }
+    popUpMessageHandler(event) {
+        if (event.origin === this.originUrl && !_.isNil(event.data)) {
+            this.popUpMessageParse(this.popUpMessageEventParser(event));
+        }
+    }
+    popUpMessageParse(item) {
+        if (_.isNil(item)) {
+            return;
+        }
+        if (this.isMessageError(item)) {
+            this.promise.reject(this.parseMessageError(item));
+        }
+        else {
+            this.promise.resolve(this.parseMessageData(item));
+        }
+        this.close();
+    }
+    open(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!_.isNil(this.promise)) {
+                this.popUpFocus();
+                return this.promise.promise;
+            }
+            this.promise = PromiseHandler.create();
+            this.popUp = this.popUpOpener(this, this.window);
+            this.popUpFocus();
+            this.window.addEventListener('message', this.popUpMessageHandlerProxy, false);
+            this.subject.next(new ObservableData(PopUpEvent.OPENED, this.popUp));
+            this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, DateUtil.MILLISECONDS_SECOND / 5);
+            return this.promise.promise;
+        });
+    }
+    close() {
+        this.window.removeEventListener('message', this.popUpMessageHandlerProxy, false);
+        this.popUpCheckCloseTimer = null;
+        if (_.isNil(this.popUp)) {
+            return;
+        }
+        this.subject.next(new ObservableData(PopUpEvent.CLOSED, this.popUp));
+        this.popUp.close();
+        this.popUp = null;
+        if (this.isRejectWhenPopUpClosed && !_.isNil(this.promise)) {
+            this.promise.reject(new ExtendedError(PopUpBase.ERROR_WINDOW_CLOSED, PopUpBase.ERROR_WINDOW_CLOSED));
+            this.promise = null;
+        }
+    }
+    destroy() {
+        if (this.isDestroyed) {
+            return;
+        }
+        super.destroy();
+        this.close();
+        if (!_.isNil(this.promise)) {
+            this.promise.reject(new ExtendedError(PopUpBase.ERROR_WINDOW_CLOSED, PopUpBase.ERROR_WINDOW_CLOSED));
+            this.promise = null;
+        }
+        if (!_.isNil(this.params)) {
+            this.params.clear();
+            this._params = null;
+        }
+        if (!_.isNil(this.subject)) {
+            this.subject.complete();
+            this.subject = null;
+        }
+    }
+    get isPopUpOpened() {
+        return !_.isNil(this.popUp) && !this.popUp.closed;
+    }
+    get popUpCheckCloseTimer() {
+        return this._popUpCheckCloseTimer;
+    }
+    set popUpCheckCloseTimer(value) {
+        if (value === this._popUpCheckCloseTimer) {
+            return;
+        }
+        clearInterval(this._popUpCheckCloseTimer);
+        this._popUpCheckCloseTimer = value;
+    }
+    get originUrl() {
+        return this.window.location.origin;
+    }
+    get params() {
+        return this._params;
+    }
+    get events() {
+        return !_.isNil(this.subject) ? this.subject.asObservable() : null;
+    }
+    get closed() {
+        return this.events.pipe(filter(item => item.type === PopUpEvent.CLOSED), map(item => item.data));
+    }
+    get opened() {
+        return this.events.pipe(filter(item => item.type === PopUpEvent.OPENED), map(item => item.data));
+    }
+}
+PopUpBase.ERROR_WINDOW_CLOSED = 'WINDOW_CLOSED';
+export var PopUpEvent;
+(function (PopUpEvent) {
+    PopUpEvent["OPENED"] = "OPENED";
+    PopUpEvent["CLOSED"] = "CLOSED";
+})(PopUpEvent || (PopUpEvent = {}));

package/esm/external/browser.d.ts

@@ -1,2 +1,5 @@
 import { OAuthBase } from '../OAuthBase';
+import { PopUpBase } from '../PopUpBase';
 export declare const OAuthBrowserPropertiesSet: (item: OAuthBase) => void;
+export declare function popUpOpener<T extends PopUpBase<U>, U>(popUp: T, window: Window): Window;
+export declare function popUpMessageEventParser(event: MessageEvent): any;

package/esm/external/browser.js

@@ -1,25 +1,14 @@
 import * as _ from 'lodash';
-import { ObjectUtil } from '@ts-core/common';
 export const OAuthBrowserPropertiesSet = (item) => {
     item.popUpOpener = popUpOpener;
-    item.popUpMessageParser = popUpMessageParser;
+    item.popUpMessageEventParser = popUpMessageEventParser;
     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}`);
+export function popUpOpener(popUp, window) {
+    let top = (window.screen.height - popUp.popUpHeight) / 2;
+    let left = (window.screen.width - popUp.popUpWidth) / 2;
+    return window.open(popUp.popUpUrl(), popUp.popUpTarget, `scrollbars=yes,width=${popUp.popUpWidth},height=${popUp.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;
+export function popUpMessageEventParser(event) {
+    return !_.isNil(event.data.oauthError) || !_.isNil(event.data.oauthCodeOrToken) ? event.data : null;
 }