Merge branch 'alexwoo/master/loginCredentialProvider_refresh1' into alexwoo/master/loginCredentialProvider_refresh_dpop

Author: alextwoods

services/signin/src/main/java/software/amazon/awssdk/services/signin/auth/LoginCredentialsProvider.java

@@ -138,8 +138,8 @@ private RefreshResult<AwsCredentials> updateSigninCredentials() {
             () -> SdkClientException.create("Invalid token expiration time. You must re-authenticate.")
         );
 
-        if (shouldRefresh(currentExpirationTime, staleTime)
-            && shouldRefresh(currentExpirationTime, prefetchTime)) {
+        if (shouldNotRefresh(currentExpirationTime, staleTime)
+            && shouldNotRefresh(currentExpirationTime, prefetchTime)) {
             log.debug(() -> "Using access token from disk, current expiration time is : " + currentExpirationTime);
             AwsCredentials credentials = tokenFromDisc.getAccessToken()
                 .toBuilder()
@@ -241,9 +241,9 @@ public Builder toBuilder() {
 
     /**
      *
-     * @return true if the token should be refreshed (it is after the given refresh window, eg stale time or prefetch time)
+     * @return true if the token does NOT need to be refreshed - it is after the given refresh window, eg stale/prefetch time.
      */
-    private static boolean shouldRefresh(Instant expiration, Duration refreshWindow) {
+    private static boolean shouldNotRefresh(Instant expiration, Duration refreshWindow) {
         Instant now = Instant.now();
         return expiration.isAfter(now.plus(refreshWindow));
     }

services/signin/src/main/java/software/amazon/awssdk/services/signin/internal/DpopAuthScheme.java

@@ -48,8 +48,8 @@ private DpopAuthScheme(DpopIdentityProvider identityProvider) {
         this.identityProvider = Validate.paramNotNull(identityProvider, "identityProvider");
     }
 
-    public static DpopAuthScheme create(ECPublicKey ecPublicKey) {
-        return new DpopAuthScheme(DpopIdentityProvider.create(ecPublicKey));
+    public static DpopAuthScheme create(DpopIdentityProvider identityProvider) {
+        return new DpopAuthScheme(identityProvider);
     }
 
     @Override
@@ -110,9 +110,9 @@ public SignedRequest sign(SignRequest<? extends DpopIdentity> request) {
         public CompletableFuture<AsyncSignedRequest> signAsync(AsyncSignRequest<? extends DpopIdentity> request) {
             return CompletableFuture.completedFuture(
                 AsyncSignedRequest.builder()
-                                                                       .request(request.request())
-                                                                       .payload(request.payload().orElse(null))
-                                                                       .build());
+                                  .request(request.request())
+                                  .payload(request.payload().orElse(null))
+                                  .build());
         }
     }
 
@@ -123,8 +123,8 @@ private DpopIdentityProvider(DpopIdentity identity) {
             this.identity = Validate.paramNotNull(identity, "identity");
         }
 
-        public static DpopIdentityProvider create(ECPublicKey ecPublicKey) {
-            return new DpopIdentityProvider(DpopIdentity.create(ecPublicKey));
+        public static DpopIdentityProvider create(String dpopKeyPem) {
+            return new DpopIdentityProvider(DpopIdentity.create(dpopKeyPem));
         }
 
         @Override
@@ -147,15 +147,23 @@ public List<AuthSchemeOption> resolveAuthScheme(SigninAuthSchemeParams authSchem
     }
 
     public static class DpopAuthPlugin implements SdkPlugin {
-        private final ECPublicKey ecPublicKey;
+        private final String dpopKeyPem;
 
+        private DpopAuthPlugin(String dpopKeyPem) {
+            this.dpopKeyPem = Validate.paramNotNull(dpopKeyPem, "dpopKeyPem");
+        }
+
+        public static DpopAuthPlugin create(String dpopKeyPem) {
+            return new DpopAuthPlugin(dpopKeyPem);
+        }
 
         @Override
         public void configureClient(SdkServiceClientConfiguration.Builder config) {
             SigninServiceClientConfiguration.Builder scb =
-                Validate.isInstanceOf(SigninServiceClientConfiguration.Builder.class, config, "bad");
+                Validate.isInstanceOf(SigninServiceClientConfiguration.Builder.class, config,
+                                      "DpopAuthPlugin must be applied to a SigninServiceClient");
             scb.authSchemeProvider(new DpopAuthSchemeResolver());
-            scb.putAuthScheme(new DpopAuthScheme());
+            scb.putAuthScheme(DpopAuthScheme.create(DpopIdentityProvider.create(dpopKeyPem)));
         }
     }
 }