@ts-core/oauth 3.0.16 → 3.0.18

package/cjs/OAuthBase.d.ts

@@ -17,7 +17,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected _popUpCheckCloseTimer: any;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected open(): Promise<IOAuthDto>;
-    protected popupOpen(): Window;
+    protected popUpOpen(): Window;
     protected popUpFocus(): void;
     protected popUpCheckClose: () => void;
     protected getUrlParams(): URLSearchParams;
@@ -28,6 +28,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
     abstract getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
+    parsePopUpResult(data: IOAuthPopUpDto): void;
     getCode(): Promise<IOAuthDto>;
     getToken(): Promise<IOAuthDto>;
     close(): void;
@@ -35,6 +36,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected get popUpCheckCloseTimer(): any;
     protected set popUpCheckCloseTimer(value: any);
     get urlParams(): Map<string, string>;
+    get state(): string;
 }
 export interface IOAuthDto {
     codeOrToken: string;

package/cjs/OAuthBase.js

@@ -22,21 +22,7 @@ class OAuthBase extends common_1.LoggerWrapper {
                 this.close();
             }
         };
-        this.messageHandler = (event) => {
-            let data = this.popUpMessageParser(event);
-            if (_.isNil(data)) {
-                return;
-            }
-            if (!_.isEmpty(data.oAuthCodeOrToken)) {
-                this.promise.resolve({ redirectUri: this.getRedirectUri(), codeOrToken: data.oAuthCodeOrToken });
-            }
-            if (!_.isEmpty(data.oAuthError)) {
-                this.promise.reject(data.oAuthError);
-            }
-            if (!this.promise.isPending) {
-                this.close();
-            }
-        };
+        this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(event));
         this.http = new common_1.TransportHttp(logger, { method: 'get' });
         this.popUpWidth = 430;
         this.popUpHeight = 520;
@@ -44,6 +30,7 @@ class OAuthBase extends common_1.LoggerWrapper {
         this.popUpIsCheckClose = true;
         this.popUpMessageParser = this.browserMessageHandler;
         this._urlParams = new Map();
+        this.urlParams.set('state', common_1.RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
     }
     open() {
@@ -55,7 +42,7 @@ class OAuthBase extends common_1.LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = common_1.PromiseHandler.create();
-            this.popUp = this.popupOpen();
+            this.popUp = this.popUpOpen();
             this.popUpFocus();
             if (this.popUpIsCheckClose) {
                 this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, common_1.DateUtil.MILLISECONDS_SECOND / 10);
@@ -64,7 +51,7 @@ class OAuthBase extends common_1.LoggerWrapper {
             return this.promise.promise;
         });
     }
