kaori 4 лет назад
Родитель
Сommit
7fc9e47bd9

+ 2 - 13
src/client/js/components/Admin/SlackIntegration/CustomBotWithProxySettings.jsx

@@ -37,16 +37,6 @@ const CustomBotWithProxySettings = (props) => {
     }
     }
   };
   };
 
 
-  const regenerateTokensHandler = async(tokenGtoP, tokenPtoG) => {
-    try {
-      await appContainer.apiv3.put('/slack-integration-settings/access-tokens', { tokenGtoP, tokenPtoG });
-    }
-    catch (err) {
-      toastError(err);
-      logger.error(err);
-    }
-  };
-
   const deleteSlackAppIntegrationHandler = async() => {
   const deleteSlackAppIntegrationHandler = async() => {
     try {
     try {
       // GW-6068 set new value after this
       // GW-6068 set new value after this
@@ -60,9 +50,9 @@ const CustomBotWithProxySettings = (props) => {
     }
     }
   };
   };
 
 
-  const generateAccessTokens = async() => {
+  const regenerateTokensHandler = async(tokenGtoP, tokenPtoG) => {
     try {
     try {
-      //  TODO: imprement regenerating tokens by GW-6068
+      await appContainer.apiv3.put('/slack-integration-settings/access-tokens', { tokenGtoP, tokenPtoG });
     }
     }
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);
@@ -140,7 +130,6 @@ const CustomBotWithProxySettings = (props) => {
               <WithProxyAccordions
               <WithProxyAccordions
                 botType="customBotWithProxy"
                 botType="customBotWithProxy"
                 slackAppIntegrationId={slackAppIntegration._id}
                 slackAppIntegrationId={slackAppIntegration._id}
-                onClickGenerateTokenBtn={generateAccessTokens}
                 onClickRegenerateTokens={() => regenerateTokensHandler(tokenGtoP, tokenPtoG)}
                 onClickRegenerateTokens={() => regenerateTokensHandler(tokenGtoP, tokenPtoG)}
                 tokenGtoP={tokenGtoP}
                 tokenGtoP={tokenGtoP}
                 tokenPtoG={tokenPtoG}
                 tokenPtoG={tokenPtoG}

+ 0 - 8
src/client/js/components/Admin/SlackIntegration/WithProxyAccordions.jsx

@@ -83,12 +83,6 @@ const GeneratingTokensAndRegisteringProxyServiceProcess = withUnstatedContainers
     }
     }
   };
   };
 
 
-  // const onClickGenerateTokenBtn = () => {
-  //   if (props.onClickGenerateTokenBtn != null) {
-  //     props.onClickGenerateTokenBtn();
-  //   }
-  // };
-
   return (
   return (
     <div className="py-4 px-5">
     <div className="py-4 px-5">
       <p className="font-weight-bold">1. {t('admin:slack_integration.accordion.generate_access_token')}</p>
       <p className="font-weight-bold">1. {t('admin:slack_integration.accordion.generate_access_token')}</p>
@@ -257,7 +251,6 @@ const WithProxyAccordions = (props) => {
       content: <GeneratingTokensAndRegisteringProxyServiceProcess
       content: <GeneratingTokensAndRegisteringProxyServiceProcess
         growiUrl={props.appContainer.config.crowi.url}
         growiUrl={props.appContainer.config.crowi.url}
         onClickRegenerateTokens={() => props.onClickRegenerateTokens}
         onClickRegenerateTokens={() => props.onClickRegenerateTokens}
-        onClickGenerateTokenBtn={props.onClickGenerateTokenBtn}
         tokenPtoG={props.tokenPtoG}
         tokenPtoG={props.tokenPtoG}
         tokenGtoP={props.tokenGtoP}
         tokenGtoP={props.tokenGtoP}
       />,
       />,
@@ -286,7 +279,6 @@ const WithProxyAccordions = (props) => {
       content: <GeneratingTokensAndRegisteringProxyServiceProcess
       content: <GeneratingTokensAndRegisteringProxyServiceProcess
         growiUrl={props.appContainer.config.crowi.url}
         growiUrl={props.appContainer.config.crowi.url}
         onClickRegenerateTokens={() => props.onClickRegenerateTokens}
         onClickRegenerateTokens={() => props.onClickRegenerateTokens}
-        onClickGenerateTokenBtn={props.onClickGenerateTokenBtn}
         tokenPtoG={props.tokenPtoG}
         tokenPtoG={props.tokenPtoG}
         tokenGtoP={props.tokenGtoP}
         tokenGtoP={props.tokenGtoP}
       />,
       />,