@ts-core/oauth 3.0.15 → 3.0.17

package/cjs/OAuthBase.d.ts

@@ -6,20 +6,24 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;
+    popUpIsCheckClose: boolean;
+    popUpMessageParser: IOAuthPopUpMessageParser;
     redirectUri: string;
     protected http: TransportHttp;
-    protected timer: any;
     protected popUp: Window;
     protected promise: PromiseHandler<IOAuthDto>;
     protected responseType: string;
     protected _urlParams: Map<string, string>;
+    protected _popUpCheckCloseTimer: any;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected open(): Promise<IOAuthDto>;
-    protected openPopup(): Window;
-    protected checkPopUp: () => void;
+    protected popUpOpen(): Window;
+    protected popUpFocus(): void;
+    protected popUpCheckClose: () => void;
     protected getUrlParams(): URLSearchParams;
     protected abstract getUrl(): string;
-    messageHandler: (event: MessageEvent<IOAuthPopUpDto>) => void;
+    protected messageHandler: (event: MessageEvent) => void;
+    protected browserMessageHandler(event: MessageEvent<IOAuthPopUpDto>): IOAuthPopUpDto;
     protected getOriginUrl(): string;
     protected getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
@@ -28,6 +32,8 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     getToken(): Promise<IOAuthDto>;
     close(): void;
     destroy(): void;
+    protected get popUpCheckCloseTimer(): any;
+    protected set popUpCheckCloseTimer(value: any);
     get urlParams(): Map<string, string>;
 }
 export interface IOAuthDto {
@@ -48,3 +54,4 @@ export interface IOAuthToken {
     expiresIn: number;
     accessToken: string;
 }
+export type IOAuthPopUpMessageParser = (event: MessageEvent) => IOAuthPopUpDto;

package/cjs/OAuthBase.js

@@ -17,17 +17,14 @@ class OAuthBase extends common_1.LoggerWrapper {
         super(logger);
         this.applicationId = applicationId;
         this.window = window;
-        this.popUpWidth = 430;
-        this.popUpHeight = 520;
-        this.popUpTarget = '_blank';
-        this.checkPopUp = () => {
+        this.popUpCheckClose = () => {
             if (_.isNil(this.popUp) || this.popUp.closed) {
                 this.close();
             }
         };
         this.messageHandler = (event) => {
-            let data = event.data;
-            if (event.origin !== this.getOriginUrl() || !_.isObject(data)) {
+            let data = this.popUpMessageParser(event);
+            if (_.isNil(data)) {
                 return;
             }
             if (!_.isEmpty(data.oAuthCodeOrToken)) {
@@ -41,6 +38,11 @@ class OAuthBase extends common_1.LoggerWrapper {
             }
         };
         this.http = new common_1.TransportHttp(logger, { method: 'get' });
+        this.popUpWidth = 430;
+        this.popUpHeight = 520;
+        this.popUpTarget = '_blank';
+        this.popUpIsCheckClose = true;
+        this.popUpMessageParser = this.browserMessageHandler;
         this._urlParams = new Map();
         this.urlParams.set('display', 'popup');
     }
@@ -53,20 +55,27 @@ class OAuthBase extends common_1.LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = common_1.PromiseHandler.create();
-            this.popUp = this.openPopup();
+            this.popUp = this.popUpOpen();
+            this.popUpFocus();
+            if (this.popUpIsCheckClose) {
+                this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, common_1.DateUtil.MILLISECONDS_SECOND / 10);
+            }
             this.window.addEventListener('message', this.messageHandler, false);
-            this.timer = setInterval(this.checkPopUp, common_1.DateUtil.MILLISECONDS_SECOND / 10);
             return this.promise.promise;
         });
     }
