SONAR-19084 GitHub Provisioning wording

diff --git a/server/sonar-auth-bitbucket/src/main/java/org/sonar/auth/bitbucket/BitbucketSettings.java b/server/sonar-auth-bitbucket/src/main/java/org/sonar/auth/bitbucket/BitbucketSettings.java
index a16b967a6795e09c330cf1ead57783b01a3268e6..7c7ed7675b3e7759d65afe0f0ef786012495cb7b 100755 (executable)
--- a/server/sonar-auth-bitbucket/src/main/java/org/sonar/auth/bitbucket/BitbucketSettings.java
+++ b/server/sonar-auth-bitbucket/src/main/java/org/sonar/auth/bitbucket/BitbucketSettings.java
@@ -104,7 +104,7 @@ public class BitbucketSettings {
         .index(3)
         .build(),
       PropertyDefinition.builder(ALLOW_USERS_TO_SIGN_UP)
-        .name("Allow users to sign-up")
+        .name("Allow users to sign up")
         .description("Allow new users to authenticate. When set to 'false', only existing users will be able to authenticate.")
         .category(CATEGORY)
         .subCategory(SUBCATEGORY)

diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java
index 32465a2d9991bc87811f2d8c96d4f05f8e1a234e..03c005da6c018cae861143ccd5190a4136c1dfa5 100644 (file)
--- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java
+++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java
@@ -196,7 +196,7 @@ public class GitHubSettings {
         .index(index++)
         .build(),
       PropertyDefinition.builder(ALLOW_USERS_TO_SIGN_UP)
-        .name("Allow users to sign-up")
+        .name("Allow users to sign up")
         .description("Allow new users to authenticate. When set to 'false', only existing users will be able to authenticate to the server.")
         .category(CATEGORY)
         .subCategory(SUBCATEGORY)

diff --git a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubSettingsTest.java b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubSettingsTest.java
index 8fb0125b7f87f4d65086a59468729231496a7dcf..8eb630cf7af71db488cc9d75db8473ac8de259ec 100644 (file)
--- a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubSettingsTest.java
+++ b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubSettingsTest.java
@@ -256,7 +256,7 @@ public class GitHubSettingsTest {
         "Client Secret",
         "App ID",
         "Private Key",
-        "Allow users to sign-up",
+        "Allow users to sign up",
         "Synchronize teams as groups",
         "The API url for a GitHub instance.",
         "The WEB url for a GitHub instance.",

diff --git a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java
index b7678aa0afae6bc095d459137d411bfa7388a0d1..a9ecff73e67b2fb7b903b0a8be78668dc9340568 100644 (file)
--- a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java
+++ b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java
@@ -110,7 +110,7 @@ public class GitLabSettings {
         .index(4)
         .build(),
       PropertyDefinition.builder(GITLAB_AUTH_ALLOW_USERS_TO_SIGNUP)
-        .name("Allow users to sign-up")
+        .name("Allow users to sign up")
         .description("Allow new users to authenticate. When set to 'false', only existing users will be able to authenticate to the server.")
         .category(CATEGORY)
         .subCategory(SUBCATEGORY)

diff --git a/server/sonar-web/src/main/js/app/components/GitHubSynchronisationWarning.tsx b/server/sonar-web/src/main/js/app/components/GitHubSynchronisationWarning.tsx
index 67e7002a905897d7b5595e562c7e2e7977ff7c94..71abf62d7999847c94cb8d6adb35943f8b5b7ec2 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/GitHubSynchronisationWarning.tsx
+++ b/server/sonar-web/src/main/js/app/components/GitHubSynchronisationWarning.tsx
@@ -57,7 +57,7 @@ function GitHubSynchronisationWarning(props: WrappedComponentProps) {
         case TaskStatuses.Failed:
           setMessage(
             translateWithParameters(
-              'settings.authentication.github.background_task.synchronisation_failed',
+              'settings.authentication.github.background_task.synchronization_failed',
               formattedDate,
               errorMessage ?? ''
             )
@@ -67,7 +67,7 @@ function GitHubSynchronisationWarning(props: WrappedComponentProps) {
         case TaskStatuses.Success:
           setMessage(
             translateWithParameters(
-              'settings.authentication.github.background_task.synchronisation_successful',
+              'settings.authentication.github.background_task.synchronization_successful',
               formattedDate
             )
           );
@@ -76,7 +76,7 @@ function GitHubSynchronisationWarning(props: WrappedComponentProps) {
         case TaskStatuses.InProgress:
           setMessage(
             translateWithParameters(
-              'settings.authentication.github.background_task.synchronisation_in_progress',
+              'settings.authentication.github.background_task.synchronization_in_progress',
               formattedDate
             )
           );

diff --git a/server/sonar-web/src/main/js/apps/users/__tests__/UsersApp-it.tsx b/server/sonar-web/src/main/js/apps/users/__tests__/UsersApp-it.tsx
index b3cbccd36683e5d6681be159724109689328206d..705dfab75242b081ca6937e36c98e8d46680867a 100644 (file)
--- a/server/sonar-web/src/main/js/apps/users/__tests__/UsersApp-it.tsx
+++ b/server/sonar-web/src/main/js/apps/users/__tests__/UsersApp-it.tsx
@@ -125,9 +125,9 @@ const ui = {
   confirmPassword: byLabelText('my_profile.password.confirm', { selector: 'input', exact: false }),
   tokenNameInput: byRole('textbox', { name: 'users.tokens.name' }),
   deleteUserCheckbox: byRole('checkbox', { name: 'users.delete_user' }),
-  githubProvisioningInProgress: byRole('status', { name: /synchronisation_in_progress/ }),
-  githubProvisioningSuccess: byRole('status', { name: /synchronisation_successful/ }),
-  githubProvisioningAlert: byRole('alert', { name: /synchronisation_failed/ }),
+  githubProvisioningInProgress: byRole('status', { name: /synchronization_in_progress/ }),
+  githubProvisioningSuccess: byRole('status', { name: /synchronization_successful/ }),
+  githubProvisioningAlert: byRole('alert', { name: /synchronization_failed/ }),
 };
 
 beforeEach(() => {

diff --git a/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts b/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts
index 8432dddc4b4048d5cfef4d76abdc7725f485c435..54548bbbe2ffd63f5b1a3e3581bf98f3f8289d09 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts
+++ b/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts
@@ -179,7 +179,7 @@ export const definitions: ExtendedSettingDefinition[] = [
   },
   {
     key: 'sonar.auth.bitbucket.allowUsersToSignUp',
-    name: 'Allow users to sign-up',
+    name: 'Allow users to sign up',
     description:
       "Allow new users to authenticate. When set to 'false', only existing users will be able to authenticate.",
     type: SettingType.BOOLEAN,
@@ -191,7 +191,7 @@ export const definitions: ExtendedSettingDefinition[] = [
   },
   {
     key: 'sonar.auth.github.allowUsersToSignUp',
-    name: 'Allow users to sign-up',
+    name: 'Allow users to sign up',
     description:
       "Allow new users to authenticate. When set to 'false', only existing users will be able to authenticate to the server.",
     type: SettingType.BOOLEAN,
@@ -223,7 +223,7 @@ export const definitions: ExtendedSettingDefinition[] = [
   },
   {
     key: 'sonar.auth.gitlab.allowUsersToSignUp',
-    name: 'Allow users to sign-up',
+    name: 'Allow users to sign up',
     description:
       "Allow new users to authenticate. When set to 'false', only existing users will be able to authenticate to the server.",
     type: SettingType.BOOLEAN,

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 853047d3aca51f60c5c55e8cd92b5d20d2e643b7..9daa1ddc8ffa2028b3d132db784da24734269f42 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1320,7 +1320,7 @@ settings.authentication.custom_message_information=You can define a custom log-i
 settings.authentication.custom_message_information.link=General
 settings.authentication.description=The following settings allow you to delegate authentication via SAML, or any of the following DevOps Platforms: GitHub, GitLab, and Bitbucket.
 settings.authentication.help=If you need help setting up authentication, read our dedicated {link}.
-settings.authentication.legacy_help.github=Your configuration is no longer supported, please checkout the {link} on how to change your configuration.
+settings.authentication.legacy_help.github=Compatibility with GitHub OAuth App is deprecated and will be removed in a future release. Please check out the {link} for information on how to update your configuration.
 settings.authentication.help.link=documentation
 settings.authentication.form.create=Create configuration
 settings.authentication.form.edit=Edit
@@ -1332,27 +1332,27 @@ settings.authentication.form.enable=Enable configuration
 settings.authentication.form.disable=Disable configuration
 settings.authentication.form.provisioning=Provisioning
 settings.authentication.form.provisioning_at_login=Just-in-Time user and group provisioning (default)
-settings.authentication.form.other_provisioning_enabled=Only one provider can have automatic user and group provisioning.
+settings.authentication.form.other_provisioning_enabled=Already enabled for another provider.  Only one identity provider can have automatic users and groups provisioning enabled.
 
 # GITHUB
-settings.authentication.form.create.github=New GitHub configuration
-settings.authentication.form.edit.github=Edit GitHub configuration
+settings.authentication.form.create.github=New GitHub Configuration
+settings.authentication.form.edit.github=Edit GitHub Configuration
 settings.authentication.github.appid_x=App ID: {0}
 settings.authentication.github.confirm.auto=Switch to automatic provisioning
 settings.authentication.github.confirm.jit=Switch to Just-in-Time provisioning
 settings.authentication.github.confirm.auto.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.github.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.github.confirm.jit.description=Switching to Just-in-Time provisioning removes all information provided while automatic provisioning through GitHub was active. These changes cannot be reverted. Are you sure?
 settings.authentication.github.configuration=GitHub Configuration
 settings.authentication.github.form.not_configured=GitHub App is not configured
-settings.authentication.github.form.legacy_configured=You current configuration is no longer supported. It will continue working but with limitted support.See the {documentation} for more information.
+settings.authentication.github.form.legacy_configured=Compatibility with GitHub OAuth App is deprecated and will be removed in a future release. Your configuration will continue to work but with limited support. We recommend using GitHub Apps. Check out the {documentation} for more information.
 settings.authentication.github.enable_first=Enable your GitHub configuration for more provisioning options.
 settings.authentication.github.form.provisioning_with_github=Automatic user and group provisioning
 settings.authentication.github.form.provisioning_with_github.description=Users and groups are automatically provisioned from your GitHub organizations. Once activated, managed users and groups can only be modified from your GitHub organizations/teams. Existing local users and groups will be kept.
 settings.authentication.github.form.provisioning_with_github.description.doc=For more details, see {documentation}.
 settings.authentication.github.form.provisioning.disabled=Your current edition does not support provisioning with GitHub. See the {documentation} for more information.
-settings.authentication.github.background_task.synchronisation_in_progress=Synchronisation is in progress. Started on {0}.
-settings.authentication.github.background_task.synchronisation_successful=Successful synchronisation on {0}.
-settings.authentication.github.background_task.synchronisation_failed=Synchronisation failed on {0}. {1}
+settings.authentication.github.background_task.synchronization_in_progress=Synchronization is in progress. Started on {0}.
+settings.authentication.github.background_task.synchronization_successful=Successful synchronization on {0}.
+settings.authentication.github.background_task.synchronization_failed=Synchronization failed on {0}. {1}
 
 # SAML
 settings.authentication.form.create.saml=New SAML configuration