rename non-proxy to without-proxy

resource/locales/en_US/admin/admin.json

@@ -257,7 +257,7 @@
       "discard": "Discard",
       "generate": "Generate"
     },
-    "custom_bot_without_proxy_settings": "Custom bot (non-proxy) Settings",
+    "custom_bot_without_proxy_settings": "Custom bot (without-proxy) Settings",
     "without_proxy": {
       "create_bot": "Create Bot"
     }

resource/locales/ja_JP/admin/admin.json

@@ -255,7 +255,7 @@
       "discard": "破棄",
       "generate": "発行"
     },
-    "custom_bot_without_proxy_settings": "Custom bot (non-proxy) 設定",
+    "custom_bot_without_proxy_settings": "Custom bot (without-proxy) 設定",
     "without_proxy": {
       "create_bot": "Bot を作成する"
     }

resource/locales/zh_CN/admin/admin.json

@@ -265,7 +265,7 @@
       "discard": "丢弃",
       "generate": "生成"
     },
-    "custom_bot_without_proxy_settings": "Custom bot (non-proxy) 设置",
+    "custom_bot_without_proxy_settings": "Custom bot (without-proxy) 设置",
     "without_proxy": {
       "create_bot": "创建 Bot"
     }

src/client/js/components/Admin/SlackIntegration/CustomBotNonProxySettings.jsx

@@ -14,7 +14,7 @@ const CustomBotWithoutProxySettings = (props) => {
   const [slackBotToken, setSlackBotToken] = useState('');
   const [slackSigningSecretEnv, setSlackSigningSecretEnv] = useState('');
   const [slackBotTokenEnv, setSlackBotTokenEnv] = useState('');
-  const botType = 'non-proxy';
+  const botType = 'without-proxy';
 
   const fetchData = useCallback(async() => {
     try {
@@ -38,7 +38,7 @@ const CustomBotWithoutProxySettings = (props) => {
 
   async function updateHandler() {
     try {
-      await appContainer.apiv3.put('/slack-integration/custom-bot-non-proxy', {
+      await appContainer.apiv3.put('/slack-integration/custom-bot-without-proxy', {
         slackSigningSecret,
         slackBotToken,
         botType,

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

@@ -95,11 +95,11 @@ module.exports = (crowi) => {
   /**
    * @swagger
    *
-   *    /slack-integration/custom-bot-non-proxy/:
+   *    /slack-integration/custom-bot-without-proxy/:
    *      put:
    *        tags: [CustomBotWithoutProxy]
    *        operationId: putCustomBotWithoutProxy
-   *        summary: /slack-integration/custom-bot-non-proxy
+   *        summary: /slack-integration/custom-bot-without-proxy
    *        description: Put customBotWithoutProxy setting.
    *        requestBody:
    *          required: true
@@ -111,7 +111,7 @@ module.exports = (crowi) => {
    *           200:
    *             description: Succeeded to put CustomBotWithoutProxy setting.
    */
-  router.put('/custom-bot-non-proxy',
+  router.put('/custom-bot-without-proxy',
     accessTokenParser, loginRequiredStrictly, adminRequired, csrf, validator.CusotmBotWithoutProxy, apiV3FormValidator, async(req, res) => {
       const { slackSigningSecret, slackBotToken, botType } = req.body;
 

src/server/service/config-loader.js

@@ -412,7 +412,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
   },
   SLACK_BOT_TYPE: {
     ns:      'crowi',
-    key:     'slackbot:type', // eg. official || custom-non-proxy || custom-with-proxy
+    key:     'slackbot:type', // eg. official || custom-without-proxy || custom-with-proxy
     type:    TYPES.STRING,
     default: null,
   },