Make a bunch of API changes.

test/credentials_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:http/http.dart' as http;
 import 'package:oauth2/oauth2.dart' as oauth2;
 import 'package:test/test.dart';
 
 import 'utils.dart';
 
 final Uri tokenEndpoint = Uri.parse('http://example.com/token');
 
 void main() {
   var httpClient;
   setUp(() => httpClient = new ExpectClient());
 
   test('is not expired if no expiration exists', () {
     var credentials = new oauth2.Credentials('access token');
     expect(credentials.isExpired, isFalse);
   });
 
   test('is not expired if the expiration is in the future', () {
     var expiration = new DateTime.now().add(new Duration(hours: 1));
     var credentials = new oauth2.Credentials(
-        'access token', null, null, null, expiration);
+        'access token', expiration: expiration);
     expect(credentials.isExpired, isFalse);
   });
 
   test('is expired if the expiration is in the past', () {
     var expiration = new DateTime.now().subtract(new Duration(hours: 1));
     var credentials = new oauth2.Credentials(
-        'access token', null, null, null, expiration);
+        'access token', expiration: expiration);
     expect(credentials.isExpired, isTrue);
   });
 
   test("can't refresh without a refresh token", () {
     var credentials = new oauth2.Credentials(
-        'access token', null, tokenEndpoint);
+        'access token', tokenEndpoint: tokenEndpoint);
     expect(credentials.canRefresh, false);
 
-    expect(credentials.refresh('identifier', 'secret', httpClient: httpClient),
+    expect(credentials.refresh(
+            identifier: 'identifier',
+            secret: 'secret',
+            httpClient: httpClient),
         throwsStateError);
   });
 
   test("can't refresh without a token endpoint", () {
-    var credentials = new oauth2.Credentials('access token', 'refresh token');
+    var credentials = new oauth2.Credentials(
+        'access token', refreshToken: 'refresh token');
     expect(credentials.canRefresh, false);
 
-    expect(credentials.refresh('identifier', 'secret', httpClient: httpClient),
+    expect(credentials.refresh(
+            identifier: 'identifier',
+            secret: 'secret',
+            httpClient: httpClient),
         throwsStateError);
   });
 
   test("can refresh with a refresh token and a token endpoint", () async {
     var credentials = new oauth2.Credentials(
-        'access token', 'refresh token', tokenEndpoint, ['scope1', 'scope2']);
+        'access token',
+        refreshToken: 'refresh token',
+        tokenEndpoint: tokenEndpoint,
+        scopes: ['scope1', 'scope2']);
     expect(credentials.canRefresh, true);
 
     httpClient.expectRequest((request) {
+      expect(request.method, equals('POST'));
+      expect(request.url.toString(), equals(tokenEndpoint.toString()));
+      expect(request.bodyFields, equals({
+        "grant_type": "refresh_token",
+        "refresh_token": "refresh token",
+        "scope": "scope1 scope2"
+      }));
+      expect(request.headers, containsPair(
+          "Authorization",
+          "Basic aWQlQzMlQUJudCVDNCVBQmZpZXI6cyVDMyVBQmNyZXQ="));
+
+      return new Future.value(new http.Response(JSON.encode({
+        'access_token': 'new access token',
+        'token_type': 'bearer',
+        'refresh_token': 'new refresh token'
+      }), 200, headers: {'content-type': 'application/json'}));
+    });
+
+    credentials = await credentials.refresh(
+        identifier: 'idëntīfier',
+        secret: 'sëcret',
+        httpClient: httpClient);
+    expect(credentials.accessToken, equals('new access token'));
+    expect(credentials.refreshToken, equals('new refresh token'));
+  });
+
+  test("can refresh without a client secret", () async {
+    var credentials = new oauth2.Credentials(
+        'access token',
+        refreshToken: 'refresh token',
+        tokenEndpoint: tokenEndpoint,
+        scopes: ['scope1', 'scope2']);
+    expect(credentials.canRefresh, true);
+
+    httpClient.expectRequest((request) {
       expect(request.method, equals('POST'));
       expect(request.url.toString(), equals(tokenEndpoint.toString()));
       expect(request.bodyFields, equals({
         "grant_type": "refresh_token",
         "refresh_token": "refresh token",
         "scope": "scope1 scope2",
-        "client_id": "identifier",
-        "client_secret": "secret"
+        "client_id": "identifier"
       }));
 
       return new Future.value(new http.Response(JSON.encode({
         'access_token': 'new access token',
         'token_type': 'bearer',
         'refresh_token': 'new refresh token'
       }), 200, headers: {'content-type': 'application/json'}));
     });
 
 
-    credentials = await credentials.refresh('identifier', 'secret',
+    credentials = await credentials.refresh(
+        identifier: 'identifier',
         httpClient: httpClient);
     expect(credentials.accessToken, equals('new access token'));
     expect(credentials.refreshToken, equals('new refresh token'));
   });
 
-  test("uses the old refresh token if a new one isn't provided", () async {
+  test("can refresh without client authentication", () async {
     var credentials = new oauth2.Credentials(
-        'access token', 'refresh token', tokenEndpoint);
+        'access token',
+        refreshToken: 'refresh token',
+        tokenEndpoint: tokenEndpoint,
+        scopes: ['scope1', 'scope2']);
     expect(credentials.canRefresh, true);
 
     httpClient.expectRequest((request) {
       expect(request.method, equals('POST'));
       expect(request.url.toString(), equals(tokenEndpoint.toString()));
       expect(request.bodyFields, equals({
         "grant_type": "refresh_token",
         "refresh_token": "refresh token",
-        "client_id": "identifier",
-        "client_secret": "secret"
+        "scope": "scope1 scope2"
       }));
 
       return new Future.value(new http.Response(JSON.encode({
         'access_token': 'new access token',
+        'token_type': 'bearer',
+        'refresh_token': 'new refresh token'
+      }), 200, headers: {'content-type': 'application/json'}));
+    });
+
+
+    credentials = await credentials.refresh(httpClient: httpClient);
+    expect(credentials.accessToken, equals('new access token'));
+    expect(credentials.refreshToken, equals('new refresh token'));
+  });
+
+  test("uses the old refresh token if a new one isn't provided", () async {
+    var credentials = new oauth2.Credentials(
+        'access token',
+        refreshToken: 'refresh token',
+        tokenEndpoint: tokenEndpoint);
+    expect(credentials.canRefresh, true);
+
+    httpClient.expectRequest((request) {
+      expect(request.method, equals('POST'));
+      expect(request.url.toString(), equals(tokenEndpoint.toString()));
+      expect(request.bodyFields, equals({
+        "grant_type": "refresh_token",
+        "refresh_token": "refresh token"
+      }));
+      expect(request.headers, containsPair(
+          "Authorization",
+          "Basic aWQlQzMlQUJudCVDNCVBQmZpZXI6cyVDMyVBQmNyZXQ="));
+
+      return new Future.value(new http.Response(JSON.encode({
+        'access_token': 'new access token',
         'token_type': 'bearer'
       }), 200, headers: {'content-type': 'application/json'}));
     });
 
 
-    credentials = await credentials.refresh('identifier', 'secret',
+    credentials = await credentials.refresh(
+        identifier: 'idëntīfier',
+        secret: 'sëcret',
         httpClient: httpClient);
     expect(credentials.accessToken, equals('new access token'));
     expect(credentials.refreshToken, equals('refresh token'));
   });
 
+  test("uses form-field authentication if basicAuth is false", () async {
+    var credentials = new oauth2.Credentials(
+        'access token',
+        refreshToken: 'refresh token',
+        tokenEndpoint: tokenEndpoint,
+        scopes: ['scope1', 'scope2']);
+    expect(credentials.canRefresh, true);
+
+    httpClient.expectRequest((request) {
+      expect(request.method, equals('POST'));
+      expect(request.url.toString(), equals(tokenEndpoint.toString()));
+      expect(request.bodyFields, equals({
+        "grant_type": "refresh_token",
+        "refresh_token": "refresh token",
+        "scope": "scope1 scope2",
+        "client_id": "idëntīfier",
+        "client_secret": "sëcret"
+      }));
+
+      return new Future.value(new http.Response(JSON.encode({
+        'access_token': 'new access token',
+        'token_type': 'bearer',
+        'refresh_token': 'new refresh token'
+      }), 200, headers: {'content-type': 'application/json'}));
+    });
+
+    credentials = await credentials.refresh(
+        identifier: 'idëntīfier',
+        secret: 'sëcret',
+        basicAuth: false,
+        httpClient: httpClient);
+    expect(credentials.accessToken, equals('new access token'));
+    expect(credentials.refreshToken, equals('new refresh token'));
+  });
+
   group("fromJson", () {
     oauth2.Credentials fromMap(Map map) =>
       new oauth2.Credentials.fromJson(JSON.encode(map));
 
     test("should load the same credentials from toJson", () {
       var expiration = new DateTime.now().subtract(new Duration(hours: 1));
       var credentials = new oauth2.Credentials(
-          'access token', 'refresh token', tokenEndpoint, ['scope1', 'scope2'],
-          expiration);
+          'access token',
+          refreshToken: 'refresh token',
+          tokenEndpoint: tokenEndpoint,
+          scopes: ['scope1', 'scope2'],
+          expiration: expiration);
       var reloaded = new oauth2.Credentials.fromJson(credentials.toJson());
 
       expect(reloaded.accessToken, equals(credentials.accessToken));
       expect(reloaded.refreshToken, equals(credentials.refreshToken));
       expect(reloaded.tokenEndpoint.toString(),
           equals(credentials.tokenEndpoint.toString()));
       expect(reloaded.scopes, equals(credentials.scopes));
       expect(reloaded.expiration, equals(credentials.expiration));
     });
 
@@ skipping 29 matching lines @@
       expect(() => fromMap({"accessToken": "foo", "scopes": 12}),
           throwsFormatException);
     });
 
     test("should throw a FormatException if expiration is not an int", () {
       expect(() => fromMap({"accessToken": "foo", "expiration": "12"}),
           throwsFormatException);
     });
   });
 }