@ts-core/oauth 3.0.20 → 3.0.22

package/cjs/OAuthBase.d.ts

@@ -7,9 +7,9 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;
-    popUpIsCheckClose: boolean;
     popUpMessageParser: IOAuthPopUpParser;
     redirectUri: string;
+    isRejectWhenPopUpClosed: boolean;
     protected http: TransportHttp;
     protected subject: Subject<ObservableData<OAuthEvent, Window>>;
     protected popUp: Window;
@@ -35,6 +35,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     getToken(): Promise<IOAuthDto>;
     close(): void;
     destroy(): void;
+    protected get isPopUpOpened(): boolean;
     protected get popUpCheckCloseTimer(): any;
     protected set popUpCheckCloseTimer(value: any);
     get urlParams(): Map<string, string>;

package/cjs/OAuthBase.js

@@ -19,8 +19,12 @@ class OAuthBase extends common_1.LoggerWrapper {
         this.applicationId = applicationId;
         this.window = window;
         this.popUpCheckClose = () => {
-            if (_.isNil(this.popUp) || this.popUp.closed) {
-                this.close();
+            if (this.isPopUpOpened) {
+                return;
+            }
+            this.close();
+            if (this.isRejectWhenPopUpClosed && !_.isNil(this.promise)) {
+                this.promise.reject(OAuthBase.ERROR_WINDOW_CLOSED);
             }
         };
         this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(event));
@@ -32,8 +36,8 @@ class OAuthBase extends common_1.LoggerWrapper {
         this.popUpWidth = 430;
         this.popUpHeight = 520;
         this.popUpTarget = '_blank';
-        this.popUpIsCheckClose = true;
         this.popUpMessageParser = this.browserInternalMessageHandler;
+        this.isRejectWhenPopUpClosed = true;
         this._urlParams = new Map();
         this.urlParams.set('state', common_1.RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
@@ -41,18 +45,13 @@ class OAuthBase extends common_1.LoggerWrapper {
     open() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!_.isNil(this.promise)) {
-                if (!_.isNil(this.popUp) && !this.popUp.closed) {
-                    this.popUp.focus();
-                }
+                this.popUpFocus();
                 return this.promise.promise;
             }
             this.promise = common_1.PromiseHandler.create();
             this.popUp = this.popUpOpen();
-            this.subject.next(new common_1.ObservableData(OAuthEvent.POPUP_OPENED, this.popUp));
             this.popUpFocus();
-            if (this.popUpIsCheckClose) {
-                this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, common_1.DateUtil.MILLISECONDS_SECOND / 10);
-            }
+            this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, common_1.DateUtil.MILLISECONDS_SECOND / 10);
             this.window.addEventListener('message', this.messageHandler, false);
             return this.promise.promise;
         });
