From 2d26f78aa8cdfa6d2bb06992f34c8792961fd1a7 Mon Sep 17 00:00:00 2001
From: Joao Machado <13315199+machadoit@users.noreply.github.com>
Date: Wed, 25 Mar 2026 12:55:41 +0100
Subject: [PATCH] breaking: Update field names and API to prepare for changes
 on May 4th CY-7671

https://developer.atlassian.com/cloud/bitbucket/changelog/#CHANGE-3052
---
 .../codacy/client/bitbucket/client/BitbucketClientBase.scala  | 2 +-
 .../scala/com/codacy/client/bitbucket/v2/AccessToken.scala    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/com/codacy/client/bitbucket/client/BitbucketClientBase.scala b/src/main/scala/com/codacy/client/bitbucket/client/BitbucketClientBase.scala
index 7e77068..484c5ca 100644
--- a/src/main/scala/com/codacy/client/bitbucket/client/BitbucketClientBase.scala
+++ b/src/main/scala/com/codacy/client/bitbucket/client/BitbucketClientBase.scala
@@ -18,7 +18,7 @@ import scala.collection.parallel.immutable.ParRange
 import scala.util.{Failure, Properties, Success, Try}
 
 object BitbucketClientBase {
-  val apiBaseUrl = "https://bitbucket.org/api/2.0"
+  val apiBaseUrl = "https://api.bitbucket.org/2.0"
 }
 
 abstract class BitbucketClientBase(val client: WSClient, credentials: Credentials) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/AccessToken.scala b/src/main/scala/com/codacy/client/bitbucket/v2/AccessToken.scala
index 4e26cbf..9de6af0 100644
--- a/src/main/scala/com/codacy/client/bitbucket/v2/AccessToken.scala
+++ b/src/main/scala/com/codacy/client/bitbucket/v2/AccessToken.scala
@@ -3,7 +3,7 @@ package com.codacy.client.bitbucket.v2
 import play.api.libs.functional.syntax._
 import play.api.libs.json.{__, Reads}
 
-case class AccessToken(access_token: String, refresh_token: String, expires_in: Int, scopes: String, token_type: String)
+case class AccessToken(access_token: String, refresh_token: String, expires_in: Int, scope: String, token_type: String)
 
 object AccessToken {
 
@@ -12,7 +12,7 @@ object AccessToken {
     (__ \ "access_token").read[String] and
       (__ \ "refresh_token").read[String] and
       (__ \ "expires_in").read[Int] and
-      (__ \ "scopes").read[String] and
+      (__ \ "scope").read[String].orElse((__ \ "scopes").read[String]) and
       (__ \ "token_type").read[String]
   )(AccessToken.apply _)
   // format: on