@ts-core/oauth 3.0.3 → 3.0.5

package/cjs/OAuthBase.d.ts

@@ -1,8 +1,7 @@
 import { PromiseHandler, LoggerWrapper, ILogger, TransportHttp } from "@ts-core/common";
 export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
-    protected window: Window;
     protected applicationId: string;
-    protected scope?: string;
+    protected window?: Window;
     protected http: TransportHttp;
     protected timer: any;
     protected popUp: Window;
@@ -10,12 +9,14 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected popUpWidth: number;
     protected popUpHeight: number;
     protected responseType: string;
-    constructor(logger: ILogger, window: Window, applicationId: string, scope?: string);
+    protected _urlParams: Map<string, string>;
+    constructor(logger: ILogger, applicationId: string, window?: Window);
     protected open(): Promise<IOAuthDto>;
-    protected openPopup(url: string, target: string): Window;
+    protected openPopup(): Window;
     protected checkPopUp: () => void;
+    protected getUrlParams(): URLSearchParams;
+    protected abstract getUrl(): string;
     protected messageHandler: (event: MessageEvent<IOAuthPopUpDto>) => void;
-    protected abstract getAuthUrl(): string;
     protected get redirectUri(): string;
     protected get originUrl(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
@@ -24,6 +25,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     getToken(): Promise<IOAuthDto>;
     close(): void;
     destroy(): void;
+    get urlParams(): Map<string, string>;
 }
 export interface IOAuthDto {
     codeOrToken: string;

package/cjs/OAuthBase.js

@@ -13,11 +13,10 @@ exports.OAuthBase = void 0;
 const common_1 = require("@ts-core/common");
 const _ = require("lodash");
 class OAuthBase extends common_1.LoggerWrapper {
-    constructor(logger, window, applicationId, scope) {
+    constructor(logger, applicationId, window) {
         super(logger);
-        this.window = window;
         this.applicationId = applicationId;
-        this.scope = scope;
+        this.window = window;
         this.popUpWidth = 640;
         this.popUpHeight = 480;
         this.checkPopUp = () => {
@@ -41,6 +40,8 @@ class OAuthBase extends common_1.LoggerWrapper {
             }
         };
         this.http = new common_1.TransportHttp(logger, { method: 'get' });
+        this._urlParams = new Map();
+        this.urlParams.set('display', 'popup');
     }
     open() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -48,20 +49,29 @@ class OAuthBase extends common_1.LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = common_1.PromiseHandler.create();
-            this.popUp = this.openPopup(this.getAuthUrl(), '_blank');
+            this.popUp = this.openPopup();
             this.window.addEventListener('message', this.messageHandler, false);
             this.timer = setInterval(this.checkPopUp, common_1.DateUtil.MILLISECONDS_NANOSECOND / 2);
             return this.promise.promise;
         });
     }
