@ts-core/oauth 3.0.30 → 3.1.1

package/esm/external/cordovaInAppBrowserPlugin.js

@@ -14,7 +14,7 @@ import { ExtendedError } from '@ts-core/common';
 export const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, method) => {
     item.redirectUri = redirectUri;
     item.popUpOpener = popUpOpener;
-    item.popUpOpened.pipe(takeUntil(item.destroyed)).subscribe((popUp) => __awaiter(void 0, void 0, void 0, function* () {
+    item.opened.pipe(takeUntil(item.destroyed)).subscribe((popUp) => __awaiter(void 0, void 0, void 0, function* () {
         let popUpClosedHandler = () => {
             popUp.removeEventListener('exit', popUpClosedHandler);
             popUp.removeEventListener('loadstop', popUpLoadedHandler);
@@ -28,24 +28,24 @@ export const OAuthCordovaInAppBrowserPluginPropertiesSet = (item, redirectUri, m
             try {
                 data = yield method(item.state);
                 if (_.isEmpty(data)) {
-                    data = { oAuthError: OAuthBase.ERROR_WINDOW_CLOSED, oAuthCodeOrToken: null };
+                    data = { oauthError: OAuthBase.ERROR_WINDOW_CLOSED };
                 }
             }
             catch (error) {
-                data = { oAuthError: error.toString(), oAuthCodeOrToken: null };
+                data = { oauthError: error.toString() };
             }
-            item.parseResponse(data);
+            item.parse(data);
         });
         popUp.addEventListener('exit', popUpClosedHandler, false);
         popUp.addEventListener('loadstop', popUpLoadedHandler, false);
     }));
 };
-function popUpOpener(item, window) {
-    let top = (window.screen.height - item.popUpHeight) / 2;
-    let left = (window.screen.width - item.popUpWidth) / 2;
+function popUpOpener(popUp, window) {
+    let top = (window.screen.height - popUp.popUpHeight) / 2;
+    let left = (window.screen.width - popUp.popUpWidth) / 2;
     let cordova = window['cordova'];
     if (_.isNil(cordova) || _.isNil(cordova.InAppBrowser)) {
         throw new ExtendedError(`Cordova InAppBrowser undefined, please check installed plugins`);
     }
-    return cordova.InAppBrowser.open(item.getPopUpUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
+    return cordova.InAppBrowser.open(popUp.popUpUrl(), popUp.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
 }

package/esm/external/cordovaOAuthPlugin.js

@@ -3,21 +3,21 @@ import * as _ from 'lodash';
 export const OAuthCordovaOAuthPluginPropertiesSet = (item, packageName) => {
     item.popUpTarget = 'oauth:cordova';
     item.popUpOpener = popUpOpener;
-    item.popUpMessageParser = popUpMessageParser;
+    item.popUpMessageEventParser = popUpMessageEventParser;
     item.redirectUri = `${packageName}://oauth_callback`;
     item.isRejectWhenPopUpClosed = false;
 };
-function popUpOpener(item, window) {
-    let top = (window.screen.height - item.popUpHeight) / 2;
-    let left = (window.screen.width - item.popUpWidth) / 2;
-    let popUp = window.open(item.getPopUpUrl(), item.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
-    if (!_.isNil(popUp)) {
-        return popUp;
+function popUpOpener(popUp, window) {
+    let top = (window.screen.height - popUp.popUpHeight) / 2;
+    let left = (window.screen.width - popUp.popUpWidth) / 2;
+    let item = window.open(popUp.popUpUrl(), popUp.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
+    if (!_.isNil(item)) {
+        return item;
     }
     let fake = { close: () => { fake.closed = true; }, closed: false };
     return fake;
 }
-function popUpMessageParser(item, event) {
+function popUpMessageEventParser(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/go/GoAuth.d.ts

@@ -3,7 +3,7 @@ import { IOAuthDto, IOAuthToken, OAuthBase } from '../OAuthBase';
 import { ILogger } from '@ts-core/common';
 export declare class GoAuth<T extends GoUser = GoUser> extends OAuthBase<T> {
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    getPopUpUrl(): string;
+    popUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/esm/go/GoAuth.js

@@ -12,10 +12,10 @@ import { OAuthBase } from '../OAuthBase';
 export class GoAuth extends OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
-        this.urlParams.set('scope', 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email');
+        this.params.set('scope', 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email');
     }
-    getPopUpUrl() {
-        return `https://accounts.google.com/o/oauth2/v2/auth?${this.getUrlParams().toString()}`;
+    popUpUrl() {
+        return `https://accounts.google.com/o/oauth2/v2/auth?${this.getParams().toString()}`;
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {

package/esm/keycloak/KeycloakAuth.d.ts

@@ -5,7 +5,7 @@ export declare class KeycloakAuth<T extends KeycloakUser = KeycloakUser> extends
     protected _settings: IKeycloakAuthSettings;
     constructor(logger: ILogger, settings: IKeycloakAuthSettings, window?: Window);
     protected getBaseUrl(): string;
-    getPopUpUrl(): string;
+    popUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
     destroy(): void;

package/esm/keycloak/KeycloakAuth.js

@@ -10,21 +10,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { ExtendedError, RandomUtil } from "@ts-core/common";
 import { OAuthBase } from "../OAuthBase";
 import { KeycloakUser } from "./KeycloakUser";
-import { URLSearchParams } from "url";
 import * as _ from 'lodash';
 export class KeycloakAuth extends OAuthBase {
     constructor(logger, settings, window) {
         super(logger, settings.applicationId, window);
         this._settings = settings;
-        this.urlParams.set('scope', 'openid');
-        this.urlParams.set('state', RandomUtil.randomString(10));
-        this.urlParams.set('response_mode', 'query');
+        this.params.set('scope', 'openid');
+        this.params.set('state', RandomUtil.randomString(10));
+        this.params.set('response_mode', 'query');
     }
     getBaseUrl() {
         return `${this.settings.url}/realms/${this.settings.realm}/protocol/openid-connect`;
     }
-    getPopUpUrl() {
-        return `${this.getBaseUrl()}/auth?${this.getUrlParams().toString()}`;
+    popUpUrl() {
+        return `${this.getBaseUrl()}/auth?${this.getParams().toString()}`;
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {

package/esm/ma/MaAuth.d.ts

@@ -3,7 +3,7 @@ import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { MaUser } from "./MaUser";
 export declare class MaAuth<T extends MaUser = MaUser> extends OAuthBase<T> {
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    getPopUpUrl(): string;
+    popUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/esm/ma/MaAuth.js

@@ -14,11 +14,11 @@ import * as _ from 'lodash';
 export class MaAuth extends OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
-        this.urlParams.set('scope', 'userinfo');
-        this.urlParams.set('state', RandomUtil.randomString(43));
+        this.params.set('scope', 'userinfo');
+        this.params.set('state', RandomUtil.randomString(43));
     }
-    getPopUpUrl() {
-        return `https://oauth.mail.ru/login?${this.getUrlParams().toString()}`;
+    popUpUrl() {
+        return `https://oauth.mail.ru/login?${this.getParams().toString()}`;
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {

package/esm/public-api.d.ts

@@ -1,5 +1,6 @@
-export * from './OAuthBase';
+export * from './PopUpBase';
 export * from './OAuthUser';
+export * from './OAuthBase';
 export * from './OAuthParser';
 export * from './go/GoUser';
 export * from './go/GoAuth';

package/esm/public-api.js

@@ -1,5 +1,6 @@
-export * from './OAuthBase';
+export * from './PopUpBase';
 export * from './OAuthUser';
+export * from './OAuthBase';
 export * from './OAuthParser';
 export * from './go/GoUser';
 export * from './go/GoAuth';

package/esm/vk/VkAuth.d.ts

@@ -5,7 +5,7 @@ export declare class VkAuth<T extends VkUser = VkUser> extends OAuthBase<T> {
     v: string;
     private email;
     constructor(logger: ILogger, applicationId: string, window?: Window);
-    getPopUpUrl(): string;
+    popUpUrl(): string;
     getProfile(token: string, fields?: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/esm/vk/VkAuth.js

@@ -15,10 +15,10 @@ export class VkAuth extends OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
         this.v = '5.131';
-        this.urlParams.set('scope', 'status,email');
+        this.params.set('scope', 'status,email');
     }
-    getPopUpUrl() {
-        return `https://oauth.vk.com/authorize?${this.getUrlParams().toString()}`;
+    popUpUrl() {
+        return `https://oauth.vk.com/authorize?${this.getParams().toString()}`;
     }
     getProfile(token, fields) {
         return __awaiter(this, void 0, void 0, function* () {

package/esm/ya/YaAuth.d.ts

@@ -1,7 +1,7 @@
 import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { YaUser } from "./YaUser";
 export declare class YaAuth<T extends YaUser = YaUser> extends OAuthBase<T> {
-    getPopUpUrl(): string;
+    popUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/esm/ya/YaAuth.js

@@ -12,8 +12,8 @@ import { OAuthBase } from "../OAuthBase";
 import { YaUser } from "./YaUser";
 import * as _ from 'lodash';
 export class YaAuth extends OAuthBase {
-    getPopUpUrl() {
-        return `https://oauth.yandex.ru/authorize?${this.getUrlParams().toString()}`;
+    popUpUrl() {
+        return `https://oauth.yandex.ru/authorize?${this.getParams().toString()}`;
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ts-core/oauth",
-    "version": "3.0.30",
+    "version": "3.1.1",
     "description": "Classes and utils for oauth",
     "main": "./cjs/public-api.js",
     "module": "./esm/public-api.js",
@@ -17,10 +17,7 @@
     },
     "license": "ISC",
     "dependencies": {
-        "@ts-core/common": "~3.0.14"
-    },
-    "peerDependencies": {
-        "url": "^0.11.0"
+        "@ts-core/common": "~3.0.43"
     },
     "devDependencies": {
         "@types/node": "^14.14.31",