Updated AzureIdentityAccessTokenProvider to be equivalent to the dotn…

…et implementation with regard to internal handling of scopes * Updated to version 1.1.1 in gradle.properties * Updated to version 1.1.1 in UserAgentHandlerOption * Fixed junit assert usage. API is expected, actual. Not actual, expected
microsoft · Mar 20, 2024 · a961572 · a961572
1 parent f7eaaae
commit a961572
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/...re/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAccessTokenProvider.java b/...re/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAccessTokenProvider.java
@@ -128,13 +128,18 @@ public AzureIdentityAccessTokenProvider(
                     "com.microsoft.kiota.authentication.additional_claims_provided",
                     decodedClaim != null && !decodedClaim.isEmpty());
 
-            final TokenRequestContext context = new TokenRequestContext();
-            if (_scopes.isEmpty()) {
-                _scopes.add(uri.getScheme() + "://" + uri.getHost() + "/.default");
+            List<String> scopes;
+            if (!_scopes.isEmpty()) {
+                scopes = new ArrayList<>(_scopes);
+            } else {
+                scopes = new ArrayList<>();
+                scopes.add(uri.getScheme() + "://" + uri.getHost() + "/.default");
             }
-            context.setScopes(_scopes);
+
+            final TokenRequestContext context = new TokenRequestContext();
+            context.setScopes(scopes);
             span.setAttribute(
-                    "com.microsoft.kiota.authentication.scopes", String.join("|", _scopes));
+                    "com.microsoft.kiota.authentication.scopes", String.join("|", scopes));
             if (decodedClaim != null && !decodedClaim.isEmpty()) {
                 context.setClaims(decodedClaim);
             }

diff --git a/...rc/test/java/com/microsoft/kiota/authentication/AzureIdentityAccessTokenProviderTest.java b/...rc/test/java/com/microsoft/kiota/authentication/AzureIdentityAccessTokenProviderTest.java
@@ -100,6 +100,6 @@ private static void assertScopes(
                 new URI("https://graph.microsoft.com"), new HashMap<>());
 
         List<String> actualScopes = tokenRequestContextArgumentCaptor.getValue().getScopes();
-        assertLinesMatch(actualScopes, Arrays.asList(expectedScopes));
+        assertLinesMatch(Arrays.asList(expectedScopes), actualScopes);
     }
 }
diff --git a/...ttp/src/main/java/com/microsoft/kiota/http/middleware/options/UserAgentHandlerOption.java b/...ttp/src/main/java/com/microsoft/kiota/http/middleware/options/UserAgentHandlerOption.java
@@ -13,7 +13,7 @@ public UserAgentHandlerOption() {}
 
     private boolean enabled = true;
     @Nonnull private String productName = "kiota-java";
-    @Nonnull private String productVersion = "1.0.6";
+    @Nonnull private String productVersion = "1.1.1";
 
     /**
      * Gets the product name to be used in the user agent header

diff --git a/gradle.properties b/gradle.properties
@@ -26,7 +26,7 @@ org.gradle.caching=true
 mavenGroupId         = com.microsoft.kiota
 mavenMajorVersion = 1
 mavenMinorVersion = 1
-mavenPatchVersion = 0
+mavenPatchVersion = 1
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests