@ts-core/oauth 3.0.8 → 3.0.10

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.
Files changed (7) hide show
  1. package/cjs/OAuthBase.js +3 -0
  2. package/cjs/OAuthParser.d.ts +1 -1
  3. package/cjs/OAuthParser.js +16 -27
  4. package/esm/OAuthBase.js +3 -0
  5. package/esm/OAuthParser.d.ts +1 -1
  6. package/esm/OAuthParser.js +16 -27
  7. package/package.json +1 -1
package/cjs/OAuthBase.js CHANGED
@@ -46,6 +46,9 @@ class OAuthBase extends common_1.LoggerWrapper {
46
46
  open() {
47
47
  return __awaiter(this, void 0, void 0, function* () {
48
48
  if (!_.isNil(this.promise)) {
49
+ if (!_.isNil(this.popUp) && !this.popUp.closed) {
50
+ this.popUp.focus();
51
+ }
49
52
  return this.promise.promise;
50
53
  }
51
54
  this.promise = common_1.PromiseHandler.create();
package/cjs/OAuthParser.d.ts CHANGED
@@ -2,5 +2,5 @@ import { IOAuthPopUpDto } from './OAuthBase';
2
2
  export declare class OAuthParser {
3
3
  names: Array<string>;
4
4
  errors: Array<string>;
5
- parse(params: any, fragment: string): Promise<IOAuthPopUpDto>;
5
+ parse(params: any, fragment: string): IOAuthPopUpDto;
6
6
  }
package/cjs/OAuthParser.js CHANGED
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.OAuthParser = void 0;
13
4
  const _ = require("lodash");
@@ -17,25 +8,23 @@ class OAuthParser {
17
8
  this.errors = ['error_description', 'error'];
18
9
  }
19
10
  parse(params, fragment) {
20
- return __awaiter(this, void 0, void 0, function* () {
21
- let item = new URLSearchParams();
22
- _.forIn(params, (value, key) => item.append(key, value));
23
- new URLSearchParams(fragment).forEach((value, key) => item.append(key, value));
24
- let oAuthError = null;
25
- let oAuthCodeOrToken = null;
26
- item.forEach((value, key) => {
27
- if (this.names.includes(key)) {
28
- oAuthCodeOrToken = value;
29
- }
30
- else if (this.errors.includes(key)) {
31
- oAuthError = value;
32
- }
33
- if (!_.isEmpty(oAuthCodeOrToken) || !_.isEmpty(oAuthError)) {
34
- return { oAuthCodeOrToken, oAuthError };
35
- }
36
- });
37
- return null;
11
+ let item = new URLSearchParams();
12
+ _.forIn(params, (value, key) => item.append(key, value));
13
+ new URLSearchParams(fragment).forEach((value, key) => item.append(key, value));
14
+ let oAuthError = null;
15
+ let oAuthCodeOrToken = null;
16
+ item.forEach((value, key) => {
17
+ if (this.names.includes(key)) {
18
+ oAuthCodeOrToken = value;
19
+ }
20
+ else if (this.errors.includes(key)) {
21
+ oAuthError = value;
22
+ }
23
+ if (!_.isEmpty(oAuthCodeOrToken) || !_.isEmpty(oAuthError)) {
24
+ return { oAuthCodeOrToken, oAuthError };
25
+ }
38
26
  });
27
+ return null;
39
28
  }
40
29
  }
41
30
  exports.OAuthParser = OAuthParser;
package/esm/OAuthBase.js CHANGED
@@ -43,6 +43,9 @@ export class OAuthBase extends LoggerWrapper {
43
43
  open() {
44
44
  return __awaiter(this, void 0, void 0, function* () {
45
45
  if (!_.isNil(this.promise)) {
46
+ if (!_.isNil(this.popUp) && !this.popUp.closed) {
47
+ this.popUp.focus();
48
+ }
46
49
  return this.promise.promise;
47
50
  }
48
51
  this.promise = PromiseHandler.create();
package/esm/OAuthParser.d.ts CHANGED
@@ -2,5 +2,5 @@ import { IOAuthPopUpDto } from './OAuthBase';
2
2
  export declare class OAuthParser {
3
3
  names: Array<string>;
4
4
  errors: Array<string>;
5
- parse(params: any, fragment: string): Promise<IOAuthPopUpDto>;
5
+ parse(params: any, fragment: string): IOAuthPopUpDto;
6
6
  }
package/esm/OAuthParser.js CHANGED
@@ -1,12 +1,3 @@
1
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
- return new (P || (P = Promise))(function (resolve, reject) {
4
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
- step((generator = generator.apply(thisArg, _arguments || [])).next());
8
- });
9
- };
10
1
  import * as _ from 'lodash';
11
2
  export class OAuthParser {
12
3
  constructor() {
@@ -14,24 +5,22 @@ export class OAuthParser {
14
5
  this.errors = ['error_description', 'error'];
15
6
  }
16
7
  parse(params, fragment) {
17
- return __awaiter(this, void 0, void 0, function* () {
18
- let item = new URLSearchParams();
19
- _.forIn(params, (value, key) => item.append(key, value));
20
- new URLSearchParams(fragment).forEach((value, key) => item.append(key, value));
21
- let oAuthError = null;
22
- let oAuthCodeOrToken = null;
23
- item.forEach((value, key) => {
24
- if (this.names.includes(key)) {
25
- oAuthCodeOrToken = value;
26
- }
27
- else if (this.errors.includes(key)) {
28
- oAuthError = value;
29
- }
30
- if (!_.isEmpty(oAuthCodeOrToken) || !_.isEmpty(oAuthError)) {
31
- return { oAuthCodeOrToken, oAuthError };
32
- }
33
- });
34
- return null;
8
+ let item = new URLSearchParams();
9
+ _.forIn(params, (value, key) => item.append(key, value));
10
+ new URLSearchParams(fragment).forEach((value, key) => item.append(key, value));
11
+ let oAuthError = null;
12
+ let oAuthCodeOrToken = null;
13
+ item.forEach((value, key) => {
14
+ if (this.names.includes(key)) {
15
+ oAuthCodeOrToken = value;
16
+ }
17
+ else if (this.errors.includes(key)) {
18
+ oAuthError = value;
19
+ }
20
+ if (!_.isEmpty(oAuthCodeOrToken) || !_.isEmpty(oAuthError)) {
21
+ return { oAuthCodeOrToken, oAuthError };
22
+ }
35
23
  });
24
+ return null;
36
25
  }
37
26
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ts-core/oauth",
3
- "version": "3.0.8",
3
+ "version": "3.0.10",
4
4
  "description": "Classes and utils for oauth",
5
5
  "main": "./cjs/public-api.js",
6
6
  "module": "./esm/public-api.js",