NIFI-14468 Fixed scope property name AccessToken (#9871)

Signed-off-by: David Handermann <[email protected]>

Author: pvillard31

nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java

@@ -24,21 +24,21 @@ public class AccessToken {
     private String refreshToken;
     private String tokenType;
     private long expiresIn;
-    private String scopes;
+    private String scope;
 
     private final Instant fetchTime;
 
     public AccessToken() {
         this.fetchTime = Instant.now();
     }
 
-    public AccessToken(String accessToken, String refreshToken, String tokenType, long expiresIn, String scopes) {
+    public AccessToken(String accessToken, String refreshToken, String tokenType, long expiresIn, String scope) {
         this();
         this.accessToken = accessToken;
         this.refreshToken = refreshToken;
         this.tokenType = tokenType;
         this.expiresIn = expiresIn;
-        this.scopes = scopes;
+        this.scope = scope;
     }
 
     public String getAccessToken() {
@@ -73,12 +73,12 @@ public void setExpiresIn(long expiresIn) {
         this.expiresIn = expiresIn;
     }
 
-    public String getScopes() {
-        return scopes;
+    public String getScope() {
+        return scope;
     }
 
-    public void setScopes(String scopes) {
-        this.scopes = scopes;
+    public void setScope(String scope) {
+        this.scope = scope;
     }
 
     public Instant getFetchTime() {

nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProviderTest.java

@@ -274,20 +274,22 @@ public void testValidWhenClientAuthenticationStrategyIsValid() throws Exception
         @Test
         public void testAcquireNewToken() throws Exception {
             String accessTokenValue = "access_token_value";
+            String scopeValue = "scope_value";
 
             // GIVEN
             Response response = buildResponse(
                 HTTP_OK,
-                "{ \"access_token\":\"" + accessTokenValue + "\" }"
+                "{ \"access_token\":\"" + accessTokenValue + "\", \"scope\":\"" + scopeValue + "\" }"
             );
 
             when(mockHttpClient.newCall(any(Request.class)).execute()).thenReturn(response);
 
             // WHEN
-            String actual = testSubject.getAccessDetails().getAccessToken();
+            AccessToken accessToken = testSubject.getAccessDetails();
 
             // THEN
-            assertEquals(accessTokenValue, actual);
+            assertEquals(accessTokenValue, accessToken.getAccessToken());
+            assertEquals(scopeValue, accessToken.getScope());
         }
 
         @Test