-    openPopup(url, target) {
+    openPopup() {
         let window = this.window;
         let top = (window.screen.height - this.popUpHeight) / 2;
         let left = (window.screen.width - this.popUpWidth) / 2;
-        let item = window.open(url, target, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
+        let item = window.open(this.getUrl(), '_blank', `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
         item.focus();
         return item;
     }
+    getUrlParams() {
+        let item = new URLSearchParams();
+        item.append('display', 'popup');
+        item.append('client_id', this.applicationId);
+        item.append('redirect_uri', this.redirectUri);
+        item.append('response_type', this.responseType);
+        this.urlParams.forEach((value, key) => item.append(key, value));
+        return item;
+    }
     get redirectUri() {
         return `${this.originUrl}/oauth`;
     }
@@ -99,10 +109,17 @@ class OAuthBase extends common_1.LoggerWrapper {
         }
         super.destroy();
         this.close();
+        if (!_.isNil(this.urlParams)) {
+            this.urlParams.clear();
+            this._urlParams = null;
+        }
         if (!_.isNil(this.http)) {
             this.http.destroy();
             this.http = null;
         }
     }
+    get urlParams() {
+        return this._urlParams;
+    }
 }
 exports.OAuthBase = OAuthBase;

package/cjs/OAuthUser.d.ts

@@ -1,5 +1,5 @@
 export declare abstract class OAuthUser {
-    id: string | number;
+    id: string;
     name: string;
     city?: string;
     phone?: string;
@@ -17,7 +17,7 @@ export declare abstract class OAuthUser {
     telegram?: string;
     instagram?: string;
     birthday?: Date;
-    constructor(item?: any);
-    protected abstract parse(item: any): void;
+    constructor();
+    abstract parse(item: any): void;
     get location(): string;
 }

package/cjs/OAuthUser.js

@@ -13,11 +13,7 @@ exports.OAuthUser = void 0;
 const _ = require("lodash");
 const class_transformer_1 = require("class-transformer");
 class OAuthUser {
-    constructor(item) {
-        if (!_.isNil(item)) {
-            this.parse(item);
-        }
-    }
+    constructor() { }
     get location() {
         let items = new Array();
         if (!_.isEmpty(this.country)) {

package/cjs/go/{GoOAuth.d.ts → GoAuth.d.ts}

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

package/cjs/go/{GoOAuth.js → GoAuth.js}

@@ -9,45 +9,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GoOAuth = void 0;
-const _ = require("lodash");
+exports.GoAuth = void 0;
 const GoUser_1 = require("./GoUser");
 const OAuthBase_1 = require("../OAuthBase");
-class GoOAuth extends OAuthBase_1.OAuthBase {
-    constructor(logger, window, applicationId, scope) {
-        super(logger, window, applicationId, scope);
+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');
     }
-    getAuthUrl() {
-        let params = new URLSearchParams();
-        params.append('display', 'popup');
-        params.append('client_id', this.applicationId);
-        params.append('redirect_uri', this.redirectUri);
-        params.append('response_type', this.responseType);
-        if (!_.isEmpty(this.scope)) {
-            params.append('scope', this.scope);
-        }
-        return `https://accounts.google.com/o/oauth2/v2/auth?${params.toString()}`;
+    getUrl() {
+        return `https://accounts.google.com/o/oauth2/v2/auth?${this.getUrlParams().toString()}`;
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {
-            let item = yield this.http.call('https://www.googleapis.com/oauth2/v3/userinfo', { headers: { 'Authorization': `Bearer ${token}` } });
-            return new GoUser_1.GoUser(item);
+            let item = new GoUser_1.GoUser();
+            item.parse(yield this.http.call('https://www.googleapis.com/oauth2/v3/userinfo', { headers: { 'Authorization': `Bearer ${token}` } }));
+            return item;
         });
     }
     getTokenByCode(dto, secret) {
         return __awaiter(this, void 0, void 0, function* () {
             let item = yield this.http.call('https://oauth2.googleapis.com/token', {
-                method: 'post',
                 data: {
                     code: dto.codeOrToken,
                     client_id: this.applicationId,
                     client_secret: secret,
                     redirect_uri: dto.redirectUri,
                     grant_type: 'authorization_code'
-                }
+                },
+                method: 'post'
             });
-            return { idToken: item.id_token, tokenType: item.token_type, expiresIn: item.expires_in, accessToken: item.access_token, scope: item.scope };
+            return {
+                expiresIn: item.expires_in,
+                accessToken: item.access_token,
+                tokenType: item.token_type,
+                idToken: item.id_token,
+                scope: item.scope
+            };
         });
     }
 }
-exports.GoOAuth = GoOAuth;
+exports.GoAuth = GoAuth;

package/cjs/go/GoUser.d.ts

@@ -2,5 +2,5 @@ import { OAuthUser } from "../OAuthUser";
 export declare class GoUser extends OAuthUser {
     givenName: string;
     familyName: string;
-    protected parse(item: any): void;
+    parse(item: any): void;
 }

package/cjs/ma/MaAuth.d.ts

@@ -0,0 +1,10 @@
+import { ILogger } from "@ts-core/common";
+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);
+    protected getUrlParams(): URLSearchParams;
+    protected getUrl(): string;
+    getProfile(token: string): Promise<T>;
+    getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
+}

package/cjs/ma/MaAuth.js

@@ -0,0 +1,64 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MaAuth = void 0;
+const common_1 = require("@ts-core/common");
+const OAuthBase_1 = require("../OAuthBase");
+const MaUser_1 = require("./MaUser");
+const _ = require("lodash");
+class MaAuth extends OAuthBase_1.OAuthBase {
+    constructor(logger, applicationId, window) {
+        super(logger, applicationId, window);
+        this.popUpWidth = 480;
+        this.popUpHeight = 520;
+        this.urlParams.set('scope', 'userinfo');
+    }
+    getUrlParams() {
+        let item = super.getUrlParams();
+        item.append('state', common_1.RandomUtil.randomString(43));
+        return item;
+    }
+    getUrl() {
+        return `https://oauth.mail.ru/login?${this.getUrlParams().toString()}`;
+    }
+    getProfile(token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = new MaUser_1.MaUser();
+            item.parse(yield this.http.call('https://oauth.mail.ru/userinfo', { data: { access_token: token } }));
+            return item;
+        });
+    }
+    getTokenByCode(dto, secret) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = yield this.http.call('https://oauth.mail.ru/token', {
+                data: {
+                    code: dto.codeOrToken,
+                    client_id: this.applicationId,
+                    client_secret: secret,
+                    redirect_uri: dto.redirectUri,
+                    grant_type: 'authorization_code'
+                },
+                method: 'post',
+                headers: { 'Content-Type': 'multipart/form-data' }
+            });
+            if (!_.isNil(item.error_description)) {
+                throw new common_1.ExtendedError(item.error_description);
+            }
+            return {
+                tokenType: item.token_type,
+                expiresIn: item.expires_in,
+                accessToken: item.access_token,
+                refreshToken: item.refresh_token,
+            };
+        });
+    }
+}
+exports.MaAuth = MaAuth;

