Fixes

grafana · Mar 1, 2024 · 6968ca0 · 6968ca0
1 parent ee82be8
commit 6968ca0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/pkg/login/social/connectors/azuread_oauth.go b/pkg/login/social/connectors/azuread_oauth.go
@@ -200,7 +200,8 @@ func (s *SocialAzureAD) Validate(ctx context.Context, settings ssoModels.SSOSett
 
 	return validation.Validate(info, requester,
 		validateAllowedGroups,
-		//validation.MustBeEmptyValidator(info.ApiUrl, "API URL"), //uncomment this after the Terraform provider is updated
+		// FIXME: uncomment this after the Terraform provider is updated
+		//validation.MustBeEmptyValidator(info.ApiUrl, "API URL"),
 		validation.RequiredUrlValidator(info.AuthUrl, "Auth URL"),
 		validation.RequiredUrlValidator(info.TokenUrl, "Token URL"))
 }

diff --git a/public/app/features/auth-config/fields.tsx b/public/app/features/auth-config/fields.tsx
@@ -46,7 +46,6 @@ export const sectionFields: Section = {
         'name',
         'clientId',
         'clientSecret',
-        'authStyle',
         'scopes',
         'authUrl',
         'tokenUrl',
@@ -66,18 +65,16 @@ export const sectionFields: Section = {
       fields: [
         'allowedOrganizations',
         'allowedDomains',
-        'defineAllowedGroups',
-        { name: 'allowedGroups', dependsOn: 'defineAllowedGroups' },
+        'allowedGroups',
         'forceUseGraphApi',
         'usePkce',
         'useRefreshToken',
+        'tlsSkipVerifyInsecure',
+        'tlsClientCert',
+        'tlsClientKey',
+        'tlsClientCa',
       ],
     },
-    {
-      name: 'TLS',
-      id: 'tls',
-      fields: ['tlsSkipVerifyInsecure', 'tlsClientCert', 'tlsClientKey', 'tlsClientCa'],
-    },
   ],
   generic_oauth: [
     {
@@ -362,7 +359,7 @@ export function fieldMap(provider: string): Record<string, FieldData> {
     },
     forceUseGraphApi: {
       label: 'Force use Graph API',
-      description: 'If enabled, Grafana will fetch the users\' groups using the Microsoft Graph API.',
+      description: "If enabled, Grafana will fetch the users' groups using the Microsoft Graph API.",
       type: 'checkbox',
     },
     usePkce: {

diff --git a/public/app/features/auth-config/types.ts b/public/app/features/auth-config/types.ts
@@ -53,6 +53,8 @@ export type SSOProviderSettingsBase = {
   defineAllowedTeamsIds?: boolean;
   configureTLS?: boolean;
   tlsSkipVerifyInsecure?: boolean;
+  // For Azure AD
+  forceUseGraphApi?: boolean;
 };
 
 // SSO data received from the API and sent to it
@@ -66,8 +68,6 @@ export type SSOProvider = {
     allowedDomains?: string;
     allowedGroups?: string;
     scopes?: string;
-    // For Azure AD
-    forceUseGraphApi?: boolean;
   };
 };