@ts-core/oauth 3.1.2 → 3.1.4

package/cjs/OAuthBase.d.ts

@@ -24,9 +24,9 @@ export interface IOAuthDto {
     redirectUri: string;
 }
 export interface IOAuthPopUpDto {
-    oauthError?: string;
-    oauthCodeOrToken?: string;
-    oauthErrorDescription?: string;
+    oAuthError?: string;
+    oAuthCodeOrToken?: string;
+    oAuthErrorDescription?: string;
 }
 export interface IOAuthToken {
     expiresIn: number;

package/cjs/OAuthBase.js

@@ -37,15 +37,15 @@ class OAuthBase extends PopUpBase_1.PopUpBase {
     }
     parseMessageData(item) {
         return {
-            codeOrToken: item.oauthCodeOrToken,
+            codeOrToken: item.oAuthCodeOrToken,
             redirectUri: this.getRedirectUri()
         };
     }
     isMessageError(item) {
-        return !_.isNil(item.oauthError);
+        return !_.isNil(item.oAuthError);
     }
     parseMessageError(item) {
-        return new common_1.ExtendedError(item.oauthError, item.oauthErrorDescription);
+        return new common_1.ExtendedError(item.oAuthError, item.oAuthErrorDescription);
     }
     getCode() {
         return __awaiter(this, void 0, void 0, function* () {

package/cjs/OAuthParser.d.ts

@@ -4,3 +4,4 @@ export declare class OAuthParser {
     static ERRORS: Array<string>;
     static parse(params: any, fragment?: string): IOAuthPopUpDto;
 }
+export declare function mergeUrlParamsAndFragment(params: any, fragment?: string): Record<string, any>;

package/cjs/OAuthParser.js

@@ -1,29 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OAuthParser = void 0;
+exports.mergeUrlParamsAndFragment = exports.OAuthParser = void 0;
 const _ = require("lodash");
 class OAuthParser {
     static parse(params, fragment) {
-        let item = new Object();
-        _.forIn(params, (value, key) => item[key] = value);
-        if (!_.isEmpty(fragment)) {
-            new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
-        }
-        let oauthError = null;
-        let oauthCodeOrToken = null;
+        let item = mergeUrlParamsAndFragment(params, fragment);
+        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)) {
-                return { oauthCodeOrToken };
+            if (!_.isEmpty(oAuthCodeOrToken)) {
+                return { oAuthCodeOrToken };
             }
-            else if (!_.isEmpty(oauthError)) {
-                return { oauthErrorDescription: item.error_description, oauthError };
+            else if (!_.isEmpty(oAuthError)) {
+                return { oAuthErrorDescription: item.error_description, oAuthError };
             }
         }
         ;
@@ -33,3 +29,12 @@ class OAuthParser {
 exports.OAuthParser = OAuthParser;
 OAuthParser.NAMES = ['code', 'access_token'];
 OAuthParser.ERRORS = ['error', 'error_description'];
+function mergeUrlParamsAndFragment(params, fragment) {
+    let item = new Object();
+    _.forIn(params, (value, key) => item[key] = value);
+    if (!_.isEmpty(fragment)) {
+        new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+    }
+    return item;
+}
+exports.mergeUrlParamsAndFragment = mergeUrlParamsAndFragment;

package/cjs/PopUpBase.d.ts

@@ -2,6 +2,7 @@ import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, ExtendedError }
 import { Observable, Subject } from "rxjs";
 export declare abstract class PopUpBase<U> extends LoggerWrapper {
     static ERROR_WINDOW_CLOSED: string;
+    static isWindowClosedError(error: any): boolean;
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;

package/cjs/PopUpBase.js

@@ -14,6 +14,9 @@ const common_1 = require("@ts-core/common");
 const rxjs_1 = require("rxjs");
 const _ = require("lodash");
 class PopUpBase extends common_1.LoggerWrapper {
+    static isWindowClosedError(error) {
+        return !_.isNil(error) && error.code === PopUpBase.ERROR_WINDOW_CLOSED;
+    }
     constructor(logger, window) {
         super(logger);
         this.popUpCheckClose = () => {

package/cjs/external/browser.js

@@ -10,5 +10,5 @@ const OAuthBrowserPropertiesSet = (item) => {
 };
 exports.OAuthBrowserPropertiesSet = OAuthBrowserPropertiesSet;
 function popUpMessageEventParser(event) {
-    return !_.isNil(event.data.oauthError) || !_.isNil(event.data.oauthCodeOrToken) ? event.data : null;
+    return !_.isNil(event.data.oAuthError) || !_.isNil(event.data.oAuthCodeOrToken) ? event.data : null;
 }

package/cjs/external/cordovaInAppBrowserPlugin.js

@@ -31,11 +31,11 @@ const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, method)
             try {
                 data = yield method(item.state);
                 if (_.isEmpty(data)) {
-                    data = { oauthError: OAuthBase_1.OAuthBase.ERROR_WINDOW_CLOSED };
+                    data = { oAuthError: OAuthBase_1.OAuthBase.ERROR_WINDOW_CLOSED };
                 }
             }
             catch (error) {
-                data = { oauthError: error.toString() };
+                data = { oAuthError: error.toString() };
             }
             item.parse(data);
         });

package/esm/OAuthBase.d.ts

@@ -24,9 +24,9 @@ export interface IOAuthDto {
     redirectUri: string;
 }
 export interface IOAuthPopUpDto {
-    oauthError?: string;
-    oauthCodeOrToken?: string;
-    oauthErrorDescription?: string;
+    oAuthError?: string;
+    oAuthCodeOrToken?: string;
+    oAuthErrorDescription?: string;
 }
 export interface IOAuthToken {
     expiresIn: number;

package/esm/OAuthBase.js

@@ -34,15 +34,15 @@ export class OAuthBase extends PopUpBase {
     }
     parseMessageData(item) {
         return {
-            codeOrToken: item.oauthCodeOrToken,
+            codeOrToken: item.oAuthCodeOrToken,
             redirectUri: this.getRedirectUri()
         };
     }
     isMessageError(item) {
-        return !_.isNil(item.oauthError);
+        return !_.isNil(item.oAuthError);
     }
     parseMessageError(item) {
-        return new ExtendedError(item.oauthError, item.oauthErrorDescription);
+        return new ExtendedError(item.oAuthError, item.oAuthErrorDescription);
     }
     getCode() {
         return __awaiter(this, void 0, void 0, function* () {

package/esm/OAuthParser.d.ts

@@ -4,3 +4,4 @@ export declare class OAuthParser {
     static ERRORS: Array<string>;
     static parse(params: any, fragment?: string): IOAuthPopUpDto;
 }
+export declare function mergeUrlParamsAndFragment(params: any, fragment?: string): Record<string, any>;

package/esm/OAuthParser.js

@@ -1,26 +1,22 @@
 import * as _ from 'lodash';
 export class OAuthParser {
     static parse(params, fragment) {
-        let item = new Object();
-        _.forIn(params, (value, key) => item[key] = value);
-        if (!_.isEmpty(fragment)) {
-            new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
-        }
-        let oauthError = null;
-        let oauthCodeOrToken = null;
+        let item = mergeUrlParamsAndFragment(params, fragment);
+        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)) {
-                return { oauthCodeOrToken };
+            if (!_.isEmpty(oAuthCodeOrToken)) {
+                return { oAuthCodeOrToken };
             }
-            else if (!_.isEmpty(oauthError)) {
-                return { oauthErrorDescription: item.error_description, oauthError };
+            else if (!_.isEmpty(oAuthError)) {
+                return { oAuthErrorDescription: item.error_description, oAuthError };
             }
         }
         ;
@@ -29,3 +25,11 @@ export class OAuthParser {
 }
 OAuthParser.NAMES = ['code', 'access_token'];
 OAuthParser.ERRORS = ['error', 'error_description'];
+export function mergeUrlParamsAndFragment(params, fragment) {
+    let item = new Object();
+    _.forIn(params, (value, key) => item[key] = value);
+    if (!_.isEmpty(fragment)) {
+        new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+    }
+    return item;
+}

package/esm/PopUpBase.d.ts

@@ -2,6 +2,7 @@ import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, ExtendedError }
 import { Observable, Subject } from "rxjs";
 export declare abstract class PopUpBase<U> extends LoggerWrapper {
     static ERROR_WINDOW_CLOSED: string;
+    static isWindowClosedError(error: any): boolean;
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;

package/esm/PopUpBase.js

@@ -11,6 +11,9 @@ import { PromiseHandler, DateUtil, ObservableData, LoggerWrapper, ExtendedError
 import { filter, map, Subject } from "rxjs";
 import * as _ from 'lodash';
 export class PopUpBase extends LoggerWrapper {
+    static isWindowClosedError(error) {
+        return !_.isNil(error) && error.code === PopUpBase.ERROR_WINDOW_CLOSED;
+    }
     constructor(logger, window) {
         super(logger);
         this.popUpCheckClose = () => {

package/esm/external/browser.js

@@ -6,5 +6,5 @@ export const OAuthBrowserPropertiesSet = (item) => {
     item.isRejectWhenPopUpClosed = true;
 };
 function popUpMessageEventParser(event) {
-    return !_.isNil(event.data.oauthError) || !_.isNil(event.data.oauthCodeOrToken) ? event.data : null;
+    return !_.isNil(event.data.oAuthError) || !_.isNil(event.data.oAuthCodeOrToken) ? event.data : null;
 }

package/esm/external/cordovaInAppBrowserPlugin.js

@@ -28,11 +28,11 @@ export const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, m
             try {
                 data = yield method(item.state);
                 if (_.isEmpty(data)) {
-                    data = { oauthError: OAuthBase.ERROR_WINDOW_CLOSED };
+                    data = { oAuthError: OAuthBase.ERROR_WINDOW_CLOSED };
                 }
             }
             catch (error) {
-                data = { oauthError: error.toString() };
+                data = { oAuthError: error.toString() };
             }
             item.parse(data);
         });

package/package.json

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