package/cjs/ma/MaUser.d.ts

@@ -0,0 +1,8 @@
+import { OAuthUser } from "../OAuthUser";
+export declare class MaUser extends OAuthUser {
+    clientId: string;
+    lastName: string;
+    nickname: string;
+    firstName: string;
+    parse(item: any): void;
+}

package/cjs/ma/MaUser.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MaUser = void 0;
+const OAuthUser_1 = require("../OAuthUser");
+const _ = require("lodash");
+class MaUser extends OAuthUser_1.OAuthUser {
+    parse(item) {
+        this.id = item.id;
+        this.name = item.name;
+        this.email = item.email;
+        this.locale = item.locale;
+        this.picture = item.image;
+        this.clientId = item.clientId;
+        this.nickname = item.nickname;
+        this.lastName = item.last_name;
+        this.firstName = item.first_name;
+        if (!_.isNil(item.gender)) {
+            this.isMale = item.gender === 'm';
+        }
+        if (!_.isNil(item.birthday)) {
+            let array = String(item.birthday).split('.');
+            if (array.length === 3) {
+                this.birthday = new Date(Number(array[2]), Number(array[1]) - 1, Number(array[0]));
+            }
+        }
+    }
+}
+exports.MaUser = MaUser;

package/cjs/public-api.d.ts

@@ -1,8 +1,8 @@
 export * from './OAuthBase';
 export * from './OAuthUser';
 export * from './go/GoUser';
-export * from './go/GoOAuth';
+export * from './go/GoAuth';
 export * from './vk/VkUser';
-export * from './vk/VkOAuth';
+export * from './vk/VkAuth';
 export * from './ya/YaUser';
-export * from './ya/YaOAuth';
+export * from './ya/YaAuth';

package/cjs/public-api.js

@@ -17,8 +17,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./OAuthBase"), exports);
 __exportStar(require("./OAuthUser"), exports);
 __exportStar(require("./go/GoUser"), exports);
-__exportStar(require("./go/GoOAuth"), exports);
+__exportStar(require("./go/GoAuth"), exports);
 __exportStar(require("./vk/VkUser"), exports);
-__exportStar(require("./vk/VkOAuth"), exports);
+__exportStar(require("./vk/VkAuth"), exports);
 __exportStar(require("./ya/YaUser"), exports);
-__exportStar(require("./ya/YaOAuth"), exports);
+__exportStar(require("./ya/YaAuth"), exports);

package/cjs/vk/VkAuth.d.ts

@@ -0,0 +1,10 @@
+import { ILogger } from '@ts-core/common';
+import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
+import { VkUser } from "./VkUser";
+export declare class VkAuth<T extends VkUser = VkUser> extends OAuthBase<T> {
+    v: string;
+    constructor(logger: ILogger, applicationId: string, window?: Window);
+    protected getUrl(): string;
+    getProfile(token: string, fields?: string): Promise<T>;
+    getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
+}

package/cjs/vk/{VkOAuth.js → VkAuth.js}

@@ -9,26 +9,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VkOAuth = void 0;
+exports.VkAuth = void 0;
+const common_1 = require("@ts-core/common");
 const _ = require("lodash");
 const OAuthBase_1 = require("../OAuthBase");
 const VkUser_1 = require("./VkUser");
-class VkOAuth extends OAuthBase_1.OAuthBase {
-    getAuthUrl() {
-        let params = new URLSearchParams();
-        params.append('display', 'popup');
-        params.append('client_id', this.applicationId);
-        params.append('redirect_uri', this.redirectUri);
-        params.append('response_type', this.responseType);
-        if (!_.isEmpty(this.scope)) {
-            params.append('scope', this.scope);
-        }
-        return `https://oauth.vk.com/authorize?${params.toString()}`;
+class VkAuth extends OAuthBase_1.OAuthBase {
+    constructor(logger, applicationId, window) {
+        super(logger, applicationId, window);
+        this.v = '5.131';
+        this.urlParams.set('scope', 'status');
+    }
+    getUrl() {
+        return `https://oauth.vk.com/authorize?${this.getUrlParams().toString()}`;
     }
     getProfile(token, fields) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { response } = yield this.http.call('https://api.vk.com/method/users.get', { data: { access_token: token, v: '5.131', fields } });
-            return new VkUser_1.VkUser(response[0]);
+            if (_.isNil(fields)) {
+                fields = 'photo_200,bdate,sex,city,country,status,about';
+            }
+            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]);
+            return item;
         });
     }
     getTokenByCode(dto, secret) {
@@ -41,8 +44,15 @@ class VkOAuth extends OAuthBase_1.OAuthBase {
                     client_secret: secret,
                 }
             });
