From 00e96e45847dbf280e6a6ebeed92e2a8b44d62b0 Mon Sep 17 00:00:00 2001
From: Misi <mgyongyosi@users.noreply.github.com>
Date: Mon, 12 Feb 2024 11:12:08 +0100
Subject: [PATCH] Auth: SSO Settings UI frontend improvements (#82264)

* Add frontend fixes

* Update labels + link
---
 .../auth-config/AuthProvidersListPage.tsx     |  5 ++-
 .../auth-config/ProviderConfigForm.test.tsx   |  4 ++-
 .../auth-config/ProviderConfigForm.tsx        |  6 ++--
 public/app/features/auth-config/fields.tsx    | 32 +++++++++++++------
 public/app/features/auth-config/types.ts      |  1 +
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/public/app/features/auth-config/AuthProvidersListPage.tsx b/public/app/features/auth-config/AuthProvidersListPage.tsx
index 77acdcc2c01..07a2e54fbb3 100644
--- a/public/app/features/auth-config/AuthProvidersListPage.tsx
+++ b/public/app/features/auth-config/AuthProvidersListPage.tsx
@@ -62,7 +62,10 @@ export const AuthConfigPageUnconnected = ({
       subTitle={
         <>
           Manage your auth settings and configure single sign-on. Find out more in our{' '}
-          <TextLink href="https://grafana.com/docs/grafana/next/setup-grafana/configure-security/configure-authentication">
+          <TextLink
+            external={true}
+            href="https://grafana.com/docs/grafana/next/setup-grafana/configure-security/configure-authentication"
+          >
             documentation
           </TextLink>
           .
diff --git a/public/app/features/auth-config/ProviderConfigForm.test.tsx b/public/app/features/auth-config/ProviderConfigForm.test.tsx
index ac76732075c..0386ab6e710 100644
--- a/public/app/features/auth-config/ProviderConfigForm.test.tsx
+++ b/public/app/features/auth-config/ProviderConfigForm.test.tsx
@@ -44,6 +44,7 @@ jest.mock('app/core/components/FormPrompt/FormPrompt', () => ({
 const testConfig: SSOProvider = {
   id: '300f9b7c-0488-40db-9763-a22ce8bf6b3e',
   provider: 'github',
+  source: 'database',
   settings: {
     ...emptySettings,
     name: 'GitHub',
@@ -101,7 +102,8 @@ describe('ProviderConfigForm', () => {
       expect(putMock).toHaveBeenCalledWith(
         '/api/v1/sso-settings/github',
         {
-          ...testConfig,
+          id: '300f9b7c-0488-40db-9763-a22ce8bf6b3e',
+          provider: 'github',
           settings: {
             name: 'GitHub',
             allowedOrganizations: 'test-org1,test-org2',
diff --git a/public/app/features/auth-config/ProviderConfigForm.tsx b/public/app/features/auth-config/ProviderConfigForm.tsx
index 184bbce65d9..17e0f24a6d5 100644
--- a/public/app/features/auth-config/ProviderConfigForm.tsx
+++ b/public/app/features/auth-config/ProviderConfigForm.tsx
@@ -82,7 +82,6 @@ export const ProviderConfigForm = ({ config, provider, isLoading }: ProviderConf
         payload: [message],
       });
       setSubmitError(true);
-    } finally {
       setIsSaving(false);
     }
   };
@@ -182,7 +181,9 @@ export const ProviderConfigForm = ({ config, provider, isLoading }: ProviderConf
           )}
           <Box display={'flex'} gap={2} marginTop={6}>
             <Field>
-              <Button type={'submit'}>{isSaving ? 'Saving...' : 'Save'}</Button>
+              <Button type={'submit'} disabled={isSaving}>
+                {isSaving ? 'Saving...' : 'Save'}
+              </Button>
             </Field>
             <Field>
               <LinkButton href={'/admin/authentication'} variant={'secondary'}>
@@ -192,6 +193,7 @@ export const ProviderConfigForm = ({ config, provider, isLoading }: ProviderConf
             <Field>
               <Button
                 variant={'secondary'}
+                hidden={config?.source === 'system'}
                 onClick={(event) => {
                   setResetConfig(true);
                 }}
diff --git a/public/app/features/auth-config/fields.tsx b/public/app/features/auth-config/fields.tsx
index 1d174f59ed0..3f4a4f5abf1 100644
--- a/public/app/features/auth-config/fields.tsx
+++ b/public/app/features/auth-config/fields.tsx
@@ -173,10 +173,13 @@ export function fieldMap(provider: string): Record<string, FieldData> {
     allowedGroups: {
       label: 'Allowed groups',
       type: 'select',
-      description:
-        'List of comma- or space-separated groups. The user should be a member of \n' +
-        'at least one group to log in. If you configure allowed_groups, you must also configure \n' +
-        'groups_attribute_path.',
+      description: (
+        <>
+          List of comma- or space-separated groups. The user should be a member of at least one group to log in.{' '}
+          {provider === 'generic_oauth' &&
+            'If you configure allowed_groups, you must also configure groups_attribute_path.'}
+        </>
+      ),
       multi: true,
       allowCustomValue: true,
       options: [],
@@ -347,9 +350,13 @@ export function fieldMap(provider: string): Record<string, FieldData> {
     },
     teamsUrl: {
       label: 'Teams URL',
-      description:
-        'The URL used to query for Team Ids. If not set, the default value is /teams. \n' +
-        'If you configure teams_url, you must also configure team_ids_attribute_path.',
+      description: (
+        <>
+          The URL used to query for Team Ids. If not set, the default value is /teams.{' '}
+          {provider === 'generic_oauth' &&
+            'If you configure teams_url, you must also configure team_ids_attribute_path.'}
+        </>
+      ),
       type: 'text',
       validation: {
         validate: (value, formValues) => {
@@ -379,9 +386,14 @@ export function fieldMap(provider: string): Record<string, FieldData> {
     teamIds: {
       label: 'Team Ids',
       type: 'select',
-      description:
-        'String list of Team Ids. If set, the user must be a member of one of the given teams to log in. \n' +
-        'If you configure team_ids, you must also configure teams_url and team_ids_attribute_path.',
+      description: (
+        <>
+          {provider === 'github' ? 'Integer' : 'String'} list of Team Ids. If set, the user must be a member of one of
+          the given teams to log in.{' '}
+          {provider === 'generic_oauth' &&
+            'If you configure team_ids, you must also configure teams_url and team_ids_attribute_path.'}
+        </>
+      ),
       multi: true,
       allowCustomValue: true,
       options: [],
diff --git a/public/app/features/auth-config/types.ts b/public/app/features/auth-config/types.ts
index 015101b2882..db9040efd4c 100644
--- a/public/app/features/auth-config/types.ts
+++ b/public/app/features/auth-config/types.ts
@@ -59,6 +59,7 @@ export type SSOProviderSettingsBase = {
 export type SSOProvider = {
   id: string;
   provider: string;
+  source: string;
   settings: SSOProviderSettingsBase & {
     teamIds: string;
     allowedOrganizations: string;