@@ -62,10 +61,11 @@ class OAuthBase extends common_1.LoggerWrapper {
         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}`);
+        this.subject.next(new common_1.ObservableData(OAuthEvent.POPUP_OPENED, item));
         return item;
     }
     popUpFocus() {
-        if (!_.isNil(this.popUp) && !this.popUp.closed) {
+        if (this.isPopUpOpened) {
             this.popUp.focus();
         }
     }
@@ -119,10 +119,6 @@ class OAuthBase extends common_1.LoggerWrapper {
             this.popUp.close();
             this.popUp = null;
         }
-        if (!_.isNil(this.promise)) {
-            this.promise.reject(OAuthBase.ERROR_WINDOW_CLOSED);
-            this.promise = null;
-        }
     }
     destroy() {
         if (this.isDestroyed) {
@@ -130,6 +126,10 @@ class OAuthBase extends common_1.LoggerWrapper {
         }
         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;
@@ -143,6 +143,9 @@ class OAuthBase extends common_1.LoggerWrapper {
             this.subject = null;
         }
     }
+    get isPopUpOpened() {
+        return !_.isNil(this.popUp) && !this.popUp.closed;
+    }
     get popUpCheckCloseTimer() {
         return this._popUpCheckCloseTimer;
     }

package/cjs/external/backend.d.ts

@@ -1,3 +1,3 @@
 import { IOAuthPopUpDto, OAuthBase } from '../OAuthBase';
-export declare const backendPropertiesSet: (item: OAuthBase, redirectUri: string, method: IOAuthBackendMethod, timeout?: number) => void;
+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

@@ -9,12 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.backendPropertiesSet = void 0;
+exports.OAuthBackendPropertiesSet = void 0;
 const common_1 = require("@ts-core/common");
 const rxjs_1 = require("rxjs");
-const backendPropertiesSet = (item, redirectUri, method, timeout = common_1.DateUtil.MILLISECONDS_SECOND) => {
+const OAuthBackendPropertiesSet = (item, redirectUri, method, timeout = common_1.DateUtil.MILLISECONDS_SECOND) => {
     item.redirectUri = redirectUri;
-    item.popUpIsCheckClose = false;
-    item.popUpOpened.pipe((0, rxjs_1.delay)(timeout), (0, rxjs_1.takeUntil)(item.destroyed)).subscribe(() => __awaiter(void 0, void 0, void 0, function* () { return item.parsePopUpResult(yield method(item.state)); }));
+    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* () { return item.parsePopUpResult(yield method(item.state)); }));
 };
-exports.backendPropertiesSet = backendPropertiesSet;
+exports.OAuthBackendPropertiesSet = OAuthBackendPropertiesSet;

package/cjs/external/cordova.d.ts

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

package/cjs/external/cordova.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cordovaPropertiesSet = void 0;
+exports.OAuthCordovaPropertiesSet = void 0;
 const OAuthParser_1 = require("../OAuthParser");
 const _ = require("lodash");
-const cordovaPropertiesSet = (item, packageName) => {
-    item.popUpTarget = 'oauth:cordova';
+const OAuthCordovaPropertiesSet = (item, packageName) => {
     item.redirectUri = `${packageName}://oauth_callback`;
-    item.popUpIsCheckClose = false;
+    item.isRejectWhenPopUpClosed = false;
+    item.popUpTarget = 'oauth:cordova';
     item.popUpMessageParser = cordovaPopUpMessageParser;
 };
-exports.cordovaPropertiesSet = cordovaPropertiesSet;
+exports.OAuthCordovaPropertiesSet = OAuthCordovaPropertiesSet;
 function cordovaPopUpMessageParser(event) {
     let data = event.data;
     let prefix = 'oauth::';

package/esm/OAuthBase.d.ts

@@ -7,9 +7,9 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;
-    popUpIsCheckClose: boolean;
     popUpMessageParser: IOAuthPopUpParser;
     redirectUri: string;
+    isRejectWhenPopUpClosed: boolean;
     protected http: TransportHttp;
     protected subject: Subject<ObservableData<OAuthEvent, Window>>;
     protected popUp: Window;
@@ -35,6 +35,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     getToken(): Promise<IOAuthDto>;
     close(): void;
     destroy(): void;
+    protected get isPopUpOpened(): boolean;
     protected get popUpCheckCloseTimer(): any;
     protected set popUpCheckCloseTimer(value: any);
     get urlParams(): Map<string, string>;

package/esm/OAuthBase.js

@@ -16,8 +16,12 @@ export class OAuthBase extends LoggerWrapper {
         this.applicationId = applicationId;
         this.window = window;
         this.popUpCheckClose = () => {
-            if (_.isNil(this.popUp) || this.popUp.closed) {
-                this.close();
+            if (this.isPopUpOpened) {
+                return;
+            }
+            this.close();
+            if (this.isRejectWhenPopUpClosed && !_.isNil(this.promise)) {
+                this.promise.reject(OAuthBase.ERROR_WINDOW_CLOSED);
             }
         };
         this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(event));
@@ -29,8 +33,8 @@ export class OAuthBase extends LoggerWrapper {
         this.popUpWidth = 430;
         this.popUpHeight = 520;
         this.popUpTarget = '_blank';
-        this.popUpIsCheckClose = true;
         this.popUpMessageParser = this.browserInternalMessageHandler;
+        this.isRejectWhenPopUpClosed = true;
         this._urlParams = new Map();
         this.urlParams.set('state', RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
@@ -38,18 +42,13 @@ export class OAuthBase extends LoggerWrapper {
     open() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!_.isNil(this.promise)) {
-                if (!_.isNil(this.popUp) && !this.popUp.closed) {
-                    this.popUp.focus();
-                }
+                this.popUpFocus();
                 return this.promise.promise;
             }
             this.promise = PromiseHandler.create();
             this.popUp = this.popUpOpen();
-            this.subject.next(new ObservableData(OAuthEvent.POPUP_OPENED, this.popUp));
             this.popUpFocus();
-            if (this.popUpIsCheckClose) {
-                this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, DateUtil.MILLISECONDS_SECOND / 10);
-            }
+            this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, DateUtil.MILLISECONDS_SECOND / 10);
             this.window.addEventListener('message', this.messageHandler, false);
             return this.promise.promise;
         });