-            return { userId: item.user_id, expiresIn: item.expires_in, accessToken: item.access_token };
+            if (!_.isNil(item.error_description)) {
+                throw new common_1.ExtendedError(item.error_description);
+            }
+            return {
+                expiresIn: item.expires_in,
+                accessToken: item.access_token,
+                userId: item.user_id,
+            };
         });
     }
 }
-exports.VkOAuth = VkOAuth;
+exports.VkAuth = VkAuth;

package/cjs/vk/VkUser.d.ts

@@ -1,5 +1,5 @@
 import { OAuthUser } from "../OAuthUser";
 export declare class VkUser extends OAuthUser {
     params: string;
-    protected parse(item: any): void;
+    parse(item: any): void;
 }

package/cjs/ya/{YaOAuth.d.ts → YaAuth.d.ts}

@@ -1,9 +1,9 @@
 import { ILogger } from "@ts-core/common";
 import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { YaUser } from "./YaUser";
-export declare class YaOAuth<T extends YaUser = YaUser> extends OAuthBase<T> {
-    constructor(logger: ILogger, window: Window, applicationId: string, scope?: string);
-    protected getAuthUrl(): string;
+export declare class YaAuth<T extends YaUser = YaUser> extends OAuthBase<T> {
+    constructor(logger: ILogger, applicationId: string, window?: Window);
+    protected getUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/cjs/ya/YaAuth.js

@@ -0,0 +1,57 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.YaAuth = void 0;
+const common_1 = require("@ts-core/common");
+const OAuthBase_1 = require("../OAuthBase");
+const YaUser_1 = require("./YaUser");
+const _ = require("lodash");
+class YaAuth extends OAuthBase_1.OAuthBase {
+    constructor(logger, applicationId, window) {
+        super(logger, applicationId, window);
+        this.popUpWidth = 480;
+        this.popUpHeight = 520;
+    }
+    getUrl() {
+        return `https://oauth.yandex.ru/authorize?${this.getUrlParams().toString()}`;
+    }
+    getProfile(token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = new YaUser_1.YaUser();
+            item.parse(yield this.http.call('https://login.yandex.ru/info', { data: { oauth_token: token } }));
+            return item;
+        });
+    }
+    getTokenByCode(dto, secret) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = yield this.http.call('https://oauth.yandex.ru/token', {
+                data: {
+                    code: dto.codeOrToken,
+                    client_id: this.applicationId,
+                    client_secret: secret,
+                    grant_type: 'authorization_code'
+                },
+                method: 'post',
+                headers: { 'Content-Type': 'multipart/form-data' }
+            });
+            if (!_.isNil(item.error_description)) {
+                throw new common_1.ExtendedError(item.error_description);
+            }
+            return {
+                expiresIn: item.expires_in,
+                accessToken: item.access_token,
+                refreshToken: item.refresh_token,
+                tokenType: item.token_type,
+            };
+        });
+    }
+}
+exports.YaAuth = YaAuth;

package/cjs/ya/YaUser.d.ts

@@ -6,5 +6,5 @@ export declare class YaUser extends OAuthUser {
     clientId: string;
     realName: string;
     displayName: string;
-    protected parse(item: any): void;
+    parse(item: any): void;
 }

package/esm/OAuthBase.d.ts

@@ -1,8 +1,7 @@
 import { PromiseHandler, LoggerWrapper, ILogger, TransportHttp } from "@ts-core/common";
 export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
-    protected window: Window;
     protected applicationId: string;
-    protected scope?: string;
+    protected window?: Window;
     protected http: TransportHttp;
     protected timer: any;
     protected popUp: Window;
@@ -10,12 +9,14 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     protected popUpWidth: number;
     protected popUpHeight: number;
     protected responseType: string;
-    constructor(logger: ILogger, window: Window, applicationId: string, scope?: string);
+    protected _urlParams: Map<string, string>;
+    constructor(logger: ILogger, applicationId: string, window?: Window);
     protected open(): Promise<IOAuthDto>;
-    protected openPopup(url: string, target: string): Window;
+    protected openPopup(): Window;
     protected checkPopUp: () => void;
+    protected getUrlParams(): URLSearchParams;
+    protected abstract getUrl(): string;
     protected messageHandler: (event: MessageEvent<IOAuthPopUpDto>) => void;
-    protected abstract getAuthUrl(): string;
     protected get redirectUri(): string;
     protected get originUrl(): string;
     abstract getProfile(token: string, ...params: any[]): Promise<T>;
