From b834e7d2f5da0aa3158a8f769969eb11f7fcd248 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Mon, 4 Apr 2022 12:27:13 -0400
Subject: [PATCH] Remove viewing enroll secrets on app settings page, add
 changelog (#4896)

---
 ...3-remove-enroll-secrets-from-settings-page |  1 +
 .../admin/AppConfigForm/AppConfigForm.tsx     | 19 -------------
 .../forms/admin/AppConfigForm/constants.ts    |  2 --
 .../admin/AppSettingsPage/AppSettingsPage.tsx | 28 ++-----------------
 4 files changed, 3 insertions(+), 47 deletions(-)
 create mode 100644 changes/issue-3573-remove-enroll-secrets-from-settings-page

diff --git a/changes/issue-3573-remove-enroll-secrets-from-settings-page b/changes/issue-3573-remove-enroll-secrets-from-settings-page
new file mode 100644
index 0000000000..a693aee08c
--- /dev/null
+++ b/changes/issue-3573-remove-enroll-secrets-from-settings-page
@@ -0,0 +1 @@
+* Global enroll secrets not viewable on the settings page (viewable and modifable on Manage Hosts page and Team Details page only)
\ No newline at end of file
diff --git a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.tsx b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.tsx
index e0dceb01ba..dcb272fd4d 100644
--- a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.tsx
+++ b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.tsx
@@ -11,7 +11,6 @@ import Button from "components/buttons/Button";
 import Checkbox from "components/forms/fields/Checkbox";
 // @ts-ignore
 import Dropdown from "components/forms/fields/Dropdown";
-import EnrollSecretTable from "components/EnrollSecretTable";
 // @ts-ignore
 import InputField from "components/forms/fields/InputField";
 // @ts-ignore
@@ -42,7 +41,6 @@ const baseClass = "app-config-form";
 
 const AppConfigFormFunctional = ({
   appConfig,
-  enrollSecret,
   handleSubmit,
 }: IAppConfigFormProps): JSX.Element => {
   // STATE
@@ -627,22 +625,6 @@ const AppConfigFormFunctional = ({
     );
   };
 
-  const renderOsqueryEnrollmentSecretsSection = () => {
-    return (
-      <div className={`${baseClass}__section`}>
-        <h2>
-          <a id="osquery-enrollment-secrets">Osquery enrollment secrets</a>
-        </h2>
-        <div className={`${baseClass}__inputs`}>
-          <p className={`${baseClass}__enroll-secret-label`}>
-            Manage secrets with <code>fleetctl</code>. Active secrets:
-          </p>
-          <EnrollSecretTable secrets={enrollSecret} />
-        </div>
-      </div>
-    );
-  };
-
   const renderGlobalAgentOptionsSection = () => {
     return (
       <div className={`${baseClass}__section`}>
@@ -977,7 +959,6 @@ const AppConfigFormFunctional = ({
         {renderFleetWebAddressSection()}
         {renderSAMLSingleSignOnOptionsSection()}
         {renderSMTPOptionsSection()}
-        {renderOsqueryEnrollmentSecretsSection()}
         {renderGlobalAgentOptionsSection()}
         {renderHostStatusWebhookSection()}
         {renderUsageStatistics()}
diff --git a/frontend/components/forms/admin/AppConfigForm/constants.ts b/frontend/components/forms/admin/AppConfigForm/constants.ts
index 9c96fb65bf..9ea8e234a6 100644
--- a/frontend/components/forms/admin/AppConfigForm/constants.ts
+++ b/frontend/components/forms/admin/AppConfigForm/constants.ts
@@ -1,9 +1,7 @@
 import { IConfigNested } from "interfaces/config";
-import { IEnrollSecret } from "interfaces/enroll_secret";
 
 export interface IAppConfigFormProps {
   appConfig: IConfigNested;
-  enrollSecret: IEnrollSecret[] | undefined;
   handleSubmit: any;
 }
 
diff --git a/frontend/pages/admin/AppSettingsPage/AppSettingsPage.tsx b/frontend/pages/admin/AppSettingsPage/AppSettingsPage.tsx
index 9ccc2da5f7..e36d87ab2b 100644
--- a/frontend/pages/admin/AppSettingsPage/AppSettingsPage.tsx
+++ b/frontend/pages/admin/AppSettingsPage/AppSettingsPage.tsx
@@ -5,17 +5,12 @@ import { AppContext } from "context/app";
 import { NotificationContext } from "context/notification"; // @ts-ignore
 import { getConfig } from "redux/nodes/app/actions";
 
-import enrollSecretsAPI from "services/entities/enroll_secret";
 import configAPI from "services/entities/config";
 
 // @ts-ignore
 import deepDifference from "utilities/deep_difference";
 import { IConfig, IConfigNested } from "interfaces/config";
 import { IApiError } from "interfaces/errors";
-import {
-  IEnrollSecret,
-  IEnrollSecretsResponse,
-} from "interfaces/enroll_secret";
 
 // @ts-ignore
 import AppConfigForm from "components/forms/admin/AppConfigForm";
@@ -40,15 +35,6 @@ const AppSettingsPage = (): JSX.Element => {
     }
   );
 
-  const { data: globalSecrets } = useQuery<
-    IEnrollSecretsResponse,
-    Error,
-    IEnrollSecret[]
-  >(["global secrets"], () => enrollSecretsAPI.getGlobalEnrollSecrets(), {
-    enabled: true,
-    select: (data: IEnrollSecretsResponse) => data.secrets,
-  });
-
   const onFormSubmit = useCallback(
     (formData: IConfigNested) => {
       const diff = deepDifference(formData, appConfig);
@@ -104,8 +90,7 @@ const AppSettingsPage = (): JSX.Element => {
   return (
     <div className={`${baseClass} body-wrap`}>
       <p className={`${baseClass}__page-description`}>
-        Set your organization information, Configure SAML and SMTP, and view
-        host enroll secrets.
+        Set your organization information and configure SAML and SMTP.
       </p>
       <div className={`${baseClass}__settings-form`}>
         <nav>
@@ -128,11 +113,6 @@ const AppSettingsPage = (): JSX.Element => {
             <li>
               <a onClick={() => scrollInto("smtp")}>SMTP options</a>
             </li>
-            <li>
-              <a onClick={() => scrollInto("osquery-enrollment-secrets")}>
-                Osquery enrollment secrets
-              </a>
-            </li>
             <li>
               <a onClick={() => scrollInto("agent-options")}>
                 Global agent options
@@ -154,11 +134,7 @@ const AppSettingsPage = (): JSX.Element => {
           </ul>
         </nav>
         {!isLoadingConfig && appConfig && (
-          <AppConfigForm
-            appConfig={appConfig}
-            handleSubmit={onFormSubmit}
-            enrollSecret={globalSecrets}
-          />
+          <AppConfigForm appConfig={appConfig} handleSubmit={onFormSubmit} />
         )}
       </div>
     </div>