Skip to content

Commit ac1eb4b

Browse files
adam-singeradam-singer
committedJul 2, 2013
Automated update
1 parent 36cde03 commit ac1eb4b

15 files changed

+73
-107
lines changed
 

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
packages/
1+
packages
22
pubspec.lock

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"0kaFfN0xfjZjASExv-gUnrWhdto/_Rxo1xnvBjhAUbm_XuYfyXrKEbI"
1+
"En7cEMgwoRpiAhsdND8UOnBCEDA/qwFbXMXKthqQggHQZAbxsQRx78U"

‎lib/oauth2_v2_api_browser.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ import "dart:json" as JSON;
1010
import "package:js/js.dart" as js;
1111
import "package:google_oauth2_client/google_oauth2_browser.dart" as oauth;
1212

13-
part "src/browser/browserclient.dart";
13+
part "src/browser/browser_client.dart";
1414
part "src/browser/oauth2.dart";
15-

‎lib/oauth2_v2_api_client.dart

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import "dart:core" as core;
44
import "dart:async" as async;
55
import "dart:json" as JSON;
66

7-
part "src/common/client.dart";
8-
part "src/common/schemas.dart";
9-
part "src/common/resources.dart";
10-
7+
part "src/client/client.dart";
8+
part "src/client/schemas.dart";
9+
part "src/client/resources.dart";

‎lib/oauth2_v2_api_console.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ import "dart:json" as JSON;
1010
import "package:http/http.dart" as http;
1111
import "package:google_oauth2_client/google_oauth2_console.dart" as oauth2;
1212

13-
part "src/console/consoleclient.dart";
13+
part "src/console/console_client.dart";
1414
part "src/console/oauth2.dart";
15-

‎lib/src/browser/browserclient.dart renamed to ‎lib/src/browser/browser_client.dart

+46-40
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ abstract class BrowserClient extends Client {
2222
}
2323

