@konker.dev/middleware-fp 0.1.9 → 0.1.11
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/dist/contrib/base64BodyDecoder.d.ts +3 -6
- package/dist/contrib/base64BodyDecoder.d.ts.map +1 -1
- package/dist/contrib/base64BodyDecoder.js +3 -2
- package/dist/contrib/base64BodyDecoder.js.map +1 -1
- package/dist/contrib/base64BodyDecoder.test.d.ts +1 -4
- package/dist/contrib/base64BodyDecoder.test.d.ts.map +1 -1
- package/dist/contrib/base64BodyDecoder.test.js +40 -19
- package/dist/contrib/base64BodyDecoder.test.js.map +1 -1
- package/dist/contrib/basicAuthAuthenticator.d.ts +6 -4
- package/dist/contrib/basicAuthAuthenticator.d.ts.map +1 -1
- package/dist/contrib/basicAuthAuthenticator.js.map +1 -1
- package/dist/contrib/basicAuthAuthenticator.test.d.ts.map +1 -1
- package/dist/contrib/basicAuthAuthenticator.test.js +29 -15
- package/dist/contrib/basicAuthAuthenticator.test.js.map +1 -1
- package/dist/contrib/basicAuthDecoder.d.ts +6 -5
- package/dist/contrib/basicAuthDecoder.d.ts.map +1 -1
- package/dist/contrib/basicAuthDecoder.js +2 -2
- package/dist/contrib/basicAuthDecoder.js.map +1 -1
- package/dist/contrib/basicAuthDecoder.test.js +27 -12
- package/dist/contrib/basicAuthDecoder.test.js.map +1 -1
- package/dist/contrib/bodyValidator.d.ts +4 -7
- package/dist/contrib/bodyValidator.d.ts.map +1 -1
- package/dist/contrib/bodyValidator.js +3 -3
- package/dist/contrib/bodyValidator.js.map +1 -1
- package/dist/contrib/bodyValidator.test.d.ts +0 -3
- package/dist/contrib/bodyValidator.test.d.ts.map +1 -1
- package/dist/contrib/bodyValidator.test.js +21 -7
- package/dist/contrib/bodyValidator.test.js.map +1 -1
- package/dist/contrib/cacheInMemory.d.ts +2 -2
- package/dist/contrib/cacheInMemory.d.ts.map +1 -1
- package/dist/contrib/cacheInMemory.js.map +1 -1
- package/dist/contrib/cacheInMemory.test.d.ts +1 -3
- package/dist/contrib/cacheInMemory.test.d.ts.map +1 -1
- package/dist/contrib/cacheInMemory.test.js +20 -7
- package/dist/contrib/cacheInMemory.test.js.map +1 -1
- package/dist/contrib/cacheMomento.d.ts +4 -3
- package/dist/contrib/cacheMomento.d.ts.map +1 -1
- package/dist/contrib/cacheMomento.js +5 -2
- package/dist/contrib/cacheMomento.js.map +1 -1
- package/dist/contrib/cacheMomento.test.d.ts +1 -3
- package/dist/contrib/cacheMomento.test.d.ts.map +1 -1
- package/dist/contrib/cacheMomento.test.js +30 -18
- package/dist/contrib/cacheMomento.test.js.map +1 -1
- package/dist/contrib/envValidator.d.ts +2 -2
- package/dist/contrib/envValidator.d.ts.map +1 -1
- package/dist/contrib/envValidator.js +3 -13
- package/dist/contrib/envValidator.js.map +1 -1
- package/dist/contrib/envValidator.test.d.ts +0 -3
- package/dist/contrib/envValidator.test.d.ts.map +1 -1
- package/dist/contrib/envValidator.test.js +20 -6
- package/dist/contrib/envValidator.test.js.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/index.d.ts +2 -3
- package/dist/contrib/headerSignatureAuthorizer/index.d.ts.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/index.js.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/index.test.d.ts.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/index.test.js +21 -14
- package/dist/contrib/headerSignatureAuthorizer/index.test.js.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/lib.d.ts +2 -2
- package/dist/contrib/headerSignatureAuthorizer/lib.d.ts.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/lib.js +3 -0
- package/dist/contrib/headerSignatureAuthorizer/lib.js.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/lib.test.js +4 -0
- package/dist/contrib/headerSignatureAuthorizer/lib.test.js.map +1 -1
- package/dist/contrib/headersNormalizer/index.d.ts +4 -4
- package/dist/contrib/headersNormalizer/index.d.ts.map +1 -1
- package/dist/contrib/headersNormalizer/index.js +1 -1
- package/dist/contrib/headersNormalizer/index.js.map +1 -1
- package/dist/contrib/headersNormalizer/index.test.d.ts +1 -8
- package/dist/contrib/headersNormalizer/index.test.d.ts.map +1 -1
- package/dist/contrib/headersNormalizer/index.test.js +38 -35
- package/dist/contrib/headersNormalizer/index.test.js.map +1 -1
- package/dist/contrib/headersNormalizer/lib.d.ts +5 -4
- package/dist/contrib/headersNormalizer/lib.d.ts.map +1 -1
- package/dist/contrib/headersNormalizer/lib.js +8 -11
- package/dist/contrib/headersNormalizer/lib.js.map +1 -1
- package/dist/contrib/headersNormalizer/lib.test.d.ts +1 -3
- package/dist/contrib/headersNormalizer/lib.test.d.ts.map +1 -1
- package/dist/contrib/headersNormalizer/lib.test.js +6 -15
- package/dist/contrib/headersNormalizer/lib.test.js.map +1 -1
- package/dist/contrib/headersNormalizer/types.d.ts +4 -13
- package/dist/contrib/headersNormalizer/types.d.ts.map +1 -1
- package/dist/contrib/headersValidator.d.ts +4 -5
- package/dist/contrib/headersValidator.d.ts.map +1 -1
- package/dist/contrib/headersValidator.js +3 -3
- package/dist/contrib/headersValidator.js.map +1 -1
- package/dist/contrib/headersValidator.test.d.ts +0 -3
- package/dist/contrib/headersValidator.test.d.ts.map +1 -1
- package/dist/contrib/headersValidator.test.js +33 -8
- package/dist/contrib/headersValidator.test.js.map +1 -1
- package/dist/contrib/helmetJsHeaders.d.ts +2 -6
- package/dist/contrib/helmetJsHeaders.d.ts.map +1 -1
- package/dist/contrib/helmetJsHeaders.js +2 -12
- package/dist/contrib/helmetJsHeaders.js.map +1 -1
- package/dist/contrib/helmetJsHeaders.test.d.ts +1 -3
- package/dist/contrib/helmetJsHeaders.test.d.ts.map +1 -1
- package/dist/contrib/helmetJsHeaders.test.js +4 -4
- package/dist/contrib/helmetJsHeaders.test.js.map +1 -1
- package/dist/contrib/identity.d.ts +2 -2
- package/dist/contrib/identity.d.ts.map +1 -1
- package/dist/contrib/identity.js.map +1 -1
- package/dist/contrib/identity.test.d.ts +1 -3
- package/dist/contrib/identity.test.d.ts.map +1 -1
- package/dist/contrib/identity.test.js +16 -6
- package/dist/contrib/identity.test.js.map +1 -1
- package/dist/contrib/index.d.ts +1 -4
- package/dist/contrib/index.d.ts.map +1 -1
- package/dist/contrib/index.js +1 -4
- package/dist/contrib/index.js.map +1 -1
- package/dist/contrib/jsonBodyParser.d.ts +4 -7
- package/dist/contrib/jsonBodyParser.d.ts.map +1 -1
- package/dist/contrib/jsonBodyParser.js +3 -3
- package/dist/contrib/jsonBodyParser.js.map +1 -1
- package/dist/contrib/jsonBodyParser.test.d.ts +1 -3
- package/dist/contrib/jsonBodyParser.test.d.ts.map +1 -1
- package/dist/contrib/jsonBodyParser.test.js +31 -15
- package/dist/contrib/jsonBodyParser.test.js.map +1 -1
- package/dist/contrib/jwtAuthenticator.d.ts +6 -5
- package/dist/contrib/jwtAuthenticator.d.ts.map +1 -1
- package/dist/contrib/jwtAuthenticator.js +3 -3
- package/dist/contrib/jwtAuthenticator.js.map +1 -1
- package/dist/contrib/jwtAuthenticator.test.d.ts.map +1 -1
- package/dist/contrib/jwtAuthenticator.test.js +33 -19
- package/dist/contrib/jwtAuthenticator.test.js.map +1 -1
- package/dist/contrib/jwtAuthenticatorRsa.d.ts +6 -5
- package/dist/contrib/jwtAuthenticatorRsa.d.ts.map +1 -1
- package/dist/contrib/jwtAuthenticatorRsa.js +3 -3
- package/dist/contrib/jwtAuthenticatorRsa.js.map +1 -1
- package/dist/contrib/jwtAuthenticatorRsa.test.d.ts.map +1 -1
- package/dist/contrib/jwtAuthenticatorRsa.test.js +28 -14
- package/dist/contrib/jwtAuthenticatorRsa.test.js.map +1 -1
- package/dist/contrib/jwtDecoder.d.ts +6 -5
- package/dist/contrib/jwtDecoder.d.ts.map +1 -1
- package/dist/contrib/jwtDecoder.js +2 -2
- package/dist/contrib/jwtDecoder.js.map +1 -1
- package/dist/contrib/jwtDecoder.test.js +30 -14
- package/dist/contrib/jwtDecoder.test.js.map +1 -1
- package/dist/contrib/momentoClientInit.d.ts +2 -2
- package/dist/contrib/momentoClientInit.d.ts.map +1 -1
- package/dist/contrib/momentoClientInit.js.map +1 -1
- package/dist/contrib/momentoClientInit.test.d.ts +1 -3
- package/dist/contrib/momentoClientInit.test.d.ts.map +1 -1
- package/dist/contrib/momentoClientInit.test.js +16 -6
- package/dist/contrib/momentoClientInit.test.js.map +1 -1
- package/dist/contrib/pathParametersValidator.d.ts +4 -6
- package/dist/contrib/pathParametersValidator.d.ts.map +1 -1
- package/dist/contrib/pathParametersValidator.js +4 -4
- package/dist/contrib/pathParametersValidator.js.map +1 -1
- package/dist/contrib/pathParametersValidator.test.d.ts +0 -3
- package/dist/contrib/pathParametersValidator.test.d.ts.map +1 -1
- package/dist/contrib/pathParametersValidator.test.js +20 -11
- package/dist/contrib/pathParametersValidator.test.js.map +1 -1
- package/dist/contrib/pathTokenAuthorizer.d.ts +2 -3
- package/dist/contrib/pathTokenAuthorizer.d.ts.map +1 -1
- package/dist/contrib/pathTokenAuthorizer.js.map +1 -1
- package/dist/contrib/pathTokenAuthorizer.test.d.ts.map +1 -1
- package/dist/contrib/pathTokenAuthorizer.test.js +17 -19
- package/dist/contrib/pathTokenAuthorizer.test.js.map +1 -1
- package/dist/contrib/queryStringValidator.d.ts +3 -6
- package/dist/contrib/queryStringValidator.d.ts.map +1 -1
- package/dist/contrib/queryStringValidator.js +3 -3
- package/dist/contrib/queryStringValidator.js.map +1 -1
- package/dist/contrib/queryStringValidator.test.d.ts +0 -3
- package/dist/contrib/queryStringValidator.test.d.ts.map +1 -1
- package/dist/contrib/queryStringValidator.test.js +20 -11
- package/dist/contrib/queryStringValidator.test.js.map +1 -1
- package/dist/contrib/requestResponseLogger.d.ts +2 -2
- package/dist/contrib/requestResponseLogger.d.ts.map +1 -1
- package/dist/contrib/requestResponseLogger.js.map +1 -1
- package/dist/contrib/requestResponseLogger.test.js +7 -10
- package/dist/contrib/requestResponseLogger.test.js.map +1 -1
- package/dist/contrib/responseProcessor.d.ts +4 -0
- package/dist/contrib/responseProcessor.d.ts.map +1 -0
- package/dist/contrib/{awsSimpleAuthorizerProcessor.js → responseProcessor.js} +5 -8
- package/dist/contrib/responseProcessor.js.map +1 -0
- package/dist/contrib/responseProcessor.test.d.ts +5 -0
- package/dist/contrib/responseProcessor.test.d.ts.map +1 -0
- package/dist/contrib/{awsApiGatewayProcessor.test.js → responseProcessor.test.js} +14 -23
- package/dist/contrib/responseProcessor.test.js.map +1 -0
- package/dist/contrib/trivial.d.ts +3 -3
- package/dist/contrib/trivial.d.ts.map +1 -1
- package/dist/contrib/trivial.js +5 -4
- package/dist/contrib/trivial.js.map +1 -1
- package/dist/contrib/trivial.test.d.ts +1 -3
- package/dist/contrib/trivial.test.d.ts.map +1 -1
- package/dist/contrib/trivial.test.js +17 -6
- package/dist/contrib/trivial.test.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/lib/HttpApiError.d.ts +3 -0
- package/dist/lib/HttpApiError.d.ts.map +1 -1
- package/dist/lib/HttpApiError.js +15 -0
- package/dist/lib/HttpApiError.js.map +1 -1
- package/dist/lib/HttpApiError.test.js +1 -1
- package/dist/lib/HttpApiError.test.js.map +1 -1
- package/dist/lib/http.d.ts +19 -45
- package/dist/lib/http.d.ts.map +1 -1
- package/dist/lib/http.js +38 -40
- package/dist/lib/http.js.map +1 -1
- package/dist/lib/http.test.js +108 -43
- package/dist/lib/http.test.js.map +1 -1
- package/dist/test/test-common.d.ts +10 -6
- package/dist/test/test-common.d.ts.map +1 -1
- package/dist/test/test-common.js +18 -17
- package/dist/test/test-common.js.map +1 -1
- package/dist/test/unit/auth-1.test.js +7 -4
- package/dist/test/unit/auth-1.test.js.map +1 -1
- package/dist/test/unit/basic-1.test.js +7 -5
- package/dist/test/unit/basic-1.test.js.map +1 -1
- package/dist/test/unit/basic-2.test.d.ts.map +1 -1
- package/dist/test/unit/basic-2.test.js +7 -5
- package/dist/test/unit/basic-2.test.js.map +1 -1
- package/dist/test/unit/basic-3.test.js +7 -5
- package/dist/test/unit/basic-3.test.js.map +1 -1
- package/dist/test/unit/kitchen-sink.test.d.ts.map +1 -1
- package/dist/test/unit/kitchen-sink.test.js +62 -16
- package/dist/test/unit/kitchen-sink.test.js.map +1 -1
- package/package.json +28 -48
- package/dist/contrib/awsApiGatewayProcessor.d.ts +0 -5
- package/dist/contrib/awsApiGatewayProcessor.d.ts.map +0 -1
- package/dist/contrib/awsApiGatewayProcessor.js +0 -27
- package/dist/contrib/awsApiGatewayProcessor.js.map +0 -1
- package/dist/contrib/awsApiGatewayProcessor.test.d.ts +0 -6
- package/dist/contrib/awsApiGatewayProcessor.test.d.ts.map +0 -1
- package/dist/contrib/awsApiGatewayProcessor.test.js.map +0 -1
- package/dist/contrib/awsIamAuthorizerProcessor.d.ts +0 -6
- package/dist/contrib/awsIamAuthorizerProcessor.d.ts.map +0 -1
- package/dist/contrib/awsIamAuthorizerProcessor.js +0 -13
- package/dist/contrib/awsIamAuthorizerProcessor.js.map +0 -1
- package/dist/contrib/awsIamAuthorizerProcessor.test.d.ts +0 -6
- package/dist/contrib/awsIamAuthorizerProcessor.test.d.ts.map +0 -1
- package/dist/contrib/awsIamAuthorizerProcessor.test.js +0 -96
- package/dist/contrib/awsIamAuthorizerProcessor.test.js.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerProcessor.d.ts +0 -5
- package/dist/contrib/awsSimpleAuthorizerProcessor.d.ts.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerProcessor.js.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerProcessor.test.d.ts +0 -7
- package/dist/contrib/awsSimpleAuthorizerProcessor.test.d.ts.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerProcessor.test.js +0 -56
- package/dist/contrib/awsSimpleAuthorizerProcessor.test.js.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.d.ts +0 -6
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.d.ts.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.js +0 -16
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.js.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.test.d.ts +0 -13
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.test.d.ts.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.test.js +0 -65
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.test.js.map +0 -1
- package/dist/contrib/dynamodbDocClientInit/index.d.ts +0 -7
- package/dist/contrib/dynamodbDocClientInit/index.d.ts.map +0 -1
- package/dist/contrib/dynamodbDocClientInit/index.js +0 -7
- package/dist/contrib/dynamodbDocClientInit/index.js.map +0 -1
- package/dist/contrib/dynamodbDocClientInit/index.test.d.ts +0 -4
- package/dist/contrib/dynamodbDocClientInit/index.test.d.ts.map +0 -1
- package/dist/contrib/dynamodbDocClientInit/index.test.js +0 -29
- package/dist/contrib/dynamodbDocClientInit/index.test.js.map +0 -1
- package/dist/test/unit/auth-2.test.d.ts +0 -2
- package/dist/test/unit/auth-2.test.d.ts.map +0 -1
- package/dist/test/unit/auth-2.test.js +0 -50
- package/dist/test/unit/auth-2.test.js.map +0 -1
|
@@ -1,15 +1,25 @@
|
|
|
1
1
|
import { pipe } from 'effect';
|
|
2
2
|
import * as Effect from 'effect/Effect';
|
|
3
3
|
import { describe, expect, it } from 'vitest';
|
|
4
|
-
import {
|
|
4
|
+
import { EMPTY_REQUEST_W } from '../lib/http.js';
|
|
5
|
+
import { echoCoreIn200W, TestDepsW } from '../test/test-common.js';
|
|
5
6
|
import * as unit from './identity.js';
|
|
6
|
-
const
|
|
7
|
-
const TEST_DEPS = TestDeps.of({ bar: 'bar' });
|
|
7
|
+
const TEST_DEPS = TestDepsW.of({ bar: 'bar' });
|
|
8
8
|
describe('middleware/identity', () => {
|
|
9
9
|
it('should work as expected', async () => {
|
|
10
|
-
const egHandler = pipe(
|
|
11
|
-
const result = pipe(egHandler(
|
|
12
|
-
await expect(result).resolves.toStrictEqual({
|
|
10
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
11
|
+
const result = pipe(egHandler(EMPTY_REQUEST_W), Effect.provideService(TestDepsW, TEST_DEPS), Effect.runPromise);
|
|
12
|
+
await expect(result).resolves.toStrictEqual({
|
|
13
|
+
body: 'OK',
|
|
14
|
+
headers: {},
|
|
15
|
+
in: {
|
|
16
|
+
headers: {},
|
|
17
|
+
method: 'GET',
|
|
18
|
+
pathParameters: {},
|
|
19
|
+
queryStringParameters: {},
|
|
20
|
+
},
|
|
21
|
+
statusCode: 200,
|
|
22
|
+
});
|
|
13
23
|
});
|
|
14
24
|
});
|
|
15
25
|
//# sourceMappingURL=identity.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.test.js","sourceRoot":"","sources":["../../src/contrib/identity.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"identity.test.js","sourceRoot":"","sources":["../../src/contrib/identity.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AAEtC,MAAM,SAAS,GAAc,SAAS,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;AAE1D,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAChH,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1C,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,KAAK;gBACb,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;aAC1B;YACD,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/contrib/index.d.ts
CHANGED
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
export * as awsApiGatewayProcessor from './awsApiGatewayProcessor.js';
|
|
2
|
-
export * as awsIamAuthorizerProcessor from './awsIamAuthorizerProcessor.js';
|
|
3
|
-
export * as awsSimpleAuthorizerProcessor from './awsSimpleAuthorizerProcessor.js';
|
|
4
1
|
export * as base64BodyDecoder from './base64BodyDecoder.js';
|
|
5
2
|
export * as basicAuthAuthenticator from './basicAuthAuthenticator.js';
|
|
6
3
|
export * as basicAuthDecoder from './basicAuthDecoder.js';
|
|
7
4
|
export * as bodyValidator from './bodyValidator.js';
|
|
8
5
|
export * as cacheInMemory from './cacheInMemory.js';
|
|
9
6
|
export * as cacheMomento from './cacheMomento.js';
|
|
10
|
-
export * as dynamodbDocClientInit from './dynamodbDocClientInit/index.js';
|
|
11
7
|
export * as envValidator from './envValidator.js';
|
|
12
8
|
export * as headerSignatureAuthorizer from './headerSignatureAuthorizer/index.js';
|
|
13
9
|
export * as headersNormalizer from './headersNormalizer/index.js';
|
|
@@ -22,6 +18,7 @@ export * as momentoClientInit from './momentoClientInit.js';
|
|
|
22
18
|
export * as pathParametersValidator from './pathParametersValidator.js';
|
|
23
19
|
export * as pathTokenAuthorizer from './pathTokenAuthorizer.js';
|
|
24
20
|
export * as queryStringValidator from './queryStringValidator.js';
|
|
21
|
+
export * as responseProcessor from './responseProcessor.js';
|
|
25
22
|
export * as requestResponseLogger from './requestResponseLogger.js';
|
|
26
23
|
export * as trivial from './trivial.js';
|
|
27
24
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contrib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contrib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,sBAAsB,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,yBAAyB,MAAM,sCAAsC,CAAC;AAClF,OAAO,KAAK,iBAAiB,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,uBAAuB,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC"}
|
package/dist/contrib/index.js
CHANGED
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
export * as awsApiGatewayProcessor from './awsApiGatewayProcessor.js';
|
|
2
|
-
export * as awsIamAuthorizerProcessor from './awsIamAuthorizerProcessor.js';
|
|
3
|
-
export * as awsSimpleAuthorizerProcessor from './awsSimpleAuthorizerProcessor.js';
|
|
4
1
|
export * as base64BodyDecoder from './base64BodyDecoder.js';
|
|
5
2
|
export * as basicAuthAuthenticator from './basicAuthAuthenticator.js';
|
|
6
3
|
export * as basicAuthDecoder from './basicAuthDecoder.js';
|
|
7
4
|
export * as bodyValidator from './bodyValidator.js';
|
|
8
5
|
export * as cacheInMemory from './cacheInMemory.js';
|
|
9
6
|
export * as cacheMomento from './cacheMomento.js';
|
|
10
|
-
export * as dynamodbDocClientInit from './dynamodbDocClientInit/index.js';
|
|
11
7
|
export * as envValidator from './envValidator.js';
|
|
12
8
|
export * as headerSignatureAuthorizer from './headerSignatureAuthorizer/index.js';
|
|
13
9
|
export * as headersNormalizer from './headersNormalizer/index.js';
|
|
@@ -22,6 +18,7 @@ export * as momentoClientInit from './momentoClientInit.js';
|
|
|
22
18
|
export * as pathParametersValidator from './pathParametersValidator.js';
|
|
23
19
|
export * as pathTokenAuthorizer from './pathTokenAuthorizer.js';
|
|
24
20
|
export * as queryStringValidator from './queryStringValidator.js';
|
|
21
|
+
export * as responseProcessor from './responseProcessor.js';
|
|
25
22
|
export * as requestResponseLogger from './requestResponseLogger.js';
|
|
26
23
|
export * as trivial from './trivial.js';
|
|
27
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/contrib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/contrib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,sBAAsB,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,yBAAyB,MAAM,sCAAsC,CAAC;AAClF,OAAO,KAAK,iBAAiB,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,uBAAuB,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Rec, RequestResponseHandler } from '../index.js';
|
|
2
2
|
import type { MiddlewareError } from '../lib/MiddlewareError.js';
|
|
3
|
-
export type WithBody = {
|
|
4
|
-
body?: string;
|
|
5
|
-
};
|
|
6
3
|
export type WithParsedBody = {
|
|
7
|
-
body
|
|
8
|
-
|
|
4
|
+
readonly body: unknown;
|
|
5
|
+
readonly jsonBodyParserRaw: string | undefined;
|
|
9
6
|
};
|
|
10
|
-
export declare const middleware: () => <I, O, E, R>(wrapped:
|
|
7
|
+
export declare const middleware: () => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I & WithParsedBody, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R>;
|
|
11
8
|
//# sourceMappingURL=jsonBodyParser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonBodyParser.d.ts","sourceRoot":"","sources":["../../src/contrib/jsonBodyParser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"jsonBodyParser.d.ts","sourceRoot":"","sources":["../../src/contrib/jsonBodyParser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAKjE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;CAChD,CAAC;AAEF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3D,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAoBnD,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { pipe, Schema } from 'effect';
|
|
2
2
|
import * as Effect from 'effect/Effect';
|
|
3
|
+
import { makeRequestW } from '../lib/http.js';
|
|
3
4
|
import { toMiddlewareError } from '../lib/MiddlewareError.js';
|
|
4
5
|
const TAG = 'jsonBodyParser';
|
|
5
6
|
export const middleware = () => (wrapped) => (i) => pipe(
|
|
@@ -8,10 +9,9 @@ Effect.succeed(i),
|
|
|
8
9
|
// Log before
|
|
9
10
|
Effect.tap(Effect.logDebug(`[${TAG}] IN`)),
|
|
10
11
|
// JSON parse the body and add to input
|
|
11
|
-
Effect.flatMap((i) => (i.body ? pipe(i.body, Schema.decode(Schema.parseJson())) : Effect.succeed(i.body))), Effect.mapError(toMiddlewareError), Effect.map((parsedBody) => ({
|
|
12
|
-
...i,
|
|
12
|
+
Effect.flatMap((i) => (i.body ? pipe(i.body, Schema.decode(Schema.parseJson())) : Effect.succeed(i.body))), Effect.mapError(toMiddlewareError), Effect.map((parsedBody) => makeRequestW(i, {
|
|
13
13
|
body: parsedBody,
|
|
14
|
-
|
|
14
|
+
jsonBodyParserRaw: i.body,
|
|
15
15
|
})),
|
|
16
16
|
// Call the next middleware in the stack
|
|
17
17
|
Effect.flatMap(wrapped),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonBodyParser.js","sourceRoot":"","sources":["../../src/contrib/jsonBodyParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"jsonBodyParser.js","sourceRoot":"","sources":["../../src/contrib/jsonBodyParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,GAAG,GAAG,gBAAgB,CAAC;AAO7B,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAA4D,EACN,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI;AACF,iBAAiB;AACjB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACjB,aAAa;AACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAC1C,uCAAuC;AACvC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAC1G,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClC,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACxB,YAAY,CAAC,CAAC,EAAE;IACd,IAAI,EAAE,UAAU;IAChB,iBAAiB,EAAE,CAAC,CAAC,IAAI;CAC1B,CAAC,CACH;AACD,wCAAwC;AACxC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;AACvB,YAAY;AACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonBodyParser.test.d.ts","sourceRoot":"","sources":["../../src/contrib/jsonBodyParser.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jsonBodyParser.test.d.ts","sourceRoot":"","sources":["../../src/contrib/jsonBodyParser.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,33 +1,49 @@
|
|
|
1
1
|
import { pipe } from 'effect';
|
|
2
2
|
import * as Effect from 'effect/Effect';
|
|
3
3
|
import { describe, expect, it } from 'vitest';
|
|
4
|
-
import {
|
|
4
|
+
import { EMPTY_REQUEST_W, makeRequestW } from '../lib/http.js';
|
|
5
|
+
import { echoCoreIn200W } from '../test/test-common.js';
|
|
5
6
|
import * as unit from './jsonBodyParser.js';
|
|
6
|
-
const TEST_IN_1 = { body: '{"foo":"ABC"}' };
|
|
7
|
-
const TEST_IN_2 = { body: 'NOT_JSON' };
|
|
8
|
-
const TEST_DEPS = { bar: 'bar' };
|
|
7
|
+
const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, { body: '{"foo":"ABC"}' });
|
|
8
|
+
const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, { body: 'NOT_JSON' });
|
|
9
9
|
describe('middleware/json-body-parser', () => {
|
|
10
10
|
it('should work as expected with default params', async () => {
|
|
11
|
-
const egHandler = pipe(
|
|
12
|
-
const result = pipe(egHandler(TEST_IN_1), Effect.
|
|
11
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
12
|
+
const result = pipe(egHandler(TEST_IN_1), Effect.runPromise);
|
|
13
13
|
await expect(result).resolves.toStrictEqual({
|
|
14
|
-
|
|
15
|
-
jsonParserRawBody: '{"foo":"ABC"}',
|
|
14
|
+
statusCode: 200,
|
|
16
15
|
body: { foo: 'ABC' },
|
|
16
|
+
headers: {},
|
|
17
|
+
in: {
|
|
18
|
+
method: 'GET',
|
|
19
|
+
headers: {},
|
|
20
|
+
pathParameters: {},
|
|
21
|
+
queryStringParameters: {},
|
|
22
|
+
jsonBodyParserRaw: '{"foo":"ABC"}',
|
|
23
|
+
body: { foo: 'ABC' },
|
|
24
|
+
},
|
|
17
25
|
});
|
|
18
26
|
});
|
|
19
27
|
it('should work as expected with bad body', async () => {
|
|
20
|
-
const egHandler = pipe(
|
|
21
|
-
const result = pipe(egHandler(TEST_IN_2), Effect.
|
|
28
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
29
|
+
const result = pipe(egHandler(TEST_IN_2), Effect.runPromise);
|
|
22
30
|
await expect(result).rejects.toThrow('NOT_JSON');
|
|
23
31
|
});
|
|
24
32
|
it('should work as expected with missing body', async () => {
|
|
25
|
-
const egHandler = pipe(
|
|
26
|
-
const result = pipe(egHandler(
|
|
33
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
34
|
+
const result = pipe(egHandler(EMPTY_REQUEST_W), Effect.runPromise);
|
|
27
35
|
await expect(result).resolves.toStrictEqual({
|
|
28
|
-
|
|
29
|
-
body:
|
|
30
|
-
|
|
36
|
+
statusCode: 200,
|
|
37
|
+
body: 'OK',
|
|
38
|
+
headers: {},
|
|
39
|
+
in: {
|
|
40
|
+
method: 'GET',
|
|
41
|
+
headers: {},
|
|
42
|
+
pathParameters: {},
|
|
43
|
+
queryStringParameters: {},
|
|
44
|
+
body: undefined,
|
|
45
|
+
jsonBodyParserRaw: undefined,
|
|
46
|
+
},
|
|
31
47
|
});
|
|
32
48
|
});
|
|
33
49
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonBodyParser.test.js","sourceRoot":"","sources":["../../src/contrib/jsonBodyParser.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"jsonBodyParser.test.js","sourceRoot":"","sources":["../../src/contrib/jsonBodyParser.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,IAAI,MAAM,qBAAqB,CAAC;AAE5C,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;AAC3E,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;AAEtE,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1C,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;YACpB,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,iBAAiB,EAAE,eAAe;gBAClC,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;aACrB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACnE,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1C,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,IAAI,EAAE,SAAS;gBACf,iBAAiB,EAAE,SAAS;aAC7B;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import type { JwtVerificationConfig } from '@konker.dev/tiny-auth-utils-fp/jwt';
|
|
2
|
-
import type { APIGatewayProxyEventV2 } from 'aws-lambda';
|
|
3
2
|
import { Context } from 'effect';
|
|
4
|
-
import type {
|
|
3
|
+
import type { Rec, RequestResponseHandler } from '../index.js';
|
|
5
4
|
import { HttpApiError } from '../lib/HttpApiError.js';
|
|
6
|
-
import type { WithNormalizedInputHeaders
|
|
5
|
+
import type { WithNormalizedInputHeaders } from './headersNormalizer/types.js';
|
|
7
6
|
export declare const JwtAuthenticatorDeps: Context.Tag<JwtVerificationConfig, JwtVerificationConfig>;
|
|
8
|
-
export type
|
|
9
|
-
|
|
7
|
+
export type WithUserId = {
|
|
8
|
+
readonly userId: string | undefined;
|
|
9
|
+
};
|
|
10
|
+
export declare const middleware: () => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I & WithUserId, O, E, R>) => RequestResponseHandler<I & WithNormalizedInputHeaders, O, E | HttpApiError, R | JwtVerificationConfig>;
|
|
10
11
|
//# sourceMappingURL=jwtAuthenticator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtAuthenticator.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAEhF,OAAO,
|
|
1
|
+
{"version":3,"file":"jwtAuthenticator.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAEhF,OAAO,EAAE,OAAO,EAAQ,MAAM,QAAQ,CAAC;AAGvC,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAK/E,eAAO,MAAM,oBAAoB,2DAAoE,CAAC;AAGtG,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,CAAC;AAGF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACvD,sBAAsB,CAAC,CAAC,GAAG,0BAA0B,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,qBAAqB,CAsBvG,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { extractBearerToken } from '@konker.dev/tiny-auth-utils-fp/helpers';
|
|
|
2
2
|
import { jwtVerifyToken } from '@konker.dev/tiny-auth-utils-fp/jwt';
|
|
3
3
|
import { Context, pipe } from 'effect';
|
|
4
4
|
import * as Effect from 'effect/Effect';
|
|
5
|
+
import { makeRequestW } from '../lib/http.js';
|
|
5
6
|
import { HttpApiError } from '../lib/HttpApiError.js';
|
|
6
7
|
const TAG = 'jwtAuthenticator';
|
|
7
8
|
// --------------------------------------------------------------------------
|
|
@@ -9,10 +10,9 @@ export const JwtAuthenticatorDeps = Context.GenericTag('JwtAuthenticatorDeps');
|
|
|
9
10
|
// --------------------------------------------------------------------------
|
|
10
11
|
export const middleware = () => (wrapped) => (i) => {
|
|
11
12
|
return pipe(Effect.Do, Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.bind('deps', () => JwtAuthenticatorDeps), Effect.bind('authToken', () => extractBearerToken(i.headers.authorization)), Effect.bind('verification', ({ authToken, deps }) => jwtVerifyToken(authToken, deps)), Effect.flatMap(({ verification }) => verification.verified
|
|
12
|
-
? Effect.succeed({
|
|
13
|
-
...i,
|
|
13
|
+
? Effect.succeed(makeRequestW(i, {
|
|
14
14
|
userId: verification.sub,
|
|
15
|
-
})
|
|
15
|
+
}))
|
|
16
16
|
: Effect.fail(void 0)), Effect.mapError((e) => HttpApiError('UnauthorizedError', `Invalid JWT credentials: ${e?.message}`, 401, TAG, e)), Effect.tapError(Effect.logError), Effect.flatMap(wrapped), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
|
|
17
17
|
};
|
|
18
18
|
//# sourceMappingURL=jwtAuthenticator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtAuthenticator.js","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"jwtAuthenticator.js","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,MAAM,GAAG,GAAG,kBAAkB,CAAC;AAE/B,6EAA6E;AAC7E,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAwB,sBAAsB,CAAC,CAAC;AAOtG,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAAwD,EACgD,EAAE,CAC5G,CAAC,CAA2C,EAAE,EAAE;IAC9C,OAAO,IAAI,CACT,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,EAC/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAC3E,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,EACrF,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAClC,YAAY,CAAC,QAAQ;QACnB,CAAC,CAAC,MAAM,CAAC,OAAO,CACZ,YAAY,CAAC,CAAC,EAAE;YACd,MAAM,EAAE,YAAY,CAAC,GAAG;SACzB,CAAC,CACH;QACH,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACxB,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAChH,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAChC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtAuthenticator.test.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticator.test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"jwtAuthenticator.test.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticator.test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAQhF,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAWxC,eAAO,MAAM,2BAA2B,EAAE,qBAGxC,CAAC;AAEH,eAAO,MAAM,wBAAwB,mGAAgF,CAAC"}
|
|
@@ -3,7 +3,8 @@ import { TEST_TOKEN } from '@konker.dev/tiny-auth-utils-fp/test/fixtures/test-jw
|
|
|
3
3
|
import { pipe } from 'effect';
|
|
4
4
|
import * as Effect from 'effect/Effect';
|
|
5
5
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
6
|
-
import {
|
|
6
|
+
import { EMPTY_REQUEST_W, makeRequestW } from '../lib/http.js';
|
|
7
|
+
import { echoCoreIn200W } from '../test/test-common.js';
|
|
7
8
|
import * as unit from './jwtAuthenticator.js';
|
|
8
9
|
// https://stackoverflow.com/a/72885576/203284
|
|
9
10
|
// https://github.com/vitest-dev/vitest/issues/6099
|
|
@@ -13,22 +14,24 @@ export const JWT_AUTHENTICATOR_TEST_DEPS = unit.JwtAuthenticatorDeps.of({
|
|
|
13
14
|
issuer: TEST_JWT_ISS,
|
|
14
15
|
});
|
|
15
16
|
export const mockJwtAuthenticatorDeps = Effect.provideService(unit.JwtAuthenticatorDeps, JWT_AUTHENTICATOR_TEST_DEPS);
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
const TEST_IN_1 = {
|
|
17
|
+
const VALID_JWT_VALUE = `Bearer ${TEST_TOKEN}`;
|
|
18
|
+
const INVALID_JWT_VALUE = 'Bearer Banana';
|
|
19
|
+
const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, {
|
|
19
20
|
headers: {
|
|
20
|
-
authorization:
|
|
21
|
+
authorization: VALID_JWT_VALUE,
|
|
21
22
|
},
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
|
|
23
|
+
headersNormalizerRequestRaw: {
|
|
24
|
+
Authorization: VALID_JWT_VALUE,
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, {
|
|
26
28
|
headers: {
|
|
27
|
-
authorization:
|
|
29
|
+
authorization: INVALID_JWT_VALUE,
|
|
30
|
+
},
|
|
31
|
+
headersNormalizerRequestRaw: {
|
|
32
|
+
authorization: INVALID_JWT_VALUE,
|
|
28
33
|
},
|
|
29
|
-
|
|
30
|
-
body: {},
|
|
31
|
-
};
|
|
34
|
+
});
|
|
32
35
|
describe('middleware/jwt-authenticator', () => {
|
|
33
36
|
let errorSpy;
|
|
34
37
|
beforeEach(() => {
|
|
@@ -40,20 +43,31 @@ describe('middleware/jwt-authenticator', () => {
|
|
|
40
43
|
vi.restoreAllMocks();
|
|
41
44
|
});
|
|
42
45
|
it('should work as expected in an success case', async () => {
|
|
43
|
-
const egHandler = pipe(
|
|
46
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
44
47
|
const result = await pipe(egHandler(TEST_IN_1), mockJwtAuthenticatorDeps, Effect.runPromise);
|
|
45
48
|
expect(result).toStrictEqual({
|
|
49
|
+
statusCode: 200,
|
|
50
|
+
body: 'OK',
|
|
46
51
|
headers: {
|
|
47
|
-
authorization:
|
|
52
|
+
authorization: VALID_JWT_VALUE,
|
|
53
|
+
},
|
|
54
|
+
in: {
|
|
55
|
+
method: 'GET',
|
|
56
|
+
pathParameters: {},
|
|
57
|
+
queryStringParameters: {},
|
|
58
|
+
headers: {
|
|
59
|
+
authorization: VALID_JWT_VALUE,
|
|
60
|
+
},
|
|
61
|
+
headersNormalizerRequestRaw: {
|
|
62
|
+
Authorization: VALID_JWT_VALUE,
|
|
63
|
+
},
|
|
64
|
+
userId: 'test-sub',
|
|
48
65
|
},
|
|
49
|
-
body: {},
|
|
50
|
-
isBase64Encoded: false,
|
|
51
|
-
userId: 'test-sub',
|
|
52
66
|
});
|
|
53
67
|
expect(errorSpy).toHaveBeenCalledTimes(0);
|
|
54
68
|
});
|
|
55
69
|
it('should work as expected in an error case', async () => {
|
|
56
|
-
const egHandler = pipe(
|
|
70
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
57
71
|
const result = pipe(egHandler(TEST_IN_2), mockJwtAuthenticatorDeps, Effect.runPromise);
|
|
58
72
|
await expect(result).rejects.toThrow('Invalid JWT credentials');
|
|
59
73
|
expect(errorSpy).toHaveBeenCalledTimes(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtAuthenticator.test.js","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticator.test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,eAAe,EACf,uBAAuB,GACxB,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"jwtAuthenticator.test.js","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticator.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import type { JwtVerificationConfigRsa } from '@konker.dev/tiny-auth-utils-fp/jwt/rsa';
|
|
2
|
-
import type { APIGatewayProxyEventV2 } from 'aws-lambda';
|
|
3
2
|
import { Context } from 'effect';
|
|
4
|
-
import type {
|
|
3
|
+
import type { Rec, RequestResponseHandler } from '../index.js';
|
|
5
4
|
import { HttpApiError } from '../lib/HttpApiError.js';
|
|
6
|
-
import type { WithNormalizedInputHeaders
|
|
5
|
+
import type { WithNormalizedInputHeaders } from './headersNormalizer/types.js';
|
|
7
6
|
export declare const JwtAuthenticatorRsaDeps: Context.Tag<JwtVerificationConfigRsa, JwtVerificationConfigRsa>;
|
|
8
|
-
export type
|
|
9
|
-
|
|
7
|
+
export type WithUserId = {
|
|
8
|
+
readonly userId: string | undefined;
|
|
9
|
+
};
|
|
10
|
+
export declare const middleware: () => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I & WithUserId, O, E, R>) => RequestResponseHandler<I & WithNormalizedInputHeaders, O, E | HttpApiError, R | JwtVerificationConfigRsa>;
|
|
10
11
|
//# sourceMappingURL=jwtAuthenticatorRsa.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtAuthenticatorRsa.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticatorRsa.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAEvF,OAAO,
|
|
1
|
+
{"version":3,"file":"jwtAuthenticatorRsa.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticatorRsa.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAEvF,OAAO,EAAE,OAAO,EAAQ,MAAM,QAAQ,CAAC;AAGvC,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAK/E,eAAO,MAAM,uBAAuB,iEAA0E,CAAC;AAE/G,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,CAAC;AAGF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACvD,sBAAsB,CAAC,CAAC,GAAG,0BAA0B,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,wBAAwB,CAwB1G,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { extractBearerToken } from '@konker.dev/tiny-auth-utils-fp/helpers';
|
|
|
2
2
|
import { jwtVerifyTokenRsa } from '@konker.dev/tiny-auth-utils-fp/jwt/rsa';
|
|
3
3
|
import { Context, pipe } from 'effect';
|
|
4
4
|
import * as Effect from 'effect/Effect';
|
|
5
|
+
import { makeRequestW } from '../lib/http.js';
|
|
5
6
|
import { HttpApiError } from '../lib/HttpApiError.js';
|
|
6
7
|
const TAG = 'jwtAuthenticatorRsa';
|
|
7
8
|
// --------------------------------------------------------------------------
|
|
@@ -9,10 +10,9 @@ export const JwtAuthenticatorRsaDeps = Context.GenericTag('JwtAuthenticatorRsaDe
|
|
|
9
10
|
// --------------------------------------------------------------------------
|
|
10
11
|
export const middleware = () => (wrapped) => (i) => {
|
|
11
12
|
return pipe(Effect.Do, Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.bind('deps', () => JwtAuthenticatorRsaDeps), Effect.bind('authToken', () => extractBearerToken(i.headers.authorization)), Effect.bind('verification', ({ authToken, deps }) => jwtVerifyTokenRsa(authToken, deps)), Effect.flatMap(({ verification }) => verification.verified
|
|
12
|
-
? Effect.succeed({
|
|
13
|
-
...i,
|
|
13
|
+
? Effect.succeed(makeRequestW(i, {
|
|
14
14
|
userId: verification.sub,
|
|
15
|
-
})
|
|
15
|
+
}))
|
|
16
16
|
: Effect.fail(void 0)), Effect.mapError((e) => HttpApiError('UnauthorizedError', `Invalid JWT RSA credentials: ${e?.message}`, 401, TAG, e)), Effect.tapError((_) => Effect.logError(`UnauthorizedError: Invalid JWT RSA credentials: ${i.headers}`)), Effect.flatMap(wrapped), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
|
|
17
17
|
};
|
|
18
18
|
//# sourceMappingURL=jwtAuthenticatorRsa.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtAuthenticatorRsa.js","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticatorRsa.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"jwtAuthenticatorRsa.js","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticatorRsa.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,MAAM,GAAG,GAAG,qBAAqB,CAAC;AAElC,6EAA6E;AAC7E,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAAC,UAAU,CAA2B,yBAAyB,CAAC,CAAC;AAM/G,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAAwD,EACmD,EAAE,CAC/G,CAAC,CAA2C,EAAE,EAAE;IAC9C,OAAO,IAAI,CACT,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,uBAAuB,CAAC,EAClD,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAC3E,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,EACxF,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAClC,YAAY,CAAC,QAAQ;QACnB,CAAC,CAAC,MAAM,CAAC,OAAO,CACZ,YAAY,CAAC,CAAC,EAAE;YACd,MAAM,EAAE,YAAY,CAAC,GAAG;SACzB,CAAC,CACH;QACH,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACxB,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CACpB,YAAY,CAAC,mBAAmB,EAAE,gCAAgC,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAC7F,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,mDAAmD,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EACvG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtAuthenticatorRsa.test.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticatorRsa.test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"jwtAuthenticatorRsa.test.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticatorRsa.test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAKvF,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAWxC,eAAO,MAAM,+BAA+B,EAAE,wBAG5C,CAAC;AAEH,eAAO,MAAM,2BAA2B,sGAGvC,CAAC"}
|
|
@@ -4,7 +4,8 @@ import { TEST_TOKEN_RSA } from '@konker.dev/tiny-auth-utils-fp/test/fixtures/tes
|
|
|
4
4
|
import { pipe } from 'effect';
|
|
5
5
|
import * as Effect from 'effect/Effect';
|
|
6
6
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
7
|
-
import {
|
|
7
|
+
import { EMPTY_REQUEST_W, makeRequestW } from '../lib/http.js';
|
|
8
|
+
import { echoCoreIn200W } from '../test/test-common.js';
|
|
8
9
|
import * as unit from './jwtAuthenticatorRsa.js';
|
|
9
10
|
// https://stackoverflow.com/a/72885576/203284
|
|
10
11
|
// https://github.com/vitest-dev/vitest/issues/6099
|
|
@@ -16,20 +17,22 @@ export const JWT_AUTHENTICATOR_RSA_TEST_DEPS = unit.JwtAuthenticatorRsaDeps.of({
|
|
|
16
17
|
export const mockJwtAuthenticatorRsaDeps = Effect.provideService(unit.JwtAuthenticatorRsaDeps, JWT_AUTHENTICATOR_RSA_TEST_DEPS);
|
|
17
18
|
const VALID_JWT_RSA_VALUE = `Bearer ${TEST_TOKEN_RSA}`;
|
|
18
19
|
const INVALID_JWT_RSA_VALUE = 'Bearer Banana';
|
|
19
|
-
const TEST_IN_1 = {
|
|
20
|
+
const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, {
|
|
20
21
|
headers: {
|
|
21
22
|
authorization: VALID_JWT_RSA_VALUE,
|
|
22
23
|
},
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
|
|
24
|
+
headersNormalizerRequestRaw: {
|
|
25
|
+
Authorization: VALID_JWT_RSA_VALUE,
|
|
26
|
+
},
|
|
27
|
+
});
|
|
28
|
+
const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, {
|
|
27
29
|
headers: {
|
|
28
30
|
authorization: INVALID_JWT_RSA_VALUE,
|
|
29
31
|
},
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
32
|
+
headersNormalizerRequestRaw: {
|
|
33
|
+
authorization: INVALID_JWT_RSA_VALUE,
|
|
34
|
+
},
|
|
35
|
+
});
|
|
33
36
|
describe('middleware/jwt-authenticator-rsa', () => {
|
|
34
37
|
let errorSpy;
|
|
35
38
|
beforeEach(() => {
|
|
@@ -41,20 +44,31 @@ describe('middleware/jwt-authenticator-rsa', () => {
|
|
|
41
44
|
vi.restoreAllMocks();
|
|
42
45
|
});
|
|
43
46
|
it('should work as expected in an success case', async () => {
|
|
44
|
-
const egHandler = pipe(
|
|
47
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
45
48
|
const result = await pipe(egHandler(TEST_IN_1), mockJwtAuthenticatorRsaDeps, Effect.runPromise);
|
|
46
49
|
expect(result).toStrictEqual({
|
|
50
|
+
statusCode: 200,
|
|
51
|
+
body: 'OK',
|
|
47
52
|
headers: {
|
|
48
53
|
authorization: VALID_JWT_RSA_VALUE,
|
|
49
54
|
},
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
55
|
+
in: {
|
|
56
|
+
method: 'GET',
|
|
57
|
+
pathParameters: {},
|
|
58
|
+
queryStringParameters: {},
|
|
59
|
+
headers: {
|
|
60
|
+
authorization: VALID_JWT_RSA_VALUE,
|
|
61
|
+
},
|
|
62
|
+
headersNormalizerRequestRaw: {
|
|
63
|
+
Authorization: VALID_JWT_RSA_VALUE,
|
|
64
|
+
},
|
|
65
|
+
userId: 'test-sub',
|
|
66
|
+
},
|
|
53
67
|
});
|
|
54
68
|
expect(errorSpy).toHaveBeenCalledTimes(0);
|
|
55
69
|
});
|
|
56
70
|
it('should work as expected in an error case', async () => {
|
|
57
|
-
const egHandler = pipe(
|
|
71
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
58
72
|
const result = pipe(egHandler(TEST_IN_2), mockJwtAuthenticatorRsaDeps, Effect.runPromise);
|
|
59
73
|
await expect(result).rejects.toThrow('Invalid JWT RSA credentials');
|
|
60
74
|
expect(errorSpy).toHaveBeenCalledTimes(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtAuthenticatorRsa.test.js","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticatorRsa.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AACrG,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;
|
|
1
|
+
{"version":3,"file":"jwtAuthenticatorRsa.test.js","sourceRoot":"","sources":["../../src/contrib/jwtAuthenticatorRsa.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AACrG,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAClG,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAqB,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5F,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,IAAI,MAAM,0BAA0B,CAAC;AAEjD,8CAA8C;AAC9C,mDAAmD;AACnD,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAExC,MAAM,CAAC,MAAM,+BAA+B,GAA6B,IAAI,CAAC,uBAAuB,CAAC,EAAE,CAAC;IACvG,YAAY,EAAE,mBAAmB;IACjC,MAAM,EAAE,UAAU;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,cAAc,CAC9D,IAAI,CAAC,uBAAuB,EAC5B,+BAA+B,CAChC,CAAC;AAEF,MAAM,mBAAmB,GAAG,UAAU,cAAc,EAAE,CAAC;AACvD,MAAM,qBAAqB,GAAG,eAAe,CAAC;AAE9C,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE;IAC9C,OAAO,EAAE;QACP,aAAa,EAAE,mBAAmB;KACnC;IACD,2BAA2B,EAAE;QAC3B,aAAa,EAAE,mBAAmB;KACnC;CACF,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE;IAC9C,OAAO,EAAE;QACP,aAAa,EAAE,qBAAqB;KACrC;IACD,2BAA2B,EAAE;QAC3B,aAAa,EAAE,qBAAqB;KACrC;CACF,CAAC,CAAC;AAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,IAAI,QAAsB,CAAC;IAE3B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QACvD,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACxE,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,2BAA2B,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAEhG,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YAC3B,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,IAAI;YACV,OAAO,EAAE;gBACP,aAAa,EAAE,mBAAmB;aACnC;YACD,EAAE,EAAE;gBACF,MAAM,EAAE,KAAK;gBACb,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,OAAO,EAAE;oBACP,aAAa,EAAE,mBAAmB;iBACnC;gBACD,2BAA2B,EAAE;oBAC3B,aAAa,EAAE,mBAAmB;iBACnC;gBACD,MAAM,EAAE,UAAU;aACnB;SACF,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,2BAA2B,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAE1F,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;QACpE,MAAM,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { Handler } from '../index.js';
|
|
1
|
+
import type { Rec, RequestResponseHandler } from '../index.js';
|
|
3
2
|
import { HttpApiError } from '../lib/HttpApiError.js';
|
|
4
|
-
import type { WithNormalizedInputHeaders
|
|
5
|
-
export type
|
|
6
|
-
|
|
3
|
+
import type { WithNormalizedInputHeaders } from './headersNormalizer/types.js';
|
|
4
|
+
export type WithUserId = {
|
|
5
|
+
readonly userId: string | undefined;
|
|
6
|
+
};
|
|
7
|
+
export declare const middleware: () => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I & WithUserId, O, E, R>) => RequestResponseHandler<I & WithNormalizedInputHeaders, O, E | HttpApiError, R>;
|
|
7
8
|
//# sourceMappingURL=jwtDecoder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwtDecoder.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtDecoder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jwtDecoder.d.ts","sourceRoot":"","sources":["../../src/contrib/jwtDecoder.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAK/E,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,CAAC;AAIF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACvD,sBAAsB,CAAC,CAAC,GAAG,0BAA0B,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,CAiB/E,CAAC"}
|