| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library oauth2.utils; | 5 library oauth2.utils; |
| 6 | 6 |
| 7 import 'dart:convert'; | 7 import 'dart:convert'; |
| 8 import 'dart:io'; | 8 import 'dart:io'; |
| 9 | 9 |
| 10 import 'package:http/http.dart' as http; | 10 import 'package:http/http.dart' as http; |
| 11 import 'package:scheduled_test/scheduled_process.dart'; | 11 import 'package:scheduled_test/scheduled_process.dart'; |
| 12 import 'package:scheduled_test/scheduled_test.dart'; | 12 import 'package:scheduled_test/scheduled_test.dart'; |
| 13 import 'package:scheduled_test/scheduled_server.dart'; | 13 import 'package:scheduled_test/scheduled_server.dart'; |
| 14 | 14 |
| 15 import '../../lib/src/io.dart'; | 15 import '../../lib/src/io.dart'; |
| 16 import '../../lib/src/utils.dart'; | 16 import '../../lib/src/utils.dart'; |
| 17 | 17 |
| 18 void authorizePub(ScheduledProcess pub, ScheduledServer server, | 18 void authorizePub(ScheduledProcess pub, ScheduledServer server, |
| 19 [String accessToken="access token"]) { | 19 [String accessToken="access token"]) { |
| 20 expect(pub.nextLine(), completion(equals('Pub needs your authorization to ' | 20 pub.stdout.expect('Pub needs your authorization to upload packages on your ' |
| 21 'upload packages on your behalf.'))); | 21 'behalf.'); |
| 22 | 22 |
| 23 expect(pub.nextLine().then((line) { | 23 schedule(() { |
| 24 var match = new RegExp(r'[?&]redirect_uri=([0-9a-zA-Z.%+-]+)[$&]') | 24 return pub.stdout.next().then((line) { |
| 25 .firstMatch(line); | 25 var match = new RegExp(r'[?&]redirect_uri=([0-9a-zA-Z.%+-]+)[$&]') |
| 26 expect(match, isNotNull); | 26 .firstMatch(line); |
| 27 expect(match, isNotNull); |
| 27 | 28 |
| 28 var redirectUrl = Uri.parse(Uri.decodeComponent(match.group(1))); | 29 var redirectUrl = Uri.parse(Uri.decodeComponent(match.group(1))); |
| 29 redirectUrl = addQueryParameters(redirectUrl, {'code': 'access code'}); | 30 redirectUrl = addQueryParameters(redirectUrl, {'code': 'access code'}); |
| 30 return (new http.Request('GET', redirectUrl)..followRedirects = false) | 31 return (new http.Request('GET', redirectUrl)..followRedirects = false) |
| 31 .send(); | 32 .send(); |
| 32 }).then((response) { | 33 }).then((response) { |
| 33 expect(response.headers['location'], | 34 expect(response.headers['location'], |
| 34 equals('http://pub.dartlang.org/authorized')); | 35 equals('http://pub.dartlang.org/authorized')); |
| 35 }), completes); | 36 }); |
| 37 }); |
| 36 | 38 |
| 37 handleAccessTokenRequest(server, accessToken); | 39 handleAccessTokenRequest(server, accessToken); |
| 38 } | 40 } |
| 39 | 41 |
| 40 void handleAccessTokenRequest(ScheduledServer server, String accessToken) { | 42 void handleAccessTokenRequest(ScheduledServer server, String accessToken) { |
| 41 server.handle('POST', '/token', (request) { | 43 server.handle('POST', '/token', (request) { |
| 42 return new ByteStream(request).toBytes().then((bytes) { | 44 return new ByteStream(request).toBytes().then((bytes) { |
| 43 var body = new String.fromCharCodes(bytes); | 45 var body = new String.fromCharCodes(bytes); |
| 44 expect(body, matches(new RegExp(r'(^|&)code=access\+code(&|$)'))); | 46 expect(body, matches(new RegExp(r'(^|&)code=access\+code(&|$)'))); |
| 45 | 47 |
| 46 request.response.headers.contentType = | 48 request.response.headers.contentType = |
| 47 new ContentType("application", "json"); | 49 new ContentType("application", "json"); |
| 48 request.response.write(JSON.encode({ | 50 request.response.write(JSON.encode({ |
| 49 "access_token": accessToken, | 51 "access_token": accessToken, |
| 50 "token_type": "bearer" | 52 "token_type": "bearer" |
| 51 })); | 53 })); |
| 52 request.response.close(); | 54 request.response.close(); |
| 53 }); | 55 }); |
| 54 }); | 56 }); |
| 55 } | 57 } |
| 56 | 58 |
| OLD | NEW |