2424
js.scoped((){
25-
js.context.handleClientLoad = new js.Callback.once(() {
25+
js.context["handleClientLoad"] = new js.Callback.once(() {
2626
_jsClientLoaded = true;
2727
completer.complete(true);
2828
});
@@ -59,7 +59,7 @@ abstract class BrowserClient extends Client {
5959
}
6060

6161
js.scoped(() {
62-
var request = js.context.gapi.client.request(js.map(requestData));
62+
var request = js.context["gapi"]["client"]["request"](js.map(requestData));
6363
var callback = new js.Callback.once((jsonResp, rawResp) {
6464
if (jsonResp == null || (jsonResp is core.bool && jsonResp == false)) {
6565
var raw = JSON.parse(rawResp);
@@ -69,7 +69,7 @@ abstract class BrowserClient extends Client {
6969
completer.complete({});
7070
}
7171
} else {
72-
completer.complete(js.context.JSON.stringify(jsonResp));
72+
completer.complete(js.context["JSON"]["stringify"](jsonResp));
7373
}
7474
});
7575
request.execute(callback);
@@ -102,53 +102,59 @@ abstract class BrowserClient extends Client {
102102
}
103103
var url = new oauth.UrlPattern(path).generate(urlParams, queryParams);
104104

105-
request.onLoadEnd.listen((_) {
105+
void handleError() {
106+
if (request.status == 0) {
107+
_loadJsClient().then((v) {
108+
if (requestUrl.substring(0,1) == "/") {
109+
path = requestUrl;
110+
} else {
111+
path ="$basePath$requestUrl";
112+
}
113+
url = new oauth.UrlPattern(path).generate(urlParams, {});
114+
_makeJsClientRequest(url, method, body: body, contentType: contentType, queryParams: queryParams)
115+
.then((response) {
116+
var data = JSON.parse(response);
117+
completer.complete(data);
118+
})
119+
.catchError((e) {
120+
completer.completeError(e);
121+
return true;
122+
});
123+
});
124+
} else {
125+
var error = "";
126+
if (request.responseText != null) {
127+
var errorJson;
128+
try {
129+
errorJson = JSON.parse(request.responseText);
130+
} on core.FormatException {
131+
errorJson = null;
132+
}
133+
if (errorJson != null && errorJson.containsKey("error")) {
134+
error = "${errorJson["error"]["code"]} ${errorJson["error"]["message"]}";
135+
}
136+
}
137+
if (error == "") {
138+
error = "${request.status} ${request.statusText}";
139+
}
140+
completer.completeError(new APIRequestException(error));
141+
}
142+
}
143+
144+
request.onLoad.listen((_) {
106145
if (request.status > 0 && request.status < 400) {
107146
var data = {};
108147
if (!request.responseText.isEmpty) {
109148
data = JSON.parse(request.responseText);
110149
}
111150
completer.complete(data);
112151
} else {
113-
if (request.status == 0) {
114-
_loadJsClient().then((v) {
115-
if (requestUrl.substring(0,1) == "/") {
116-
path = requestUrl;
117-
} else {
118-
path ="$basePath$requestUrl";
119-
}
120-
url = new oauth.UrlPattern(path).generate(urlParams, {});
121-
_makeJsClientRequest(url, method, body: body, contentType: contentType, queryParams: queryParams)
122-
.then((response) {
123-
var data = JSON.parse(response);
124-
completer.complete(data);
125-
})
126-
.catchError((e) {
127-
completer.completeError(e);
128-
return true;
129-
});
130-
});
131-
} else {
132-
var error = "";
133-
if (request.responseText != null) {
134-
var errorJson;
135-
try {
136-
errorJson = JSON.parse(request.responseText);
137-
} on core.FormatException {
138-
errorJson = null;
139-
}
140-
if (errorJson != null && errorJson.containsKey("error")) {
141-
error = "${errorJson["error"]["code"]} ${errorJson["error"]["message"]}";
142-
}
143-
}
144-
if (error == "") {
145-
error = "${request.status} ${request.statusText}";
146-
}
147-
completer.completeError(new APIRequestException(error));
148-
}
152+
handleError();
149153
}
150154
});
151155

156+
request.onError.listen((_) => handleError());
157+
152158
request.open(method, url);
153159
request.setRequestHeader("Content-Type", contentType);
154160
if (makeAuthRequests && _auth != null) {

‎lib/src/browser/oauth2.dart

+3-7
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class Oauth2 extends BrowserClient {
8383
* [optParams] - Additional query parameters
8484
*/
8585
async.Future<Tokeninfo> tokeninfo({core.String access_token, core.String id_token, core.Map optParams}) {
86-
var completer = new async.Completer();
8786
var url = "oauth2/v2/tokeninfo";
8887
var urlParams = new core.Map();
8988
var queryParams = new core.Map();
@@ -100,15 +99,12 @@ class Oauth2 extends BrowserClient {
10099
}
101100

102101
if (!paramErrors.isEmpty) {
103-
completer.completeError(new core.ArgumentError(paramErrors.join(" / ")));
104-
return completer.future;
102+
throw new core.ArgumentError(paramErrors.join(" / "));
105103
}
106104

107105
var response;
108106
response = this.request(url, "POST", urlParams: urlParams, queryParams: queryParams);
109-
response
110-
.then((data) => completer.complete(new Tokeninfo.fromJson(data)))
111-
.catchError((e) { completer.completeError(e); return true; });
112-
return completer.future;
107+
return response
108+
.then((data) => new Tokeninfo.fromJson(data));
113109
}
114110
}

‎lib/src/common/client.dart renamed to ‎lib/src/client/client.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ abstract class Client {
5151
/// Base-class for all API Resources
5252
abstract class Resource {
5353
/// The [Client] to be used for all requests
54-
Client _client;
54+
final Client _client;
5555

5656
/// Create a new Resource, using the specified [Client] for requests
5757
Resource(Client this._client);

‎lib/src/common/resources.dart renamed to ‎lib/src/client/resources.dart

+6-14
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class UserinfoResource_ extends Resource {
1414
* [optParams] - Additional query parameters
1515
*/
1616
async.Future<Userinfo> get({core.Map optParams}) {
17-
var completer = new async.Completer();
1817
var url = "oauth2/v2/userinfo";
1918
var urlParams = new core.Map();
2019
var queryParams = new core.Map();
@@ -29,16 +28,13 @@ class UserinfoResource_ extends Resource {
2928
}
3029

3130
if (!paramErrors.isEmpty) {
32-
completer.completeError(new core.ArgumentError(paramErrors.join(" / ")));
33-
return completer.future;
31+
throw new core.ArgumentError(paramErrors.join(" / "));
3432
}
3533

3634
var response;
3735
response = _client.request(url, "GET", urlParams: urlParams, queryParams: queryParams);
38-
response
39-
.then((data) => completer.complete(new Userinfo.fromJson(data)))
40-
.catchError((e) { completer.completeError(e); return true; });
41-
return completer.future;
36+
return response
37+
.then((data) => new Userinfo.fromJson(data));
4238
}
4339
}
4440

@@ -62,7 +58,6 @@ class UserinfoV2MeResource_ extends Resource {
6258
* [optParams] - Additional query parameters
6359
*/
6460
async.Future<Userinfo> get({core.Map optParams}) {
65-
var completer = new async.Completer();
6661
var url = "userinfo/v2/me";
6762
var urlParams = new core.Map();
6863
var queryParams = new core.Map();
@@ -77,16 +72,13 @@ class UserinfoV2MeResource_ extends Resource {
7772
}
7873

7974
if (!paramErrors.isEmpty) {
80-
completer.completeError(new core.ArgumentError(paramErrors.join(" / ")));
81-
return completer.future;
75+
throw new core.ArgumentError(paramErrors.join(" / "));
8276
}
8377

8478
var response;
8579
response = _client.request(url, "GET", urlParams: urlParams, queryParams: queryParams);
86-
response
87-
.then((data) => completer.complete(new Userinfo.fromJson(data)))
88-
.catchError((e) { completer.completeError(e); return true; });
89-
return completer.future;
80+
return response
81+
.then((data) => new Userinfo.fromJson(data));
9082
}
9183
}
9284

‎lib/src/common/schemas.dart renamed to ‎lib/src/client/schemas.dart

File renamed without changes.

‎lib/src/console/oauth2.dart

+3-7
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class Oauth2 extends ConsoleClient {
8383
* [optParams] - Additional query parameters
8484
*/
8585
async.Future<Tokeninfo> tokeninfo({core.String access_token, core.String id_token, core.Map optParams}) {
86-
var completer = new async.Completer();
8786
var url = "oauth2/v2/tokeninfo";
8887
var urlParams = new core.Map();
8988
var queryParams = new core.Map();
@@ -100,15 +99,12 @@ class Oauth2 extends ConsoleClient {
10099
}
101100

102101
if (!paramErrors.isEmpty) {
103-
completer.completeError(new core.ArgumentError(paramErrors.join(" / ")));
104-
return completer.future;
102+
throw new core.ArgumentError(paramErrors.join(" / "));
105103
}
106104

107105
var response;
108106
response = this.request(url, "POST", urlParams: urlParams, queryParams: queryParams);
109-
response
110-
.then((data) => completer.complete(new Tokeninfo.fromJson(data)))
111-
.catchError((e) { completer.completeError(e); return true; });
112-
return completer.future;
107+
return response
108+
.then((data) => new Tokeninfo.fromJson(data));
113109
}
114110
}

‎pubspec.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
name: google_oauth2_v2_api
2-
version: 0.1.6
3-
description: Auto-generated client library for accessing the oauth2 v2 API
4-
homepage: https://github.com/dart-gde/discovery_api_dart_client_generator
2+
version: 0.1.7
53
authors:
64
- Gerwin Sturm <scarygami@gmail.com>
75
- Adam Singer <financeCoding@gmail.com>
6+
description: Auto-generated client library for accessing the oauth2 v2 API
7+
homepage: https://github.com/dart-gde/discovery_api_dart_client_generator
88
environment:
9-
sdk: '>=0.5.13'
9+
sdk: '>=0.5.20'
1010
dependencies:
11-
js: '>=0.0.22'
12-
google_oauth2_client: '>=0.2.14'
11+
google_oauth2_client: '>=0.2.15'
12+
js: '>=0.0.23'
13+
dev_dependencies:
1314
hop: any

‎test/run.sh

-19
This file was deleted.

‎tool/hop_runner.dart

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
library hop_runner;
22

3-
import 'dart:async';
4-
import 'dart:io';
53
import 'package:hop/hop.dart';
64
import 'package:hop/hop_tasks.dart';
75

@@ -18,5 +16,4 @@ void main() {
1816
addTask('analyze', createAnalyzerTask(pathList));
1917

2018
runHop();
21-
2219
}

0 commit comments

Comments
 (0)