Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentica…

…tion-library-for-java into avdunn/api-fix
AzureAD · Jun 26, 2024 · 5f6c2e0 · 5f6c2e0
2 parents 7e8874b + c134ec2
commit 5f6c2e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AuthenticationResult.java b/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AuthenticationResult.java
@@ -92,7 +92,7 @@ private ITenantProfile getTenantProfile() {
     private final String scopes;
 
     @Builder.Default
-    private final AuthenticationResultMetadata metadata = new AuthenticationResultMetadata();
+    private final AuthenticationResultMetadata metadata = AuthenticationResultMetadata.builder().build();
 
     @Getter(value = AccessLevel.PACKAGE)
     private final Boolean isPopAuthorization;

diff --git a/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AuthenticationResultMetadata.java b/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AuthenticationResultMetadata.java
@@ -4,6 +4,7 @@
 package com.microsoft.aad.msal4j;
 
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -16,17 +17,9 @@
 @Accessors(fluent = true)
 @Getter
 @Setter(AccessLevel.PACKAGE)
+@Builder
 public class AuthenticationResultMetadata implements Serializable {
 
     private TokenSource tokenSource;
-
-    /**
-     * Sets default metadata values. Used when creating an {@link IAuthenticationResult} before the values are known.
-     */
-    AuthenticationResultMetadata() {
-    }
-
-    AuthenticationResultMetadata(TokenSource tokenSource) {
-        this.tokenSource = tokenSource;
-    }
+    private Long refreshOn;
 }
diff --git a/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/TokenRequestExecutor.java b/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/TokenRequestExecutor.java
@@ -155,7 +155,10 @@ private AuthenticationResult createAuthenticationResultFromOauthHttpResponse(
                     refreshOn(response.getRefreshIn() > 0 ? currTimestampSec + response.getRefreshIn() : 0).
                     accountCacheEntity(accountCacheEntity).
                     scopes(response.getScope()).
-                    metadata(new AuthenticationResultMetadata(TokenSource.IDENTITY_PROVIDER)).
+                    metadata(AuthenticationResultMetadata.builder()
+                            .tokenSource(TokenSource.IDENTITY_PROVIDER)
+                            .refreshOn(response.getRefreshIn() > 0 ? currTimestampSec + response.getRefreshIn() : 0)
+                            .build()).
                     build();
 
         } else {