change default of useBasicAuthorization to false

Yaniv Inbar · Yaniv Inbar · commit fec35387b662 · 2011-05-06T10:53:34.000-04:00
http://codereview.appspot.com/4475044/
diff --git a/google-api-client-extensions/src/main/java/com/google/api/client/extensions/auth/helpers/oauth2/draft10/OAuth2ThreeLeggedFlow.java b/google-api-client-extensions/src/main/java/com/google/api/client/extensions/auth/helpers/oauth2/draft10/OAuth2ThreeLeggedFlow.java
@@ -119,7 +119,6 @@ public Credential complete(String authorizationCode) throws IOException {
         clientSecret,
         authorizationCode,
         callbackUrl);
-    request.useBasicAuthorization = false;
 
     AccessTokenResponse response = request.execute();
 
diff --git a/google-api-client-googleapis/src/main/java/com/google/api/client/googleapis/auth/oauth2/draft10/GoogleAccessTokenRequest.java b/google-api-client-googleapis/src/main/java/com/google/api/client/googleapis/auth/oauth2/draft10/GoogleAccessTokenRequest.java
@@ -194,7 +194,6 @@ public GoogleAssertionGrant(HttpTransport transport, JsonFactory jsonFactory,
    */
   static void init(AccessTokenRequest request) {
     request.authorizationServerUrl = AUTHORIZATION_SERVER_URL;
-    request.useBasicAuthorization = false;
   }
 
   private GoogleAccessTokenRequest() {
diff --git a/google-api-client/src/main/java/com/google/api/client/auth/oauth2/draft10/AccessTokenRequest.java b/google-api-client/src/main/java/com/google/api/client/auth/oauth2/draft10/AccessTokenRequest.java
@@ -418,12 +418,15 @@ public enum GrantType {
   public String authorizationServerUrl;
 
   /**
-   * Defaults to {@code true} to use Basic Authentication as recommended in <a
+   * {@code false} to specify the password in the request body using the {@code "clientSecret"}
+   * parameter in the HTTP body or {@code true} to use Basic Authentication as recommended in <a
    * href="http://tools.ietf.org/html/draft-ietf-oauth-v2-10#section-2.1">Client Password
-   * Credentials</a>, but may be set to {@code false} for for specifying the password in the request
-   * body using the {@code "clientSecret"} parameter in the HTTP body.
+   * Credentials</a>.
+   * <p>
+   * Defaults to {@code false}.
+   * </p>
    */
-  public boolean useBasicAuthorization = true;
+  public boolean useBasicAuthorization;
 
   /**
    * Executes request for an access token, and returns the HTTP response.
diff --git a/google-api-client/src/test/java/com/google/api/client/auth/oauth2/draft10/AccessTokenRequestTest.java b/google-api-client/src/test/java/com/google/api/client/auth/oauth2/draft10/AccessTokenRequestTest.java
@@ -147,7 +147,7 @@ private void check(AccessTokenRequest request, boolean withParameters) {
 
   private void check(AccessTokenRequest request, GrantType grantType, boolean withParameters) {
     assertEquals(grantType, request.grantType);
-    assertTrue(request.useBasicAuthorization);
+    assertFalse(request.useBasicAuthorization);
     assertNull(request.scope);
     if (withParameters) {
       assertEquals(TRANSPORT, request.transport);

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,6 @@ public GoogleAssertionGrant(HttpTransport transport, JsonFactory jsonFactory,`
`194`	`194`	`*/`
`195`	`195`	`static void init(AccessTokenRequest request) {`
`196`	`196`	`request.authorizationServerUrl = AUTHORIZATION_SERVER_URL;`
`197`		`- request.useBasicAuthorization = false;`
`198`	`197`	`}`
`199`	`198`
`200`	`199`	`private GoogleAccessTokenRequest() {`