@@ -59,10 +58,11 @@ export class OAuthBase extends LoggerWrapper {
         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}`);
+        this.subject.next(new ObservableData(OAuthEvent.POPUP_OPENED, item));
         return item;
     }
     popUpFocus() {
-        if (!_.isNil(this.popUp) && !this.popUp.closed) {
+        if (this.isPopUpOpened) {
             this.popUp.focus();
         }
     }
@@ -116,10 +116,6 @@ export class OAuthBase extends LoggerWrapper {
             this.popUp.close();
             this.popUp = null;
         }
-        if (!_.isNil(this.promise)) {
-            this.promise.reject(OAuthBase.ERROR_WINDOW_CLOSED);
-            this.promise = null;
-        }
     }
     destroy() {
         if (this.isDestroyed) {
@@ -127,6 +123,10 @@ export class OAuthBase extends LoggerWrapper {
         }
         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;
@@ -140,6 +140,9 @@ export class OAuthBase extends LoggerWrapper {
             this.subject = null;
         }
     }
+    get isPopUpOpened() {
+        return !_.isNil(this.popUp) && !this.popUp.closed;
+    }
     get popUpCheckCloseTimer() {
         return this._popUpCheckCloseTimer;
     }

package/esm/external/backend.d.ts

@@ -1,3 +1,3 @@
 import { IOAuthPopUpDto, OAuthBase } from '../OAuthBase';
-export declare const backendPropertiesSet: (item: OAuthBase, redirectUri: string, method: IOAuthBackendMethod, timeout?: number) => void;
+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

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { DateUtil } from '@ts-core/common';
 import { delay, takeUntil } from 'rxjs';
-export const backendPropertiesSet = (item, redirectUri, method, timeout = DateUtil.MILLISECONDS_SECOND) => {
+export const OAuthBackendPropertiesSet = (item, redirectUri, method, timeout = DateUtil.MILLISECONDS_SECOND) => {
     item.redirectUri = redirectUri;
-    item.popUpIsCheckClose = false;
-    item.popUpOpened.pipe(delay(timeout), takeUntil(item.destroyed)).subscribe(() => __awaiter(void 0, void 0, void 0, function* () { return item.parsePopUpResult(yield method(item.state)); }));
+    item.isRejectWhenPopUpClosed = false;
+    item.popUpClosed.pipe(delay(timeout), takeUntil(item.destroyed)).subscribe(() => __awaiter(void 0, void 0, void 0, function* () { return item.parsePopUpResult(yield method(item.state)); }));
 };

package/esm/external/cordova.d.ts

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

package/esm/external/cordova.js

@@ -1,9 +1,9 @@
 import { OAuthParser } from '../OAuthParser';
 import * as _ from 'lodash';
-export const cordovaPropertiesSet = (item, packageName) => {
-    item.popUpTarget = 'oauth:cordova';
+export const OAuthCordovaPropertiesSet = (item, packageName) => {
     item.redirectUri = `${packageName}://oauth_callback`;
-    item.popUpIsCheckClose = false;
+    item.isRejectWhenPopUpClosed = false;
+    item.popUpTarget = 'oauth:cordova';
     item.popUpMessageParser = cordovaPopUpMessageParser;
 };
 function cordovaPopUpMessageParser(event) {

package/package.json

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