@@ -24,6 +25,7 @@ export declare abstract class OAuthBase<T = any> extends LoggerWrapper {
     getToken(): Promise<IOAuthDto>;
     close(): void;
     destroy(): void;
+    get urlParams(): Map<string, string>;
 }
 export interface IOAuthDto {
     codeOrToken: string;

package/esm/OAuthBase.js

@@ -10,11 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { PromiseHandler, DateUtil, LoggerWrapper, TransportHttp } from "@ts-core/common";
 import * as _ from 'lodash';
 export class OAuthBase extends LoggerWrapper {
-    constructor(logger, window, applicationId, scope) {
+    constructor(logger, applicationId, window) {
         super(logger);
-        this.window = window;
         this.applicationId = applicationId;
-        this.scope = scope;
+        this.window = window;
         this.popUpWidth = 640;
         this.popUpHeight = 480;
         this.checkPopUp = () => {
@@ -38,6 +37,8 @@ export class OAuthBase extends LoggerWrapper {
             }
         };
         this.http = new TransportHttp(logger, { method: 'get' });
+        this._urlParams = new Map();
+        this.urlParams.set('display', 'popup');
     }
     open() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -45,20 +46,29 @@ export class OAuthBase extends LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = PromiseHandler.create();
-            this.popUp = this.openPopup(this.getAuthUrl(), '_blank');
+            this.popUp = this.openPopup();
             this.window.addEventListener('message', this.messageHandler, false);
             this.timer = setInterval(this.checkPopUp, DateUtil.MILLISECONDS_NANOSECOND / 2);
             return this.promise.promise;
         });
     }
-    openPopup(url, target) {
+    openPopup() {
         let window = this.window;
         let top = (window.screen.height - this.popUpHeight) / 2;
         let left = (window.screen.width - this.popUpWidth) / 2;
-        let item = window.open(url, target, `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
+        let item = window.open(this.getUrl(), '_blank', `scrollbars=yes,width=${this.popUpWidth},height=${this.popUpHeight},top=${top},left=${left}`);
         item.focus();
         return item;
     }
+    getUrlParams() {
+        let item = new URLSearchParams();
+        item.append('display', 'popup');
+        item.append('client_id', this.applicationId);
+        item.append('redirect_uri', this.redirectUri);
+        item.append('response_type', this.responseType);
+        this.urlParams.forEach((value, key) => item.append(key, value));
+        return item;
+    }
     get redirectUri() {
         return `${this.originUrl}/oauth`;
     }
@@ -96,9 +106,16 @@ export class OAuthBase extends LoggerWrapper {
         }
         super.destroy();
         this.close();
+        if (!_.isNil(this.urlParams)) {
+            this.urlParams.clear();
+            this._urlParams = null;
+        }
         if (!_.isNil(this.http)) {
             this.http.destroy();
             this.http = null;
         }
     }
+    get urlParams() {
+        return this._urlParams;
+    }
 }

package/esm/OAuthUser.d.ts

@@ -1,5 +1,5 @@
 export declare abstract class OAuthUser {
-    id: string | number;
+    id: string;
     name: string;
     city?: string;
     phone?: string;
@@ -17,7 +17,7 @@ export declare abstract class OAuthUser {
     telegram?: string;
     instagram?: string;
     birthday?: Date;
-    constructor(item?: any);
-    protected abstract parse(item: any): void;
+    constructor();
+    abstract parse(item: any): void;
     get location(): string;
 }

package/esm/OAuthUser.js

@@ -10,11 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import * as _ from 'lodash';
 import { Type } from 'class-transformer';
 export class OAuthUser {
-    constructor(item) {
-        if (!_.isNil(item)) {
-            this.parse(item);
-        }
-    }
+    constructor() { }
     get location() {
         let items = new Array();
         if (!_.isEmpty(this.country)) {

package/esm/go/{GoOAuth.d.ts → GoAuth.d.ts}

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

package/esm/go/{GoOAuth.js → GoAuth.js}

@@ -7,43 +7,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import * as _ from 'lodash';
 import { GoUser } from './GoUser';
 import { OAuthBase } from '../OAuthBase';
-export class GoOAuth extends OAuthBase {
-    constructor(logger, window, applicationId, scope) {
-        super(logger, window, applicationId, scope);
+export class GoAuth extends OAuthBase {
+    constructor(logger, applicationId, window) {
+        super(logger, applicationId, window);
+        this.urlParams.set('scope', 'https://www.googleapis.com/auth/userinfo.profile');
     }
-    getAuthUrl() {
-        let params = new URLSearchParams();
-        params.append('display', 'popup');
-        params.append('client_id', this.applicationId);
-        params.append('redirect_uri', this.redirectUri);
-        params.append('response_type', this.responseType);
-        if (!_.isEmpty(this.scope)) {
-            params.append('scope', this.scope);
-        }
-        return `https://accounts.google.com/o/oauth2/v2/auth?${params.toString()}`;
+    getUrl() {
+        return `https://accounts.google.com/o/oauth2/v2/auth?${this.getUrlParams().toString()}`;
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {
-            let item = yield this.http.call('https://www.googleapis.com/oauth2/v3/userinfo', { headers: { 'Authorization': `Bearer ${token}` } });
-            return new GoUser(item);
+            let item = new GoUser();
+            item.parse(yield this.http.call('https://www.googleapis.com/oauth2/v3/userinfo', { headers: { 'Authorization': `Bearer ${token}` } }));
+            return item;
         });
     }
     getTokenByCode(dto, secret) {
         return __awaiter(this, void 0, void 0, function* () {
             let item = yield this.http.call('https://oauth2.googleapis.com/token', {
-                method: 'post',
                 data: {
                     code: dto.codeOrToken,
                     client_id: this.applicationId,
                     client_secret: secret,
                     redirect_uri: dto.redirectUri,
                     grant_type: 'authorization_code'
-                }
+                },
+                method: 'post'
             });
-            return { idToken: item.id_token, tokenType: item.token_type, expiresIn: item.expires_in, accessToken: item.access_token, scope: item.scope };
+            return {
+                expiresIn: item.expires_in,
+                accessToken: item.access_token,
+                tokenType: item.token_type,
+                idToken: item.id_token,
+                scope: item.scope
+            };
         });
     }
 }

