@api-client/core 0.5.21 → 0.5.22
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.
- package/build/src/models/Authorization.d.ts +3 -5
- package/build/src/models/RequestAuthorization.js +4 -0
- package/build/src/models/RequestAuthorization.js.map +1 -1
- package/build/src/runtime/modules/RequestAuthorization.js +3 -7
- package/build/src/runtime/modules/RequestAuthorization.js.map +1 -1
- package/package.json +1 -1
- package/src/models/Authorization.ts +4 -5
- package/src/models/RequestAuthorization.ts +5 -1
- package/src/runtime/modules/RequestAuthorization.ts +3 -7
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { HttpCertificate } from "./ClientCertificate.js";
|
|
1
2
|
export interface IBasicAuthorization {
|
|
2
3
|
/**
|
|
3
4
|
* User name value.
|
|
@@ -63,12 +64,9 @@ export interface IOAuth1Authorization {
|
|
|
63
64
|
*/
|
|
64
65
|
export interface ICCAuthorization {
|
|
65
66
|
/**
|
|
66
|
-
* The
|
|
67
|
-
* Because the certificates are stored by the application
|
|
68
|
-
* this configuration only returns an ID of the certificate
|
|
69
|
-
* to use when making the request.
|
|
67
|
+
* The certificate object to use with the HTTP request.
|
|
70
68
|
*/
|
|
71
|
-
|
|
69
|
+
certificate?: HttpCertificate;
|
|
72
70
|
}
|
|
73
71
|
export declare interface IOAuth2CustomParameter {
|
|
74
72
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestAuthorization.js","sourceRoot":"","sources":["../../../src/models/RequestAuthorization.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,IAAI,GAAG,2BAA2B,CAAC;AA0BhD,MAAM,OAAO,oBAAoB;IAC/B,IAAI,GAAG,IAAI,CAAC;IACZ;;OAEG;IACH,MAAM,CAA+B;IACrC;;OAEG;IACH,IAAI,CAAqB;IACzB;;OAEG;IACH,OAAO,CAAW;IAClB;;;OAGG;IACH,KAAK,CAAW;IAEhB,MAAM,CAAC,eAAe,CAAC,IAAuB,EAAE,MAAmC,EAAE,KAAK,GAAC,IAAI;QAC7F,OAAO,IAAI,oBAAoB,CAAC;YAC9B,IAAI,EAAE,IAAI;YACV,MAAM;YACN,OAAO,EAAE,IAAI;YACb,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAyB;QACzC,OAAO,IAAI,oBAAoB,CAAC;YAC9B,IAAI,EAAE,IAAI;YACV,MAAM,
|
|
1
|
+
{"version":3,"file":"RequestAuthorization.js","sourceRoot":"","sources":["../../../src/models/RequestAuthorization.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,IAAI,GAAG,2BAA2B,CAAC;AA0BhD,MAAM,OAAO,oBAAoB;IAC/B,IAAI,GAAG,IAAI,CAAC;IACZ;;OAEG;IACH,MAAM,CAA+B;IACrC;;OAEG;IACH,IAAI,CAAqB;IACzB;;OAEG;IACH,OAAO,CAAW;IAClB;;;OAGG;IACH,KAAK,CAAW;IAEhB,MAAM,CAAC,eAAe,CAAC,IAAuB,EAAE,MAAmC,EAAE,KAAK,GAAC,IAAI;QAC7F,OAAO,IAAI,oBAAoB,CAAC;YAC9B,IAAI,EAAE,IAAI;YACV,MAAM;YACN,OAAO,EAAE,IAAI;YACb,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAyB;QACzC,MAAM,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,KAAK,oBAAoB,EAAE;YACtC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;SAClB;QACD,OAAO,IAAI,oBAAoB,CAAC;YAC9B,IAAI,EAAE,IAAI;YACV,MAAM,EAAG,IAAI,CAAC,MAAc;YAC5B,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI,CAAC,IAAyB;YACpC,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,YAAY,KAAoC;QAC9C,IAAI,IAA2B,CAAC;QAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1B;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,IAAI,GAAG,KAAK,CAAC;SACd;aAAM;YACL,IAAI,GAAG;gBACL,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,EAAuB;gBAC7B,KAAK,EAAE,IAAI;aACZ,CAAC;SACH;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,GAAG,CAAC,IAA2B;QAC7B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAC9C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,MAAM;QACJ,MAAM,EAAE,MAAM,GAAC,EAAE,EAAE,GAAG,IAAI,CAAC;QAC3B,MAAM,MAAM,GAAyB;YACnC,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE;YACrB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,KAAK;YAC9B,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAuB;YAC1C,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI;SAC1B,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -5,18 +5,14 @@ import applyCachedBasicAuthData, { applyRequestBasicAuthData } from './BasicAuth
|
|
|
5
5
|
* Injects client certificate object into the request object
|
|
6
6
|
*/
|
|
7
7
|
async function processClientCertificate(config, context) {
|
|
8
|
-
const {
|
|
9
|
-
if (!
|
|
10
|
-
return;
|
|
11
|
-
}
|
|
12
|
-
const result = await context.Events.ClientCertificate.read(context.eventsTarget, id);
|
|
13
|
-
if (!result) {
|
|
8
|
+
const { certificate } = config;
|
|
9
|
+
if (!certificate) {
|
|
14
10
|
return;
|
|
15
11
|
}
|
|
16
12
|
if (!Array.isArray(context.certificates)) {
|
|
17
13
|
context.certificates = [];
|
|
18
14
|
}
|
|
19
|
-
context.certificates.push(
|
|
15
|
+
context.certificates.push(certificate);
|
|
20
16
|
}
|
|
21
17
|
/**
|
|
22
18
|
* Injects basic auth header into the request headers.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestAuthorization.js","sourceRoot":"","sources":["../../../../src/runtime/modules/RequestAuthorization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,wBAAwB,EAAE,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAK1F;;GAEG;AACH,KAAK,UAAU,wBAAwB,CAAC,MAAwB,EAAE,OAAyB;IACzF,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"RequestAuthorization.js","sourceRoot":"","sources":["../../../../src/runtime/modules/RequestAuthorization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,wBAAwB,EAAE,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAK1F;;GAEG;AACH,KAAK,UAAU,wBAAwB,CAAC,MAAwB,EAAE,OAAyB;IACzF,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAC/B,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO;KACR;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACxC,OAAO,CAAC,YAAY,GAAG,EAAE,CAAC;KAC3B;IACD,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,OAAqB,EAAE,MAA2B;IAC1E,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAC5B,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IACD,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,OAAqB,EAAE,MAA4B;IACxE,MAAM,EAAE,WAAW,EAAE,SAAS,GAAC,QAAQ,EAAE,cAAc,GAAC,QAAQ,EAAE,YAAY,GAAC,eAAe,EAAE,GAAG,MAAM,CAAC;IAC1G,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO;KACR;IACD,MAAM,KAAK,GAAG,GAAG,SAAS,IAAI,WAAW,EAAE,CAAC;IAC5C,IAAI,cAAc,KAAK,QAAQ,EAAE;QAC/B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACnD,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACpC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;KACtC;SAAM,IAAI,cAAc,KAAK,OAAO,EAAE;QACrC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACxB,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;YAChD,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;SACjC;QAAC,OAAO,CAAC,EAAE;YACV,MAAM;SACP;KACF;AACH,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,OAAqB,EAAE,MAA0B;IACtE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAC/B,IAAI,WAAW,EAAE;QACf,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAChC;IACD,mGAAmG;IACnG,qHAAqH;AACvH,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,OAAqB,EAAE,MAA4B;IACxE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACzB,MAAM,KAAK,GAAG,UAAU,KAAK,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IACvC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;AACvC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CAAC,OAAqB,EAAE,OAAyB;IACxF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE;QAC1E,OAAO,iBAAiB,CAAC,EAAE,CAAC;KAC7B;IACD,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,aAAa,EAAE;QACxC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACjC,SAAS;SACV;QACD,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,oBAAoB;gBAAE,MAAM,wBAAwB,CAAC,IAAI,CAAC,MAA0B,EAAE,OAAO,CAAC,CAAC;gBAAC,MAAM;YAC3G,KAAK,OAAO;gBAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,MAA6B,CAAC,CAAC;gBAAC,MAAM;YACnF,KAAK,SAAS;gBAAE,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,MAA8B,CAAC,CAAC;gBAAC,MAAM;YACnF,KAAK,SAAS;gBAAE,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,MAA4B,CAAC,CAAC;gBAAC,MAAM;YACjF,KAAK,QAAQ;gBAAE,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,MAA8B,CAAC,CAAC;gBAAC,MAAM;YAClF,QAAQ;SACT;KACF;IACD,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE;QAC1E,sEAAsE;QACtE,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KAC5C;IACD,OAAO,iBAAiB,CAAC,EAAE,CAAC;AAC9B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { HttpCertificate } from "./ClientCertificate.js";
|
|
2
|
+
|
|
1
3
|
export interface IBasicAuthorization {
|
|
2
4
|
/**
|
|
3
5
|
* User name value.
|
|
@@ -68,12 +70,9 @@ export interface IOAuth1Authorization {
|
|
|
68
70
|
*/
|
|
69
71
|
export interface ICCAuthorization {
|
|
70
72
|
/**
|
|
71
|
-
* The
|
|
72
|
-
* Because the certificates are stored by the application
|
|
73
|
-
* this configuration only returns an ID of the certificate
|
|
74
|
-
* to use when making the request.
|
|
73
|
+
* The certificate object to use with the HTTP request.
|
|
75
74
|
*/
|
|
76
|
-
|
|
75
|
+
certificate?: HttpCertificate;
|
|
77
76
|
}
|
|
78
77
|
|
|
79
78
|
export declare interface IOAuth2CustomParameter {
|
|
@@ -58,9 +58,13 @@ export class RequestAuthorization {
|
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
static fromLegacy(info: LegacyAuthorization): RequestAuthorization {
|
|
61
|
+
const copy = { ...info };
|
|
62
|
+
if (copy.type === 'client certificate') {
|
|
63
|
+
copy.config = {};
|
|
64
|
+
}
|
|
61
65
|
return new RequestAuthorization({
|
|
62
66
|
kind: Kind,
|
|
63
|
-
config: info.config,
|
|
67
|
+
config: (info.config as any),
|
|
64
68
|
enabled: true,
|
|
65
69
|
type: info.type as AuthorizationType,
|
|
66
70
|
valid: info.valid,
|
|
@@ -9,18 +9,14 @@ import { ExecutionContext } from './ModulesRegistry.js';
|
|
|
9
9
|
* Injects client certificate object into the request object
|
|
10
10
|
*/
|
|
11
11
|
async function processClientCertificate(config: ICCAuthorization, context: ExecutionContext): Promise<void> {
|
|
12
|
-
const {
|
|
13
|
-
if (!
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
|
-
const result = await context.Events.ClientCertificate.read(context.eventsTarget, id);
|
|
17
|
-
if (!result) {
|
|
12
|
+
const { certificate } = config;
|
|
13
|
+
if (!certificate) {
|
|
18
14
|
return;
|
|
19
15
|
}
|
|
20
16
|
if (!Array.isArray(context.certificates)) {
|
|
21
17
|
context.certificates = [];
|
|
22
18
|
}
|
|
23
|
-
context.certificates.push(
|
|
19
|
+
context.certificates.push(certificate);
|
|
24
20
|
}
|
|
25
21
|
|
|
26
22
|
/**
|