@cloudbase/oauth 0.1.1-alpha.7 → 0.1.1-alpha.8

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 (5) hide show
  1. package/dist/app/index.d.ts +4 -3
  2. package/dist/app/index.js +1 -4
  3. package/dist/app/index.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/app/index.ts +56 -65
package/dist/app/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import { RequestFn as requestFn, RequestOptions as requestOptions } from "./request";
2
- import { OpenURIWithCallback as openURIWithCallback } from "./openuri";
3
- import { Storage as storage } from "./storage";
1
+ import { RequestFn as requestFn, RequestOptions as requestOptions } from './request';
2
+ import { OpenURIWithCallback as openURIWithCallback } from './openuri';
3
+ import { Storage as storage } from './storage';
4
4
  export interface Options {
5
5
  env: string;
6
6
  region?: string;
@@ -9,6 +9,7 @@ export interface Options {
9
9
  clientSecret?: string;
10
10
  custom?: any;
11
11
  request?: requestFn;
12
+ baseRequest?: requestFn;
12
13
  storage?: storage;
13
14
  openURIWithCallback?: openURIWithCallback;
14
15
  }
package/dist/app/index.js CHANGED
@@ -30,10 +30,7 @@ class AppImpl {
30
30
  if (!options.openURIWithCallback) {
31
31
  options.openURIWithCallback = openuri_1.defaultOpenURIWithCallback;
32
32
  }
33
- let baseRequest = options.request;
34
- if (!baseRequest) {
35
- baseRequest = request_1.defaultRequest;
36
- }
33
+ let baseRequest = options.baseRequest || options.request || request_1.defaultRequest;
37
34
  const apiOrigin = options.apiOrigin;
38
35
  options.request = async (url, options) => {
39
36
  if (url.startsWith('/')) {
package/dist/app/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":";;;AAAA,uCAAmG;AACnG,uCAAiG;AACjG,uCAA6D;AAgB7D,SAAgB,aAAa,CACzB,OAAgB;IAEhB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC;AAJD,sCAIC;AAMD,MAAa,OAAO;IAIhB,YAAY,OAAgB;QAFX,eAAU,GAAG,IAAI,GAAG,EAAe,CAAC;QAGjD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACjB,OAAO,CAAC,MAAM,GAAG,aAAa,CAAA;SACjC;QACD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACpB,OAAO,CAAC,SAAS,GAAG,WAAW,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,MAAM,8BAA8B,CAAA;SAC7F;QACD,IAAI,UAAU,GAAG,OAAO,CAAC,GAAG,CAAA;QAC5B,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACnB,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAA;SACxB;aAAM;YACH,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAA;SAChC;QACD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YAClB,OAAO,CAAC,OAAO,GAAG,IAAI,wBAAc,CAAC,EAAC,GAAG,EAAE,UAAU,EAAC,CAAC,CAAC;SAC3D;QACD,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YAC9B,OAAO,CAAC,mBAAmB,GAAG,oCAA0B,CAAC;SAC5D;QACD,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,CAAA;QACjC,IAAI,CAAC,WAAW,EAAE;YACd,WAAW,GAAG,wBAAc,CAAA;SAC/B;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;QACnC,OAAO,CAAC,OAAO,GAAG,KAAK,EACnB,GAAW,EACX,OAAwB,EACd,EAAE;YACZ,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACrB,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC;aACzB;YACD,OAAO,WAAW,CAAI,GAAG,EAAE,OAAO,CAAC,CAAA;QACvC,CAAC,CAAA;QACD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;CACJ;AA/CD,0BA+CC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":";;;AAAA,uCAAqG;AACrG,uCAAmG;AACnG,uCAA+D;AAiB/D,SAAgB,aAAa,CAAC,OAAgB;IAC5C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAFD,sCAEC;AAMD,MAAa,OAAO;IAIlB,YAAY,OAAgB;QAFX,eAAU,GAAG,IAAI,GAAG,EAAe,CAAC;QAGnD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC;SAChC;QACD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACtB,OAAO,CAAC,SAAS,GAAG,WAAW,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,MAAM,8BAA8B,CAAC;SAC5F;QACD,IAAI,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACrB,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAC;SACvB;aAAM;YACL,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC;SAC/B;QACD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,OAAO,CAAC,OAAO,GAAG,IAAI,wBAAc,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;SAC3D;QACD,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YAChC,OAAO,CAAC,mBAAmB,GAAG,oCAA0B,CAAC;SAC1D;QACD,IAAI,WAAW,GAAc,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO,IAAI,wBAAc,CAAC;QACtF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACpC,OAAO,CAAC,OAAO,GAAG,KAAK,EAAK,GAAW,EAAE,OAAwB,EAAc,EAAE;YAC/E,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACvB,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC;aACvB;YACD,OAAO,WAAW,CAAI,GAAG,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;CACF;AAzCD,0BAyCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/oauth",
3
- "version": "0.1.1-alpha.7",
3
+ "version": "0.1.1-alpha.8",
4
4
  "description": "auth apis for cloudbase",
5
5
  "author": "xbase",
6
6
  "main": "./dist/index.js",
package/src/app/index.ts CHANGED
@@ -1,83 +1,74 @@
1
- import {defaultRequest, RequestFn as requestFn, RequestOptions as requestOptions} from "./request";
2
- import {OpenURIWithCallback as openURIWithCallback, defaultOpenURIWithCallback} from "./openuri";
3
- import {DefaultStorage, Storage as storage} from "./storage";
1
+ import { defaultRequest, RequestFn as requestFn, RequestOptions as requestOptions } from './request';
2
+ import { OpenURIWithCallback as openURIWithCallback, defaultOpenURIWithCallback } from './openuri';
3
+ import { DefaultStorage, Storage as storage } from './storage';
4
4
 
5
5
  export interface Options {
6
- env: string,
7
- region?: string,
8
- apiOrigin?: string;
9
- clientId?: string;
10
- clientSecret?: string;
11
- custom?: any;
6
+ env: string;
7
+ region?: string;
8
+ apiOrigin?: string;
9
+ clientId?: string;
10
+ clientSecret?: string;
11
+ custom?: any;
12
12
 
13
- // plugins can set platform functions
14
- request?: requestFn;
15
- storage?: storage;
16
- openURIWithCallback?: openURIWithCallback;
13
+ // plugins can set platform functions
14
+ request?: requestFn;
15
+ baseRequest?: requestFn;
16
+ storage?: storage;
17
+ openURIWithCallback?: openURIWithCallback;
17
18
  }
18
19
 
19
- export function initializeApp(
20
- options: Options,
21
- ): App {
22
- return new AppImpl(options);
20
+ export function initializeApp(options: Options): App {
21
+ return new AppImpl(options);
23
22
  }
24
23
 
25
24
  export interface App {
26
- readonly options: Options;
25
+ readonly options: Options;
27
26
  }
28
27
 
29
28
  export class AppImpl implements App {
30
- private readonly _options: Options;
31
- private readonly _container = new Map<string, any>();
29
+ private readonly _options: Options;
30
+ private readonly _container = new Map<string, any>();
32
31
 
33
- constructor(options: Options) {
34
- if (!options.region) {
35
- options.region = 'ap-shanghai'
36
- }
37
- if (!options.apiOrigin) {
38
- options.apiOrigin = `https://${options.env}.${options.region}.tcb-api.tencentcloudapi.com`
39
- }
40
- let storageEnv = options.env
41
- if (!options.clientId) {
42
- options.clientId = ''
43
- } else {
44
- storageEnv = options.clientId
45
- }
46
- if (!options.storage) {
47
- options.storage = new DefaultStorage({env: storageEnv});
48
- }
49
- if (!options.openURIWithCallback) {
50
- options.openURIWithCallback = defaultOpenURIWithCallback;
51
- }
52
- let baseRequest = options.request
53
- if (!baseRequest) {
54
- baseRequest = defaultRequest
55
- }
56
- const apiOrigin = options.apiOrigin
57
- options.request = async <T>(
58
- url: string,
59
- options?: RequestOptions,
60
- ): Promise<T> => {
61
- if (url.startsWith('/')) {
62
- url = apiOrigin + url;
63
- }
64
- return baseRequest<T>(url, options)
65
- }
66
- this._options = options;
32
+ constructor(options: Options) {
33
+ if (!options.region) {
34
+ options.region = 'ap-shanghai';
67
35
  }
68
-
69
- get options(): Options {
70
- return this._options;
36
+ if (!options.apiOrigin) {
37
+ options.apiOrigin = `https://${options.env}.${options.region}.tcb-api.tencentcloudapi.com`;
71
38
  }
72
-
73
- get container(): Map<string, any> {
74
- return this._container;
39
+ let storageEnv = options.env;
40
+ if (!options.clientId) {
41
+ options.clientId = '';
42
+ } else {
43
+ storageEnv = options.clientId;
75
44
  }
76
- }
45
+ if (!options.storage) {
46
+ options.storage = new DefaultStorage({ env: storageEnv });
47
+ }
48
+ if (!options.openURIWithCallback) {
49
+ options.openURIWithCallback = defaultOpenURIWithCallback;
50
+ }
51
+ let baseRequest: requestFn = options.baseRequest || options.request || defaultRequest;
52
+ const apiOrigin = options.apiOrigin;
53
+ options.request = async <T>(url: string, options?: RequestOptions): Promise<T> => {
54
+ if (url.startsWith('/')) {
55
+ url = apiOrigin + url;
56
+ }
57
+ return baseRequest<T>(url, options);
58
+ };
59
+ this._options = options;
60
+ }
77
61
 
62
+ get options(): Options {
63
+ return this._options;
64
+ }
78
65
 
79
- export type RequestFn = requestFn
80
- export type RequestOptions = requestOptions
81
- export type OpenURIWithCallback = openURIWithCallback
82
- export type Storage = storage
66
+ get container(): Map<string, any> {
67
+ return this._container;
68
+ }
69
+ }
83
70
 
71
+ export type RequestFn = requestFn;
72
+ export type RequestOptions = requestOptions;
73
+ export type OpenURIWithCallback = openURIWithCallback;
74
+ export type Storage = storage;