-    openPopup() {
+    popUpOpen() {
         let window = this.window;
         let top = (window.screen.height - this.popUpHeight) / 2;
         let left = (window.screen.width - this.popUpWidth) / 2;
         let item = window.open(this.getUrl(), this.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
-        item.focus();
         return item;
     }
+    popUpFocus() {
+        if (!_.isNil(this.popUp) && !this.popUp.closed) {
+            this.popUp.focus();
+        }
+    }
     getUrlParams() {
         let item = new URLSearchParams();
         item.append('client_id', this.applicationId);
@@ -75,6 +84,9 @@ 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;
     }
@@ -95,8 +107,7 @@ class OAuthBase extends common_1.LoggerWrapper {
     }
     close() {
         this.window.removeEventListener('message', this.messageHandler, false);
-        clearInterval(this.timer);
-        this.timer = null;
+        this.popUpCheckCloseTimer = null;
         if (!_.isNil(this.popUp)) {
             this.popUp.close();
             this.popUp = null;
@@ -121,6 +132,16 @@ class OAuthBase extends common_1.LoggerWrapper {
             this.http = null;
         }
     }
+    get popUpCheckCloseTimer() {
+        return this._popUpCheckCloseTimer;
+    }
+    set popUpCheckCloseTimer(value) {
+        if (value === this._popUpCheckCloseTimer) {
+            return;
+        }
+        clearInterval(this._popUpCheckCloseTimer);
+        this._popUpCheckCloseTimer = value;
+    }
     get urlParams() {
         return this._urlParams;
     }

package/cjs/go/GoAuth.js

@@ -15,7 +15,7 @@ const OAuthBase_1 = require("../OAuthBase");
 class GoAuth extends OAuthBase_1.OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
-        this.urlParams.set('scope', 'https://www.googleapis.com/auth/userinfo.profile');
+        this.urlParams.set('scope', 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email');
     }
     getUrl() {
         return `https://accounts.google.com/o/oauth2/v2/auth?${this.getUrlParams().toString()}`;

package/cjs/vk/VkAuth.d.ts

@@ -3,6 +3,7 @@ import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { VkUser } from "./VkUser";
 export declare class VkAuth<T extends VkUser = VkUser> extends OAuthBase<T> {
     v: string;
+    private email;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected getUrl(): string;
     getProfile(token: string, fields?: string): Promise<T>;

package/cjs/vk/VkAuth.js

@@ -31,6 +31,9 @@ class VkAuth extends OAuthBase_1.OAuthBase {
             let { response } = yield this.http.call('https://api.vk.com/method/users.get', { data: { access_token: token, v: this.v, fields } });
             let item = new VkUser_1.VkUser();
             item.parse(response[0]);
+            if (_.isNil(item.email)) {
+                item.email = this.email;
+            }
             return item;
         });
     }
@@ -47,10 +50,13 @@ class VkAuth extends OAuthBase_1.OAuthBase {
             if (!_.isNil(item.error_description)) {
                 throw new common_1.ExtendedError(item.error_description);
             }
+            if (!_.isNil(item.email)) {
+                this.email = item.email;
+            }
             return {
+                userId: item.user_id,
                 expiresIn: item.expires_in,
                 accessToken: item.access_token,
-                userId: item.user_id,
             };
         });
     }

package/esm/OAuthBase.d.ts

@@ -6,20 +6,24 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;
+    popUpIsCheckClose: boolean;
+    popUpMessageParser: IOAuthPopUpMessageParser;
     redirectUri: string;
     protected http: TransportHttp;
-    protected timer: any;
     protected popUp: Window;
     protected promise: PromiseHandler<IOAuthDto>;
     protected responseType: string;
     protected _urlParams: Map<string, string>;
+    protected _popUpCheckCloseTimer: any;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected open(): Promise<IOAuthDto>;
-    protected openPopup(): Window;
-    protected checkPopUp: () => void;
+    protected popUpOpen(): Window;
+    protected popUpFocus(): void;
+    protected popUpCheckClose: () => void;
     protected getUrlParams(): URLSearchParams;
     protected abstract getUrl(): string;
-    messageHandler: (event: MessageEvent<IOAuthPopUpDto>) => void;
+    protected messageHandler: (event: MessageEvent) => void;
+    protected browserMessageHandler(event: MessageEvent<IOAuthPopUpDto>): IOAuthPopUpDto;
     protected getOriginUrl(): string;
     protected getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
@@ -28,6 +32,8 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     getToken(): Promise<IOAuthDto>;
     close(): void;
     destroy(): void;
+    protected get popUpCheckCloseTimer(): any;
+    protected set popUpCheckCloseTimer(value: any);
     get urlParams(): Map<string, string>;
 }
 export interface IOAuthDto {
@@ -48,3 +54,4 @@ export interface IOAuthToken {
     expiresIn: number;
     accessToken: string;
 }
+export type IOAuthPopUpMessageParser = (event: MessageEvent) => IOAuthPopUpDto;

package/esm/OAuthBase.js

@@ -14,17 +14,14 @@ export class OAuthBase extends LoggerWrapper {
         super(logger);
         this.applicationId = applicationId;
         this.window = window;
-        this.popUpWidth = 430;
-        this.popUpHeight = 520;
-        this.popUpTarget = '_blank';
-        this.checkPopUp = () => {
+        this.popUpCheckClose = () => {
             if (_.isNil(this.popUp) || this.popUp.closed) {
                 this.close();
             }
         };
         this.messageHandler = (event) => {
-            let data = event.data;
-            if (event.origin !== this.getOriginUrl() || !_.isObject(data)) {
+            let data = this.popUpMessageParser(event);
+            if (_.isNil(data)) {
                 return;
             }
             if (!_.isEmpty(data.oAuthCodeOrToken)) {
@@ -38,6 +35,11 @@ export class OAuthBase extends LoggerWrapper {
             }
         };
         this.http = new TransportHttp(logger, { method: 'get' });
+        this.popUpWidth = 430;
+        this.popUpHeight = 520;
+        this.popUpTarget = '_blank';
+        this.popUpIsCheckClose = true;
+        this.popUpMessageParser = this.browserMessageHandler;
         this._urlParams = new Map();
         this.urlParams.set('display', 'popup');
     }
@@ -50,20 +52,27 @@ export class OAuthBase extends LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = PromiseHandler.create();
-            this.popUp = this.openPopup();
+            this.popUp = this.popUpOpen();
+            this.popUpFocus();
+            if (this.popUpIsCheckClose) {
+                this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, DateUtil.MILLISECONDS_SECOND / 10);
+            }
             this.window.addEventListener('message', this.messageHandler, false);
-            this.timer = setInterval(this.checkPopUp, DateUtil.MILLISECONDS_SECOND / 10);
             return this.promise.promise;
         });
     }
