Merge branch 'sdk-6220-update-change-password-endpoint' of https://github.com/auth0/auth0-java into sdk-6220-update-change-password-endpoint

tanya732 · tanya732 · commit bad93eceacd8 · 2025-07-10T11:58:06.000+05:30
diff --git a/src/main/java/com/auth0/json/mgmt/refreshtokens/ResourceServer.java b/src/main/java/com/auth0/json/mgmt/refreshtokens/ResourceServer.java
@@ -12,7 +12,7 @@ public class ResourceServer {
     @JsonProperty("audience")
     private String audience;
     @JsonProperty("scopes")
-    private List<String> scopes;
+    private String scopes;
 
     /**
      * @return Resource server ID
@@ -24,7 +24,7 @@ public String getAudience() {
     /**
      * @return List of scopes for the refresh token
      */
-    public List<String> getScopes() {
+    public String getScopes() {
         return scopes;
     }
 }
diff --git a/src/test/java/com/auth0/json/mgmt/refreshtokens/RefreshTokenTest.java b/src/test/java/com/auth0/json/mgmt/refreshtokens/RefreshTokenTest.java
@@ -28,10 +28,7 @@ public class RefreshTokenTest extends JsonTest<RefreshToken> {
         "  \"resource_servers\": [\n" +
         "    {\n" +
         "      \"audience\": \"https://api.example.com\",\n" +
-        "      \"scopes\": [\n" +
-        "        \"read:examples\",\n" +
-        "        \"write:examples\"\n" +
-        "      ]\n" +
+        "      \"scopes\": \"offline_access\"\n" +
         "    }\n" +
         "  ],\n" +
         "  \"last_exchanged_at\": \"2024-07-03T09:10:26.643Z\"\n" +
@@ -69,8 +66,7 @@ public void shouldDeserialize() throws Exception {
         assertThat(refreshToken.getResourceServers(), is(notNullValue()));
         assertThat(refreshToken.getResourceServers().get(0).getAudience(), is("https://api.example.com"));
         assertThat(refreshToken.getResourceServers().get(0).getScopes(), is(notNullValue()));
-        assertThat(refreshToken.getResourceServers().get(0).getScopes().get(0), is("read:examples"));
-        assertThat(refreshToken.getResourceServers().get(0).getScopes().get(1), is("write:examples"));
+        assertThat(refreshToken.getResourceServers().get(0).getScopes(), is("offline_access"));
 
         assertThat(refreshToken.getLastExchangedAt(), is(parseJSONDate("2024-07-03T09:10:26.643Z")));
     }
diff --git a/src/test/java/com/auth0/json/mgmt/refreshtokens/RefreshTokensPageTest.java b/src/test/java/com/auth0/json/mgmt/refreshtokens/RefreshTokensPageTest.java
@@ -30,10 +30,7 @@ public class RefreshTokensPageTest extends JsonTest<RefreshTokensPage> {
         "      \"resource_servers\": [\n" +
         "        {\n" +
         "          \"audience\": \"https://api.example.com\",\n" +
-        "          \"scopes\": [\n" +
-        "            \"read:examples\",\n" +
-        "            \"write:examples\"\n" +
-        "          ]\n" +
+        "          \"scopes\": \"offline_access\"\n" +
         "        }\n" +
         "      ],\n" +
         "      \"last_exchanged_at\": \"2024-07-03T09:10:26.643Z\"\n" +
@@ -58,10 +55,7 @@ public class RefreshTokensPageTest extends JsonTest<RefreshTokensPage> {
         "      \"resource_servers\": [\n" +
         "        {\n" +
         "          \"audience\": \"https://api.example.com\",\n" +
-        "          \"scopes\": [\n" +
-        "            \"read:examples\",\n" +
-        "            \"write:examples\"\n" +
-        "          ]\n" +
+        "          \"scopes\": \"offline_access\"\n" +
         "        }\n" +
         "      ],\n" +
         "      \"last_exchanged_at\": \"2024-07-03T09:10:26.643Z\"\n" +
@@ -92,10 +86,7 @@ public class RefreshTokensPageTest extends JsonTest<RefreshTokensPage> {
         "      \"resource_servers\": [\n" +
         "        {\n" +
         "          \"audience\": \"https://api.example.com\",\n" +
-        "          \"scopes\": [\n" +
-        "            \"read:examples\",\n" +
-        "            \"write:examples\"\n" +
-        "          ]\n" +
+        "          \"scopes\": \"offline_access\"\n" +
         "        }\n" +
         "      ],\n" +
         "      \"last_exchanged_at\": \"2024-07-03T09:10:26.643Z\"\n" +
@@ -120,10 +111,7 @@ public class RefreshTokensPageTest extends JsonTest<RefreshTokensPage> {
         "      \"resource_servers\": [\n" +
         "        {\n" +
         "          \"audience\": \"https://api.example.com\",\n" +
-        "          \"scopes\": [\n" +
-        "            \"read:examples\",\n" +
-        "            \"write:examples\"\n" +
-        "          ]\n" +
+        "          \"scopes\": \"offline_access\"\n" +
         "        }\n" +
         "      ],\n" +
         "      \"last_exchanged_at\": \"2024-07-03T09:10:26.643Z\"\n" +
@@ -159,9 +147,7 @@ public void shouldDeserialize() throws Exception {
 
         assertThat(page.getTokens().get(0).getResourceServers().size(), is(1));
         assertThat(page.getTokens().get(0).getResourceServers().get(0).getAudience(), is("https://api.example.com"));
-        assertThat(page.getTokens().get(0).getResourceServers().get(0).getScopes().size(), is(2));
-        assertThat(page.getTokens().get(0).getResourceServers().get(0).getScopes().get(0), is("read:examples"));
-        assertThat(page.getTokens().get(0).getResourceServers().get(0).getScopes().get(1), is("write:examples"));
+        assertThat(page.getTokens().get(0).getResourceServers().get(0).getScopes(), is("offline_access"));
 
         assertThat(page.getTokens().get(0).getLastExchangedAt(), is(parseJSONDate("2024-07-03T09:10:26.643Z")));
     }
diff --git a/src/test/resources/mgmt/refresh_token.json b/src/test/resources/mgmt/refresh_token.json
@@ -18,10 +18,7 @@
   "resource_servers": [
     {
       "audience": "https://api.example.com",
-      "scopes": [
-        "read:examples",
-        "write:examples"
-      ]
+      "scopes": "offline_access"
     }
   ],
   "last_exchanged_at": "2024-07-03T09:10:26.643Z"
diff --git a/src/test/resources/mgmt/user_refresh_tokens.json b/src/test/resources/mgmt/user_refresh_tokens.json
@@ -20,10 +20,7 @@
       "resource_servers": [
         {
           "audience": "https://api.example.com",
-          "scopes": [
-            "read:examples",
-            "write:examples"
-          ]
+          "scopes": "offline_access"
         }
       ],
       "last_exchanged_at": "2024-07-03T09:10:26.643Z"
@@ -49,10 +46,7 @@
       "resource_servers": [
         {
           "audience": "https://api.example.com",
-          "scopes": [
-            "read:examples",
-            "write:examples"
-          ]
+          "scopes": "offline_access"
         }
       ],
       "last_exchanged_at": "2024-07-03T09:10:26.643Z"

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,7 @@`
`18`	`18`	`"resource_servers": [`
`19`	`19`	`{`
`20`	`20`	`"audience": "https://api.example.com",`
`21`		`- "scopes": [`
`22`		`- "read:examples",`
`23`		`- "write:examples"`
`24`		`- ]`
	`21`	`+ "scopes": "offline_access"`
`25`	`22`	`}`
`26`	`23`	`],`
`27`	`24`	`"last_exchanged_at": "2024-07-03T09:10:26.643Z"`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,7 @@`
`20`	`20`	`"resource_servers": [`
`21`	`21`	`{`
`22`	`22`	`"audience": "https://api.example.com",`
`23`		`- "scopes": [`
`24`		`- "read:examples",`
`25`		`- "write:examples"`
`26`		`- ]`
	`23`	`+ "scopes": "offline_access"`
`27`	`24`	`}`
`28`	`25`	`],`
`29`	`26`	`"last_exchanged_at": "2024-07-03T09:10:26.643Z"`
`@@ -49,10 +46,7 @@`
`49`	`46`	`"resource_servers": [`
`50`	`47`	`{`
`51`	`48`	`"audience": "https://api.example.com",`
`52`		`- "scopes": [`
`53`		`- "read:examples",`
`54`		`- "write:examples"`
`55`		`- ]`
	`49`	`+ "scopes": "offline_access"`
`56`	`50`	`}`
`57`	`51`	`],`
`58`	`52`	`"last_exchanged_at": "2024-07-03T09:10:26.643Z"`