Fix OffsetDateTime parsing in IdentityClient (#4031)

Azure · Jun 27, 2019 · ae568a3 · ae568a3
1 parent 553b20b
commit ae568a3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/identity/client/src/main/java/com/azure/identity/IdentityClient.java b/identity/client/src/main/java/com/azure/identity/IdentityClient.java
@@ -30,6 +30,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.Random;
 import java.util.Scanner;
 import java.util.concurrent.ExecutorService;
@@ -78,7 +79,7 @@ public Mono<AccessToken> authenticateWithClientSecret(String tenantId, String cl
                 resource,
                 new ClientCredential(clientId, clientSecret),
                 Adal4jUtil.authenticationDelegate(callback));
-        }).map(ar -> new AccessToken(ar.getAccessToken(), OffsetDateTime.from(ar.getExpiresOnDate().toInstant())))
+        }).map(ar -> new AccessToken(ar.getAccessToken(), OffsetDateTime.ofInstant(ar.getExpiresOnDate().toInstant(), ZoneOffset.UTC)))
             .doFinally(s -> executor.shutdown());
     }
 
@@ -105,7 +106,7 @@ public Mono<AccessToken> authenticateWithPfxCertificate(String tenantId, String
             } catch (IOException e) {
                 callback.error(e);
             }
-        }).map(ar -> new AccessToken(ar.getAccessToken(), OffsetDateTime.from(ar.getExpiresOnDate().toInstant())))
+        }).map(ar -> new AccessToken(ar.getAccessToken(), OffsetDateTime.ofInstant(ar.getExpiresOnDate().toInstant(), ZoneOffset.UTC)))
             .doFinally(s -> executor.shutdown());
     }
 
@@ -131,7 +132,7 @@ public Mono<AccessToken> authenticateWithPemCertificate(String tenantId, String
             } catch (IOException e) {
                 callback.error(e);
             }
-        }).map(ar -> new AccessToken(ar.getAccessToken(), OffsetDateTime.from(ar.getExpiresOnDate().toInstant())))
+        }).map(ar -> new AccessToken(ar.getAccessToken(), OffsetDateTime.ofInstant(ar.getExpiresOnDate().toInstant(), ZoneOffset.UTC)))
             .doFinally(s -> executor.shutdown());
     }