Don't require users to copy-paste authorization codes when authorizing pub.

utils/tests/pub/oauth2_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.
 
 library oauth2_test;
 
 import 'dart:io';
 import 'dart:json';
+import 'dart:uri';
 
 import 'test_pub.dart';
+import '../../../pkg/http/lib/http.dart' as http;
 import '../../../pkg/unittest/lib/unittest.dart';
 import '../../pub/io.dart';
+import '../../pub/utils.dart';
 
 main() {
   setUp(() => dir(appPath, [libPubspec("test_pkg", "1.0.0")]).scheduleCreate());
 
   test('with no credentials.json, authenticates and saves credentials.json',
       () {
     var server = new ScheduledServer();
     var pub = startPubLish(server);
-
-    expectLater(pub.nextLine(), equals('Pub needs your '
-       'authorization to upload packages on your behalf.'));
-    pub.writeLine('access code');
-
-    handleAccessTokenRequest(server, "access token");
+    authorizePub(pub, server);
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer access token'));
 
       response.outputStream.close();
     });
 
     pub.kill();
 
@@ skipping 63 matching lines @@
        'authenticates again and saves credentials.json', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token',
         expiration: new Date.now().subtract(new Duration(hours: 1)))
         .scheduleCreate();
 
     var pub = startPubLish(server);
 
     expectLater(pub.nextErrLine(), equals("Pub's authorization to upload "
           "packages has expired and can't be automatically refreshed."));
-    expectLater(pub.nextLine(), equals('Pub needs your '
-       'authorization to upload packages on your behalf.'));
-    pub.writeLine('access code');
-
-    handleAccessTokenRequest(server, "new access token");
+    authorizePub(pub, server, "new access token");
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer new access token'));
 
       response.outputStream.close();
     });
 
     pub.kill();
 
     credentialsFile(server, 'new access token').scheduleValidate();
 
     run();
   });
 
   test('with a malformed credentials.json, authenticates again and saves '
       'credentials.json', () {
     var server = new ScheduledServer();
     dir(cachePath, [
       file('credentials.json', '{bad json')
     ]).scheduleCreate();
 
     var pub = startPubLish(server);
-
-    expectLater(pub.nextLine(), equals('Pub needs your '
-       'authorization to upload packages on your behalf.'));
-    pub.writeLine('access code');
-
-    handleAccessTokenRequest(server, "new access token");
+    authorizePub(pub, server, "new access token");
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer new access token'));
 
       response.outputStream.close();
     });
 
     pub.kill();
 
     credentialsFile(server, 'new access token').scheduleValidate();
 
     run();
   });
 }
 
+void authorizePub(ScheduledProcess pub, ScheduledServer server,
+    [String accessToken="access token"]) {
+  expectLater(pub.nextLine(), equals('Pub needs your '
+     'authorization to upload packages on your behalf.'));
+
+  expectLater(pub.nextLine().chain((line) {
+    var match = new RegExp(r'[?&]redirect_uri=([0-9a-zA-Z%+-]+)[$&]')
+        .firstMatch(line);
+    expect(match, isNotNull);
+
+    var redirectUrl = new Uri.fromString(decodeUriComponent(match.group(1)));
+    redirectUrl = addQueryParameters(redirectUrl, {'code': 'access code'});
+    return (new http.Request('GET', redirectUrl)..followRedirects = false)
+      .send();
+  }).transform((response) {
+    expect(response.headers['location'],
+        equals(['http://pub.dartlang.org/authorized']));
+  }), anything);
+
+  handleAccessTokenRequest(server, accessToken);
+}
+
 void handleAccessTokenRequest(ScheduledServer server, String accessToken) {
   server.handle('POST', '/token', (request, response) {
     return consumeInputStream(request.inputStream).transform((bytes) {
       var body = new String.fromCharCodes(bytes);
       expect(body, matches(new RegExp(r'(^|&)code=access%20code(&|$)')));
 
       response.headers.contentType = new ContentType("application", "json");
       response.outputStream.writeString(JSON.stringify({
         "access_token": accessToken,
         "token_type": "bearer"
       }));
       response.outputStream.close();
     });
   });
 }