Merge pull request #3779 from weseek/imprv/gw6056-rename-serverUri-to-proxyServerUri

rename serverUri to proxyServerUri

src/server/routes/apiv3/slack-integration-settings.js

@@ -81,7 +81,7 @@ module.exports = (crowi) => {
       'slackbot:currentBotType': null,
       'slackbot:signingSecret': null,
       'slackbot:token': null,
-      'slackbot:serverUri': null,
+      'slackbot:proxyServerUri': null,
     };
     const { configManager } = crowi;
     // update config without publishing S2sMessage
@@ -96,7 +96,7 @@ module.exports = (crowi) => {
 
   async function getConnectionStatusesFromProxy(tokens) {
     const csv = tokens.join(',');
-    const proxyUri = crowi.configManager.getConfig('crowi', 'slackbot:serverUri');
+    const proxyUri = crowi.configManager.getConfig('crowi', 'slackbot:proxyServerUri');
 
     const result = await axios.get(urljoin(proxyUri, '/g2s/connection-status'), {
       headers: {
@@ -108,7 +108,7 @@ module.exports = (crowi) => {
   }
 
   async function postRelationTest(token) {
-    const proxyUri = crowi.configManager.getConfig('crowi', 'slackbot:serverUri');
+    const proxyUri = crowi.configManager.getConfig('crowi', 'slackbot:proxyServerUri');
 
     const result = await axios.get(urljoin(proxyUri, '/g2s/relation-test'), {
       headers: {
@@ -146,8 +146,8 @@ module.exports = (crowi) => {
       settings.slackBotToken = configManager.getConfig('crowi', 'slackbot:token');
     }
     else {
-      settings.proxyServerUri = crowi.configManager.getConfig('crowi', 'slackbot:serverUri');
-      settings.proxyUriEnvVars = configManager.getConfigFromEnvVars('crowi', 'slackbot:serverUri');
+      settings.proxyServerUri = crowi.configManager.getConfig('crowi', 'slackbot:proxyServerUri');
+      settings.proxyUriEnvVars = configManager.getConfigFromEnvVars('crowi', 'slackbot:proxyServerUri');
     }
 
     // retrieve connection statuses
@@ -423,7 +423,7 @@ module.exports = (crowi) => {
   router.put('/proxy-uri', loginRequiredStrictly, adminRequired, csrf, validator.proxyUri, apiV3FormValidator, async(req, res) => {
     const { proxyUri } = req.body;
 
-    const requestParams = { 'slackbot:serverUri': proxyUri };
+    const requestParams = { 'slackbot:proxyServerUri': proxyUri };
 
     try {
       await updateSlackBotSettings(requestParams);

src/server/service/config-loader.js

@@ -410,9 +410,9 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.STRING,
     default: null,
   },
-  SERVER_URI: {
+  SLACK_INTEGRATION_PROXY_URI: {
     ns:      'crowi',
-    key:     'slackbot:serverUri',
+    key:     'slackbot:proxyServerUri',
     type:    TYPES.STRING,
     default: null,
   },