SONAR-18662 Improve text for SCIM configuration

diff --git a/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlSettings.java b/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlSettings.java
index 39184848603726ea764897fba5d202bc8a23d131..d4a71907f60ff0fb08d158400f37cb102f81c39b 100644 (file)
--- a/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlSettings.java
+++ b/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlSettings.java
@@ -188,8 +188,7 @@ public class SamlSettings {
         .build(),
       PropertyDefinition.builder(GROUP_NAME_ATTRIBUTE)
         .name("SAML group attribute")
-        .description("Attribute defining the user groups in SAML. " +
-          "Users are associated to the default group only if no attribute is defined.")
+        .description("Attribute defining the user groups in SAML, used to synchronize group memberships. If you leave this field empty, group memberships are managed locally by SonarQube administrators.")
         .category(CATEGORY)
         .subCategory(SUBCATEGORY)
         .index(10)

diff --git a/server/sonar-web/src/main/js/apps/settings/components/authentication/SamlAuthentication.tsx b/server/sonar-web/src/main/js/apps/settings/components/authentication/SamlAuthentication.tsx
index 9186bbada034c635d408b5aa6b5c0a7cc3eae8af..9492328cbd4f1efc36a7fb1b0f3100b66735f6b0 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/authentication/SamlAuthentication.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/authentication/SamlAuthentication.tsx
@@ -210,14 +210,19 @@ export default function SamlAuthentication(props: SamlAuthenticationProps) {
                             'settings.authentication.saml.form.provisioning_with_scim.sub'
                           )}
                         </p>
+                        <p className="spacer-bottom">
+                          {translate(
+                            'settings.authentication.saml.form.provisioning_with_scim.description'
+                          )}
+                        </p>
                         <p>
                           <FormattedMessage
-                            id="settings.authentication.saml.form.provisioning_with_scim.description"
+                            id="settings.authentication.saml.form.provisioning_with_scim.description.doc"
                             defaultMessage={translate(
-                              'settings.authentication.saml.form.provisioning_with_scim.description'
+                              'settings.authentication.saml.form.provisioning_with_scim.description.doc'
                             )}
                             values={{
-                              doc: (
+                              documentation: (
                                 <DocLink to="/instance-administration/authentication/saml/scim/overview">
                                   {translate('documentation')}
                                 </DocLink>

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 27776147d2118d88504ebf9a032656d443a71907..d339498d9391a25817e99acf96ea7e63d3c5f63c 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1297,10 +1297,10 @@ settings.authentication.form.create=Create configuration
 settings.authentication.form.edit=Edit
 settings.authentication.form.delete=Delete
 settings.authentication.saml.configuration=SAML Configuration
-settings.authentication.saml.confirm.scim=Activate auto provisioning
-settings.authentication.saml.confirm.jit=Use just-in-time provisioning
-settings.authentication.saml.confirm.scim.description=Turning on auto provisioning with SCIM will no longer allow you to edit group, user and group membership. All action will need to be done on your identity provider. Are you sure?
-settings.authentication.saml.confirm.jit.description=Turning off auto provisioning will remove all information provided during SCIM provisioning. This cannot be reverted. Are you sure? 
+settings.authentication.saml.confirm.scim=Switch to automatic provisioning
+settings.authentication.saml.confirm.jit=Switch to Just-in-Time provisioning
+settings.authentication.saml.confirm.scim.description=After you switch to automatic provisioning, you will no longer be able to edit groups, users, and group memberships within SonarQube. Are you sure?
+settings.authentication.saml.confirm.jit.description=Switching to Just-in-Time provisioning removes all information provided while automatic provisioning through SCIM was active. These changes cannot be reverted. Are you sure?
 settings.authentication.saml.form.loading=Loading SAML configuration
 settings.authentication.saml.form.not_configured=SAML is not configured
 settings.authentication.saml.form.enable=Enable configuration
@@ -1316,11 +1316,12 @@ settings.authentication.saml.form.test.help.incomplete=Some mandatory fields are
 settings.authentication.saml.form.save_success=Saved successfully
 settings.authentication.saml.form.save_partial=Saved partially
 settings.authentication.saml.form.provisioning=Provisioning
-settings.authentication.saml.form.provisioning_at_login=Just-in-time user and group provisioning (default)
-settings.authentication.saml.form.provisioning_at_login.sub=Use this option if your identity provider does not support SCIM protocol. 
-settings.authentication.saml.form.provisioning_with_scim=Automatically provision user and group with SCIM
-settings.authentication.saml.form.provisioning_with_scim.sub=Prefered option when using the supported identity provider
-settings.authentication.saml.form.provisioning_with_scim.description=Users and groups are automatically provisioned from your identity provider using SCIM protocol. Once activated, managed users and groups can only be modified from your identity provider. Existing local users and groups will be kept. See {doc} for more details
+settings.authentication.saml.form.provisioning_at_login=Just-in-Time user and group provisioning (default)
+settings.authentication.saml.form.provisioning_at_login.sub=Use this option if your identity provider does not support the SCIM protocol.
+settings.authentication.saml.form.provisioning_with_scim=Automatic user and group provisioning SCIM (recommended)
+settings.authentication.saml.form.provisioning_with_scim.sub=Preferred option when using a supported identity provider.
+settings.authentication.saml.form.provisioning_with_scim.description=Users and groups are automatically provisioned from your identity provider using the SCIM protocol. Once activated, managed users and groups can only be modified from your identity provider. Existing local users and groups will be kept.
+settings.authentication.saml.form.provisioning_with_scim.description.doc=For a list of supported providers and more details on automatic provisioning, see {documentation}.
 settings.authentication.saml.enable_first=Enable your SAML configuration to benefit from automatic user provisioning options.
 settings.pr_decoration.binding.category=DevOps Platform Integration
 settings.pr_decoration.binding.no_bindings=A system administrator needs to enable this feature in the global settings.