package/esm/go/GoUser.d.ts

@@ -2,5 +2,5 @@ import { OAuthUser } from "../OAuthUser";
 export declare class GoUser extends OAuthUser {
     givenName: string;
     familyName: string;
-    protected parse(item: any): void;
+    parse(item: any): void;
 }

package/esm/ma/MaAuth.d.ts

@@ -0,0 +1,10 @@
+import { ILogger } from "@ts-core/common";
+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);
+    protected getUrlParams(): URLSearchParams;
+    protected getUrl(): string;
+    getProfile(token: string): Promise<T>;
+    getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
+}

package/esm/ma/MaAuth.js

@@ -0,0 +1,60 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { ExtendedError, RandomUtil } from "@ts-core/common";
+import { OAuthBase } from "../OAuthBase";
+import { MaUser } from "./MaUser";
+import * as _ from 'lodash';
+export class MaAuth extends OAuthBase {
+    constructor(logger, applicationId, window) {
+        super(logger, applicationId, window);
+        this.popUpWidth = 480;
+        this.popUpHeight = 520;
+        this.urlParams.set('scope', 'userinfo');
+    }
+    getUrlParams() {
+        let item = super.getUrlParams();
+        item.append('state', RandomUtil.randomString(43));
+        return item;
+    }
+    getUrl() {
+        return `https://oauth.mail.ru/login?${this.getUrlParams().toString()}`;
+    }
+    getProfile(token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = new MaUser();
+            item.parse(yield this.http.call('https://oauth.mail.ru/userinfo', { data: { access_token: token } }));
+            return item;
+        });
+    }
+    getTokenByCode(dto, secret) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = yield this.http.call('https://oauth.mail.ru/token', {
+                data: {
+                    code: dto.codeOrToken,
+                    client_id: this.applicationId,
+                    client_secret: secret,
+                    redirect_uri: dto.redirectUri,
+                    grant_type: 'authorization_code'
+                },
+                method: 'post',
+                headers: { 'Content-Type': 'multipart/form-data' }
+            });
+            if (!_.isNil(item.error_description)) {
+                throw new ExtendedError(item.error_description);
+            }
+            return {
+                tokenType: item.token_type,
+                expiresIn: item.expires_in,
+                accessToken: item.access_token,
+                refreshToken: item.refresh_token,
+            };
+        });
+    }
+}

package/esm/ma/MaUser.d.ts

@@ -0,0 +1,8 @@
+import { OAuthUser } from "../OAuthUser";
+export declare class MaUser extends OAuthUser {
+    clientId: string;
+    lastName: string;
+    nickname: string;
+    firstName: string;
+    parse(item: any): void;
+}

package/esm/ma/MaUser.js

@@ -0,0 +1,24 @@
+import { OAuthUser } from "../OAuthUser";
+import * as _ from 'lodash';
+export class MaUser extends OAuthUser {
+    parse(item) {
+        this.id = item.id;
+        this.name = item.name;
+        this.email = item.email;
+        this.locale = item.locale;
+        this.picture = item.image;
+        this.clientId = item.clientId;
+        this.nickname = item.nickname;
+        this.lastName = item.last_name;
+        this.firstName = item.first_name;
+        if (!_.isNil(item.gender)) {
+            this.isMale = item.gender === 'm';
+        }
+        if (!_.isNil(item.birthday)) {
+            let array = String(item.birthday).split('.');
+            if (array.length === 3) {
+                this.birthday = new Date(Number(array[2]), Number(array[1]) - 1, Number(array[0]));
+            }
+        }
+    }
+}

package/esm/public-api.d.ts

@@ -1,8 +1,8 @@
 export * from './OAuthBase';
 export * from './OAuthUser';
 export * from './go/GoUser';
-export * from './go/GoOAuth';
+export * from './go/GoAuth';
 export * from './vk/VkUser';