-    openPopup() {
+    popUpOpen() {
         let window = this.window;
         let top = (window.screen.height - this.popUpHeight) / 2;
         let left = (window.screen.width - this.popUpWidth) / 2;
         let item = window.open(this.getUrl(), this.popUpTarget, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
-        item.focus();
         return item;
     }
+    popUpFocus() {
+        if (!_.isNil(this.popUp) && !this.popUp.closed) {
+            this.popUp.focus();
+        }
+    }
     getUrlParams() {
         let item = new URLSearchParams();
         item.append('client_id', this.applicationId);
@@ -72,6 +81,9 @@ 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;
     }
@@ -92,8 +104,7 @@ export class OAuthBase extends LoggerWrapper {
     }
     close() {
         this.window.removeEventListener('message', this.messageHandler, false);
-        clearInterval(this.timer);
-        this.timer = null;
+        this.popUpCheckCloseTimer = null;
         if (!_.isNil(this.popUp)) {
             this.popUp.close();
             this.popUp = null;
@@ -118,6 +129,16 @@ export class OAuthBase extends LoggerWrapper {
             this.http = null;
         }
     }
+    get popUpCheckCloseTimer() {
+        return this._popUpCheckCloseTimer;
+    }
+    set popUpCheckCloseTimer(value) {
+        if (value === this._popUpCheckCloseTimer) {
+            return;
+        }
+        clearInterval(this._popUpCheckCloseTimer);
+        this._popUpCheckCloseTimer = value;
+    }
     get urlParams() {
         return this._urlParams;
     }

package/esm/go/GoAuth.js

@@ -12,7 +12,7 @@ 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');
+        this.urlParams.set('scope', 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email');
     }
     getUrl() {
         return `https://accounts.google.com/o/oauth2/v2/auth?${this.getUrlParams().toString()}`;

package/esm/vk/VkAuth.d.ts

@@ -3,6 +3,7 @@ import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { VkUser } from "./VkUser";
 export declare class VkAuth<T extends VkUser = VkUser> extends OAuthBase<T> {
     v: string;
+    private email;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected getUrl(): string;
     getProfile(token: string, fields?: string): Promise<T>;

package/esm/vk/VkAuth.js

@@ -28,6 +28,9 @@ export class VkAuth extends OAuthBase {
             let { response } = yield this.http.call('https://api.vk.com/method/users.get', { data: { access_token: token, v: this.v, fields } });
             let item = new VkUser();
             item.parse(response[0]);
+            if (_.isNil(item.email)) {
+                item.email = this.email;
+            }
             return item;
         });
     }
@@ -44,10 +47,13 @@ export class VkAuth extends OAuthBase {
             if (!_.isNil(item.error_description)) {
                 throw new ExtendedError(item.error_description);
             }
+            if (!_.isNil(item.email)) {
+                this.email = item.email;
+            }
             return {
+                userId: item.user_id,
                 expiresIn: item.expires_in,
                 accessToken: item.access_token,
-                userId: item.user_id,
             };
         });
     }

package/package.json

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