@ts-core/oauth 3.0.6 → 3.0.8

package/cjs/OAuthBase.js

@@ -17,8 +17,8 @@ class OAuthBase extends common_1.LoggerWrapper {
         super(logger);
         this.applicationId = applicationId;
         this.window = window;
-        this.popUpWidth = 640;
-        this.popUpHeight = 480;
+        this.popUpWidth = 430;
+        this.popUpHeight = 520;
         this.checkPopUp = () => {
             if (_.isNil(this.popUp) || this.popUp.closed) {
                 this.close();
@@ -65,7 +65,6 @@ class OAuthBase extends common_1.LoggerWrapper {
     }
     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);

package/cjs/OAuthParser.d.ts

@@ -0,0 +1,6 @@
+import { IOAuthPopUpDto } from './OAuthBase';
+export declare class OAuthParser {
+    names: Array<string>;
+    errors: Array<string>;
+    parse(params: any, fragment: string): Promise<IOAuthPopUpDto>;
+}

package/cjs/OAuthParser.js

@@ -0,0 +1,41 @@
+"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.OAuthParser = void 0;
+const _ = require("lodash");
+class OAuthParser {
+    constructor() {
+        this.names = ['code', 'access_token'];
+        this.errors = ['error_description', 'error'];
+    }
+    parse(params, fragment) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = new URLSearchParams();
+            _.forIn(params, (value, key) => item.append(key, value));
+            new URLSearchParams(fragment).forEach((value, key) => item.append(key, value));
+            let oAuthError = null;
+            let oAuthCodeOrToken = null;
+            item.forEach((value, key) => {
+                if (this.names.includes(key)) {
+                    oAuthCodeOrToken = value;
+                }
+                else if (this.errors.includes(key)) {
+                    oAuthError = value;
+                }
+                if (!_.isEmpty(oAuthCodeOrToken) || !_.isEmpty(oAuthError)) {
+                    return { oAuthCodeOrToken, oAuthError };
+                }
+            });
+            return null;
+        });
+    }
+}
+exports.OAuthParser = OAuthParser;

package/cjs/ma/MaAuth.js

@@ -17,8 +17,6 @@ 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() {

package/cjs/public-api.d.ts

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

package/cjs/public-api.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./OAuthBase"), exports);
 __exportStar(require("./OAuthUser"), exports);
+__exportStar(require("./OAuthParser"), exports);
 __exportStar(require("./go/GoUser"), exports);
 __exportStar(require("./go/GoAuth"), exports);
 __exportStar(require("./vk/VkUser"), exports);

package/cjs/vk/VkAuth.js

@@ -18,7 +18,7 @@ class VkAuth extends OAuthBase_1.OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
         this.v = '5.131';
-        this.urlParams.set('scope', 'status');
+        this.urlParams.set('scope', 'status,email');
     }
     getUrl() {
         return `https://oauth.vk.com/authorize?${this.getUrlParams().toString()}`;

package/cjs/ya/YaAuth.d.ts

@@ -1,8 +1,6 @@
-import { ILogger } from "@ts-core/common";
 import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { YaUser } from "./YaUser";
 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

@@ -15,11 +15,6 @@ 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()}`;
     }

package/esm/OAuthBase.js

@@ -14,8 +14,8 @@ export class OAuthBase extends LoggerWrapper {
         super(logger);
         this.applicationId = applicationId;
         this.window = window;
-        this.popUpWidth = 640;
-        this.popUpHeight = 480;
+        this.popUpWidth = 430;
+        this.popUpHeight = 520;
         this.checkPopUp = () => {
             if (_.isNil(this.popUp) || this.popUp.closed) {
                 this.close();
@@ -62,7 +62,6 @@ export class OAuthBase extends LoggerWrapper {
     }
     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);

package/esm/OAuthParser.d.ts

@@ -0,0 +1,6 @@
+import { IOAuthPopUpDto } from './OAuthBase';
+export declare class OAuthParser {
+    names: Array<string>;
+    errors: Array<string>;
+    parse(params: any, fragment: string): Promise<IOAuthPopUpDto>;
+}

package/esm/OAuthParser.js

@@ -0,0 +1,37 @@
+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 * as _ from 'lodash';
+export class OAuthParser {
+    constructor() {
+        this.names = ['code', 'access_token'];
+        this.errors = ['error_description', 'error'];
+    }
+    parse(params, fragment) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let item = new URLSearchParams();
+            _.forIn(params, (value, key) => item.append(key, value));
+            new URLSearchParams(fragment).forEach((value, key) => item.append(key, value));
+            let oAuthError = null;
+            let oAuthCodeOrToken = null;
+            item.forEach((value, key) => {
+                if (this.names.includes(key)) {
+                    oAuthCodeOrToken = value;
+                }
+                else if (this.errors.includes(key)) {
+                    oAuthError = value;
+                }
+                if (!_.isEmpty(oAuthCodeOrToken) || !_.isEmpty(oAuthError)) {
+                    return { oAuthCodeOrToken, oAuthError };
+                }
+            });
+            return null;
+        });
+    }
+}

package/esm/ma/MaAuth.js

@@ -14,8 +14,6 @@ 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() {

package/esm/public-api.d.ts

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

package/esm/public-api.js

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

package/esm/vk/VkAuth.js

@@ -15,7 +15,7 @@ export class VkAuth extends OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);
         this.v = '5.131';
-        this.urlParams.set('scope', 'status');
+        this.urlParams.set('scope', 'status,email');
     }
     getUrl() {
         return `https://oauth.vk.com/authorize?${this.getUrlParams().toString()}`;

package/esm/ya/YaAuth.d.ts

@@ -1,8 +1,6 @@
-import { ILogger } from "@ts-core/common";
 import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
 import { YaUser } from "./YaUser";
 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

@@ -12,11 +12,6 @@ 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()}`;
     }

package/package.json

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