-    popupOpen() {
+    popUpOpen() {
         let window = this.window;
         let top = (window.screen.height - this.popUpHeight) / 2;
         let left = (window.screen.width - this.popUpWidth) / 2;
@@ -93,6 +80,20 @@ class OAuthBase extends common_1.LoggerWrapper {
     getRedirectUri() {
         return !_.isNil(this.redirectUri) ? this.redirectUri : `${this.getOriginUrl()}/oauth`;
     }
+    parsePopUpResult(data) {
+        if (_.isNil(data)) {
+            return;
+        }
+        if (!_.isEmpty(data.oAuthCodeOrToken)) {
+            this.promise.resolve({ redirectUri: this.getRedirectUri(), codeOrToken: data.oAuthCodeOrToken });
+        }
+        if (!_.isEmpty(data.oAuthError)) {
+            this.promise.reject(data.oAuthError);
+        }
+        if (!this.promise.isPending) {
+            this.close();
+        }
+    }
     getCode() {
         return __awaiter(this, void 0, void 0, function* () {
             this.responseType = 'code';
@@ -145,6 +146,9 @@ class OAuthBase extends common_1.LoggerWrapper {
     get urlParams() {
         return this._urlParams;
     }
+    get state() {
+        return !_.isNil(this.urlParams) ? this.urlParams.get('state') : null;
+    }
 }
 exports.OAuthBase = OAuthBase;
 OAuthBase.ERROR_WINDOW_CLOSED = 'WINDOW_CLOSED';

package/cjs/OAuthParser.d.ts

@@ -2,5 +2,5 @@ import { IOAuthPopUpDto } from './OAuthBase';
 export declare class OAuthParser {
     static NAMES: Array<string>;
     static ERRORS: Array<string>;
-    static parse(params: any, fragment: string): IOAuthPopUpDto;
+    static parse(params: any, fragment?: string): IOAuthPopUpDto;
 }

package/cjs/OAuthParser.js

@@ -6,7 +6,9 @@ class OAuthParser {
     static parse(params, fragment) {
         let item = new Object();
         _.forIn(params, (value, key) => item[key] = value);
-        new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+        if (!_.isEmpty(fragment)) {
+            new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+        }
         let oAuthError = null;
         let oAuthCodeOrToken = null;
         for (let key in item) {

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

@@ -17,7 +17,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected _popUpCheckCloseTimer: any;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected open(): Promise<IOAuthDto>;
-    protected popupOpen(): Window;
+    protected popUpOpen(): Window;
     protected popUpFocus(): void;
     protected popUpCheckClose: () => void;
     protected getUrlParams(): URLSearchParams;
@@ -28,6 +28,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected getRedirectUri(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
     abstract getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
+    parsePopUpResult(data: IOAuthPopUpDto): void;
     getCode(): Promise<IOAuthDto>;
     getToken(): Promise<IOAuthDto>;
     close(): void;
@@ -35,6 +36,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected get popUpCheckCloseTimer(): any;
     protected set popUpCheckCloseTimer(value: any);
     get urlParams(): Map<string, string>;
+    get state(): string;
 }
 export interface IOAuthDto {
     codeOrToken: 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, LoggerWrapper, TransportHttp } from "@ts-core/common";
+import { PromiseHandler, DateUtil, LoggerWrapper, TransportHttp, RandomUtil } from "@ts-core/common";
 import * as _ from 'lodash';
 export class OAuthBase extends LoggerWrapper {
     constructor(logger, applicationId, window) {
@@ -19,21 +19,7 @@ export class OAuthBase extends LoggerWrapper {
                 this.close();
             }
         };
-        this.messageHandler = (event) => {
-            let data = this.popUpMessageParser(event);
-            if (_.isNil(data)) {
-                return;
-            }
-            if (!_.isEmpty(data.oAuthCodeOrToken)) {
-                this.promise.resolve({ redirectUri: this.getRedirectUri(), codeOrToken: data.oAuthCodeOrToken });
-            }
-            if (!_.isEmpty(data.oAuthError)) {
-                this.promise.reject(data.oAuthError);
-            }
-            if (!this.promise.isPending) {
-                this.close();
-            }
-        };
+        this.messageHandler = (event) => this.parsePopUpResult(this.popUpMessageParser(event));
         this.http = new TransportHttp(logger, { method: 'get' });
         this.popUpWidth = 430;
         this.popUpHeight = 520;
@@ -41,6 +27,7 @@ export class OAuthBase extends LoggerWrapper {
         this.popUpIsCheckClose = true;
         this.popUpMessageParser = this.browserMessageHandler;
         this._urlParams = new Map();
+        this.urlParams.set('state', RandomUtil.randomString());
         this.urlParams.set('display', 'popup');
     }
     open() {
@@ -52,7 +39,7 @@ export class OAuthBase extends LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = PromiseHandler.create();
-            this.popUp = this.popupOpen();
+            this.popUp = this.popUpOpen();
             this.popUpFocus();
             if (this.popUpIsCheckClose) {
                 this.popUpCheckCloseTimer = setInterval(this.popUpCheckClose, DateUtil.MILLISECONDS_SECOND / 10);
@@ -61,7 +48,7 @@ export class OAuthBase extends LoggerWrapper {
             return this.promise.promise;
         });
     }
-    popupOpen() {
+    popUpOpen() {
         let window = this.window;
         let top = (window.screen.height - this.popUpHeight) / 2;
         let left = (window.screen.width - this.popUpWidth) / 2;
@@ -90,6 +77,20 @@ export class OAuthBase extends LoggerWrapper {
     getRedirectUri() {
         return !_.isNil(this.redirectUri) ? this.redirectUri : `${this.getOriginUrl()}/oauth`;
     }
+    parsePopUpResult(data) {
+        if (_.isNil(data)) {
+            return;
+        }
+        if (!_.isEmpty(data.oAuthCodeOrToken)) {
+            this.promise.resolve({ redirectUri: this.getRedirectUri(), codeOrToken: data.oAuthCodeOrToken });
+        }
+        if (!_.isEmpty(data.oAuthError)) {
+            this.promise.reject(data.oAuthError);
+        }
+        if (!this.promise.isPending) {
+            this.close();
+        }
+    }
     getCode() {
         return __awaiter(this, void 0, void 0, function* () {
             this.responseType = 'code';
@@ -142,5 +143,8 @@ export class OAuthBase extends LoggerWrapper {
     get urlParams() {
         return this._urlParams;
     }
+    get state() {
+        return !_.isNil(this.urlParams) ? this.urlParams.get('state') : null;
+    }
 }
 OAuthBase.ERROR_WINDOW_CLOSED = 'WINDOW_CLOSED';

package/esm/OAuthParser.d.ts

@@ -2,5 +2,5 @@ import { IOAuthPopUpDto } from './OAuthBase';
 export declare class OAuthParser {
     static NAMES: Array<string>;
     static ERRORS: Array<string>;
-    static parse(params: any, fragment: string): IOAuthPopUpDto;
+    static parse(params: any, fragment?: string): IOAuthPopUpDto;
 }

package/esm/OAuthParser.js

@@ -3,7 +3,9 @@ export class OAuthParser {
     static parse(params, fragment) {
         let item = new Object();
         _.forIn(params, (value, key) => item[key] = value);
-        new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+        if (!_.isEmpty(fragment)) {
+            new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+        }
         let oAuthError = null;
         let oAuthCodeOrToken = null;
         for (let key in item) {

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.16",
+    "version": "3.0.18",
     "description": "Classes and utils for oauth",
     "main": "./cjs/public-api.js",
     "module": "./esm/public-api.js",