integreat 1.0.0 → 1.1.0-rc.0
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/CONTRIBUTING.md +1 -1
- package/README.md +5 -1
- package/SECURITY.md +2 -2
- package/dist/authenticators/ident.js +1 -1
- package/dist/authenticators/ident.js.map +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/index.js +0 -1
- package/dist/index.js.map +1 -1
- package/dist/schema/castFns/nonPrimitive.js +2 -1
- package/dist/schema/castFns/nonPrimitive.js.map +1 -1
- package/dist/service/Auth.js +5 -5
- package/dist/service/Auth.js.map +1 -1
- package/dist/service/Service.js.map +1 -1
- package/dist/service/types.d.ts +1 -1
- package/dist/service/utils/incoming.d.ts +1 -1
- package/dist/service/utils/incoming.js +14 -4
- package/dist/service/utils/incoming.js.map +1 -1
- package/dist/service/utils/resolveAuth.d.ts +1 -1
- package/dist/service/utils/resolveAuth.js +6 -2
- package/dist/service/utils/resolveAuth.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/utils/action.d.ts +1 -1
- package/dist/utils/action.js +2 -1
- package/dist/utils/action.js.map +1 -1
- package/dist/utils/createMapOptions.js +0 -2
- package/dist/utils/createMapOptions.js.map +1 -1
- package/package.json +7 -7
package/CONTRIBUTING.md
CHANGED
|
@@ -75,7 +75,7 @@ further defined and clarified by project maintainers.
|
|
|
75
75
|
### Enforcement
|
|
76
76
|
|
|
77
77
|
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
|
78
|
-
reported by contacting the project team at
|
|
78
|
+
reported by contacting the project team at dev@integreat.io. All
|
|
79
79
|
complaints will be reviewed and investigated and will result in a response that
|
|
80
80
|
is deemed necessary and appropriate to the circumstances. The project team is
|
|
81
81
|
obligated to maintain confidentiality with regard to the reporter of an
|
package/README.md
CHANGED
|
@@ -225,7 +225,10 @@ authentication. In cases where the service is authenticated by other means, e.g.
|
|
|
225
225
|
by including username and password in the uri, set the `auth` property to `true`
|
|
226
226
|
to signal that this is an authenticated service. For services accepting incoming
|
|
227
227
|
actions, `auth` should be set to an object with
|
|
228
|
-
`{ outgoing: <auth id | true>, incoming: <auth id | true>}`.
|
|
228
|
+
`{ outgoing: <auth id | true>, incoming: <auth id | true>}`. To accept several
|
|
229
|
+
incoming actions, provide an array of `<auth id | true>`, and they will be run
|
|
230
|
+
from first to last until one of them returns an ident or an error other than
|
|
231
|
+
`noaccess`.
|
|
229
232
|
|
|
230
233
|
**Note:** When connecting to a service for listening, the `outgoing` auth is
|
|
231
234
|
used. `incoming` is only used for validating the actions being dispatched "back"
|
|
@@ -634,6 +637,7 @@ Integreat currently have the following adapters:
|
|
|
634
637
|
- [JSON](https://github.com/integreat-io/integreat-adapter-json)
|
|
635
638
|
- [SOAP](https://github.com/integreat-io/integreat-adapter-soap)
|
|
636
639
|
- [Url encoded form data](https://github.com/integreat-io/integreat-adapter-form)
|
|
640
|
+
- [URI templates](https://github.com/integreat-io/integreat-adapter-uri)
|
|
637
641
|
- [XML](https://github.com/integreat-io/integreat-adapter-xml)
|
|
638
642
|
|
|
639
643
|
You may write your own adapters as well, and documentation on this is coming.
|
package/SECURITY.md
CHANGED
|
@@ -9,7 +9,7 @@ const identAuth = {
|
|
|
9
9
|
async validate(_authentication, options) {
|
|
10
10
|
const { identId } = options || {};
|
|
11
11
|
const id = typeof identId === 'string' ? identId : 'anonymous';
|
|
12
|
-
return { id };
|
|
12
|
+
return { status: 'ok', access: { ident: { id } } };
|
|
13
13
|
},
|
|
14
14
|
authentication: {
|
|
15
15
|
asObject(_authentication) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ident.js","sourceRoot":"","sources":["../../src/authenticators/ident.ts"],"names":[],"mappings":"AAOA,MAAM,SAAS,GAAkB;IAC/B,EAAE,EAAE,OAAO;IAOX,KAAK,CAAC,YAAY,CAAC,QAAQ;QACzB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;IAC9B,CAAC;IAMD,eAAe,CAAC,eAAe;QAC7B,OAAO,IAAI,CAAA;IACb,CAAC;IAMD,KAAK,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO;QACrC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACjC,MAAM,EAAE,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAA;QAC9D,OAAO,EAAE,EAAE,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"ident.js","sourceRoot":"","sources":["../../src/authenticators/ident.ts"],"names":[],"mappings":"AAOA,MAAM,SAAS,GAAkB;IAC/B,EAAE,EAAE,OAAO;IAOX,KAAK,CAAC,YAAY,CAAC,QAAQ;QACzB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;IAC9B,CAAC;IAMD,eAAe,CAAC,eAAe;QAC7B,OAAO,IAAI,CAAA;IACb,CAAC;IAMD,KAAK,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO;QACrC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACjC,MAAM,EAAE,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAA;QAC9D,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAA;IACpD,CAAC;IAED,cAAc,EAAE;QAMd,QAAQ,CAAC,eAAe;YACtB,OAAO,EAAE,CAAA;QACX,CAAC;QAOD,aAAa,CAAC,eAAe;YAC3B,OAAO,EAAE,CAAA;QACX,CAAC;KACF;CACF,CAAA;AAED,eAAe,SAAS,CAAA"}
|
package/dist/index.d.ts
CHANGED
|
@@ -12,7 +12,6 @@ export * as middleware from './middleware/index.js';
|
|
|
12
12
|
export { createAction } from './utils/action.js';
|
|
13
13
|
export declare const transformers: {};
|
|
14
14
|
declare const _default: {
|
|
15
|
-
version: string;
|
|
16
15
|
create(definitions: Definitions, resources: Resources, middlewareForDispatch?: Middleware[], middlewareForService?: Middleware[]): Instance;
|
|
17
16
|
mergeDefinitions: typeof mergeDefinitions;
|
|
18
17
|
mergeResources: typeof mergeResources;
|
package/dist/index.js
CHANGED
|
@@ -6,7 +6,6 @@ export * as middleware from './middleware/index.js';
|
|
|
6
6
|
export { createAction } from './utils/action.js';
|
|
7
7
|
export const transformers = {};
|
|
8
8
|
export default {
|
|
9
|
-
version: '1.0.0',
|
|
10
9
|
create(definitions, resources, middlewareForDispatch, middlewareForService) {
|
|
11
10
|
return new Instance(definitions, resources, middlewareForDispatch, middlewareForService);
|
|
12
11
|
},
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,eAAe,CAAA;AACpC,OAAO,gBAAgB,MAAM,6BAA6B,CAAA;AAC1D,OAAO,cAAc,MAAM,2BAA2B,CAAA;AAsCtD,OAAO,KAAK,cAAc,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,MAAM,CAAC,MAAM,YAAY,GAAG,EAAE,CAAA;AAE9B,eAAe;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,eAAe,CAAA;AACpC,OAAO,gBAAgB,MAAM,6BAA6B,CAAA;AAC1D,OAAO,cAAc,MAAM,2BAA2B,CAAA;AAsCtD,OAAO,KAAK,cAAc,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,MAAM,CAAC,MAAM,YAAY,GAAG,EAAE,CAAA;AAE9B,eAAe;IAIb,MAAM,CACJ,WAAwB,EACxB,SAAoB,EACpB,qBAAoC,EACpC,oBAAmC;QAEnC,OAAO,IAAI,QAAQ,CACjB,WAAW,EACX,SAAS,EACT,qBAAqB,EACrB,oBAAoB,CACrB,CAAA;IACH,CAAC;IAED,gBAAgB;IAChB,cAAc;CACf,CAAA"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { isTypedData, isReference, isDate, isObject } from '../../utils/is.js';
|
|
2
|
+
import unwrapValue from '../../utils/unwrapValue.js';
|
|
2
3
|
function extractId(value) {
|
|
3
4
|
if (isObject(value)) {
|
|
4
|
-
return value.id;
|
|
5
|
+
return unwrapValue(value.id);
|
|
5
6
|
}
|
|
6
7
|
else {
|
|
7
8
|
return isDate(value) ? value.getTime() : value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonPrimitive.js","sourceRoot":"","sources":["../../../src/schema/castFns/nonPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"nonPrimitive.js","sourceRoot":"","sources":["../../../src/schema/castFns/nonPrimitive.ts"],"names":[],"mappings":"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"}
|
package/dist/service/Auth.js
CHANGED
|
@@ -36,12 +36,12 @@ export default class Auth {
|
|
|
36
36
|
if (authentication.status !== 'granted') {
|
|
37
37
|
return createErrorResponse('Authentication was refused', this.id, 'noaccess');
|
|
38
38
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
return
|
|
39
|
+
const response = await this.#authenticator.validate(authentication, this.#options, action);
|
|
40
|
+
if (response.status === 'ok' && response.access?.ident) {
|
|
41
|
+
return response;
|
|
42
42
|
}
|
|
43
|
-
|
|
44
|
-
return createErrorResponse(`Authentication was refused. ${
|
|
43
|
+
else {
|
|
44
|
+
return createErrorResponse(`Authentication was refused. ${response.error}`, this.id, response.status || 'autherror', response.reason);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
async authenticateAndGetAuthObject(action, method) {
|
package/dist/service/Auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/service/Auth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAExD,MAAM,WAAW,GAAG,CAAC,CAAA;AAErB,MAAM,WAAW,GAAG,CAClB,cAAqC,EACrC,UAAkB,EAClB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,SAAS,IAAI,UAAU,GAAG,WAAW,CAAA;AAErE,MAAM,MAAM,GAAG,CACb,aAA4B,EAC5B,OAA2B,EAC3B,MAAqB,EACrB,EAAE,CACF,OAAO,aAAa,CAAC,cAAc,KAAK,UAAU;IAChD,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;IACrD,CAAC,CAAC,EAAE,CAAA;AAER,MAAM,CAAC,OAAO,OAAO,IAAI;IACd,EAAE,CAAQ;IACnB,cAAc,CAAe;IAC7B,QAAQ,CAAa;IACrB,gBAAgB,GAAG,IAAI,GAAG,EAA0B,CAAA;IAEpD,YAAY,EAAU,EAAE,aAA4B,EAAE,OAAqB;QACzE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,cAAc,GAAG,aAAa,CAAA;QACnC,IAAI,CAAC,QAAQ,GAAG,OAAO,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAqB;QACtC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC9D,IAAI,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAEnD,IACE,cAAc,EAAE,MAAM,KAAK,SAAS;YACpC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAC1E;YACA,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,GAAG;YACD,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CACrD,IAAI,CAAC,QAAQ,EACb,MAAM,CACP,CAAA;SACF,QAAQ,WAAW,CAAC,cAAc,EAAE,OAAO,EAAE,CAAC,EAAC;QAEhD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;QAC9C,OAAO,cAAc,EAAE,MAAM,KAAK,SAAS,CAAA;IAC7C,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,cAA8B,EAC9B,MAAqB;QAErB,IAAI,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,KAAK,UAAU,EAAE;YAEtD,OAAO,mBAAmB,CACxB,0CACE,IAAI,CAAC,cAAc,CAAC,EACtB,8BAA8B,EAC9B,IAAI,CAAC,EAAE,EACP,WAAW,CACZ,CAAA;SACF;QAED,IAAI,cAAc,CAAC,MAAM,KAAK,SAAS,EAAE;YAEvC,OAAO,mBAAmB,CACxB,4BAA4B,EAC5B,IAAI,CAAC,EAAE,EACP,UAAU,CACX,CAAA;SACF;
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/service/Auth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAExD,MAAM,WAAW,GAAG,CAAC,CAAA;AAErB,MAAM,WAAW,GAAG,CAClB,cAAqC,EACrC,UAAkB,EAClB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,SAAS,IAAI,UAAU,GAAG,WAAW,CAAA;AAErE,MAAM,MAAM,GAAG,CACb,aAA4B,EAC5B,OAA2B,EAC3B,MAAqB,EACrB,EAAE,CACF,OAAO,aAAa,CAAC,cAAc,KAAK,UAAU;IAChD,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;IACrD,CAAC,CAAC,EAAE,CAAA;AAER,MAAM,CAAC,OAAO,OAAO,IAAI;IACd,EAAE,CAAQ;IACnB,cAAc,CAAe;IAC7B,QAAQ,CAAa;IACrB,gBAAgB,GAAG,IAAI,GAAG,EAA0B,CAAA;IAEpD,YAAY,EAAU,EAAE,aAA4B,EAAE,OAAqB;QACzE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,cAAc,GAAG,aAAa,CAAA;QACnC,IAAI,CAAC,QAAQ,GAAG,OAAO,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAqB;QACtC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC9D,IAAI,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAEnD,IACE,cAAc,EAAE,MAAM,KAAK,SAAS;YACpC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAC1E;YACA,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,GAAG;YACD,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CACrD,IAAI,CAAC,QAAQ,EACb,MAAM,CACP,CAAA;SACF,QAAQ,WAAW,CAAC,cAAc,EAAE,OAAO,EAAE,CAAC,EAAC;QAEhD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;QAC9C,OAAO,cAAc,EAAE,MAAM,KAAK,SAAS,CAAA;IAC7C,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,cAA8B,EAC9B,MAAqB;QAErB,IAAI,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,KAAK,UAAU,EAAE;YAEtD,OAAO,mBAAmB,CACxB,0CACE,IAAI,CAAC,cAAc,CAAC,EACtB,8BAA8B,EAC9B,IAAI,CAAC,EAAE,EACP,WAAW,CACZ,CAAA;SACF;QAED,IAAI,cAAc,CAAC,MAAM,KAAK,SAAS,EAAE;YAEvC,OAAO,mBAAmB,CACxB,4BAA4B,EAC5B,IAAI,CAAC,EAAE,EACP,UAAU,CACX,CAAA;SACF;QAGD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CACjD,cAAc,EACd,IAAI,CAAC,QAAQ,EACb,MAAM,CACP,CAAA;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,IAAI,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;YAEtD,OAAO,QAAQ,CAAA;SAChB;aAAM;YAEL,OAAO,mBAAmB,CACxB,+BAA+B,QAAQ,CAAC,KAAK,EAAE,EAC/C,IAAI,CAAC,EAAE,EACP,QAAQ,CAAC,MAAM,IAAI,WAAW,EAC9B,QAAQ,CAAC,MAAM,CAChB,CAAA;SACF;IACH,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,MAAqB,EACrB,MAAc;QAGd,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAErD,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;YAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAC1E,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC7B,OAAO,EAAE,CAAC,IAAI,CAAC,CAAA;aAChB;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,uBAAuB,CAAC,CAAA;aACvD;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,aAAa,CAAC,WAAwB;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAC1C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YACtC,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAA;QACzC,MAAM,EAAE,GACN,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC;YACvC,OAAO,WAAW,CAAC,cAAc,KAAK,QAAQ;YAC9C,aAAa,CAAC,cAAc,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;QAC1D,OAAO,OAAO,EAAE,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACnD,CAAC;IAED,mBAAmB;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAC1C,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;gBACL,MAAM,EAAE,UAAU;gBAClB,KAAK,EAAE,uBAAuB,IAAI,CAAC,EAAE,sCAAsC;aAC5E,CAAA;SACF;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YAC7B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;SACxB;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAA;QACnE,MAAM,KAAK,GACT,IAAI,CAAC,MAAM,KAAK,SAAS;YACvB,CAAC,CAAC,oCAAoC,IAAI,CAAC,EAAE,gBAAgB;YAC7D,CAAC,CAAC,gCAAgC,IAAI,CAAC,EAAE,OAAO,IAAI,CAAC,MAAM,GAAG,CAAA;QAClE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;IACzE,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,WAAwB;QACpD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3C,IAAI,IAAI,EAAE,MAAM,KAAK,SAAS,EAAE;YAC9B,OAAO;gBACL,GAAG,MAAM;gBACT,IAAI,EAAE;oBACJ,GAAG,MAAM,CAAC,IAAI;oBACd,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;iBACtC;aACF,CAAA;SACF;QAED,OAAO;YACL,GAAG,MAAM;YACT,QAAQ,EAAE;gBACR,GAAG,MAAM,CAAC,QAAQ;gBAClB,GAAG,IAAI,CAAC,mBAAmB,EAAE;aAC9B;YACD,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;SACrC,CAAA;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/service/Service.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,OAAO,CAAA;AAC5B,OAAO,QAAQ,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACtE,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,SAAS,EACT,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,UAAU,MAAM,iBAAiB,CAAA;AAExC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AACpD,OAAO,eAAe,EAAE,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAcxC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;AAgB/B,MAAM,CAAC,OAAO,OAAO,OAAO;IAC1B,EAAE,CAAQ;IACV,IAAI,CAAS;IAEb,QAAQ,CAAqB;IAC7B,QAAQ,CAAoB;IAC5B,UAAU,CAAY;IACtB,YAAY,CAAa;IAEzB,KAAK,CAAO;IACZ,aAAa,
|
|
1
|
+
{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/service/Service.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,OAAO,CAAA;AAC5B,OAAO,QAAQ,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACtE,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,SAAS,EACT,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,UAAU,MAAM,iBAAiB,CAAA;AAExC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AACpD,OAAO,eAAe,EAAE,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAcxC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;AAgB/B,MAAM,CAAC,OAAO,OAAO,OAAO;IAC1B,EAAE,CAAQ;IACV,IAAI,CAAS;IAEb,QAAQ,CAAqB;IAC7B,QAAQ,CAAoB;IAC5B,UAAU,CAAY;IACtB,YAAY,CAAa;IAEzB,KAAK,CAAO;IACZ,aAAa,CAAS;IACtB,WAAW,CAAmB;IAE9B,yBAAyB,CAAA;IACzB,uBAAuB,CAAA;IACvB,WAAW,CAAY;IAEvB,YACE,EACE,EAAE,EAAE,SAAS,EACb,WAAW,EAAE,aAAa,EAC1B,QAAQ,EAAE,WAAW,GAAG,EAAE,EAC1B,IAAI,EACJ,IAAI,EACJ,OAAO,GAAG,EAAE,EACZ,QAAQ,EACR,SAAS,EAAE,YAAY,GAAG,EAAE,GACjB,EACb,EACE,YAAY,EACZ,QAAQ,GAAG,EAAE,EACb,cAAc,GAAG,EAAE,EACnB,KAAK,EACL,OAAO,EACP,UAAU,GAAG,EAAE,EACf,UAAU,GAAG,EAAE,EACf,IAAI,GAAG,GAAG,EAAE,CAAC,SAAS,GACZ;QAEZ,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,EAAE,EAAE;YACrD,MAAM,IAAI,SAAS,CAAC,qCAAqC,CAAC,CAAA;SAC3D;QAED,IAAI,CAAC,EAAE,GAAG,SAAS,CAAA;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QAEvB,MAAM,WAAW,GAAG,UAAU,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;QAC3D,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,SAAS,CACjB,YAAY,SAAS,qCAAqC,aAAa,GAAG,CAC3E,CAAA;SACF;QACD,IAAI,CAAC,YAAY,GAAG,WAAW,CAAA;QAE/B,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,cAAc,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACrD,IAAI,CAAC,aAAa,GAAG,mBAAmB,CAAC,cAAc,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QAErE,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QACnE,IAAI,CAAC,uBAAuB,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAE/D,MAAM,eAAe,GAAG,WAAW,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QAC1D,MAAM,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;QAC9C,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAA;QAE1C,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,GAAG,CACzD,CAAC,QAAQ,EAAE,EAAE,CACX,IAAI,QAAQ,CACV,QAAQ,EACR,SAAS,EACT,QAAQ,CAAC,OAAO;YACd,CAAC,CAAC,YAAY,CAAC,cAAc,EAAE,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAChE,CAAC,CAAC,cAAc,EAClB,UAAU,EACV,QAAQ,EACR,eAAe,EACf,WAAW,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CACzC,CACJ,CAAA;QAED,IAAI,CAAC,WAAW;YACd,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAA;QAE7D,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,CAC/B,IAAI,CAAC,YAAY,EACjB,cAAc,CAAC,WAAW,EAC1B,IAAI,CACL,CAAA;IACH,CAAC;IAKD,KAAK,CAAC,kBAAkB,CACtB,MAAc,EACd,UAAU,GAAG,KAAK;QAElB,OAAO,MAAM,QAAQ,CAAC,oBAAoB,CACxC,IAAI,CAAC,UAAU,EACf,MAAM,EACN,UAAU,CACX,CAAA;IACH,CAAC;IAMD,eAAe,CAAC,MAAc;QAC5B,OAAO,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;IAC7D,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,MAAc,EAAE,QAAkB;QACpD,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC5D,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC9D,MAAM,YAAY,GAAG,WAAW,CAAC,iBAAiB,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;QACrE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACzD,YAAY,EACZ,QAAQ,CAAC,eAAe,CACzB,CAAA;QAED,IAAI,aAAqB,CAAA;QACzB,IAAI;YACF,aAAa,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAa,CAAA;SAC1E;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,gBAAgB,CACrB,MAAM,EACN,iCACE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,EAAE,EACF,gBAAgB,CACjB,CAAA;SACF;QAED,OAAO,iBAAiB,CAAC,aAAa,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;IAClE,CAAC;IAMD,KAAK,CAAC,qBAAqB,CACzB,MAAc,EACd,QAAkB;QAElB,IAAI,OAAe,CAAA;QACnB,IAAI;YACF,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAa,CAAA;SAC3D;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,gBAAgB,CACrB,MAAM,EACN,0CACE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,EAAE,EACF,yBAAyB,CAC1B,CAAA;SACF;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC7D,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;QACrD,MAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAA;QACvE,OAAO,IAAI,CAAC,uBAAuB,CAAC,UAAU,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;IAC3E,CAAC;IAKD,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,QAAkB;QACrD,IAAI,OAAO,CAAA;QACX,IAAI;YACF,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAa,CAAA;SAC3D;QAAC,OAAO,KAAK,EAAE;YACd,OAAO;gBACL,GAAG,MAAM,CAAC,QAAQ;gBAClB,GAAG,mBAAmB,CACpB,kCACE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,EAAE,EACF,iBAAiB,CAClB;aACF,CAAA;SACF;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC7D,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;QACtD,MAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAA;QACtE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,yBAAyB,CACvD,UAAU,EACV,QAAQ,CAAC,gBAAgB,CAC1B,CAAA;QAED,OAAO,QAAQ,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;IAC1C,CAAC;IAMD,KAAK,CAAC,sBAAsB,CAC1B,MAAc,EACd,QAAkB;QAElB,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC5D,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC3D,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAC3D,YAAY,EACZ,QAAQ,CAAC,gBAAgB,CAC1B,CAAA;QAED,IAAI,aAAqB,CAAA;QACzB,IAAI;YAEF,aAAa,GAAG,MAAM,QAAQ,CAAC,MAAM,CACnC,gBAAgB,EAChB,IAAI,CACL,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO;gBACL,GAAG,MAAM,CAAC,QAAQ;gBAClB,GAAG,mBAAmB,CACpB,kCACE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,EAAE,EACF,0BAA0B,CAC3B;aACF,CAAA;SACF;QAED,MAAM,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CACpC,aAAa,EACb,0BAA0B,EAC1B,KAAK,CACN,CAAA;QACD,OAAO,QAAQ,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;IAC1C,CAAC;IAMD,KAAK,CAAC,IAAI,CAAC,MAAc;QAEvB,IAAI,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE;YAC3B,OAAO,MAAM,CAAC,QAAQ,CAAA;SACvB;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,OAAO,mBAAmB,CACxB,YAAY,IAAI,CAAC,EAAE,0BAA0B,EAC7C,WAAW,IAAI,CAAC,EAAE,EAAE,CACrB,CAAA;SACF;QAED,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;YAC/B,OAAO,mBAAmB,CACxB,gBAAgB,EAChB,oBAAoB,IAAI,CAAC,EAAE,EAAE,EAC7B,WAAW,CACZ,CAAA;SACF;QAGD,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;YACrC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;YAC5D,IAAI,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE;gBAC3B,OAAO,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;aAC9D;SACF;QAED,OAAO,SAAS,CACd,MAAM,IAAI,CAAC,WAAW,CACpB,iBAAiB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,CAChE,CAAC,MAAM,CAAC,EACT,sBAAsB,IAAI,CAAC,EAAE,EAAE,CAChC,CAAA;IACH,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,QAAkB;QAC7B,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAErC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,KAAK,CAAC,YAAY,IAAI,CAAC,EAAE,0BAA0B,CAAC,CAAA;YACpD,OAAO,mBAAmB,CACxB,YAAY,IAAI,CAAC,EAAE,0BAA0B,EAC7C,WAAW,IAAI,CAAC,EAAE,EAAE,CACrB,CAAA;SACF;QAED,IAAI,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,UAAU,EAAE;YAClD,KAAK,CAAC,kCAAkC,CAAC,CAAA;YACzC,OAAO,mBAAmB,CACxB,kCAAkC,EAClC,WAAW,IAAI,CAAC,EAAE,EAAE,EACpB,UAAU,CACX,CAAA;SACF;QAED,IACE,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,KAAK,UAAU;YACpD,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC9C;YACA,KAAK,CAAC,yCAAyC,CAAC,CAAA;YAChD,OAAO,mBAAmB,CACxB,yCAAyC,EACzC,WAAW,IAAI,CAAC,EAAE,EAAE,EACpB,UAAU,CACX,CAAA;SACF;QAED,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE;YACxD,KAAK,CAAC,wBAAwB,CAAC,CAAA;YAC/B,OAAO,SAAS,CACd,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAChC,WAAW,IAAI,CAAC,EAAE,EAAE,EACpB,IAAI,CACL,CAAA;SACF;QAED,IACE,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAC9B,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAC7C,CAAC,EACF;YACA,KAAK,CAAC,wBAAwB,IAAI,CAAC,EAAE,8BAA8B,CAAC,CAAA;YACpE,OAAO,mBAAmB,CACxB,wBAAwB,IAAI,CAAC,EAAE,8BAA8B,EAC7D,WAAW,IAAI,CAAC,EAAE,EAAE,CACrB,CAAA;SACF;QAED,KAAK,CAAC,kCAAkC,CAAC,CAAA;QACzC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAC7B,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,EACrD,IAAI,CAAC,WAAW,CAAC,MAAM,EACvB,oBAAoB,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,CAClD,CAAA;IACH,CAAC;IAKD,KAAK,CAAC,KAAK;QACT,KAAK,CAAC,kBAAkB,IAAI,CAAC,EAAE,GAAG,CAAC,CAAA;QAEnC,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YAC3D,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;YACvB,KAAK,CAAC,QAAQ,CAAC,CAAA;SAChB;aAAM;YACL,KAAK,CAAC,6BAA6B,CAAC,CAAA;SACrC;QAED,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;IACzB,CAAC;CACF"}
|
package/dist/service/types.d.ts
CHANGED
|
@@ -25,7 +25,7 @@ export interface AuthDef {
|
|
|
25
25
|
}
|
|
26
26
|
export type AuthProp = AuthDef | string | boolean | null;
|
|
27
27
|
export interface AuthObject {
|
|
28
|
-
incoming?: AuthProp;
|
|
28
|
+
incoming?: AuthProp | AuthProp[];
|
|
29
29
|
outgoing?: AuthProp;
|
|
30
30
|
}
|
|
31
31
|
export interface TransporterOptions extends Record<string, unknown> {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Auth from '../Auth.js';
|
|
2
2
|
import type { Authentication } from '../types.js';
|
|
3
3
|
import type { Action, Response, Dispatch, Middleware } from '../../types.js';
|
|
4
|
-
export declare const authenticateCallback: (
|
|
4
|
+
export declare const authenticateCallback: (auths: Auth[] | undefined, serviceId: string) => (authentication: Authentication, action?: Action | null) => Promise<Response<unknown>>;
|
|
5
5
|
export declare function dispatchIncoming(dispatch: Dispatch, middleware: Middleware, serviceId: string): (action: Action | null) => import("p-progress").PProgress<Response<unknown>>;
|
|
@@ -50,13 +50,23 @@ const dispatchWithProgress = (dispatch, setProgress, serviceId) => async functio
|
|
|
50
50
|
p.onProgress(setProgress);
|
|
51
51
|
return setOrigin(await p, `service:${serviceId}`);
|
|
52
52
|
};
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
async function runAuths(auths, authentication, action) {
|
|
54
|
+
let response = undefined;
|
|
55
|
+
for (const auth of auths) {
|
|
56
|
+
response = await auth.validate(authentication, action);
|
|
57
|
+
if (response.status !== 'noaccess' && response.access?.ident) {
|
|
58
|
+
return response;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return response || { status: 'noaccess', error: 'No authentication was run' };
|
|
62
|
+
}
|
|
63
|
+
export const authenticateCallback = (auths, serviceId) => async function authenticateFromListen(authentication, action) {
|
|
64
|
+
if (auths === undefined) {
|
|
55
65
|
return createErrorResponse(`Could not authenticate. Service '${serviceId}' has no incoming authenticator`, `auth:service:${serviceId}`, 'noaction');
|
|
56
66
|
}
|
|
57
67
|
else {
|
|
58
|
-
const response =
|
|
59
|
-
return setOrigin(response, `auth:service:${serviceId}`, true);
|
|
68
|
+
const response = await runAuths(auths, authentication, action || null);
|
|
69
|
+
return setOrigin(markIdentAsKnown(response), `auth:service:${serviceId}`, true);
|
|
60
70
|
}
|
|
61
71
|
};
|
|
62
72
|
export function dispatchIncoming(dispatch, middleware, serviceId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incoming.js","sourceRoot":"","sources":["../../../src/service/utils/incoming.ts"],"names":[],"mappings":"AACA,OAAO,SAA+B,MAAM,YAAY,CAAA;AACxD,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,SAAS,GACV,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAU5C,MAAM,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAA;AAE7D,MAAM,mCAAmC,GAAG,CAC1C,MAAc,EACd,SAAiB,EACT,EAAE,CAAC,CAAC;IACZ,GAAG,MAAM;IACT,OAAO,EAAE;QACP,GAAG,MAAM,CAAC,OAAO;QACjB,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,IAAI,SAAS;KACzD;CACF,CAAC,CAAA;AAEF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAkB,EAAE,CACjD,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,CAAA;AAEjD,MAAM,YAAY,GAAG,CAAC,KAAoD,EAAE,EAAE,CAC5E,KAAK,CAAC,qBAAqB,CAAC,KAAK,IAAI,CAAA;AAEvC,SAAS,gBAAgB,CAAC,QAAkB;IAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAA;IACpC,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO;YACL,GAAG,QAAQ;YACX,MAAM,EAAE;gBACN,GAAG,QAAQ,CAAC,MAAM;gBAClB,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE;aACnD;SACF,CAAA;KACF;SAAM;QACL,OAAO,QAAQ,CAAA;KAChB;AACH,CAAC;AAED,MAAM,sBAAsB,GAAG,CAAC,EAC9B,CAAC,qBAAqB,CAAC,EAAE,CAAC,EAC1B,GAAG,kBAAkB,EACyB,EAAE,EAAE,CAAC,kBAAkB,CAAA;AAEvE,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,SAAiB;IAChE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,KAAK,CAAA;IAChC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACnB,OAAO,gBAAgB,CACrB,MAAM,EACN,sCAAsC,EACtC,gBAAgB,SAAS,EAAE,EAC3B,UAAU,CACX,CAAA;KACF;SAAM;QACL,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE;gBACJ,GAAG,MAAM,CAAC,IAAI;gBACd,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;aACvE;SACF,CAAA;KACF;AACH,CAAC;AAED,MAAM,oBAAoB,GAAG,CAC3B,QAAkB,EAClB,WAA6B,EAC7B,SAAiB,EACjB,EAAE,CACF,KAAK,WAAW,MAAc;IAC5B,IAAI,OAAO,MAAM,CAAC,QAAQ,EAAE,MAAM,KAAK,QAAQ,EAAE;QAC/C,OAAO,MAAM,CAAC,QAAQ,CAAA;KACvB;IAED,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC1B,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;IACzB,OAAO,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,SAAS,EAAE,CAAC,CAAA;AACnD,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"incoming.js","sourceRoot":"","sources":["../../../src/service/utils/incoming.ts"],"names":[],"mappings":"AACA,OAAO,SAA+B,MAAM,YAAY,CAAA;AACxD,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,SAAS,GACV,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAU5C,MAAM,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAA;AAE7D,MAAM,mCAAmC,GAAG,CAC1C,MAAc,EACd,SAAiB,EACT,EAAE,CAAC,CAAC;IACZ,GAAG,MAAM;IACT,OAAO,EAAE;QACP,GAAG,MAAM,CAAC,OAAO;QACjB,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,IAAI,SAAS;KACzD;CACF,CAAC,CAAA;AAEF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAkB,EAAE,CACjD,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,CAAA;AAEjD,MAAM,YAAY,GAAG,CAAC,KAAoD,EAAE,EAAE,CAC5E,KAAK,CAAC,qBAAqB,CAAC,KAAK,IAAI,CAAA;AAEvC,SAAS,gBAAgB,CAAC,QAAkB;IAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAA;IACpC,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO;YACL,GAAG,QAAQ;YACX,MAAM,EAAE;gBACN,GAAG,QAAQ,CAAC,MAAM;gBAClB,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE;aACnD;SACF,CAAA;KACF;SAAM;QACL,OAAO,QAAQ,CAAA;KAChB;AACH,CAAC;AAED,MAAM,sBAAsB,GAAG,CAAC,EAC9B,CAAC,qBAAqB,CAAC,EAAE,CAAC,EAC1B,GAAG,kBAAkB,EACyB,EAAE,EAAE,CAAC,kBAAkB,CAAA;AAEvE,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,SAAiB;IAChE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,KAAK,CAAA;IAChC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACnB,OAAO,gBAAgB,CACrB,MAAM,EACN,sCAAsC,EACtC,gBAAgB,SAAS,EAAE,EAC3B,UAAU,CACX,CAAA;KACF;SAAM;QACL,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE;gBACJ,GAAG,MAAM,CAAC,IAAI;gBACd,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;aACvE;SACF,CAAA;KACF;AACH,CAAC;AAED,MAAM,oBAAoB,GAAG,CAC3B,QAAkB,EAClB,WAA6B,EAC7B,SAAiB,EACjB,EAAE,CACF,KAAK,WAAW,MAAc;IAC5B,IAAI,OAAO,MAAM,CAAC,QAAQ,EAAE,MAAM,KAAK,QAAQ,EAAE;QAC/C,OAAO,MAAM,CAAC,QAAQ,CAAA;KACvB;IAED,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC1B,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;IACzB,OAAO,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,SAAS,EAAE,CAAC,CAAA;AACnD,CAAC,CAAA;AAEH,KAAK,UAAU,QAAQ,CACrB,KAAa,EACb,cAA8B,EAC9B,MAAqB;IAErB,IAAI,QAAQ,GAAyB,SAAS,CAAA;IAC9C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;QACtD,IAAI,QAAQ,CAAC,MAAM,KAAK,UAAU,IAAI,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;YAC5D,OAAO,QAAQ,CAAA;SAChB;KACF;IACD,OAAO,QAAQ,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAA;AAC/E,CAAC;AAID,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAyB,EACzB,SAAiB,EACjB,EAAE,CACF,KAAK,UAAU,sBAAsB,CACnC,cAA8B,EAC9B,MAAsB;IAEtB,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,OAAO,mBAAmB,CACxB,oCAAoC,SAAS,iCAAiC,EAC9E,gBAAgB,SAAS,EAAE,EAC3B,UAAU,CACX,CAAA;KACF;SAAM;QACL,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,MAAM,IAAI,IAAI,CAAC,CAAA;QACtE,OAAO,SAAS,CACd,gBAAgB,CAAC,QAAQ,CAAC,EAC1B,gBAAgB,SAAS,EAAE,EAC3B,IAAI,CACL,CAAA;KACF;AACH,CAAC,CAAA;AAIH,MAAM,UAAU,gBAAgB,CAC9B,QAAkB,EAClB,UAAsB,EACtB,SAAiB;IAEjB,OAAO,CAAC,MAAqB,EAAE,EAAE,CAC/B,SAAS,CAAW,KAAK,EAAE,WAAW,EAAE,EAAE;QACxC,IAAI,MAAM,EAAE;YACV,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAC9C,mCAAmC,CAAC,MAAM,EAAE,SAAS,CAAC,EACtD,SAAS,CACV,CAAA;YACD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAC/B,oBAAoB,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC,CACvD,CAAC,gBAAgB,CAAC,CAAA;YACnB,OAAO,CACL,SAAS,CAAC,QAAQ,EAAE,sBAAsB,SAAS,EAAE,CAAC,IAAI;gBACxD,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE,WAAW,SAAS,EAAE;aAC/B,CACF,CAAA;SACF;aAAM;YACL,OAAO;gBACL,MAAM,EAAE,UAAU;gBAClB,KAAK,EAAE,0BAA0B;gBACjC,MAAM,EAAE,WAAW,SAAS,EAAE;aAC/B,CAAA;SACF;IACH,CAAC,CAAC,CAAA;AACN,CAAC"}
|
|
@@ -2,4 +2,4 @@ import Auth from '../Auth.js';
|
|
|
2
2
|
import type { Authenticator } from '../../types.js';
|
|
3
3
|
import type { AuthObject, AuthProp } from '../types.js';
|
|
4
4
|
export declare function resolveAuth(authenticators: Record<string, Authenticator>, auths?: Record<string, Auth>, auth?: AuthObject | AuthProp): Auth | undefined;
|
|
5
|
-
export declare function resolveIncomingAuth(authenticators: Record<string, Authenticator>, auths?: Record<string, Auth>, auth?: AuthObject | AuthProp): Auth | undefined;
|
|
5
|
+
export declare function resolveIncomingAuth(authenticators: Record<string, Authenticator>, auths?: Record<string, Auth>, auth?: AuthObject | AuthProp): Auth[] | undefined;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import Auth from '../Auth.js';
|
|
2
2
|
import identAuth from '../../authenticators/ident.js';
|
|
3
|
-
import {
|
|
3
|
+
import { ensureArray } from '../../utils/array.js';
|
|
4
|
+
import { isNotNullOrUndefined, isObject } from '../../utils/is.js';
|
|
4
5
|
import { setUpAuth } from '../../instance.js';
|
|
5
6
|
import { lookupById } from '../../utils/indexUtils.js';
|
|
6
7
|
const isAuthDef = (def) => isObject(def) &&
|
|
@@ -25,7 +26,10 @@ export function resolveAuth(authenticators, auths, auth) {
|
|
|
25
26
|
}
|
|
26
27
|
export function resolveIncomingAuth(authenticators, auths, auth) {
|
|
27
28
|
if (isObject(auth) && auth.incoming) {
|
|
28
|
-
|
|
29
|
+
const incomingAuths = ensureArray(auth.incoming);
|
|
30
|
+
return incomingAuths
|
|
31
|
+
.map((incoming) => resolveAuth(authenticators, auths, incoming))
|
|
32
|
+
.filter(isNotNullOrUndefined);
|
|
29
33
|
}
|
|
30
34
|
else {
|
|
31
35
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveAuth.js","sourceRoot":"","sources":["../../../src/service/utils/resolveAuth.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,YAAY,CAAA;AAC7B,OAAO,SAAS,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"resolveAuth.js","sourceRoot":"","sources":["../../../src/service/utils/resolveAuth.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,YAAY,CAAA;AAC7B,OAAO,SAAS,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAItD,MAAM,SAAS,GAAG,CAAC,GAAY,EAAkB,EAAE,CACjD,QAAQ,CAAC,GAAG,CAAC;IACb,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ;IAC1B,OAAO,GAAG,CAAC,aAAa,KAAK,QAAQ,CAAA;AAEvC,MAAM,UAAU,WAAW,CACzB,cAA6C,EAC7C,KAA4B,EAC5B,IAA4B;IAE5B,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE;QACrC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAA;KACrB;IAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,OAAO,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;KAC/B;SAAM,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE;QAC1B,OAAO,SAAS,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAA;KACvC;SAAM,IAAI,IAAI,EAAE;QACf,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;KACxC;SAAM;QACL,OAAO,SAAS,CAAA;KACjB;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,cAA6C,EAC7C,KAA4B,EAC5B,IAA4B;IAE5B,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;QACnC,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChD,OAAO,aAAa;aACjB,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;aAC/D,MAAM,CAAC,oBAAoB,CAAC,CAAA;KAChC;SAAM;QACL,OAAO,SAAS,CAAA;KACjB;AACH,CAAC"}
|
package/dist/types.d.ts
CHANGED
|
@@ -118,7 +118,7 @@ export interface Authenticator<T extends Authentication = Authentication, U exte
|
|
|
118
118
|
extractAuthKey?: (options: U | null, action: Action | null) => string | undefined;
|
|
119
119
|
authenticate: (options: AuthOptions | null, action: Action | null) => Promise<T>;
|
|
120
120
|
isAuthenticated: (authentication: T | null, options: U | null, action: Action | null) => boolean;
|
|
121
|
-
validate?: (authentication: T | null, options: AuthOptions | null, action: Action | null) => Promise<
|
|
121
|
+
validate?: (authentication: T | null, options: AuthOptions | null, action: Action | null) => Promise<Response>;
|
|
122
122
|
authentication: {
|
|
123
123
|
[asFunction: string]: (authentication: T | null) => Record<string, unknown>;
|
|
124
124
|
};
|
package/dist/utils/action.d.ts
CHANGED
|
@@ -31,7 +31,7 @@ export declare function setResponseOnAction(action: Action, response?: Response)
|
|
|
31
31
|
meta?: Meta | undefined;
|
|
32
32
|
};
|
|
33
33
|
export declare function setOptionsOnAction(action: Action, endpoint: Endpoint): Action;
|
|
34
|
-
export declare function createErrorResponse(error: unknown, origin: string, status?: string): Response;
|
|
34
|
+
export declare function createErrorResponse(error: unknown, origin: string, status?: string, reason?: string): Response;
|
|
35
35
|
export declare function setErrorOnAction(action: Action, error: unknown, origin: string, status?: string): Action;
|
|
36
36
|
export declare function combineResponses(responses: Response[]): Response<unknown>;
|
|
37
37
|
export declare const setOrigin: (response: Response, origin: string, doPrefix?: boolean) => Response<unknown>;
|
package/dist/utils/action.js
CHANGED
|
@@ -20,7 +20,7 @@ export function setOptionsOnAction(action, endpoint) {
|
|
|
20
20
|
meta: { ...action.meta, options: endpoint?.options.transporter || {} },
|
|
21
21
|
};
|
|
22
22
|
}
|
|
23
|
-
export function createErrorResponse(error, origin, status = 'error') {
|
|
23
|
+
export function createErrorResponse(error, origin, status = 'error', reason) {
|
|
24
24
|
return {
|
|
25
25
|
status,
|
|
26
26
|
error: error instanceof Error
|
|
@@ -28,6 +28,7 @@ export function createErrorResponse(error, origin, status = 'error') {
|
|
|
28
28
|
: typeof error === 'string'
|
|
29
29
|
? error
|
|
30
30
|
: 'Unknown error',
|
|
31
|
+
...(reason ? { reason } : {}),
|
|
31
32
|
...(origin ? { origin } : {}),
|
|
32
33
|
};
|
|
33
34
|
}
|
package/dist/utils/action.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../src/utils/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAOzC,MAAM,UAAU,YAAY,CAC1B,IAAa,EACb,UAAmB,EAAE,EACrB,OAAa,EAAE;IAEf,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAChC,CAAC;AAKD,MAAM,UAAU,sBAAsB,CAAC,MAAc,EAAE,IAAc;IACnE,OAAO;QACL,GAAG,MAAM;QACT,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE;KACrC,CAAA;AACH,CAAC;AAKD,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,QAAmB;IACrE,OAAO,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAA;AAChD,CAAC;AAKD,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,QAAkB;IACnE,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE;KACvE,CAAA;AACH,CAAC;AAKD,MAAM,UAAU,mBAAmB,CACjC,KAAc,EACd,MAAc,EACd,MAAM,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../src/utils/action.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import modifyOperationObject from './modifyOperationObject.js';
|
|
2
|
-
import unwrapValue from './unwrapValue.js';
|
|
3
2
|
const transformersFromSchemas = (schemas) => Object.fromEntries([...schemas.values()].map((schema) => [
|
|
4
3
|
Symbol.for(`cast_${schema.id}`),
|
|
5
4
|
() => () => (data, { rev = false }) => schema.castFn(data, rev),
|
|
@@ -16,7 +15,6 @@ export default function createMapOptions(schemas, mutations, transformers, dicti
|
|
|
16
15
|
revAlias: 'to',
|
|
17
16
|
nonvalues: [undefined, null, ''],
|
|
18
17
|
modifyOperationObject,
|
|
19
|
-
modifyGetValue: unwrapValue,
|
|
20
18
|
};
|
|
21
19
|
}
|
|
22
20
|
//# sourceMappingURL=createMapOptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMapOptions.js","sourceRoot":"","sources":["../../src/utils/createMapOptions.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"createMapOptions.js","sourceRoot":"","sources":["../../src/utils/createMapOptions.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,4BAA4B,CAAA;AAU9D,MAAM,uBAAuB,GAAG,CAC9B,OAA4B,EACC,EAAE,CAC/B,MAAM,CAAC,WAAW,CAChB,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;IACpC,MAAM,CAAC,GAAG,CAAC,QAAQ,MAAM,CAAC,EAAE,EAAE,CAAC;IAC/B,GAAG,EAAE,CACH,GAAG,EAAE,CACL,CAAC,IAAI,EAAE,EAAE,GAAG,GAAG,KAAK,EAAE,EAAE,EAAE,CACxB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC;CAC7B,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,OAA4B,EAC5B,SAA+C,EAC/C,YAA6D,EAC7D,YAA2B;IAE3B,OAAO;QACL,SAAS,EAAE,EAAE,GAAG,SAAS,EAAE;QAC3B,YAAY,EAAE;YACZ,GAAG,YAAY;YACf,GAAG,uBAAuB,CAAC,OAAO,CAAC;SACpC;QACD,YAAY;QACZ,QAAQ,EAAE,MAAM;QAChB,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;QAChC,qBAAqB;KACtB,CAAA;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "1.0.0",
|
|
3
|
+
"version": "1.1.0-rc.0",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
}
|
|
19
19
|
},
|
|
20
20
|
"scripts": {
|
|
21
|
-
"test": "c8 --reporter=text-summary ava --config ./ava-dist.config.cjs",
|
|
21
|
+
"test": "npm run build && c8 --reporter=text-summary ava --config ./ava-dist.config.cjs",
|
|
22
22
|
"test:watch": "npm run dev",
|
|
23
23
|
"dev": "ava --watch",
|
|
24
24
|
"build": "tsc",
|
|
25
25
|
"prepare": "npm run build",
|
|
26
26
|
"coverage": "c8 report",
|
|
27
27
|
"lint": "eslint --ext .ts src",
|
|
28
|
-
"verify": "npm run lint && npm
|
|
28
|
+
"verify": "npm run lint && npm test"
|
|
29
29
|
},
|
|
30
30
|
"repository": {
|
|
31
31
|
"type": "git",
|
|
@@ -56,10 +56,10 @@
|
|
|
56
56
|
"devDependencies": {
|
|
57
57
|
"@integreat/ts-dev-setup": "^4.1.1",
|
|
58
58
|
"@types/sinon": "^10.0.16",
|
|
59
|
-
"integreat-adapter-json": "^0.
|
|
60
|
-
"integreat-adapter-uri": "^
|
|
61
|
-
"integreat-transformers": "^0.
|
|
62
|
-
"integreat-transporter-http": "0.
|
|
59
|
+
"integreat-adapter-json": "^1.0.0",
|
|
60
|
+
"integreat-adapter-uri": "^1.0.0",
|
|
61
|
+
"integreat-transformers": "^1.0.0",
|
|
62
|
+
"integreat-transporter-http": "1.0.0",
|
|
63
63
|
"nock": "^13.3.2",
|
|
64
64
|
"sinon": "^15.2.0"
|
|
65
65
|
}
|