@ts-core/oauth 3.0.17 → 3.0.19

package/cjs/OAuthBase.d.ts

@@ -1,4 +1,5 @@
-import { PromiseHandler, LoggerWrapper, ILogger, TransportHttp } from "@ts-core/common";
+import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, TransportHttp } from "@ts-core/common";
+import { Observable, Subject } from "rxjs";
 export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected applicationId: string;
     protected window?: Window;
@@ -10,6 +11,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpMessageParser: IOAuthPopUpMessageParser;
     redirectUri: string;
     protected http: TransportHttp;
+    protected subject: Subject<ObservableData<OAuthEvent, Window>>;
     protected popUp: Window;
     protected promise: PromiseHandler<IOAuthDto>;
     protected responseType: string;
@@ -28,6 +30,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
     abstract getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
+    parsePopUpResult(data: IOAuthPopUpDto): void;
     getCode(): Promise<IOAuthDto>;
     getToken(): Promise<IOAuthDto>;
     close(): void;
@@ -35,6 +38,10 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     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;
@@ -54,4 +61,8 @@ export interface IOAuthToken {
     expiresIn: number;
     accessToken: string;
 }
+export declare enum OAuthEvent {
+    POPUP_OPENED = "POPUP_OPENED",
+    POPUP_CLOSED = "POPUP_CLOSED"
+}
 export type IOAuthPopUpMessageParser = (event: MessageEvent) => IOAuthPopUpDto;

package/cjs/OAuthBase.js

@@ -9,9 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OAuthBase = void 0;
+exports.OAuthEvent = exports.OAuthBase = void 0;
 const common_1 = require("@ts-core/common");
 const _ = require("lodash");
