@ts-core/oauth 3.1.1 → 3.1.3

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.js

@@ -9,21 +9,21 @@ class OAuthParser {
         if (!_.isEmpty(fragment)) {
             new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
         }
-        let oauthError = null;
-        let oauthCodeOrToken = null;
+        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 };
             }
         }
         ;

package/cjs/PopUpBase.d.ts

@@ -37,6 +37,7 @@ export declare abstract class PopUpBase<U> extends LoggerWrapper {
     get closed(): Observable<Window>;
     get opened(): Observable<Window>;
 }
+export declare function popUpOpener<T extends PopUpBase<U>, U>(popUp: T, window: Window): Window;
 export type IPopUpOpener = <T extends PopUpBase<U>, U>(popUp: T, window: Window) => Window;
 export type IPopUpMessageEventParser = (event: MessageEvent) => any;
 export declare enum PopUpEvent {

package/cjs/PopUpBase.js

@@ -9,10 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PopUpEvent = exports.PopUpBase = void 0;
+exports.PopUpEvent = exports.popUpOpener = exports.PopUpBase = void 0;
 const common_1 = require("@ts-core/common");
 const rxjs_1 = require("rxjs");
-const external_1 = require("./external");
 const _ = require("lodash");
 class PopUpBase extends common_1.LoggerWrapper {
     constructor(logger, window) {
@@ -29,7 +28,7 @@ class PopUpBase extends common_1.LoggerWrapper {
         this.popUpWidth = 430;
         this.popUpHeight = 520;
         this.popUpTarget = '_blank';
-        this.popUpOpener = external_1.popUpOpener;
+        this.popUpOpener = popUpOpener;
         this.isRejectWhenPopUpClosed = true;
     }
     popUpFocus() {
@@ -138,6 +137,12 @@ class PopUpBase extends common_1.LoggerWrapper {
 }
 exports.PopUpBase = PopUpBase;
 PopUpBase.ERROR_WINDOW_CLOSED = 'WINDOW_CLOSED';
+function popUpOpener(popUp, window) {
+    let top = (window.screen.height - popUp.popUpHeight) / 2;
+    let left = (window.screen.width - popUp.popUpWidth) / 2;
+    return window.open(popUp.popUpUrl(), popUp.popUpTarget, `scrollbars=yes,width=${popUp.popUpWidth},height=${popUp.popUpHeight},top=${top},left=${left}`);
+}
+exports.popUpOpener = popUpOpener;
 var PopUpEvent;
 (function (PopUpEvent) {
     PopUpEvent["OPENED"] = "OPENED";

package/cjs/external/browser.d.ts

@@ -1,5 +1,2 @@
 import { OAuthBase } from '../OAuthBase';
-import { PopUpBase } from '../PopUpBase';
 export declare const OAuthBrowserPropertiesSet: (item: OAuthBase) => void;
-export declare function popUpOpener<T extends PopUpBase<U>, U>(popUp: T, window: Window): Window;
-export declare function popUpMessageEventParser(event: MessageEvent): any;

package/cjs/external/browser.js

@@ -1,20 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.popUpMessageEventParser = exports.popUpOpener = exports.OAuthBrowserPropertiesSet = void 0;
+exports.OAuthBrowserPropertiesSet = void 0;
+const PopUpBase_1 = require("../PopUpBase");
 const _ = require("lodash");
 const OAuthBrowserPropertiesSet = (item) => {
-    item.popUpOpener = popUpOpener;
+    item.popUpOpener = PopUpBase_1.popUpOpener;
     item.popUpMessageEventParser = popUpMessageEventParser;
     item.isRejectWhenPopUpClosed = true;
 };
 exports.OAuthBrowserPropertiesSet = OAuthBrowserPropertiesSet;
-function popUpOpener(popUp, window) {
-    let top = (window.screen.height - popUp.popUpHeight) / 2;
-    let left = (window.screen.width - popUp.popUpWidth) / 2;
-    return window.open(popUp.popUpUrl(), popUp.popUpTarget, `scrollbars=yes,width=${popUp.popUpWidth},height=${popUp.popUpHeight},top=${top},left=${left}`);
-}
-exports.popUpOpener = popUpOpener;
 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;
 }
-exports.popUpMessageEventParser = popUpMessageEventParser;

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.js

@@ -6,21 +6,21 @@ export class OAuthParser {
         if (!_.isEmpty(fragment)) {
             new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
         }
-        let oauthError = null;
-        let oauthCodeOrToken = null;
+        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 };
             }
         }
         ;

package/esm/PopUpBase.d.ts

@@ -37,6 +37,7 @@ export declare abstract class PopUpBase<U> extends LoggerWrapper {
     get closed(): Observable<Window>;
     get opened(): Observable<Window>;
 }
+export declare function popUpOpener<T extends PopUpBase<U>, U>(popUp: T, window: Window): Window;
 export type IPopUpOpener = <T extends PopUpBase<U>, U>(popUp: T, window: Window) => Window;
 export type IPopUpMessageEventParser = (event: MessageEvent) => any;
 export declare enum PopUpEvent {

package/esm/PopUpBase.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { PromiseHandler, DateUtil, ObservableData, LoggerWrapper, ExtendedError } from "@ts-core/common";
 import { filter, map, Subject } from "rxjs";
-import { popUpOpener } from "./external";
 import * as _ from 'lodash';
 export class PopUpBase extends LoggerWrapper {
     constructor(logger, window) {
@@ -134,6 +133,11 @@ export class PopUpBase extends LoggerWrapper {
     }
 }
 PopUpBase.ERROR_WINDOW_CLOSED = 'WINDOW_CLOSED';
+export function popUpOpener(popUp, window) {
+    let top = (window.screen.height - popUp.popUpHeight) / 2;
+    let left = (window.screen.width - popUp.popUpWidth) / 2;
+    return window.open(popUp.popUpUrl(), popUp.popUpTarget, `scrollbars=yes,width=${popUp.popUpWidth},height=${popUp.popUpHeight},top=${top},left=${left}`);
+}
 export var PopUpEvent;
 (function (PopUpEvent) {
     PopUpEvent["OPENED"] = "OPENED";

package/esm/external/browser.d.ts

@@ -1,5 +1,2 @@
 import { OAuthBase } from '../OAuthBase';
-import { PopUpBase } from '../PopUpBase';
 export declare const OAuthBrowserPropertiesSet: (item: OAuthBase) => void;
-export declare function popUpOpener<T extends PopUpBase<U>, U>(popUp: T, window: Window): Window;
-export declare function popUpMessageEventParser(event: MessageEvent): any;

package/esm/external/browser.js

@@ -1,14 +1,10 @@
+import { popUpOpener } from '../PopUpBase';
 import * as _ from 'lodash';
 export const OAuthBrowserPropertiesSet = (item) => {
     item.popUpOpener = popUpOpener;
     item.popUpMessageEventParser = popUpMessageEventParser;
     item.isRejectWhenPopUpClosed = true;
 };
-export function popUpOpener(popUp, window) {
-    let top = (window.screen.height - popUp.popUpHeight) / 2;
-    let left = (window.screen.width - popUp.popUpWidth) / 2;
-    return window.open(popUp.popUpUrl(), popUp.popUpTarget, `scrollbars=yes,width=${popUp.popUpWidth},height=${popUp.popUpHeight},top=${top},left=${left}`);
-}
-export function popUpMessageEventParser(event) {
-    return !_.isNil(event.data.oauthError) || !_.isNil(event.data.oauthCodeOrToken) ? event.data : null;
+function popUpMessageEventParser(event) {
+    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.1",
+    "version": "3.1.3",
     "description": "Classes and utils for oauth",
     "main": "./cjs/public-api.js",
     "module": "./esm/public-api.js",