AWS SDK for Android 2.3.2

Author: AWS

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Change Log - AWS SDK for Android
+## [Release 2.3.2] (https://github.com/aws/aws-sdk-android/releases/tag/release_v2.3.2) (10/06/2016)
+
+### Improvements
+- **Amazon Cognito Identity Provider**: 
+- Support for Admin Create User feature.
+- Allow SDK to refresh tokens which are about to expire within a pre-set threshold.
 
 ## [Release 2.3.1](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.3.1) (09/08/2016)
 

aws-android-sdk-apigateway-core/pom.xml

@@ -12,15 +12,15 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-android-sdk-pom</artifactId>
-    <version>2.3.1</version>
+    <version>2.3.2</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-android-sdk-core</artifactId>
       <optional>false</optional>
-      <version>2.3.1</version>
+      <version>2.3.2</version>
     </dependency>
   </dependencies>
 

aws-android-sdk-apigateway-core/src/main/java/com/amazonaws/mobileconnectors/apigateway/ApiRequest.java

@@ -35,11 +35,21 @@ public class ApiRequest {
 
     /**
      * Constructor.
+     *
+     * @param serviceName The name of the service to which this request is being
+     *            sent.
      */
     public ApiRequest(String serviceName) {
         request = new DefaultRequest<ApiResponse>(serviceName);
     }
 
+    /**
+     * Constructor.
+     */
+    public ApiRequest() {
+        request = new DefaultRequest<ApiResponse>("");
+    }
+
     /**
      * Sets all headers, clearing any existing ones.
      *

aws-android-sdk-autoscaling/pom.xml

@@ -12,15 +12,15 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-android-sdk-pom</artifactId>
-    <version>2.3.1</version>
+    <version>2.3.2</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-android-sdk-core</artifactId>
       <optional>false</optional>
-      <version>2.3.1</version>
+      <version>2.3.2</version>
     </dependency>
   </dependencies>
 

aws-android-sdk-cloudwatch/pom.xml

@@ -12,15 +12,15 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-android-sdk-pom</artifactId>
-    <version>2.3.1</version>
+    <version>2.3.2</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-android-sdk-core</artifactId>
       <optional>false</optional>
-      <version>2.3.1</version>
+      <version>2.3.2</version>
     </dependency>
   </dependencies>
 

aws-android-sdk-cognito/pom.xml

@@ -6,14 +6,14 @@
   <artifactId>aws-android-sdk-cognito</artifactId>
   <packaging>jar</packaging>
   <name>AWS SDK for Android - Amazon Cognito Sync</name>
-  <version>2.3.1</version>
+  <version>2.3.2</version>
   <description>The AWS Android SDK for Amazon Cognito Sync module holds the client classes that are used for communicating with Amazon Cognito Sync Service</description>
   <url>http://aws.amazon.com/sdkforandroid</url>
 
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-android-sdk-pom</artifactId>
-    <version>2.3.1</version>
+    <version>2.3.2</version>
   </parent>
 
   <licenses>
@@ -29,7 +29,7 @@
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-android-sdk-core</artifactId>
       <optional>false</optional>
-      <version>2.3.1</version>
+      <version>2.3.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.android</groupId>

aws-android-sdk-cognito/src/main/resources/fabric/com.amazonaws.aws-android-sdk-cognito.properties

@@ -1,3 +1,3 @@
 fabric-identifier=com.amazonaws.aws-android-sdk-cognito
-fabric-version=2.3.1
+fabric-version=2.3.2
 fabric-build-type=binary

aws-android-sdk-cognitoidentityprovider/pom.xml

@@ -6,14 +6,14 @@
   <artifactId>aws-android-sdk-cognitoidentityprovider</artifactId>
   <packaging>jar</packaging>
   <name>AWS SDK for Android - Amazon Cognito Identity Provider</name>
-  <version>2.3.1</version>
+  <version>2.3.2</version>
   <description>The AWS Android SDK for Amazon Cognito Identity Provider module holds the client classes that are used for communicating with Amazon Cognito Identity Provider Service</description>
   <url>http://aws.amazon.com/sdkforandroid</url>
 
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-android-sdk-pom</artifactId>
-    <version>2.3.1</version>
+    <version>2.3.2</version>
   </parent>
 
   <licenses>
@@ -29,7 +29,7 @@
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-android-sdk-core</artifactId>
       <optional>false</optional>
-      <version>2.3.1</version>
+      <version>2.3.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.android</groupId>

aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/mobileconnectors/cognitoidentityprovider/CognitoUser.java

@@ -28,6 +28,7 @@
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.continuations.ChallengeContinuation;
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.continuations.ForgotPasswordContinuation;
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.continuations.MultiFactorAuthenticationContinuation;
+import com.amazonaws.mobileconnectors.cognitoidentityprovider.continuations.NewPasswordContinuation;
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.exceptions.CognitoInternalErrorException;
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.exceptions.CognitoNotAuthorizedException;
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.exceptions.CognitoParameterInvalidException;
@@ -83,10 +84,10 @@
 import com.amazonaws.services.cognitoidentityprovider.model.UpdateUserAttributesResult;
 import com.amazonaws.services.cognitoidentityprovider.model.VerifyUserAttributeRequest;
 import com.amazonaws.services.cognitoidentityprovider.model.VerifyUserAttributeResult;
-
 import com.amazonaws.util.Base64;
 import com.amazonaws.util.StringUtils;
 
+import java.io.IOException;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -707,14 +708,14 @@ protected CognitoUserSession getCachedSession() {
         }
 
         if (cipSession != null) {
-            if (cipSession.isValid()) {
+            if (cipSession.isValidForThreshold()) {
                 return cipSession;
             }
         }
 
         CognitoUserSession cachedTokens = readCachedTokens();
 
-        if (cachedTokens.isValid()) {
+        if (cachedTokens.isValidForThreshold()) {
             cipSession = cachedTokens;
             return  cipSession;
         }
@@ -724,12 +725,14 @@ protected CognitoUserSession getCachedSession() {
                 cipSession = refreshSession(cachedTokens);
                 cacheTokens(cipSession);
                 return cipSession;
-            } catch (Exception e) {
+            } catch (NotAuthorizedException nae) {
                 clearCachedTokens();
-                throw new CognitoNotAuthorizedException("user is not authenticated");
+                throw new CognitoNotAuthorizedException("User is not authenticated", nae);
+            } catch (Exception e) {
+                throw new CognitoInternalErrorException("Failed to authenticate user", e);
             }
         }
-        throw new CognitoNotAuthorizedException("user is not authenticated");
+        throw new CognitoNotAuthorizedException("User is not authenticated");
     }
 
     /**
@@ -1583,9 +1586,18 @@ private void setUserSettingsInternal(CognitoUserSettings cognitoUserSettings,
      */
     private void clearCachedTokens() {
         try {
-            // Clear all cached tokens and last logged in user.
+            // Clear all cached tokens.
             SharedPreferences csiCachedTokens =  context.getSharedPreferences("CognitoIdentityProviderCache", 0);
-            csiCachedTokens.edit().clear().apply();
+        
+            // Format "key" strings
+            String csiIdTokenKey      =  String.format("CognitoIdentityProvider.%s.%s.idToken", clientId, userId);
+            String csiAccessTokenKey  =  String.format("CognitoIdentityProvider.%s.%s.accessToken", clientId, userId);
+            String csiRefreshTokenKey =  String.format("CognitoIdentityProvider.%s.%s.refreshToken", clientId, userId);
+
+            SharedPreferences.Editor cacheEdit = csiCachedTokens.edit();
+            cacheEdit.remove(csiIdTokenKey);
+            cacheEdit.remove(csiAccessTokenKey);
+            cacheEdit.remove(csiRefreshTokenKey).apply();
         } catch (Exception e) {
             // Logging exception, this is not a fatal error
             Log.e(TAG, "Error while deleting from SharedPreferences");
@@ -1599,15 +1611,15 @@ private void clearCachedTokens() {
      */
     private CognitoUserSession readCachedTokens() {
         CognitoUserSession userSession = new CognitoUserSession(null, null, null);
-        
+
         try {
             SharedPreferences csiCachedTokens = context.getSharedPreferences("CognitoIdentityProviderCache", 0);
 
             // Format "key" strings
             String csiIdTokenKey        = "CognitoIdentityProvider." + clientId + "." + userId + ".idToken";
             String csiAccessTokenKey    = "CognitoIdentityProvider." + clientId + "." + userId + ".accessToken";
             String csiRefreshTokenKey   = "CognitoIdentityProvider." + clientId + "." + userId + ".refreshToken";
-            
+
             if (csiCachedTokens.contains(csiIdTokenKey)) {
                 CognitoIdToken csiCachedIdToken = new CognitoIdToken(csiCachedTokens.getString(csiIdTokenKey, null));
                 CognitoAccessToken csiCachedAccessToken = new CognitoAccessToken(csiCachedTokens.getString(csiAccessTokenKey, null));
@@ -1911,9 +1923,18 @@ public void run() {
             };
         } else if (CognitoServiceConstants.CHLG_TYPE_DEVICE_SRP_AUTH.equals(challengeName)) {
             nextTask = deviceSrpAuthentication(challenge, callback, runInBackground);
+        } else if (CognitoServiceConstants.CHLG_TYPE_NEW_PASSWORD_REQUIRED.equals(challengeName)) {
+            final NewPasswordContinuation newPasswordContinuation =
+                    new NewPasswordContinuation(cognitoUser, context, usernameInternal, clientId, secretHash, challenge, runInBackground, callback);
+            nextTask = new Runnable() {
+                @Override
+                public void run() {
+                    callback.authenticationChallenge(newPasswordContinuation);
+                }
+            };
         } else {
             final ChallengeContinuation challengeContinuation =
-                    new ChallengeContinuation(cognitoUser, context, clientId, challenge, runInBackground, callback);
+                    new ChallengeContinuation(cognitoUser, context, usernameInternal, clientId, secretHash, challenge, runInBackground, callback);
             nextTask = new Runnable() {
                 @Override
                 public void run() {

aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/mobileconnectors/cognitoidentityprovider/CognitoUserSession.java

@@ -17,9 +17,11 @@
 
 package com.amazonaws.mobileconnectors.cognitoidentityprovider;
 
+import com.amazonaws.SDKGlobalConfiguration;
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.tokens.CognitoAccessToken;
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.tokens.CognitoIdToken;
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.tokens.CognitoRefreshToken;
+import com.amazonaws.mobileconnectors.cognitoidentityprovider.util.CognitoIdentityProviderClientConfig;
 
 import java.util.Date;
 
@@ -97,4 +99,19 @@ public boolean isValid() {
             return false;
         }
     }
+    
+    /**
+     * Returns true if this session for the threshold set in {@link CognitoIdentityProviderClientConfig#refreshThreshold}.
+     *
+     * @return boolean to indicate if the session is valid for atleast {@link CognitoIdentityProviderClientConfig#refreshThreshold} seconds.
+     */
+    public boolean isValidForThreshold() {
+        try {
+            long currentTime = System.currentTimeMillis() - SDKGlobalConfiguration.getGlobalTimeOffset() * 1000;
+            long expiresInMilliSeconds = idToken.getExpiration().getTime() - currentTime;
+            return (expiresInMilliSeconds > CognitoIdentityProviderClientConfig.getRefreshThreshold());
+        } catch (Exception e) {
+            return false;
+        }
+    }
  }