Skip to content

Commit 9f704f7

Browse files
authored
fix(api-generation): api generation package now uses WIldduck Joi and does not depend on fixed joi version ZMS-126 (#639)
* restifyapi generate transformed into a class and uses the passed Joi and dirname * remove joi dependency from .ncurc.js
1 parent f6f5f5e commit 9f704f7

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

.ncurc.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ module.exports = {
99

1010
// esm only
1111
'chai',
12-
'unixcrypt',
13-
14-
// temporary
15-
'joi'
12+
'unixcrypt'
1613
]
1714
};

api.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ const settingsRoutes = require('./lib/api/settings');
5050
const healthRoutes = require('./lib/api/health');
5151
const { SettingsHandler } = require('./lib/settings-handler');
5252

53-
const restifyApiGenerate = require('restifyapigenerate');
53+
const { RestifyApiGenerate } = require('restifyapigenerate');
54+
const Joi = require('joi');
5455
const restifyApiGenerateConfig = require('./config/apigeneration.json');
56+
const restifyApiGenerate = new RestifyApiGenerate(Joi, __dirname);
5557

5658
let userHandler;
5759
let mailboxHandler;
@@ -578,7 +580,7 @@ module.exports = done => {
578580
);
579581
}
580582

581-
server.pre(restifyApiGenerate(server, restifyApiGenerateConfig));
583+
server.pre(restifyApiGenerate.restifyApiGenerate(server, restifyApiGenerateConfig));
582584

583585
server.on('error', err => {
584586
if (!started) {

config/apigeneration.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@
6464
}
6565
},
6666
"security": [{ "AccessTokenAuth": [] }],
67-
"docsPath": "/../../openapidocs.json"
67+
"docsPath": "/openapidocs.json"
6868
}

package-lock.json

+4-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"restify-cors-middleware2": "2.2.1",
9696
"restify-errors": "8.0.2",
9797
"restify-logger": "2.0.1",
98-
"restifyapigenerate": "1.1.0",
98+
"restifyapigenerate": "1.2.0",
9999
"search-string": "3.1.0",
100100
"seq-index": "1.1.0",
101101
"smtp-server": "3.13.2",

0 commit comments

Comments
 (0)