(nifi) branch main updated: NIFI-14468 Fixed scope property name AccessToken (#9871)

[exceptionfactory]

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 538aafc903 NIFI-14468 Fixed scope property name AccessToken (#9871)
538aafc903 is described below

commit 538aafc903611dc33ca685aca8f52b80674c36fb
Author: Pierre Villard <pierre.villard...@gmail.com>
AuthorDate: Fri Apr 11 23:27:15 2025 +0200

    NIFI-14468 Fixed scope property name AccessToken (#9871)
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../src/main/java/org/apache/nifi/oauth2/AccessToken.java  | 14 +++++++-------
 .../nifi/oauth2/StandardOauth2AccessTokenProviderTest.java |  8 +++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git 
a/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
 
b/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
index e2d289e19a..19002a867a 100644
--- 
a/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
+++ 
b/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
@@ -24,7 +24,7 @@ public class AccessToken {
     private String refreshToken;
     private String tokenType;
     private long expiresIn;
-    private String scopes;
+    private String scope;
 
     private final Instant fetchTime;
 
@@ -32,13 +32,13 @@ public class 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 class AccessToken {
         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() {
diff --git 
a/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProviderTest.java
 
b/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProviderTest.java
index 4d619cbee7..d734474725 100644
--- 
a/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProviderTest.java
+++ 
b/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 class StandardOauth2AccessTokenProviderTest {
         @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