SONAR-27440 Fix Bitbucket Cloud OAuth token field rename scopes to scope

Author: dmgodoy

server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucket/bitbucketcloud/BitbucketCloudRestClient.java

@@ -102,10 +102,10 @@ protected BitbucketCloudRestClient(OkHttpClient bitBucketCloudHttpClient, String
   public void validate(String clientId, String clientSecret, String workspace) {
     Token token = validateAccessToken(clientId, clientSecret);
 
-    if (token.getScopes() == null || !token.getScopes().contains("pullrequest")) {
+    if (token.getScope() == null || !token.getScope().contains("pullrequest")) {
       LOG.atInfo()
         .addArgument(MISSING_PULL_REQUEST_READ_PERMISSION)
-        .addArgument(() -> String.format(SCOPE, token.getScopes()))
+        .addArgument(() -> String.format(SCOPE, token.getScope()))
         .log("{}{}");
       throw new IllegalArgumentException(ERROR_BBC_SERVERS + ": " + MISSING_PULL_REQUEST_READ_PERMISSION);
     }

server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucket/bitbucketcloud/Token.java

@@ -22,8 +22,8 @@
 import com.google.gson.annotations.SerializedName;
 
 public class Token {
-  @SerializedName("scopes")
-  private String scopes;
+  @SerializedName("scope")
+  private String scope;
   @SerializedName("access_token")
   private String accessToken;
   @SerializedName("exires_in")
@@ -39,8 +39,8 @@ public Token() {
     // nothing to do here
   }
 
-  public String getScopes() {
-    return scopes;
+  public String getScope() {
+    return scope;
   }
 
   public String getAccessToken() {

server/sonar-alm-client/src/test/java/org/sonar/alm/client/bitbucket/bitbucketcloud/BitbucketCloudRestClientTest.java

@@ -207,7 +207,7 @@ void validate_fails_with_IAE_if_timeout() {
 
   @Test
   void validate_success() throws Exception {
-    String tokenResponse = "{\"scopes\": \"webhook pullrequest:write\", \"access_token\": \"token\", \"expires_in\": 7200, "
+    String tokenResponse = "{\"scope\": \"webhook pullrequest:write\", \"access_token\": \"token\", \"expires_in\": 7200, "
       + "\"token_type\": \"bearer\", \"state\": \"client_credentials\", \"refresh_token\": \"abc\"}";
 
     server.enqueue(new MockResponse().setBody(tokenResponse));
@@ -223,7 +223,7 @@ void validate_success() throws Exception {
 
   @Test
   void validate_fails_if_unsufficient_pull_request_privileges() {
-    String tokenResponse = "{\"scopes\": \"\", \"access_token\": \"token\", \"expires_in\": 7200, "
+    String tokenResponse = "{\"scope\": \"\", \"access_token\": \"token\", \"expires_in\": 7200, "
       + "\"token_type\": \"bearer\", \"state\": \"client_credentials\", \"refresh_token\": \"abc\"}";
     server.enqueue(new MockResponse().setBody(tokenResponse));
 
@@ -235,7 +235,7 @@ void validate_fails_if_unsufficient_pull_request_privileges() {
 
   @Test
   void validate_with_invalid_workspace() {
-    String tokenResponse = "{\"scopes\": \"webhook pullrequest:write\", \"access_token\": \"token\", \"expires_in\": 7200, "
+    String tokenResponse = "{\"scope\": \"webhook pullrequest:write\", \"access_token\": \"token\", \"expires_in\": 7200, "
       + "\"token_type\": \"bearer\", \"state\": \"client_credentials\", \"refresh_token\": \"abc\"}";
     server.enqueue(new MockResponse().setBody(tokenResponse).setResponseCode(200).setHeader("Content-Type", JSON_MEDIA_TYPE));
 
@@ -275,7 +275,7 @@ void validate_with_invalid_credentials() {
 
   @Test
   void validate_with_insufficient_privileges() {
-    String tokenResponse = "{\"scopes\": \"webhook pullrequest:write\", \"access_token\": \"token\", \"expires_in\": 7200, "
+    String tokenResponse = "{\"scope\": \"webhook pullrequest:write\", \"access_token\": \"token\", \"expires_in\": 7200, "
       + "\"token_type\": \"bearer\", \"state\": \"client_credentials\", \"refresh_token\": \"abc\"}";
     server.enqueue(new MockResponse().setBody(tokenResponse).setResponseCode(200).setHeader("Content-Type", JSON_MEDIA_TYPE));