-export * from './vk/VkOAuth';
+export * from './vk/VkAuth';
 export * from './ya/YaUser';
-export * from './ya/YaOAuth';
+export * from './ya/YaAuth';

package/esm/public-api.js

@@ -1,8 +1,8 @@
 export * from './OAuthBase';
 export * from './OAuthUser';
 export * from './go/GoUser';
-export * from './go/GoOAuth';
+export * from './go/GoAuth';
 export * from './vk/VkUser';
-export * from './vk/VkOAuth';
+export * from './vk/VkAuth';
 export * from './ya/YaUser';
-export * from './ya/YaOAuth';
+export * from './ya/YaAuth';

package/esm/vk/VkAuth.d.ts

@@ -0,0 +1,10 @@
+import { ILogger } from '@ts-core/common';
+import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
+import { VkUser } from "./VkUser";
+export declare class VkAuth<T extends VkUser = VkUser> extends OAuthBase<T> {
+    v: string;
+    constructor(logger: ILogger, applicationId: string, window?: Window);
+    protected getUrl(): string;
+    getProfile(token: string, fields?: string): Promise<T>;
+    getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
+}

package/esm/vk/{VkOAuth.js → VkAuth.js}

@@ -7,25 +7,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { ExtendedError } from '@ts-core/common';
 import * as _ from 'lodash';
 import { OAuthBase } from "../OAuthBase";
 import { VkUser } from "./VkUser";
-export class VkOAuth extends OAuthBase {
-    getAuthUrl() {
-        let params = new URLSearchParams();
-        params.append('display', 'popup');
-        params.append('client_id', this.applicationId);
-        params.append('redirect_uri', this.redirectUri);
-        params.append('response_type', this.responseType);
-        if (!_.isEmpty(this.scope)) {
-            params.append('scope', this.scope);
-        }
-        return `https://oauth.vk.com/authorize?${params.toString()}`;
+export class VkAuth extends OAuthBase {
+    constructor(logger, applicationId, window) {
+        super(logger, applicationId, window);
+        this.v = '5.131';
+        this.urlParams.set('scope', 'status');
+    }
+    getUrl() {
+        return `https://oauth.vk.com/authorize?${this.getUrlParams().toString()}`;
     }
     getProfile(token, fields) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { response } = yield this.http.call('https://api.vk.com/method/users.get', { data: { access_token: token, v: '5.131', fields } });
-            return new VkUser(response[0]);
+            if (_.isNil(fields)) {
+                fields = 'photo_200,bdate,sex,city,country,status,about';
+            }
+            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]);
+            return item;
         });
     }
     getTokenByCode(dto, secret) {
@@ -38,7 +41,14 @@ export class VkOAuth extends OAuthBase {
                     client_secret: secret,
                 }
             });
-            return { userId: item.user_id, expiresIn: item.expires_in, accessToken: item.access_token };
+            if (!_.isNil(item.error_description)) {
+                throw new ExtendedError(item.error_description);
+            }
+            return {
+                expiresIn: item.expires_in,
+                accessToken: item.access_token,
+                userId: item.user_id,
+            };
         });
     }
 }

package/esm/vk/VkUser.d.ts

@@ -1,5 +1,5 @@
 import { OAuthUser } from "../OAuthUser";
 export declare class VkUser extends OAuthUser {
     params: string;
-    protected parse(item: any): void;
+    parse(item: any): void;
 }

package/esm/ya/{YaOAuth.d.ts → YaAuth.d.ts}

@@ -1,9 +1,9 @@
 import { ILogger } from "@ts-core/common";
 import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { YaUser } from "./YaUser";
-export declare class YaOAuth<T extends YaUser = YaUser> extends OAuthBase<T> {
-    constructor(logger: ILogger, window: Window, applicationId: string, scope?: string);
-    protected getAuthUrl(): string;
+export declare class YaAuth<T extends YaUser = YaUser> extends OAuthBase<T> {
+    constructor(logger: ILogger, applicationId: string, window?: Window);
+    protected getUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
 }

package/esm/ya/YaAuth.js

@@ -0,0 +1,53 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { ExtendedError } from "@ts-core/common";
+import { OAuthBase } from "../OAuthBase";
+import { YaUser } from "./YaUser";
+import * as _ from 'lodash';
+export class YaAuth extends OAuthBase {
+    constructor(logger, applicationId, window) {
+        super(logger, applicationId, window);
+        this.popUpWidth = 480;
+        this.popUpHeight = 520;
+    }
+    getUrl() {
+        return `https://oauth.yandex.ru/authorize?${this.getUrlParams().toString()}`;
+    }
+    getProfile(token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = new YaUser();
+            item.parse(yield this.http.call('https://login.yandex.ru/info', { data: { oauth_token: token } }));
+            return item;
+        });
+    }
+    getTokenByCode(dto, secret) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = yield this.http.call('https://oauth.yandex.ru/token', {
+                data: {
+                    code: dto.codeOrToken,
+                    client_id: this.applicationId,
+                    client_secret: secret,
+                    grant_type: 'authorization_code'
+                },
+                method: 'post',
+                headers: { 'Content-Type': 'multipart/form-data' }
+            });
+            if (!_.isNil(item.error_description)) {
+                throw new ExtendedError(item.error_description);
+            }
+            return {
+                expiresIn: item.expires_in,
+                accessToken: item.access_token,
+                refreshToken: item.refresh_token,
+                tokenType: item.token_type,
+            };
+        });
+    }
+}

