Allow refreshToken to be null in OAuth2Credential and AccessProtected…

…Resource

google-oauth-client-extensions/src/main/java/com/google/api/client/extensions/auth/helpers/oauth2/draft10/OAuth2Credential.java

@@ -76,12 +76,12 @@ public final class OAuth2Credential implements Credential, InstanceCallbacks {
    * @param userId Key that can be used to associate this Credential object with an end user.
    * @param accessToken Access token that can be used to authorize this request.
    * @param refreshToken Token that can be given to the token server in exchange for a new access
-   *        token.
+   *        token or {@code null} for none.
    */
   public OAuth2Credential(String userId, String accessToken, String refreshToken) {
     this.userId = Preconditions.checkNotNull(userId);
     this.accessToken = Preconditions.checkNotNull(accessToken);
-    this.refreshToken = Preconditions.checkNotNull(refreshToken);
+    this.refreshToken = refreshToken;
     initializeAfterConstruction();
   }
 
@@ -93,9 +93,7 @@ public OAuth2Credential(String userId, String accessToken, String refreshToken)
    * @param accessToken Access token that can be used to authorize this request.
    */
   public OAuth2Credential(String userId, String accessToken) {
-    this.userId = Preconditions.checkNotNull(userId);
-    this.accessToken = Preconditions.checkNotNull(accessToken);
-    initializeAfterConstruction();
+    this(userId, accessToken, null);
   }
 
   /**
@@ -146,14 +144,6 @@ public boolean handleResponse(
    */
   public void initializeForRefresh(String clientId, String clientSecret, String refreshUrl,
       JsonFactory jsonFactory, HttpTransport transport) {
-    Preconditions.checkArgument(
-        refreshToken != null, "Must construct the object with a refreshToken");
-    Preconditions.checkNotNull(clientId);
-    Preconditions.checkNotNull(clientSecret);
-    Preconditions.checkNotNull(clientSecret);
-    Preconditions.checkNotNull(transport);
-    Preconditions.checkNotNull(jsonFactory);
-
     authInterceptor = new AccessProtectedResource(accessToken,
         Method.AUTHORIZATION_HEADER,
         transport,
@@ -184,9 +174,9 @@ public void setAccessToken(String accessToken) {
   }
 
   /**
-   * Return the refresh token with which this object was constructed. This can be used for out of
-   * band use cases, but most users should just let the credential be refreshed by the library when
-   * a call fails.
+   * Return the refresh token with which this object was constructed or {@code null} for none. This
+   * can be used for out of band use cases, but most users should just let the credential be
+   * refreshed by the library when a call fails.
    */
   public String getRefreshToken() {
     return refreshToken;

google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/draft10/AccessProtectedResource.java

@@ -142,6 +142,8 @@ public enum Method {
   private final String refreshToken;
 
   /**
+   * Constructor that uses a non-expired access token.
+   * 
    * @param accessToken access token or {@code null} for none (does not call
    *        {@link #setAccessToken(String)})
    * @param method method of accessing protected resources
@@ -168,7 +170,8 @@ public AccessProtectedResource(String accessToken, Method method) {
    * @param authorizationServerUrl encoded authorization server URL
    * @param clientId client identifier
    * @param clientSecret client secret
-   * @param refreshToken refresh token associated with the access token to be refreshed
+   * @param refreshToken refresh token associated with the access token to be refreshed or
+   *        {@code null} for none
    */
   public AccessProtectedResource(String accessToken,
       Method method,
@@ -185,7 +188,7 @@ public AccessProtectedResource(String accessToken,
     this.authorizationServerUrl = Preconditions.checkNotNull(authorizationServerUrl);
     this.clientId = Preconditions.checkNotNull(clientId);
     this.clientSecret = Preconditions.checkNotNull(clientSecret);
-    this.refreshToken = Preconditions.checkNotNull(refreshToken);
+    this.refreshToken = refreshToken;
   }
 
   /** Returns the access token or {@code null} for none. */

google-oauth-client/src/test/java/com/google/api/client/auth/oauth2/draft10/AccessProtectedResourceTest.java

@@ -195,6 +195,20 @@ public void testRefreshToken_noRefreshToken() throws IOException {
     assertFalse(accesss.refreshToken());
   }
 
+  public void testRefreshToken_noRefreshToken2() throws IOException {
+    AccessTokenTransport transport = new AccessTokenTransport();
+    AccessProtectedResource access = new AccessProtectedResource(ACCESS_TOKEN,
+        Method.QUERY_PARAMETER,
+        transport,
+        JSON_FACTORY,
+        AUTHORIZATION_SERVER_URL,
+        CLIENT_ID,
+        CLIENT_SECRET,
+        null);
+    assertFalse(access.refreshToken());
+    assertEquals(ACCESS_TOKEN, access.getAccessToken());
+  }
+
   public void testRefreshToken_refreshToken() throws IOException {
     AccessTokenTransport transport = new AccessTokenTransport();
     AccessProtectedResource access = new AccessProtectedResource(ACCESS_TOKEN,