+const rxjs_1 = require("rxjs");
 class OAuthBase extends common_1.LoggerWrapper {
     constructor(logger, applicationId, window) {
         super(logger);
@@ -22,28 +23,16 @@ class OAuthBase extends common_1.LoggerWrapper {
                 this.close();
             }
         };
-        this.messageHandler = (event) => {
-            let data = this.popUpMessageParser(event);
-            if (_.isNil(data)) {
-                return;
-            }
-            if (!_.isEmpty(data.oAuthCodeOrToken)) {
-                this.promise.resolve({ redirectUri: this.getRedirectUri(), codeOrToken: data.oAuthCodeOrToken });
-            }
-            if (!_.isEmpty(data.oAuthError)) {
-                this.promise.reject(data.oAuthError);
-            }
-            if (!this.promise.isPending) {
-                this.close();
-            }
-        };
+        this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(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.popUpIsCheckClose = true;
         this.popUpMessageParser = this.browserMessageHandler;
         this._urlParams = new Map();
+        this.urlParams.set('state', common_1.RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
     }
     open() {
@@ -56,6 +45,7 @@ class OAuthBase extends common_1.LoggerWrapper {
             }
             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);
@@ -93,6 +83,20 @@ class OAuthBase extends common_1.LoggerWrapper {
     getRedirectUri() {
         return !_.isNil(this.redirectUri) ? this.redirectUri : `${this.getOriginUrl()}/oauth`;
     }
+    parsePopUpResult(data) {
+        if (_.isNil(data)) {
+            return;
+        }
+        if (!_.isEmpty(data.oAuthCodeOrToken)) {
+            this.promise.resolve({ redirectUri: this.getRedirectUri(), codeOrToken: data.oAuthCodeOrToken });
+        }
+        if (!_.isEmpty(data.oAuthError)) {
+            this.promise.reject(data.oAuthError);
+        }
+        if (!this.promise.isPending) {
+            this.close();
+        }
+    }
     getCode() {
         return __awaiter(this, void 0, void 0, function* () {
             this.responseType = 'code';
@@ -108,6 +112,9 @@ class OAuthBase extends common_1.LoggerWrapper {
     close() {
         this.window.removeEventListener('message', this.messageHandler, false);
         this.popUpCheckCloseTimer = null;
+        if (!_.isNil(this.subject)) {
+            this.subject.next(new common_1.ObservableData(OAuthEvent.POPUP_CLOSED, this.popUp));
+        }
         if (!_.isNil(this.popUp)) {
             this.popUp.close();
             this.popUp = null;
@@ -131,6 +138,10 @@ class OAuthBase extends common_1.LoggerWrapper {
             this.http.destroy();
             this.http = null;
         }
+        if (!_.isNil(this.subject)) {
+            this.subject.complete();
+            this.subject = null;
+        }
     }
     get popUpCheckCloseTimer() {
         return this._popUpCheckCloseTimer;
@@ -145,6 +156,23 @@ class OAuthBase extends common_1.LoggerWrapper {
     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((0, rxjs_1.filter)(item => item.type === OAuthEvent.POPUP_CLOSED), (0, rxjs_1.map)(item => item.data));
+    }
+    get popUpOpened() {
+        return this.events.pipe((0, rxjs_1.filter)(item => item.type === OAuthEvent.POPUP_OPENED), (0, rxjs_1.map)(item => item.data));
+    }
 }
 exports.OAuthBase = OAuthBase;
 OAuthBase.ERROR_WINDOW_CLOSED = 'WINDOW_CLOSED';
+var OAuthEvent;
+(function (OAuthEvent) {
+    OAuthEvent["POPUP_OPENED"] = "POPUP_OPENED";
+    OAuthEvent["POPUP_CLOSED"] = "POPUP_CLOSED";
+})(OAuthEvent = exports.OAuthEvent || (exports.OAuthEvent = {}));

package/cjs/OAuthParser.d.ts

@@ -2,5 +2,5 @@ import { IOAuthPopUpDto } from './OAuthBase';
 export declare class OAuthParser {
     static NAMES: Array<string>;
     static ERRORS: Array<string>;
-    static parse(params: any, fragment: string): IOAuthPopUpDto;
+    static parse(params: any, fragment?: string): IOAuthPopUpDto;
 }

package/cjs/OAuthParser.js

@@ -6,7 +6,9 @@ class OAuthParser {
     static parse(params, fragment) {
         let item = new Object();
         _.forIn(params, (value, key) => item[key] = value);
-        new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+        if (!_.isEmpty(fragment)) {
+            new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+        }
         let oAuthError = null;
         let oAuthCodeOrToken = null;
         for (let key in item) {

package/esm/OAuthBase.d.ts

@@ -1,4 +1,5 @@
-import { PromiseHandler, LoggerWrapper, ILogger, TransportHttp } from "@ts-core/common";
+import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, TransportHttp } from "@ts-core/common";
+import { Observable, Subject } from "rxjs";
 export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected applicationId: string;
     protected window?: Window;
@@ -10,6 +11,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpMessageParser: IOAuthPopUpMessageParser;
     redirectUri: string;
     protected http: TransportHttp;
+    protected subject: Subject<ObservableData<OAuthEvent, Window>>;
     protected popUp: Window;
     protected promise: PromiseHandler<IOAuthDto>;
     protected responseType: string;
@@ -28,6 +30,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
     abstract getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
+    parsePopUpResult(data: IOAuthPopUpDto): void;
     getCode(): Promise<IOAuthDto>;
     getToken(): Promise<IOAuthDto>;
     close(): void;
@@ -35,6 +38,10 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     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;
@@ -54,4 +61,8 @@ export interface IOAuthToken {
     expiresIn: number;
     accessToken: string;
 }
+export declare enum OAuthEvent {
+    POPUP_OPENED = "POPUP_OPENED",
+    POPUP_CLOSED = "POPUP_CLOSED"
+}
 export type IOAuthPopUpMessageParser = (event: MessageEvent) => IOAuthPopUpDto;

package/esm/OAuthBase.js

@@ -7,8 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { PromiseHandler, DateUtil, LoggerWrapper, TransportHttp } 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";
 export class OAuthBase extends LoggerWrapper {
     constructor(logger, applicationId, window) {
         super(logger);
@@ -19,28 +20,16 @@ export class OAuthBase extends LoggerWrapper {
                 this.close();
             }
         };
-        this.messageHandler = (event) => {
-            let data = this.popUpMessageParser(event);
-            if (_.isNil(data)) {
-                return;
-            }
-            if (!_.isEmpty(data.oAuthCodeOrToken)) {
-                this.promise.resolve({ redirectUri: this.getRedirectUri(), codeOrToken: data.oAuthCodeOrToken });
-            }
-            if (!_.isEmpty(data.oAuthError)) {
-                this.promise.reject(data.oAuthError);
-            }
-            if (!this.promise.isPending) {
-                this.close();
-            }
-        };
+        this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(event));
         this.http = new TransportHttp(logger, { method: 'get' });
+        this.subject = new Subject();
         this.popUpWidth = 430;
         this.popUpHeight = 520;
         this.popUpTarget = '_blank';
         this.popUpIsCheckClose = true;
         this.popUpMessageParser = this.browserMessageHandler;
         this._urlParams = new Map();
+        this.urlParams.set('state', RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
     }
     open() {
@@ -53,6 +42,7 @@ export class OAuthBase extends LoggerWrapper {
             }
             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);
@@ -90,6 +80,20 @@ export class OAuthBase extends LoggerWrapper {
     getRedirectUri() {
         return !_.isNil(this.redirectUri) ? this.redirectUri : `${this.getOriginUrl()}/oauth`;
     }
+    parsePopUpResult(data) {
+        if (_.isNil(data)) {
+            return;
+        }
+        if (!_.isEmpty(data.oAuthCodeOrToken)) {
+            this.promise.resolve({ redirectUri: this.getRedirectUri(), codeOrToken: data.oAuthCodeOrToken });
+        }
+        if (!_.isEmpty(data.oAuthError)) {
+            this.promise.reject(data.oAuthError);
+        }
+        if (!this.promise.isPending) {
+            this.close();
+        }
+    }
     getCode() {
         return __awaiter(this, void 0, void 0, function* () {
             this.responseType = 'code';
@@ -105,6 +109,9 @@ export class OAuthBase extends LoggerWrapper {
     close() {
         this.window.removeEventListener('message', this.messageHandler, false);
         this.popUpCheckCloseTimer = null;
+        if (!_.isNil(this.subject)) {
+            this.subject.next(new ObservableData(OAuthEvent.POPUP_CLOSED, this.popUp));
+        }
         if (!_.isNil(this.popUp)) {
             this.popUp.close();
             this.popUp = null;
@@ -128,6 +135,10 @@ export class OAuthBase extends LoggerWrapper {
             this.http.destroy();
             this.http = null;
         }
+        if (!_.isNil(this.subject)) {
+            this.subject.complete();
+            this.subject = null;
+        }
     }
     get popUpCheckCloseTimer() {
         return this._popUpCheckCloseTimer;
@@ -142,5 +153,22 @@ export class OAuthBase extends LoggerWrapper {
     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));
+    }
 }
 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.d.ts

@@ -2,5 +2,5 @@ import { IOAuthPopUpDto } from './OAuthBase';
 export declare class OAuthParser {
     static NAMES: Array<string>;
     static ERRORS: Array<string>;
-    static parse(params: any, fragment: string): IOAuthPopUpDto;
+    static parse(params: any, fragment?: string): IOAuthPopUpDto;
 }

package/esm/OAuthParser.js

@@ -3,7 +3,9 @@ export class OAuthParser {
     static parse(params, fragment) {
         let item = new Object();
         _.forIn(params, (value, key) => item[key] = value);
-        new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+        if (!_.isEmpty(fragment)) {
+            new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+        }
         let oAuthError = null;
         let oAuthCodeOrToken = null;
         for (let key in item) {

package/package.json

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