yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 13:45:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix custom settings override

Browse Source
This commit is contained in:
Mark Kaylor 2022-02-10 15:55:29 +01:00
parent 73b2d7f99b
commit 46f09b3a45
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/plugins/documentation/server/services/documentation.js
View File

@ -20,6 +20,10 @@ module.exports = ({ strapi }) => {
return path.join(strapi.dirs.extensions, 'documentation', 'documentation'); return path.join(strapi.dirs.extensions, 'documentation', 'documentation');
}, },
getCustomDocumentationPath() {
return path.join(strapi.dirs.extensions, 'documentation', 'config', 'settings.json');
},
getDocumentationVersions() { getDocumentationVersions() {
return fs return fs
.readdirSync(this.getFullDocumentationPath()) .readdirSync(this.getFullDocumentationPath())
@ -103,6 +107,16 @@ module.exports = ({ strapi }) => {
return [...apisToDocument, ...pluginsToDocument]; return [...apisToDocument, ...pluginsToDocument];
}, },
async getCustomSettings() {
const customConfigPath = this.getCustomDocumentationPath();
const pathExists = await fs.pathExists(customConfigPath);
if (pathExists) {
return fs.readJson(customConfigPath);
}
return {};
},
/** /**
* @description - Creates the Swagger json files * @description - Creates the Swagger json files
*/ */
@ -133,20 +147,24 @@ module.exports = ({ strapi }) => {
'full_documentation.json' 'full_documentation.json'
); );
const settings = _.cloneDeep(defaultConfig); const defaultSettings = _.cloneDeep(defaultConfig);
const serverUrl = getAbsoluteServerUrl(strapi.config); const serverUrl = getAbsoluteServerUrl(strapi.config);
const apiPath = strapi.config.get('api.rest.prefix'); const apiPath = strapi.config.get('api.rest.prefix');
_.set(settings, 'servers', [ _.set(defaultSettings, 'servers', [
{ {
url: `${serverUrl}${apiPath}`, url: `${serverUrl}${apiPath}`,
description: 'Development server', description: 'Development server',
}, },
]); ]);
_.set(settings, ['info', 'x-generation-date'], new Date().toISOString()); _.set(defaultSettings, ['info', 'x-generation-date'], new Date().toISOString());
_.set(settings, ['info', 'version'], version); _.set(defaultSettings, ['info', 'version'], version);
const customSettings = await this.getCustomSettings();
const settings = _.merge(defaultSettings, customSettings);
await fs.ensureFile(fullDocJsonPath); await fs.ensureFile(fullDocJsonPath);
await fs.writeJson(fullDocJsonPath, { ...settings, paths }, { spaces: 2 }); await fs.writeJson(fullDocJsonPath, { ...settings, paths }, { spaces: 2 });