@ts-core/oauth 3.0.23 → 3.0.24

package/cjs/OAuthBase.d.ts

@@ -49,8 +49,8 @@ export interface IOAuthDto {
     redirectUri: string;
 }
 export interface IOAuthPopUpDto {
-    oAuthCodeOrToken: string;
     oAuthError: string;
+    oAuthCodeOrToken: string;
 }
 export interface IOAuthToken {
     state?: string;

package/cjs/OAuthBase.js

@@ -25,7 +25,17 @@ 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;
+            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.http = new common_1.TransportHttp(logger, { method: 'get' });
         this.subject = new rxjs_1.Subject();

package/cjs/external/backend.js

@@ -10,11 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 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* () { return item.parsePopUpResult(yield method(item.state)); }));
+    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/esm/OAuthBase.d.ts

@@ -49,8 +49,8 @@ export interface IOAuthDto {
     redirectUri: string;
 }
 export interface IOAuthPopUpDto {
-    oAuthCodeOrToken: string;
     oAuthError: string;
+    oAuthCodeOrToken: string;
 }
 export interface IOAuthToken {
     state?: string;

package/esm/OAuthBase.js

@@ -7,7 +7,7 @@ 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 { PromiseHandler, DateUtil, ObservableData, LoggerWrapper, TransportHttp, RandomUtil, ObjectUtil } from "@ts-core/common";
 import * as _ from 'lodash';
 import { filter, map, Subject } from "rxjs";
 export class OAuthBase extends LoggerWrapper {
@@ -22,7 +22,17 @@ 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;
+            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.http = new TransportHttp(logger, { method: 'get' });
         this.subject = new Subject();

package/esm/external/backend.js

@@ -7,10 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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* () { return item.parsePopUpResult(yield method(item.state)); }));
+    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/package.json

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