@ts-core/oauth 3.0.18 → 3.0.20

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;
@@ -7,9 +8,10 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpHeight: number;
     popUpTarget: string;
     popUpIsCheckClose: boolean;
-    popUpMessageParser: IOAuthPopUpMessageParser;
+    popUpMessageParser: IOAuthPopUpParser;
     redirectUri: string;
     protected http: TransportHttp;
+    protected subject: Subject<ObservableData<OAuthEvent, Window>>;
     protected popUp: Window;
     protected promise: PromiseHandler<IOAuthDto>;
     protected responseType: string;
@@ -23,7 +25,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected getUrlParams(): URLSearchParams;
     protected abstract getUrl(): string;
     protected messageHandler: (event: MessageEvent) => void;
-    protected browserMessageHandler(event: MessageEvent<IOAuthPopUpDto>): IOAuthPopUpDto;
+    protected browserInternalMessageHandler: IOAuthPopUpParser;
     protected getOriginUrl(): string;
     protected getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
@@ -37,6 +39,9 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     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;
@@ -56,4 +61,8 @@ export interface IOAuthToken {
     expiresIn: number;
     accessToken: string;
 }
-export type IOAuthPopUpMessageParser = (event: MessageEvent) => IOAuthPopUpDto;
+export declare enum OAuthEvent {
+    POPUP_OPENED = "POPUP_OPENED",
+    POPUP_CLOSED = "POPUP_CLOSED"
+}
+export type IOAuthPopUpParser = (...params: any[]) => 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);
@@ -23,12 +24,16 @@ class OAuthBase extends common_1.LoggerWrapper {
             }
         };
         this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(event));
+        this.browserInternalMessageHandler = (event) => {
+            return event.origin === this.getOriginUrl() && _.isObject(event.data) ? event.data : null;
+        };
         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.popUpMessageParser = this.browserInternalMessageHandler;
         this._urlParams = new Map();
         this.urlParams.set('state', common_1.RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
@@ -43,6 +48,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);
@@ -71,9 +77,6 @@ class OAuthBase extends common_1.LoggerWrapper {
         this.urlParams.forEach((value, key) => item.append(key, value));
         return item;
     }
-    browserMessageHandler(event) {
-        return event.origin === this.getOriginUrl() && _.isObject(event.data) ? event.data : null;
-    }
     getOriginUrl() {
         return this.window.location.origin;
     }
@@ -109,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;
@@ -132,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;
@@ -149,6 +159,20 @@ class OAuthBase extends common_1.LoggerWrapper {
     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/external/backend.d.ts

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

package/cjs/external/backend.js

@@ -0,0 +1,20 @@
+"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.backendPropertiesSet = 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) => {
+    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)); }));
+};
+exports.backendPropertiesSet = backendPropertiesSet;

package/cjs/external/cordova.d.ts

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

package/cjs/external/cordova.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cordovaPropertiesSet = void 0;
+const OAuthParser_1 = require("../OAuthParser");
+const _ = require("lodash");
+const cordovaPropertiesSet = (item, packageName) => {
+    item.popUpTarget = 'oauth:cordova';
+    item.redirectUri = `${packageName}://oauth_callback`;
+    item.popUpIsCheckClose = false;
+    item.popUpMessageParser = cordovaPopUpMessageParser;
+};
+exports.cordovaPropertiesSet = cordovaPropertiesSet;
+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/cjs/public-api.d.ts

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

package/cjs/public-api.js

@@ -25,3 +25,5 @@ __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);

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;
@@ -7,9 +8,10 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpHeight: number;
     popUpTarget: string;
     popUpIsCheckClose: boolean;
-    popUpMessageParser: IOAuthPopUpMessageParser;
+    popUpMessageParser: IOAuthPopUpParser;
     redirectUri: string;
     protected http: TransportHttp;
+    protected subject: Subject<ObservableData<OAuthEvent, Window>>;
     protected popUp: Window;
     protected promise: PromiseHandler<IOAuthDto>;
     protected responseType: string;
@@ -23,7 +25,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected getUrlParams(): URLSearchParams;
     protected abstract getUrl(): string;
     protected messageHandler: (event: MessageEvent) => void;
-    protected browserMessageHandler(event: MessageEvent<IOAuthPopUpDto>): IOAuthPopUpDto;
+    protected browserInternalMessageHandler: IOAuthPopUpParser;
     protected getOriginUrl(): string;
     protected getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
@@ -37,6 +39,9 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     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;
@@ -56,4 +61,8 @@ export interface IOAuthToken {
     expiresIn: number;
     accessToken: string;
 }
-export type IOAuthPopUpMessageParser = (event: MessageEvent) => IOAuthPopUpDto;
+export declare enum OAuthEvent {
+    POPUP_OPENED = "POPUP_OPENED",
+    POPUP_CLOSED = "POPUP_CLOSED"
+}
+export type IOAuthPopUpParser = (...params: any[]) => 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, RandomUtil } 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);
@@ -20,12 +21,16 @@ export class OAuthBase extends LoggerWrapper {
             }
         };
         this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(event));
+        this.browserInternalMessageHandler = (event) => {
+            return event.origin === this.getOriginUrl() && _.isObject(event.data) ? event.data : null;
+        };
         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.popUpMessageParser = this.browserInternalMessageHandler;
         this._urlParams = new Map();
         this.urlParams.set('state', RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
@@ -40,6 +45,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);
@@ -68,9 +74,6 @@ export class OAuthBase extends LoggerWrapper {
         this.urlParams.forEach((value, key) => item.append(key, value));
         return item;
     }
-    browserMessageHandler(event) {
-        return event.origin === this.getOriginUrl() && _.isObject(event.data) ? event.data : null;
-    }
     getOriginUrl() {
         return this.window.location.origin;
     }
@@ -106,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;
@@ -129,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;
@@ -146,5 +156,19 @@ export class OAuthBase extends LoggerWrapper {
     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/external/backend.d.ts

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

package/esm/external/backend.js

@@ -0,0 +1,16 @@
+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 { DateUtil } from '@ts-core/common';
+import { delay, takeUntil } from 'rxjs';
+export const backendPropertiesSet = (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)); }));
+};

package/esm/external/cordova.d.ts

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

package/esm/external/cordova.js

@@ -0,0 +1,13 @@
+import { OAuthParser } from '../OAuthParser';
+import * as _ from 'lodash';
+export const cordovaPropertiesSet = (item, packageName) => {
+    item.popUpTarget = 'oauth:cordova';
+    item.redirectUri = `${packageName}://oauth_callback`;
+    item.popUpIsCheckClose = false;
+    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;
+}

package/esm/public-api.d.ts

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

package/esm/public-api.js

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

package/package.json

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