package/esm/ya/YaUser.d.ts

@@ -6,5 +6,5 @@ export declare class YaUser extends OAuthUser {
     clientId: string;
     realName: string;
     displayName: string;
-    protected parse(item: any): void;
+    parse(item: any): void;
 }

package/package.json

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

package/cjs/vk/VkOAuth.d.ts

@@ -1,7 +0,0 @@
-import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
-import { VkUser } from "./VkUser";
-export declare class VkOAuth<T extends VkUser = VkUser> extends OAuthBase<T> {
-    protected getAuthUrl(): string;
-    getProfile(token: string, fields: string): Promise<T>;
-    getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
-}

package/cjs/ya/YaOAuth.js

@@ -1,57 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.YaOAuth = void 0;
-const OAuthBase_1 = require("../OAuthBase");
-const YaUser_1 = require("./YaUser");
-const _ = require("lodash");
-const axios_1 = require("axios");
-class YaOAuth extends OAuthBase_1.OAuthBase {
-    constructor(logger, window, applicationId, scope) {
-        super(logger, window, applicationId, scope);
-        this.popUpWidth = 480;
-        this.popUpHeight = 520;
-    }
-    getAuthUrl() {
-        let params = new URLSearchParams();
-        params.append('display', 'popup');
-        params.append('client_id', this.applicationId);
-        params.append('redirect_uri', this.redirectUri);
-        params.append('response_type', this.responseType);
-        if (!_.isEmpty(this.scope)) {
-            params.append('scope', this.scope);
-        }
-        return `https://oauth.yandex.ru/authorize?${params.toString()}`;
-    }
-    getProfile(token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let item = yield this.http.call('https://login.yandex.ru/info', { data: { oauth_token: token } });
-            return new YaUser_1.YaUser(item);
-        });
-    }
-    getTokenByCode(dto, secret) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { data } = yield axios_1.default.postForm('https://oauth.yandex.ru/token', {
-                code: dto.codeOrToken,
-                client_id: this.applicationId,
-                client_secret: secret,
-                grant_type: 'authorization_code'
-            });
-            return {
-                tokenType: data.token_type,
-                expiresIn: data.expires_in,
-                accessToken: data.access_token,
-                refreshToken: data.refresh_token,
-            };
-        });
-    }
-}
-exports.YaOAuth = YaOAuth;

package/esm/vk/VkOAuth.d.ts

@@ -1,7 +0,0 @@
-import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
-import { VkUser } from "./VkUser";
-export declare class VkOAuth<T extends VkUser = VkUser> extends OAuthBase<T> {
-    protected getAuthUrl(): string;
-    getProfile(token: string, fields: string): Promise<T>;
-    getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
-}

package/esm/ya/YaOAuth.js

@@ -1,53 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { OAuthBase } from "../OAuthBase";
-import { YaUser } from "./YaUser";
-import * as _ from 'lodash';
-import axios from 'axios';
-export class YaOAuth extends OAuthBase {
-    constructor(logger, window, applicationId, scope) {
-        super(logger, window, applicationId, scope);
-        this.popUpWidth = 480;
-        this.popUpHeight = 520;
-    }
-    getAuthUrl() {
-        let params = new URLSearchParams();
-        params.append('display', 'popup');
-        params.append('client_id', this.applicationId);
-        params.append('redirect_uri', this.redirectUri);
-        params.append('response_type', this.responseType);
-        if (!_.isEmpty(this.scope)) {
-            params.append('scope', this.scope);
-        }
-        return `https://oauth.yandex.ru/authorize?${params.toString()}`;
-    }
-    getProfile(token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let item = yield this.http.call('https://login.yandex.ru/info', { data: { oauth_token: token } });
-            return new YaUser(item);
-        });
-    }
-    getTokenByCode(dto, secret) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { data } = yield axios.postForm('https://oauth.yandex.ru/token', {
-                code: dto.codeOrToken,
-                client_id: this.applicationId,
-                client_secret: secret,
-                grant_type: 'authorization_code'
-            });
-            return {
-                tokenType: data.token_type,
-                expiresIn: data.expires_in,
-                accessToken: data.access_token,
-                refreshToken: data.refresh_token,
-            };
-        });
-    }
-}