@ts-core/oauth 3.1.3 → 3.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,3 +4,4 @@ export declare class OAuthParser {
4
4
  static ERRORS: Array<string>;
5
5
  static parse(params: any, fragment?: string): IOAuthPopUpDto;
6
6
  }
7
+ export declare function mergeUrlParamsAndFragment(params: any, fragment?: string): Record<string, any>;
@@ -1,14 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.OAuthParser = void 0;
3
+ exports.mergeUrlParamsAndFragment = exports.OAuthParser = void 0;
4
4
  const _ = require("lodash");
5
5
  class OAuthParser {
6
6
  static parse(params, fragment) {
7
- let item = new Object();
8
- _.forIn(params, (value, key) => item[key] = value);
9
- if (!_.isEmpty(fragment)) {
10
- new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
11
- }
7
+ let item = mergeUrlParamsAndFragment(params, fragment);
12
8
  let oAuthError = null;
13
9
  let oAuthCodeOrToken = null;
14
10
  for (let key in item) {
@@ -33,3 +29,12 @@ class OAuthParser {
33
29
  exports.OAuthParser = OAuthParser;
34
30
  OAuthParser.NAMES = ['code', 'access_token'];
35
31
  OAuthParser.ERRORS = ['error', 'error_description'];
32
+ function mergeUrlParamsAndFragment(params, fragment) {
33
+ let item = new Object();
34
+ _.forIn(params, (value, key) => item[key] = value);
35
+ if (!_.isEmpty(fragment)) {
36
+ new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
37
+ }
38
+ return item;
39
+ }
40
+ exports.mergeUrlParamsAndFragment = mergeUrlParamsAndFragment;
@@ -2,6 +2,7 @@ import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, ExtendedError }
2
2
  import { Observable, Subject } from "rxjs";
3
3
  export declare abstract class PopUpBase<U> extends LoggerWrapper {
4
4
  static ERROR_WINDOW_CLOSED: string;
5
+ static isWindowClosedError(error: any): boolean;
5
6
  popUpWidth: number;
6
7
  popUpHeight: number;
7
8
  popUpTarget: string;
package/cjs/PopUpBase.js CHANGED
@@ -14,6 +14,9 @@ const common_1 = require("@ts-core/common");
14
14
  const rxjs_1 = require("rxjs");
15
15
  const _ = require("lodash");
16
16
  class PopUpBase extends common_1.LoggerWrapper {
17
+ static isWindowClosedError(error) {
18
+ return !_.isNil(error) && error.code === PopUpBase.ERROR_WINDOW_CLOSED;
19
+ }
17
20
  constructor(logger, window) {
18
21
  super(logger);
19
22
  this.popUpCheckClose = () => {
@@ -4,3 +4,4 @@ export declare class OAuthParser {
4
4
  static ERRORS: Array<string>;
5
5
  static parse(params: any, fragment?: string): IOAuthPopUpDto;
6
6
  }
7
+ export declare function mergeUrlParamsAndFragment(params: any, fragment?: string): Record<string, any>;
@@ -1,11 +1,7 @@
1
1
  import * as _ from 'lodash';
2
2
  export class OAuthParser {
3
3
  static parse(params, fragment) {
4
- let item = new Object();
5
- _.forIn(params, (value, key) => item[key] = value);
6
- if (!_.isEmpty(fragment)) {
7
- new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
8
- }
4
+ let item = mergeUrlParamsAndFragment(params, fragment);
9
5
  let oAuthError = null;
10
6
  let oAuthCodeOrToken = null;
11
7
  for (let key in item) {
@@ -29,3 +25,11 @@ export class OAuthParser {
29
25
  }
30
26
  OAuthParser.NAMES = ['code', 'access_token'];
31
27
  OAuthParser.ERRORS = ['error', 'error_description'];
28
+ export function mergeUrlParamsAndFragment(params, fragment) {
29
+ let item = new Object();
30
+ _.forIn(params, (value, key) => item[key] = value);
31
+ if (!_.isEmpty(fragment)) {
32
+ new URLSearchParams(fragment).forEach((value, key) => item[key] = value);
33
+ }
34
+ return item;
35
+ }
@@ -2,6 +2,7 @@ import { PromiseHandler, ObservableData, LoggerWrapper, ILogger, ExtendedError }
2
2
  import { Observable, Subject } from "rxjs";
3
3
  export declare abstract class PopUpBase<U> extends LoggerWrapper {
4
4
  static ERROR_WINDOW_CLOSED: string;
5
+ static isWindowClosedError(error: any): boolean;
5
6
  popUpWidth: number;
6
7
  popUpHeight: number;
7
8
  popUpTarget: string;
package/esm/PopUpBase.js CHANGED
@@ -11,6 +11,9 @@ import { PromiseHandler, DateUtil, ObservableData, LoggerWrapper, ExtendedError
11
11
  import { filter, map, Subject } from "rxjs";
12
12
  import * as _ from 'lodash';
13
13
  export class PopUpBase extends LoggerWrapper {
14
+ static isWindowClosedError(error) {
15
+ return !_.isNil(error) && error.code === PopUpBase.ERROR_WINDOW_CLOSED;
16
+ }
14
17
  constructor(logger, window) {
15
18
  super(logger);
16
19
  this.popUpCheckClose = () => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ts-core/oauth",
3
- "version": "3.1.3",
3
+ "version": "3.1.4",
4
4
  "description": "Classes and utils for oauth",
5
5
  "main": "./cjs/public-api.js",
6
6
  "module": "./esm/public-api.js",