@furystack/rest-service 6.2.0 → 6.2.2
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/actions/error-action.js +5 -5
- package/dist/actions/error-action.js.map +1 -1
- package/dist/actions/error-action.spec.js +0 -3
- package/dist/actions/error-action.spec.js.map +1 -1
- package/dist/endpoint-generators/create-delete-endpoint.spec.js +4 -7
- package/dist/endpoint-generators/create-delete-endpoint.spec.js.map +1 -1
- package/dist/endpoint-generators/create-get-collection-endpoint.spec.js +15 -14
- package/dist/endpoint-generators/create-get-collection-endpoint.spec.js.map +1 -1
- package/dist/endpoint-generators/create-get-entity-endpoint.spec.js +12 -18
- package/dist/endpoint-generators/create-get-entity-endpoint.spec.js.map +1 -1
- package/dist/endpoint-generators/create-patch-endpoint.spec.js +4 -7
- package/dist/endpoint-generators/create-patch-endpoint.spec.js.map +1 -1
- package/dist/endpoint-generators/create-post-endpoint.spec.js +4 -7
- package/dist/endpoint-generators/create-post-endpoint.spec.js.map +1 -1
- package/dist/rest-service.integration.spec.js +34 -24
- package/dist/rest-service.integration.spec.js.map +1 -1
- package/dist/rest.integration.test.js +11 -11
- package/dist/rest.integration.test.js.map +1 -1
- package/dist/static-server-manager.js +1 -1
- package/dist/static-server-manager.js.map +1 -1
- package/dist/static-server-manager.spec.js +80 -68
- package/dist/static-server-manager.spec.js.map +1 -1
- package/dist/validate.integration.spec.js +32 -37
- package/dist/validate.integration.spec.js.map +1 -1
- package/package.json +11 -12
- package/src/actions/error-action.spec.ts +0 -3
- package/src/actions/error-action.ts +6 -6
- package/src/endpoint-generators/create-delete-endpoint.spec.ts +4 -4
- package/src/endpoint-generators/create-get-collection-endpoint.spec.ts +17 -11
- package/src/endpoint-generators/create-get-entity-endpoint.spec.ts +12 -16
- package/src/endpoint-generators/create-patch-endpoint.spec.ts +4 -4
- package/src/endpoint-generators/create-post-endpoint.spec.ts +4 -4
- package/src/rest-service.integration.spec.ts +36 -29
- package/src/rest.integration.test.ts +10 -10
- package/src/static-server-manager.spec.ts +86 -45
- package/src/static-server-manager.ts +3 -1
- package/src/validate.integration.spec.ts +31 -36
- package/types/actions/error-action.d.ts +0 -2
- package/types/actions/error-action.d.ts.map +1 -1
- package/types/static-server-manager.d.ts.map +1 -1
- package/types/validate.integration.spec.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.integration.test.js","sourceRoot":"","sources":["../src/rest.integration.test.ts"],"names":[],"mappings":";;AAAA,8CAA4C;AAE5C,
|
|
1
|
+
{"version":3,"file":"rest.integration.test.js","sourceRoot":"","sources":["../src/rest.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ let StaticServerManager = class StaticServerManager {
|
|
|
50
50
|
'Content-Type': (0, mime_types_1.getMimeForFile)(fullPath),
|
|
51
51
|
};
|
|
52
52
|
res.writeHead(200, head);
|
|
53
|
-
(0, fs_1.createReadStream)(fullPath, { autoClose: true }).pipe(res);
|
|
53
|
+
await new Promise((resolve, reject) => (0, fs_1.createReadStream)(fullPath, { autoClose: true }).once('finish', resolve).once('error', reject).pipe(res));
|
|
54
54
|
}
|
|
55
55
|
async addStaticSite(options) {
|
|
56
56
|
const server = await this.serverManager.getOrCreate({ hostName: options.hostName, port: options.port });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static-server-manager.js","sourceRoot":"","sources":["../src/static-server-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAwD;AACxD,2BAAqC;AACrC,0CAAkC;AAElC,6CAA6C;AAC7C,+BAA2C;AAC3C,qDAAgD;AAYzC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAAzB;
|
|
1
|
+
{"version":3,"file":"static-server-manager.js","sourceRoot":"","sources":["../src/static-server-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,98 +1,107 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
3
|
const inject_1 = require("@furystack/inject");
|
|
27
4
|
const utils_1 = require("@furystack/utils");
|
|
28
|
-
const got_1 = __importStar(require("got"));
|
|
29
5
|
const server_manager_1 = require("./server-manager");
|
|
30
6
|
const static_server_manager_1 = require("./static-server-manager");
|
|
7
|
+
/**
|
|
8
|
+
* Generator for an incremental port number
|
|
9
|
+
*
|
|
10
|
+
* @param initialPort The initial port number
|
|
11
|
+
* @yields a port for testing
|
|
12
|
+
* @returns The Port number
|
|
13
|
+
*/
|
|
14
|
+
function* getPort(initialPort = 1234) {
|
|
15
|
+
let port = initialPort;
|
|
16
|
+
while (true) {
|
|
17
|
+
yield port++;
|
|
18
|
+
}
|
|
19
|
+
return port;
|
|
20
|
+
}
|
|
31
21
|
describe('StaticServerManager', () => {
|
|
22
|
+
const portGenerator = getPort();
|
|
32
23
|
describe('Top level routing', () => {
|
|
33
24
|
it('Should return a 404 without fallback', async () => {
|
|
34
25
|
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
35
26
|
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
27
|
+
const port = portGenerator.next().value;
|
|
36
28
|
await staticServerManager.addStaticSite({
|
|
37
29
|
baseUrl: '/',
|
|
38
30
|
path: '.',
|
|
39
|
-
port
|
|
31
|
+
port,
|
|
40
32
|
});
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
expect(requestError.response?.statusCode).toBe(404);
|
|
48
|
-
expect(requestError.response?.headers['content-type']).toBe('text/plain');
|
|
49
|
-
expect(requestError.response?.body).toBe('Not found');
|
|
50
|
-
}
|
|
33
|
+
const result = await fetch(`http://localhost:${port}/not-found.html`);
|
|
34
|
+
expect(result.ok).toBe(false);
|
|
35
|
+
expect(result.status).toBe(404);
|
|
36
|
+
expect(result?.headers.get('content-type')).toBe('text/plain');
|
|
37
|
+
const body = await result.text();
|
|
38
|
+
expect(body).toBe('Not found');
|
|
51
39
|
});
|
|
52
40
|
});
|
|
53
41
|
it('Should return a fallback', async () => {
|
|
54
42
|
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
55
43
|
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
44
|
+
const port = portGenerator.next().value;
|
|
45
|
+
await staticServerManager.addStaticSite({
|
|
46
|
+
baseUrl: '/',
|
|
47
|
+
path: '.',
|
|
48
|
+
fallback: 'package.json',
|
|
49
|
+
port,
|
|
50
|
+
headers: {
|
|
51
|
+
'custom-header': 'custom-value',
|
|
52
|
+
},
|
|
53
|
+
});
|
|
54
|
+
const result = await fetch(`http://localhost:${port}/not-found.html`);
|
|
55
|
+
expect(result.headers.get('content-type')).toBe('application/json');
|
|
56
|
+
expect(result.headers.get('custom-header')).toBe('custom-value');
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
it('Should return a fallback for root files', async () => {
|
|
60
|
+
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
61
|
+
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
62
|
+
const port = portGenerator.next().value;
|
|
56
63
|
await staticServerManager.addStaticSite({
|
|
57
64
|
baseUrl: '/',
|
|
58
65
|
path: '.',
|
|
59
66
|
fallback: 'package.json',
|
|
60
|
-
port
|
|
67
|
+
port,
|
|
61
68
|
headers: {
|
|
62
69
|
'custom-header': 'custom-value',
|
|
63
70
|
},
|
|
64
71
|
});
|
|
65
|
-
const result = await
|
|
66
|
-
expect(result.headers
|
|
67
|
-
expect(result.headers
|
|
72
|
+
const result = await fetch(`http://localhost:${port}`);
|
|
73
|
+
expect(result.headers.get('content-type')).toBe('application/json');
|
|
74
|
+
expect(result.headers.get('custom-header')).toBe('custom-value');
|
|
68
75
|
});
|
|
69
76
|
});
|
|
70
77
|
it('Should return a defined file from a root directory', async () => {
|
|
71
78
|
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
72
79
|
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
80
|
+
const port = portGenerator.next().value;
|
|
73
81
|
await staticServerManager.addStaticSite({
|
|
74
82
|
baseUrl: '/',
|
|
75
83
|
path: '.',
|
|
76
|
-
port
|
|
84
|
+
port,
|
|
77
85
|
headers: {
|
|
78
86
|
'custom-header': 'custom-value',
|
|
79
87
|
},
|
|
80
88
|
});
|
|
81
|
-
const result = await
|
|
82
|
-
expect(result.headers
|
|
83
|
-
expect(result.headers
|
|
89
|
+
const result = await fetch(`http://localhost:${port}/README.md`);
|
|
90
|
+
expect(result.headers.get('content-type')).toBe('text/markdown');
|
|
91
|
+
expect(result.headers.get('custom-header')).toBe('custom-value');
|
|
84
92
|
});
|
|
85
93
|
});
|
|
86
94
|
it('Should return a defined file from a subdirectory', async () => {
|
|
87
95
|
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
88
96
|
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
97
|
+
const port = portGenerator.next().value;
|
|
89
98
|
await staticServerManager.addStaticSite({
|
|
90
99
|
baseUrl: '/',
|
|
91
100
|
path: '.',
|
|
92
|
-
port
|
|
101
|
+
port,
|
|
93
102
|
});
|
|
94
|
-
const result = await
|
|
95
|
-
expect(result.headers
|
|
103
|
+
const result = await fetch(`http://localhost:${port}/packages/utils/README.md`);
|
|
104
|
+
expect(result.headers.get('content-type')).toBe('text/markdown');
|
|
96
105
|
});
|
|
97
106
|
});
|
|
98
107
|
});
|
|
@@ -100,14 +109,17 @@ describe('StaticServerManager', () => {
|
|
|
100
109
|
it('Should not handle a request when the path is not matching', async () => {
|
|
101
110
|
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
102
111
|
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
112
|
+
const port = portGenerator.next().value;
|
|
103
113
|
await staticServerManager.addStaticSite({
|
|
104
114
|
baseUrl: '/bundle',
|
|
105
115
|
path: '.',
|
|
106
|
-
port
|
|
116
|
+
port,
|
|
107
117
|
});
|
|
108
118
|
const server = [...injector.getInstance(server_manager_1.ServerManager).servers.values()][0];
|
|
109
119
|
server.apis[0].onRequest = jest.fn();
|
|
110
|
-
|
|
120
|
+
fetch(`http://localhost:${port}/bundleToAnotherFolder/not-found.html`).catch(() => {
|
|
121
|
+
/** should fall, ignore */
|
|
122
|
+
});
|
|
111
123
|
await (0, utils_1.sleepAsync)(100);
|
|
112
124
|
expect(server.apis[0].onRequest).not.toHaveBeenCalled();
|
|
113
125
|
});
|
|
@@ -115,58 +127,58 @@ describe('StaticServerManager', () => {
|
|
|
115
127
|
it('Should return a 404 without fallback', async () => {
|
|
116
128
|
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
117
129
|
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
130
|
+
const port = portGenerator.next().value;
|
|
118
131
|
await staticServerManager.addStaticSite({
|
|
119
132
|
baseUrl: '/bundle',
|
|
120
133
|
path: '.',
|
|
121
|
-
port
|
|
134
|
+
port,
|
|
122
135
|
});
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
expect(requestError.response?.statusCode).toBe(404);
|
|
130
|
-
expect(requestError.response?.headers['content-type']).toBe('text/plain');
|
|
131
|
-
expect(requestError.response?.body).toBe('Not found');
|
|
132
|
-
}
|
|
136
|
+
const result = await fetch(`http://localhost:${port}/bundle/not-found.html`);
|
|
137
|
+
expect(result.ok).toBe(false);
|
|
138
|
+
expect(result.status).toBe(404);
|
|
139
|
+
expect(result.headers.get('content-type')).toBe('text/plain');
|
|
140
|
+
const body = await result.text();
|
|
141
|
+
expect(body).toBe('Not found');
|
|
133
142
|
});
|
|
134
143
|
});
|
|
135
144
|
it('Should return a fallback', async () => {
|
|
136
145
|
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
137
146
|
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
147
|
+
const port = portGenerator.next().value;
|
|
138
148
|
await staticServerManager.addStaticSite({
|
|
139
149
|
baseUrl: '/bundle',
|
|
140
150
|
path: '.',
|
|
141
151
|
fallback: 'package.json',
|
|
142
|
-
port
|
|
152
|
+
port,
|
|
143
153
|
});
|
|
144
|
-
const result = await
|
|
145
|
-
expect(result.headers
|
|
154
|
+
const result = await fetch(`http://localhost:${port}/bundle/not-found.html`);
|
|
155
|
+
expect(result.headers.get('content-type')).toBe('application/json');
|
|
146
156
|
});
|
|
147
157
|
});
|
|
148
158
|
it('Should return a defined file from a root directory', async () => {
|
|
149
159
|
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
150
160
|
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
161
|
+
const port = portGenerator.next().value;
|
|
151
162
|
await staticServerManager.addStaticSite({
|
|
152
163
|
baseUrl: '/',
|
|
153
164
|
path: '.',
|
|
154
|
-
port
|
|
165
|
+
port,
|
|
155
166
|
});
|
|
156
|
-
const result = await
|
|
157
|
-
expect(result.headers
|
|
167
|
+
const result = await fetch(`http://localhost:${port}/README.md`);
|
|
168
|
+
expect(result.headers.get('content-type')).toBe('text/markdown');
|
|
158
169
|
});
|
|
159
170
|
});
|
|
160
171
|
it('Should return a defined file from a subdirectory', async () => {
|
|
161
172
|
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
|
|
162
173
|
const staticServerManager = injector.getInstance(static_server_manager_1.StaticServerManager);
|
|
174
|
+
const port = portGenerator.next().value;
|
|
163
175
|
await staticServerManager.addStaticSite({
|
|
164
176
|
baseUrl: '/',
|
|
165
177
|
path: '.',
|
|
166
|
-
port
|
|
178
|
+
port,
|
|
167
179
|
});
|
|
168
|
-
const result = await
|
|
169
|
-
expect(result.headers
|
|
180
|
+
const result = await fetch(`http://localhost:${port}/packages/utils/README.md`);
|
|
181
|
+
expect(result.headers.get('content-type')).toBe('text/markdown');
|
|
170
182
|
});
|
|
171
183
|
});
|
|
172
184
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static-server-manager.spec.js","sourceRoot":"","sources":["../src/static-server-manager.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"static-server-manager.spec.js","sourceRoot":"","sources":["../src/static-server-manager.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const inject_1 = require("@furystack/inject");
|
|
7
|
-
const
|
|
7
|
+
const rest_client_fetch_1 = require("@furystack/rest-client-fetch");
|
|
8
8
|
const utils_1 = require("@furystack/utils");
|
|
9
|
-
const source_1 = require("got/dist/source");
|
|
10
9
|
const request_action_implementation_1 = require("./request-action-implementation");
|
|
11
10
|
const validate_1 = require("./validate");
|
|
12
11
|
require("./helpers");
|
|
@@ -55,7 +54,7 @@ const createValidateApi = async () => {
|
|
|
55
54
|
port,
|
|
56
55
|
root: '/api',
|
|
57
56
|
});
|
|
58
|
-
const client = (0,
|
|
57
|
+
const client = (0, rest_client_fetch_1.createClient)({
|
|
59
58
|
endpointUrl: `http://localhost:${port}/api`,
|
|
60
59
|
});
|
|
61
60
|
return {
|
|
@@ -76,10 +75,10 @@ describe('Validation integration tests', () => {
|
|
|
76
75
|
});
|
|
77
76
|
}
|
|
78
77
|
catch (error) {
|
|
79
|
-
if (error instanceof
|
|
80
|
-
expect(error.message).toBe('
|
|
81
|
-
expect(error.response?.
|
|
82
|
-
const responseJson =
|
|
78
|
+
if (error instanceof rest_client_fetch_1.ResponseError) {
|
|
79
|
+
expect(error.message).toBe('Bad Request');
|
|
80
|
+
expect(error.response?.status).toBe(400);
|
|
81
|
+
const responseJson = await error.response.json();
|
|
83
82
|
expect(responseJson.errors[0].params.missingProperty).toEqual('foo');
|
|
84
83
|
expect(responseJson.errors[1].params.missingProperty).toEqual('bar');
|
|
85
84
|
expect(responseJson.errors[2].params.missingProperty).toEqual('baz');
|
|
@@ -98,10 +97,10 @@ describe('Validation integration tests', () => {
|
|
|
98
97
|
});
|
|
99
98
|
}
|
|
100
99
|
catch (error) {
|
|
101
|
-
if (error instanceof
|
|
102
|
-
expect(error.message).toBe('
|
|
103
|
-
expect(error.response?.
|
|
104
|
-
const responseJson =
|
|
100
|
+
if (error instanceof rest_client_fetch_1.ResponseError) {
|
|
101
|
+
expect(error.message).toBe('Bad Request');
|
|
102
|
+
expect(error.response?.status).toBe(400);
|
|
103
|
+
const responseJson = await error.response.json();
|
|
105
104
|
expect(responseJson.errors[0].params.type).toEqual('number');
|
|
106
105
|
expect(responseJson.errors[0].instancePath).toEqual('/url/id');
|
|
107
106
|
}
|
|
@@ -119,10 +118,10 @@ describe('Validation integration tests', () => {
|
|
|
119
118
|
});
|
|
120
119
|
}
|
|
121
120
|
catch (error) {
|
|
122
|
-
if (error instanceof
|
|
123
|
-
expect(error.message).toBe('
|
|
124
|
-
expect(error.response?.
|
|
125
|
-
const responseJson =
|
|
121
|
+
if (error instanceof rest_client_fetch_1.ResponseError) {
|
|
122
|
+
expect(error.message).toBe('Bad Request');
|
|
123
|
+
expect(error.response?.status).toBe(400);
|
|
124
|
+
const responseJson = await error.response.json();
|
|
126
125
|
expect(responseJson.errors.find((e) => e.keyword === 'required' && e.message.includes('foo'))).toBeDefined();
|
|
127
126
|
}
|
|
128
127
|
}
|
|
@@ -139,10 +138,10 @@ describe('Validation integration tests', () => {
|
|
|
139
138
|
});
|
|
140
139
|
}
|
|
141
140
|
catch (error) {
|
|
142
|
-
if (error instanceof
|
|
143
|
-
expect(error.message).toBe('
|
|
144
|
-
expect(error.response?.
|
|
145
|
-
const responseJson =
|
|
141
|
+
if (error instanceof rest_client_fetch_1.ResponseError) {
|
|
142
|
+
expect(error.message).toBe('Bad Request');
|
|
143
|
+
expect(error.response?.status).toBe(400);
|
|
144
|
+
const responseJson = await error.response.json();
|
|
146
145
|
expect(responseJson.errors[0].params.missingProperty).toEqual('body');
|
|
147
146
|
}
|
|
148
147
|
}
|
|
@@ -161,11 +160,10 @@ describe('Validation integration tests', () => {
|
|
|
161
160
|
baz: false,
|
|
162
161
|
},
|
|
163
162
|
});
|
|
164
|
-
expect(result.response.
|
|
165
|
-
|
|
166
|
-
expect(
|
|
167
|
-
expect(
|
|
168
|
-
expect(responseJson.baz).toBe(false);
|
|
163
|
+
expect(result.response.status).toBe(200);
|
|
164
|
+
expect(result.result.foo).toBe('foo');
|
|
165
|
+
expect(result.result.bar).toBe(2);
|
|
166
|
+
expect(result.result.baz).toBe(false);
|
|
169
167
|
});
|
|
170
168
|
});
|
|
171
169
|
it('Should validate url', async () => {
|
|
@@ -175,9 +173,8 @@ describe('Validation integration tests', () => {
|
|
|
175
173
|
action: '/validate-url/:id',
|
|
176
174
|
url: { id: 3 },
|
|
177
175
|
});
|
|
178
|
-
expect(result.response.
|
|
179
|
-
|
|
180
|
-
expect(responseJson.id).toBe(3);
|
|
176
|
+
expect(result.response.status).toBe(200);
|
|
177
|
+
expect(result.result.id).toBe(3);
|
|
181
178
|
});
|
|
182
179
|
});
|
|
183
180
|
it('Should validate headers', async () => {
|
|
@@ -191,11 +188,10 @@ describe('Validation integration tests', () => {
|
|
|
191
188
|
baz: true,
|
|
192
189
|
},
|
|
193
190
|
});
|
|
194
|
-
expect(result.response.
|
|
195
|
-
|
|
196
|
-
expect(
|
|
197
|
-
expect(
|
|
198
|
-
expect(responseJson.baz).toBe(true);
|
|
191
|
+
expect(result.response.status).toBe(200);
|
|
192
|
+
expect(result.result.foo).toBe('foo');
|
|
193
|
+
expect(result.result.bar).toBe(42);
|
|
194
|
+
expect(result.result.baz).toBe(true);
|
|
199
195
|
});
|
|
200
196
|
});
|
|
201
197
|
it('Should validate body', async () => {
|
|
@@ -209,11 +205,10 @@ describe('Validation integration tests', () => {
|
|
|
209
205
|
baz: true,
|
|
210
206
|
},
|
|
211
207
|
});
|
|
212
|
-
expect(result.response.
|
|
213
|
-
|
|
214
|
-
expect(
|
|
215
|
-
expect(
|
|
216
|
-
expect(responseJson.baz).toBe(true);
|
|
208
|
+
expect(result.response.status).toBe(200);
|
|
209
|
+
expect(result.result.foo).toBe('foo');
|
|
210
|
+
expect(result.result.bar).toBe(42);
|
|
211
|
+
expect(result.result.baz).toBe(true);
|
|
217
212
|
});
|
|
218
213
|
});
|
|
219
214
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.integration.spec.js","sourceRoot":"","sources":["../src/validate.integration.spec.ts"],"names":[],"mappings":";;;;;AAAA,8CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"validate.integration.spec.js","sourceRoot":"","sources":["../src/validate.integration.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@furystack/rest-service",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.2",
|
|
4
4
|
"description": "Repository implementation for FuryStack",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -29,23 +29,22 @@
|
|
|
29
29
|
},
|
|
30
30
|
"homepage": "https://github.com/furystack/furystack",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@furystack/core": "^11.1.
|
|
33
|
-
"@furystack/inject": "^7.1.
|
|
34
|
-
"@furystack/logging": "^3.1.
|
|
35
|
-
"@furystack/repository": "^6.1.
|
|
36
|
-
"@furystack/rest": "^4.1.
|
|
37
|
-
"@furystack/security": "^2.1.
|
|
38
|
-
"@furystack/utils": "^3.1.
|
|
32
|
+
"@furystack/core": "^11.1.1",
|
|
33
|
+
"@furystack/inject": "^7.1.1",
|
|
34
|
+
"@furystack/logging": "^3.1.1",
|
|
35
|
+
"@furystack/repository": "^6.1.1",
|
|
36
|
+
"@furystack/rest": "^4.1.1",
|
|
37
|
+
"@furystack/security": "^2.1.1",
|
|
38
|
+
"@furystack/utils": "^3.1.1",
|
|
39
39
|
"ajv": "^8.11.0",
|
|
40
40
|
"ajv-formats": "^2.1.1",
|
|
41
41
|
"path-to-regexp": "^6.2.1",
|
|
42
42
|
"semaphore-async-await": "^1.5.1"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"@furystack/rest-client-
|
|
46
|
-
"@types/jest": "^29.
|
|
47
|
-
"@types/node": "^18.
|
|
48
|
-
"got": "^11.8.5"
|
|
45
|
+
"@furystack/rest-client-fetch": "^4.1.1",
|
|
46
|
+
"@types/jest": "^29.2.1",
|
|
47
|
+
"@types/node": "^18.11.9"
|
|
49
48
|
},
|
|
50
49
|
"typings": "./types/index.d.ts",
|
|
51
50
|
"gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
|
|
@@ -20,7 +20,6 @@ describe('ErrorAction tests', () => {
|
|
|
20
20
|
})
|
|
21
21
|
expect(result.statusCode).toBe(500)
|
|
22
22
|
expect(result.chunk.message).toBe('Something went wrong')
|
|
23
|
-
expect(result.chunk.url).toBe('https://google.com')
|
|
24
23
|
})
|
|
25
24
|
})
|
|
26
25
|
|
|
@@ -34,7 +33,6 @@ describe('ErrorAction tests', () => {
|
|
|
34
33
|
})
|
|
35
34
|
expect(result.statusCode).toBe(401)
|
|
36
35
|
expect(result.chunk.message).toBe('Something went wrong')
|
|
37
|
-
expect(result.chunk.url).toBe('https://google.com')
|
|
38
36
|
})
|
|
39
37
|
})
|
|
40
38
|
|
|
@@ -48,7 +46,6 @@ describe('ErrorAction tests', () => {
|
|
|
48
46
|
})
|
|
49
47
|
expect(result.statusCode).toBe(403)
|
|
50
48
|
expect(result.chunk.message).toBe('Something went wrong')
|
|
51
|
-
expect(result.chunk.url).toBe('https://google.com')
|
|
52
49
|
})
|
|
53
50
|
})
|
|
54
51
|
})
|
|
@@ -11,24 +11,24 @@ import { SchemaValidationError } from '../schema-validator'
|
|
|
11
11
|
|
|
12
12
|
export const ErrorAction: RequestAction<{
|
|
13
13
|
body: unknown
|
|
14
|
-
result: { message: string
|
|
15
|
-
}> = async ({ getBody
|
|
14
|
+
result: { message: string }
|
|
15
|
+
}> = async ({ getBody }) => {
|
|
16
16
|
const body = await getBody()
|
|
17
17
|
|
|
18
18
|
if (body instanceof SchemaValidationError) {
|
|
19
|
-
return JsonResult({ message: body.message,
|
|
19
|
+
return JsonResult({ message: body.message, errors: body.errors }, 400)
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
if (body instanceof RequestError) {
|
|
23
|
-
return JsonResult({ message: body.message
|
|
23
|
+
return JsonResult({ message: body.message }, body.responseCode)
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
if (body instanceof AuthorizationError) {
|
|
27
|
-
return JsonResult({ message: body.message
|
|
27
|
+
return JsonResult({ message: body.message }, 403)
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
if (body instanceof Error) {
|
|
31
|
-
return JsonResult({ message: body.message
|
|
31
|
+
return JsonResult({ message: body.message }, 500)
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
return JsonResult({ message: 'An unexpected error happened' }, 500)
|