From 3fe1778c276606fc5a84aaa27f8eacf351e25b88 Mon Sep 17 00:00:00 2001 From: "thomashii@dukefirehawk.com" Date: Sat, 27 Aug 2022 15:49:21 +0800 Subject: [PATCH] Fixed client analysis warnings --- packages/client/lib/base_angel_client.dart | 39 ++++++++++------------ packages/client/test/auth_test.dart | 10 +++--- packages/client/test/shared.dart | 2 +- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/packages/client/lib/base_angel_client.dart b/packages/client/lib/base_angel_client.dart index 8eb5bfd7..4d2aeda1 100644 --- a/packages/client/lib/base_angel_client.dart +++ b/packages/client/lib/base_angel_client.dart @@ -1,10 +1,6 @@ import 'dart:async'; import 'dart:convert'; -import 'package:http/src/base_client.dart' as http; -import 'package:http/src/base_request.dart' as http; -import 'package:http/src/request.dart' as http; -import 'package:http/src/response.dart' as http; -import 'package:http/src/streamed_response.dart' as http; +import 'package:http/http.dart'; import 'package:path/path.dart'; import 'package:logging/logging.dart'; import 'angel3_client.dart'; @@ -19,10 +15,10 @@ Map _buildQuery(Map? params) { return params?.map((k, v) => MapEntry(k, v.toString())) ?? {}; } -bool _invalid(http.Response response) => +bool _invalid(Response response) => response.statusCode < 200 || response.statusCode >= 300; -AngelHttpException failure(http.Response response, +AngelHttpException failure(Response response, {error, String? message, StackTrace? stack}) { try { var v = json.decode(response.body); @@ -50,7 +46,7 @@ abstract class BaseAngelClient extends Angel { final StreamController _onAuthenticated = StreamController(); final List _services = []; - final http.BaseClient client; + final BaseClient client; final Context _p = Context(style: Style.url); @@ -71,7 +67,7 @@ abstract class BaseAngelClient extends Angel { //var p1 = p.joinAll(segments).replaceAll('\\', '/'); var url = baseUrl.replace(path: _p.joinAll(segments)); - http.Response response; + Response response; if (credentials != null) { response = await post(url, @@ -121,7 +117,7 @@ abstract class BaseAngelClient extends Angel { } @override - Future send(http.BaseRequest request) async { + Future send(BaseRequest request) async { if (authToken?.isNotEmpty == true) { request.headers['authorization'] ??= 'Bearer $authToken'; } @@ -129,11 +125,10 @@ abstract class BaseAngelClient extends Angel { } /// Sends a non-streaming [Request] and returns a non-streaming [Response]. - Future sendUnstreamed( + Future sendUnstreamed( String method, url, Map? headers, [body, Encoding? encoding]) async { - var request = - http.Request(method, url is Uri ? url : Uri.parse(url.toString())); + var request = Request(method, url is Uri ? url : Uri.parse(url.toString())); if (headers != null) request.headers.addAll(headers); @@ -153,7 +148,7 @@ abstract class BaseAngelClient extends Angel { } } - return http.Response.fromStream(await send(request)); + return Response.fromStream(await send(request)); } @override @@ -173,34 +168,34 @@ abstract class BaseAngelClient extends Angel { } //@override - //Future delete(url, {Map headers}) async { + //Future delete(url, {Map headers}) async { // return sendUnstreamed('DELETE', _join(url), headers); //} @override - Future get(url, {Map? headers}) async { + Future get(url, {Map? headers}) async { return sendUnstreamed('GET', _join(url), headers); } @override - Future head(url, {Map? headers}) async { + Future head(url, {Map? headers}) async { return sendUnstreamed('HEAD', _join(url), headers); } @override - Future patch(url, + Future patch(url, {body, Map? headers, Encoding? encoding}) async { return sendUnstreamed('PATCH', _join(url), headers, body, encoding); } @override - Future post(url, + Future post(url, {body, Map? headers, Encoding? encoding}) async { return sendUnstreamed('POST', _join(url), headers, body, encoding); } @override - Future put(url, + Future put(url, {body, Map? headers, Encoding? encoding}) async { return sendUnstreamed('PUT', _join(url), headers, body, encoding); } @@ -210,7 +205,7 @@ class BaseAngelService extends Service { @override final BaseAngelClient app; final Uri baseUrl; - final http.BaseClient client; + final BaseClient client; final AngelDeserializer? deserializer; final Context _p = Context(style: Style.url); @@ -262,7 +257,7 @@ class BaseAngelService extends Service { return jsonEncode(x); } - Future send(http.BaseRequest request) { + Future send(BaseRequest request) { if (app.authToken != null && app.authToken!.isNotEmpty) { request.headers['Authorization'] = 'Bearer ${app.authToken}'; } diff --git a/packages/client/test/auth_test.dart b/packages/client/test/auth_test.dart index fbb243b2..7552e7b0 100644 --- a/packages/client/test/auth_test.dart +++ b/packages/client/test/auth_test.dart @@ -5,7 +5,7 @@ import 'package:angel3_framework/http.dart'; import 'package:logging/logging.dart'; import 'package:test/test.dart'; -const Map USER = {'username': 'foo', 'password': 'bar'}; +const Map user = {'username': 'foo', 'password': 'bar'}; var localOpts = AngelAuthOptions>(canRespondWithJson: true); void main() { @@ -17,12 +17,12 @@ void main() { app = Angel(); http = AngelHttp(app, useZone: false); var auth = AngelAuth( - serializer: (_) async => 'baz', deserializer: (_) async => USER); + serializer: (_) async => 'baz', deserializer: (_) async => user); auth.strategies['local'] = LocalAuthStrategy( (username, password) async { if (username == 'foo' && password == 'bar') { - return USER; + return user; } return {}; @@ -50,10 +50,10 @@ void main() { }); test('auth event fires', () async { - var localAuth = await client.authenticate(type: 'local', credentials: USER); + var localAuth = await client.authenticate(type: 'local', credentials: user); print('JWT: ${localAuth.token}'); print('Data: ${localAuth.data}'); - expect(localAuth.data, USER); + expect(localAuth.data, user); }); } diff --git a/packages/client/test/shared.dart b/packages/client/test/shared.dart index e698aac2..be0594cb 100644 --- a/packages/client/test/shared.dart +++ b/packages/client/test/shared.dart @@ -15,7 +15,7 @@ class Postcard extends Model { @override bool operator ==(other) { - if (!(other is Postcard)) return false; + if (other is! Postcard) return false; return id == other.id && location == other.location &&