Auth.authorize(): use supplied token or tokenDetails

As in proposed RSA10e spec clarification in PR ably/docs#186
ably · Dec 23, 2016 · e2e23e8 · e2e23e8
1 parent 3036e80
commit e2e23e8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/lib/src/main/java/io/ably/lib/http/Http.java b/lib/src/main/java/io/ably/lib/http/Http.java
@@ -288,7 +288,7 @@ private String getAuthorizationHeader(boolean renew) throws AblyException {
 			authHeader = "Basic " + Base64Coder.encodeString(auth.getBasicCredentials());
 		} else {
 			if (renew)
-				auth.authorize(null, null);
+				auth.renew();
 			else
 				auth.ensureValidAuth();
 			authHeader = "Bearer " + auth.getTokenAuth().getEncodedToken();

diff --git a/lib/src/main/java/io/ably/lib/rest/Auth.java b/lib/src/main/java/io/ably/lib/rest/Auth.java
@@ -389,8 +389,17 @@ public TokenDetails authorize(TokenParams params, AuthOptions options) throws Ab
 		options = (options == null) ? this.authOptions : options.copy();
 		params = (params == null) ? this.tokenParams : params.copy();
 
-		TokenDetails tokenDetails = tokenAuth.authorize(params, options, /*force=*/true);
-
+		/* RSA10e (as clarified in PR https://github.com/ably/docs/pull/186 )
+		 * Use supplied token or tokenDetails if any. */
+		if (authOptions.token != null)
+			authOptions.tokenDetails = new TokenDetails(authOptions.token);
+		TokenDetails tokenDetails;
+		if (authOptions.tokenDetails != null) {
+			tokenDetails = authOptions.tokenDetails;
+			tokenAuth.setTokenDetails(tokenDetails);
+		} else {
+			tokenDetails = tokenAuth.authorize(params, options, /*force=*/true);
+		}
 		ably.onAuthUpdated();
 		return tokenDetails;
 	}
@@ -410,6 +419,17 @@ public TokenDetails ensureValidAuth() throws AblyException {
 		return tokenAuth.authorize(this.tokenParams, this.authOptions, /*force=*/false);
 	}
 
+	/**
+	 * Renew auth credentials.
+	 * Will obtain a new token, even if we already have an apparently valid one.
+	 * Authorization will use the parameters supplied on construction.
+	 */
+	public TokenDetails renew() throws AblyException {
+		TokenDetails tokenDetails = tokenAuth.authorize(this.tokenParams, this.authOptions, /*force=*/true);
+		ably.onAuthUpdated();
+		return tokenDetails;
+	}
+
 	/**
 	 * Make a token request. This will make a token request now, even if the library already
 	 * has a valid token. It would typically be used to issue tokens for use by other clients.