improve environment variable

packages/slackbot-proxy/src/Server.ts

@@ -76,10 +76,10 @@ export class Server {
   injector: InjectorService;
 
   $beforeInit(): Promise<any> | void {
-    const serverUri = process.env.SERVER_URI;
+    const serverUri = process.env.PROXY_SERVER_URI;
 
     if (serverUri === undefined) {
-      throw new Error('The environment variable \'SERVER_URI\' must be defined.');
+      throw new Error('The environment variable \'PROXY_SERVER_URI\' must be defined.');
     }
   }
 

packages/slackbot-proxy/src/services/RegisterService.ts

@@ -64,7 +64,7 @@ export class RegisterService implements GrowiCommandProcessor {
     const { botToken } = authorizeResult;
     const { channel } = JSON.parse(payload.view.private_metadata);
 
-    const serverUri = process.env.SERVER_URI;
+    const serverUri = process.env.PROXY_SERVER_URI;
 
     const client = new WebClient(botToken, { logLevel: isProduction ? LogLevel.DEBUG : LogLevel.INFO });
 

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

@@ -77,7 +77,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
@@ -92,7 +92,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: {
@@ -104,7 +104,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: {
@@ -142,8 +142,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
@@ -419,7 +419,7 @@ module.exports = (crowi) => {
   router.put('/proxy-uri', loginRequiredStrictly, adminRequired, csrf, 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: {
+  PROXY_SERVER_URI: {
     ns:      'crowi',
-    key:     'slackbot:serverUri',
+    key:     'slackbot:proxyServerUri',
     type:    TYPES.STRING,
     default: null,
   },