@ts-core/oauth 3.1.3 → 3.1.5

package/cjs/OAuthBase.d.ts

@@ -3,7 +3,7 @@ import { PopUpBase } from "./PopUpBase";
 export declare abstract class OAuthBase<T = any> extends PopUpBase<IOAuthDto> {
     protected applicationId: string;
     redirectUri: string;
-    protected http: TransportHttp;
+    protected _http: TransportHttp;
     protected responseType: string;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected getRedirectUri(): string;
@@ -17,6 +17,7 @@ export declare abstract class OAuthBase<T = any> extends PopUpBase<IOAuthDto> {
     getToken(): Promise<IOAuthDto>;
     parse(item: any): void;
     destroy(): void;
+    get http(): TransportHttp;
     get state(): string;
 }
 export interface IOAuthDto {

package/cjs/OAuthBase.js

@@ -14,16 +14,16 @@ const common_1 = require("@ts-core/common");
 const _ = require("lodash");
 const rxjs_1 = require("rxjs");
 const PopUpBase_1 = require("./PopUpBase");
-const public_api_1 = require("./public-api");
+const browser_1 = require("./external/browser");
 class OAuthBase extends PopUpBase_1.PopUpBase {
     constructor(logger, applicationId, window) {
         super(logger, window);
         this.applicationId = applicationId;
-        this.http = new common_1.TransportHttp(logger, { method: 'get' });
+        this._http = new common_1.TransportHttp(logger, { method: 'get', timeout: common_1.DateUtil.MILLISECONDS_MINUTE });
         this.subject = new rxjs_1.Subject();
         this.params.set('state', common_1.RandomUtil.randomString());
         this.params.set('display', 'popup');
-        (0, public_api_1.OAuthBrowserPropertiesSet)(this);
+        (0, browser_1.OAuthBrowserPropertiesSet)(this);
     }
     getRedirectUri() {
         return !_.isNil(this.redirectUri) ? this.redirectUri : `${this.originUrl}/oauth`;
@@ -67,11 +67,14 @@ class OAuthBase extends PopUpBase_1.PopUpBase {
             return;
         }
         super.destroy();
-        if (!_.isNil(this.http)) {
-            this.http.destroy();
-            this.http = null;
+        if (!_.isNil(this._http)) {
+            this._http.destroy();
+            this._http = null;
         }
     }
+    get http() {
+        return this._http;
+    }
     get state() {
         return !_.isNil(this.params) ? this.params.get('state') : null;
     }

package/cjs/OAuthParser.d.ts

@@ -4,3 +4,4 @@ export declare class OAuthParser {
     static ERRORS: Array<string>;
     static parse(params: any, fragment?: string): IOAuthPopUpDto;
 }
+export declare function mergeUrlParamsAndFragment(params: any, fragment?: string): Record<string, any>;

package/cjs/OAuthParser.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OAuthParser = void 0;
+exports.mergeUrlParamsAndFragment = exports.OAuthParser = void 0;
 const _ = require("lodash");
 class OAuthParser {
     static parse(params, fragment) {
-        let item = new Object();
-        _.forIn(params, (value, key) => item[key] = value);
-        if (!_.isEmpty(fragment)) {
-            new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
-        }
+        let item = mergeUrlParamsAndFragment(params, fragment);
         let oAuthError = null;
         let oAuthCodeOrToken = null;
         for (let key in item) {
@@ -33,3 +29,12 @@ class OAuthParser {
 exports.OAuthParser = OAuthParser;
 OAuthParser.NAMES = ['code', 'access_token'];
 OAuthParser.ERRORS = ['error', 'error_description'];
+function mergeUrlParamsAndFragment(params, fragment) {
+    let item = new Object();
+    _.forIn(params, (value, key) => item[key] = value);
+    if (!_.isEmpty(fragment)) {
+        new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+    }
+    return item;
+}
+exports.mergeUrlParamsAndFragment = mergeUrlParamsAndFragment;

package/cjs/PopUpBase.d.ts

@@ -2,6 +2,7 @@ import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, ExtendedError }
 import { Observable, Subject } from "rxjs";
 export declare abstract class PopUpBase<U> extends LoggerWrapper {
     static ERROR_WINDOW_CLOSED: string;
+    static isWindowClosedError(error: any): boolean;
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;

package/cjs/PopUpBase.js

@@ -14,6 +14,9 @@ const common_1 = require("@ts-core/common");
 const rxjs_1 = require("rxjs");
 const _ = require("lodash");
 class PopUpBase extends common_1.LoggerWrapper {
+    static isWindowClosedError(error) {
+        return !_.isNil(error) && error.code === PopUpBase.ERROR_WINDOW_CLOSED;
+    }
     constructor(logger, window) {
         super(logger);
         this.popUpCheckClose = () => {

package/cjs/external/browser.d.ts

@@ -1,2 +1,2 @@
-import { OAuthBase } from '../OAuthBase';
-export declare const OAuthBrowserPropertiesSet: (item: OAuthBase) => void;
+import { PopUpBase } from '../PopUpBase';
+export declare const OAuthBrowserPropertiesSet: <U>(item: PopUpBase<U>) => void;

package/cjs/go/GoAuth.d.ts

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

package/cjs/go/GoAuth.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoAuth = void 0;
+const _ = require("lodash");
 const GoUser_1 = require("./GoUser");
 const OAuthBase_1 = require("../OAuthBase");
 class GoAuth extends OAuthBase_1.OAuthBase {
@@ -24,6 +25,9 @@ class GoAuth extends OAuthBase_1.OAuthBase {
         return __awaiter(this, void 0, void 0, function* () {
             let item = new GoUser_1.GoUser();
             item.parse(yield this.http.call('https://www.googleapis.com/oauth2/v3/userinfo', { headers: { 'Authorization': `Bearer ${token}` } }));
+            if (!_.isEmpty(this.personFields)) {
+                item.parsePerson(yield this.http.call(`https://people.googleapis.com/v1/people/me`, { headers: { 'Authorization': `Bearer ${token}` }, data: { personFields: this.personFields } }));
+            }
             return item;
         });
     }

package/cjs/go/GoUser.d.ts

@@ -3,4 +3,5 @@ export declare class GoUser extends OAuthUser {
     givenName: string;
     familyName: string;
     parse(item: any): void;
+    parsePerson(item: any): void;
 }

package/cjs/go/GoUser.js

@@ -12,5 +12,7 @@ class GoUser extends OAuthUser_1.OAuthUser {
         this.givenName = item.given_name;
         this.familyName = item.family_name;
     }
+    parsePerson(item) {
+    }
 }
 exports.GoUser = GoUser;

package/esm/OAuthBase.d.ts

@@ -3,7 +3,7 @@ import { PopUpBase } from "./PopUpBase";
 export declare abstract class OAuthBase<T = any> extends PopUpBase<IOAuthDto> {
     protected applicationId: string;
     redirectUri: string;
-    protected http: TransportHttp;
+    protected _http: TransportHttp;
     protected responseType: string;
     constructor(logger: ILogger, applicationId: string, window?: Window);
     protected getRedirectUri(): string;
@@ -17,6 +17,7 @@ export declare abstract class OAuthBase<T = any> extends PopUpBase<IOAuthDto> {
     getToken(): Promise<IOAuthDto>;
     parse(item: any): void;
     destroy(): void;
+    get http(): TransportHttp;
     get state(): string;
 }
 export interface IOAuthDto {

package/esm/OAuthBase.js

@@ -7,16 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { TransportHttp, RandomUtil, ExtendedError } from "@ts-core/common";
+import { TransportHttp, RandomUtil, ExtendedError, DateUtil } from "@ts-core/common";
 import * as _ from 'lodash';
 import { Subject } from "rxjs";
 import { PopUpBase } from "./PopUpBase";
-import { OAuthBrowserPropertiesSet } from "./public-api";
+import { OAuthBrowserPropertiesSet } from "./external/browser";
 export class OAuthBase extends PopUpBase {
     constructor(logger, applicationId, window) {
         super(logger, window);
         this.applicationId = applicationId;
-        this.http = new TransportHttp(logger, { method: 'get' });
+        this._http = new TransportHttp(logger, { method: 'get', timeout: DateUtil.MILLISECONDS_MINUTE });
         this.subject = new Subject();
         this.params.set('state', RandomUtil.randomString());
         this.params.set('display', 'popup');
@@ -64,11 +64,14 @@ export class OAuthBase extends PopUpBase {
             return;
         }
         super.destroy();
-        if (!_.isNil(this.http)) {
-            this.http.destroy();
-            this.http = null;
+        if (!_.isNil(this._http)) {
+            this._http.destroy();
+            this._http = null;
         }
     }
+    get http() {
+        return this._http;
+    }
     get state() {
         return !_.isNil(this.params) ? this.params.get('state') : null;
     }

package/esm/OAuthParser.d.ts

@@ -4,3 +4,4 @@ export declare class OAuthParser {
     static ERRORS: Array<string>;
     static parse(params: any, fragment?: string): IOAuthPopUpDto;
 }
+export declare function mergeUrlParamsAndFragment(params: any, fragment?: string): Record<string, any>;

package/esm/OAuthParser.js

@@ -1,11 +1,7 @@
 import * as _ from 'lodash';
 export class OAuthParser {
     static parse(params, fragment) {
-        let item = new Object();
-        _.forIn(params, (value, key) => item[key] = value);
-        if (!_.isEmpty(fragment)) {
-            new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
-        }
+        let item = mergeUrlParamsAndFragment(params, fragment);
         let oAuthError = null;
         let oAuthCodeOrToken = null;
         for (let key in item) {
@@ -29,3 +25,11 @@ export class OAuthParser {
 }
 OAuthParser.NAMES = ['code', 'access_token'];
 OAuthParser.ERRORS = ['error', 'error_description'];
+export function mergeUrlParamsAndFragment(params, fragment) {
+    let item = new Object();
+    _.forIn(params, (value, key) => item[key] = value);
+    if (!_.isEmpty(fragment)) {
+        new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
+    }
+    return item;
+}

package/esm/PopUpBase.d.ts

@@ -2,6 +2,7 @@ import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, ExtendedError }
 import { Observable, Subject } from "rxjs";
 export declare abstract class PopUpBase<U> extends LoggerWrapper {
     static ERROR_WINDOW_CLOSED: string;
+    static isWindowClosedError(error: any): boolean;
     popUpWidth: number;
     popUpHeight: number;
     popUpTarget: string;

package/esm/PopUpBase.js

@@ -11,6 +11,9 @@ import { PromiseHandler, DateUtil, ObservableData, LoggerWrapper, ExtendedError
 import { filter, map, Subject } from "rxjs";
 import * as _ from 'lodash';
 export class PopUpBase extends LoggerWrapper {
+    static isWindowClosedError(error) {
+        return !_.isNil(error) && error.code === PopUpBase.ERROR_WINDOW_CLOSED;
+    }
     constructor(logger, window) {
         super(logger);
         this.popUpCheckClose = () => {

package/esm/external/browser.d.ts

@@ -1,2 +1,2 @@
-import { OAuthBase } from '../OAuthBase';
-export declare const OAuthBrowserPropertiesSet: (item: OAuthBase) => void;
+import { PopUpBase } from '../PopUpBase';
+export declare const OAuthBrowserPropertiesSet: <U>(item: PopUpBase<U>) => void;

package/esm/go/GoAuth.d.ts

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

package/esm/go/GoAuth.js

@@ -7,6 +7,7 @@ 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 GoAuth extends OAuthBase {
@@ -21,6 +22,9 @@ export class GoAuth extends OAuthBase {
         return __awaiter(this, void 0, void 0, function* () {
             let item = new GoUser();
             item.parse(yield this.http.call('https://www.googleapis.com/oauth2/v3/userinfo', { headers: { 'Authorization': `Bearer ${token}` } }));
+            if (!_.isEmpty(this.personFields)) {
+                item.parsePerson(yield this.http.call(`https://people.googleapis.com/v1/people/me`, { headers: { 'Authorization': `Bearer ${token}` }, data: { personFields: this.personFields } }));
+            }
             return item;
         });
     }

package/esm/go/GoUser.d.ts

@@ -3,4 +3,5 @@ export declare class GoUser extends OAuthUser {
     givenName: string;
     familyName: string;
     parse(item: any): void;
+    parsePerson(item: any): void;
 }

package/esm/go/GoUser.js

@@ -9,4 +9,6 @@ export class GoUser extends OAuthUser {
         this.givenName = item.given_name;
         this.familyName = item.family_name;
     }
+    parsePerson(item) {
+    }
 }

package/package.json

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