Make a bunch of API changes.

test/authorization_code_grant_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:test/test.dart';
 import 'package:http/http.dart' as http;
 import 'package:oauth2/oauth2.dart' as oauth2;
 
 import 'utils.dart';
 
 final redirectUrl = Uri.parse('http://example.com/redirect');
 
 void main() {
   var client;
   var grant;
   setUp(() {
     client = new ExpectClient();
     grant = new oauth2.AuthorizationCodeGrant(
         'identifier',
-        'secret',
         Uri.parse('https://example.com/authorization'),
         Uri.parse('https://example.com/token'),
+        secret: 'secret',
         httpClient: client);
   });
 
   group('.getAuthorizationUrl', () {
     test('builds the correct URL', () {
       expect(grant.getAuthorizationUrl(redirectUrl).toString(),
           equals('https://example.com/authorization'
               '?response_type=code'
               '&client_id=identifier'
               '&redirect_uri=http%3A%2F%2Fexample.com%2Fredirect'));
@@ skipping 17 matching lines @@
           equals('https://example.com/authorization'
               '?response_type=code'
               '&client_id=identifier'
               '&redirect_uri=http%3A%2F%2Fexample.com%2Fredirect'
               '&state=state'));
     });
 
     test('merges with existing query parameters', () {
       grant = new oauth2.AuthorizationCodeGrant(
           'identifier',
-          'secret',
           Uri.parse('https://example.com/authorization?query=value'),
           Uri.parse('https://example.com/token'),
+          secret: 'secret',
           httpClient: client);
 
       var authorizationUrl = grant.getAuthorizationUrl(redirectUrl);
       expect(authorizationUrl.toString(),
           equals('https://example.com/authorization'
               '?query=value'
               '&response_type=code'
               '&client_id=identifier'
               '&redirect_uri=http%3A%2F%2Fexample.com%2Fredirect'));
     });
@@ skipping 44 matching lines @@
     });
 
     test('sends an authorization code request', () {
       grant.getAuthorizationUrl(redirectUrl);
       client.expectRequest((request) {
         expect(request.method, equals('POST'));
         expect(request.url.toString(), equals(grant.tokenEndpoint.toString()));
         expect(request.bodyFields, equals({
           'grant_type': 'authorization_code',
           'code': 'auth code',
-          'redirect_uri': redirectUrl.toString(),
-          'client_id': 'identifier',
-          'client_secret': 'secret'
+          'redirect_uri': redirectUrl.toString()
         }));
+        expect(request.headers, containsPair(
+            "Authorization",
+            "Basic aWRlbnRpZmllcjpzZWNyZXQ="));
 
         return new Future.value(new http.Response(JSON.encode({
           'access_token': 'access token',
           'token_type': 'bearer',
         }), 200, headers: {'content-type': 'application/json'}));
       });
 
       expect(grant.handleAuthorizationResponse({'code': 'auth code'})
             .then((client) => client.credentials.accessToken),
           completion(equals('access token')));
@@ skipping 12 matching lines @@
     });
 
     test('sends an authorization code request', () {
       grant.getAuthorizationUrl(redirectUrl);
       client.expectRequest((request) {
         expect(request.method, equals('POST'));
         expect(request.url.toString(), equals(grant.tokenEndpoint.toString()));
         expect(request.bodyFields, equals({
           'grant_type': 'authorization_code',
           'code': 'auth code',
+          'redirect_uri': redirectUrl.toString()
+        }));
+        expect(request.headers, containsPair(
+            "Authorization",
+            "Basic aWRlbnRpZmllcjpzZWNyZXQ="));
+
+        return new Future.value(new http.Response(JSON.encode({
+          'access_token': 'access token',
+          'token_type': 'bearer',
+        }), 200, headers: {'content-type': 'application/json'}));
+      });
+
+      expect(grant.handleAuthorizationCode('auth code'),
+          completion(predicate((client) {
+            expect(client.credentials.accessToken, equals('access token'));
+            return true;
+          })));
+    });
+  });
+
+  group("with basicAuth: false", () {
+    setUp(() {
+      client = new ExpectClient();
+      grant = new oauth2.AuthorizationCodeGrant(
+          'identifier',
+          Uri.parse('https://example.com/authorization'),
+          Uri.parse('https://example.com/token'),
+          secret: 'secret',
+          basicAuth: false,
+          httpClient: client);
+    });
+
+    test('.handleAuthorizationResponse sends an authorization code request',
+        () {
+      grant.getAuthorizationUrl(redirectUrl);
+      client.expectRequest((request) {
+        expect(request.method, equals('POST'));
+        expect(request.url.toString(), equals(grant.tokenEndpoint.toString()));
+        expect(request.bodyFields, equals({
+          'grant_type': 'authorization_code',
+          'code': 'auth code',
           'redirect_uri': redirectUrl.toString(),
           'client_id': 'identifier',
           'client_secret': 'secret'
+        }));
+
+        return new Future.value(new http.Response(JSON.encode({
+          'access_token': 'access token',
+          'token_type': 'bearer',
+        }), 200, headers: {'content-type': 'application/json'}));
+      });
+
+      expect(grant.handleAuthorizationResponse({'code': 'auth code'})
+            .then((client) => client.credentials.accessToken),
+          completion(equals('access token')));
+    });
+
+    test('.handleAuthorizationCode sends an authorization code request', () {
+      grant.getAuthorizationUrl(redirectUrl);
+      client.expectRequest((request) {
+        expect(request.method, equals('POST'));
+        expect(request.url.toString(), equals(grant.tokenEndpoint.toString()));
+        expect(request.bodyFields, equals({
+          'grant_type': 'authorization_code',
+          'code': 'auth code',
+          'redirect_uri': redirectUrl.toString(),
+          'client_id': 'identifier',
+          'client_secret': 'secret'
         }));
 
         return new Future.value(new http.Response(JSON.encode({
           'access_token': 'access token',
           'token_type': 'bearer',
         }), 200, headers: {'content-type': 'application/json'}));
       });
 
       expect(grant.handleAuthorizationCode('auth code'),
           completion(predicate((client) {
             expect(client.credentials.accessToken, equals('access token'));
             return true;
           })));
     });
   });
 }