From 45218176c7573bf447ccc1523c9d3a4d54370227 Mon Sep 17 00:00:00 2001
From: "thomashii@dukefirehawk.com" <thomashii@dukefirehawk.com>
Date: Sat, 27 Aug 2022 15:52:28 +0800
Subject: [PATCH] Fixed oauth2 analysis warnings

---
 packages/oauth2/example/main.dart                 | 4 ++--
 packages/oauth2/lib/src/server.dart               | 2 +-
 packages/oauth2/test/auth_code_test.dart          | 6 +++---
 packages/oauth2/test/client_credentials_test.dart | 6 +++---
 packages/oauth2/test/device_code_test.dart        | 1 -
 packages/oauth2/test/implicit_grant_test.dart     | 1 -
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/oauth2/example/main.dart b/packages/oauth2/example/main.dart
index 471c6291..04471d72 100644
--- a/packages/oauth2/example/main.dart
+++ b/packages/oauth2/example/main.dart
@@ -6,7 +6,7 @@ import 'package:angel3_oauth2/angel3_oauth2.dart';
 void main() async {
   var app = Angel();
   var oauth2 = _ExampleAuthorizationServer();
-  var _rgxBearer = RegExp(r'^[Bb]earer ([^\n\s]+)$');
+  var rgxBearer = RegExp(r'^[Bb]earer ([^\n\s]+)$');
 
   app.group('/auth', (router) {
     router
@@ -17,7 +17,7 @@ void main() async {
   // Assume that all other requests must be authenticated...
   app.fallback((req, res) {
     var authToken =
-        req.headers!.value('authorization')?.replaceAll(_rgxBearer, '').trim();
+        req.headers!.value('authorization')?.replaceAll(rgxBearer, '').trim();
 
     if (authToken == null) {
       throw AngelHttpException.forbidden();
diff --git a/packages/oauth2/lib/src/server.dart b/packages/oauth2/lib/src/server.dart
index f4e7cfda..8bfa68ad 100644
--- a/packages/oauth2/lib/src/server.dart
+++ b/packages/oauth2/lib/src/server.dart
@@ -234,7 +234,7 @@ abstract class AuthorizationServer<Client, User> {
       if (buf.isNotEmpty) buf.write('&');
       return buf
         ..write(
-          '$k=' + Uri.encodeComponent(queryParameters[k]!),
+          '$k=${Uri.encodeComponent(queryParameters[k]!)}',
         );
     }).toString();
 
diff --git a/packages/oauth2/test/auth_code_test.dart b/packages/oauth2/test/auth_code_test.dart
index c44cc904..ccca5471 100644
--- a/packages/oauth2/test/auth_code_test.dart
+++ b/packages/oauth2/test/auth_code_test.dart
@@ -100,7 +100,7 @@ void main() {
 
       var authCode = json.decode(response.body)['code'].toString();
       var client = await grant.handleAuthorizationCode(authCode);
-      expect(client.credentials.accessToken, authCode + '_access');
+      expect(client.credentials.accessToken, '${authCode}_access');
     });
 
     test('can send refresh token', () async {
@@ -111,9 +111,9 @@ void main() {
 
       var authCode = json.decode(response.body)['code'].toString();
       var client = await grant.handleAuthorizationCode(authCode);
-      expect(client.credentials.accessToken, authCode + '_access');
+      expect(client.credentials.accessToken, '${authCode}_access');
       expect(client.credentials.canRefresh, isTrue);
-      expect(client.credentials.refreshToken, authCode + '_refresh');
+      expect(client.credentials.refreshToken, '${authCode}_refresh');
     });
   });
 }
diff --git a/packages/oauth2/test/client_credentials_test.dart b/packages/oauth2/test/client_credentials_test.dart
index da2bec66..fa80a0ba 100644
--- a/packages/oauth2/test/client_credentials_test.dart
+++ b/packages/oauth2/test/client_credentials_test.dart
@@ -32,7 +32,7 @@ void main() {
     var response = await client.post(
       Uri.parse('oauth2/token'),
       headers: {
-        'Authorization': 'Basic ' + base64Url.encode('foo:bar'.codeUnits),
+        'Authorization': 'Basic ${base64Url.encode('foo:bar'.codeUnits)}',
       },
       body: {
         'grant_type': 'client_credentials',
@@ -60,7 +60,7 @@ void main() {
     var response = await client.post(
       Uri.parse('/oauth2/token'),
       headers: {
-        'Authorization': 'Basic ' + base64Url.encode('fooa:bar'.codeUnits),
+        'Authorization': 'Basic ${base64Url.encode('fooa:bar'.codeUnits)}',
       },
       body: {
         'grant_type': 'client_credentials',
@@ -75,7 +75,7 @@ void main() {
     var response = await client.post(
       Uri.parse('/oauth2/token'),
       headers: {
-        'Authorization': 'Basic ' + base64Url.encode('foo:bara'.codeUnits),
+        'Authorization': 'Basic ${base64Url.encode('foo:bara'.codeUnits)}',
       },
       body: {
         'grant_type': 'client_credentials',
diff --git a/packages/oauth2/test/device_code_test.dart b/packages/oauth2/test/device_code_test.dart
index 59a71b82..62d9e388 100644
--- a/packages/oauth2/test/device_code_test.dart
+++ b/packages/oauth2/test/device_code_test.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'package:angel3_framework/angel3_framework.dart';
 import 'package:angel3_test/angel3_test.dart';
 import 'package:angel3_oauth2/angel3_oauth2.dart';
-import 'package:angel3_validate/angel3_validate.dart';
 import 'package:logging/logging.dart';
 import 'package:test/test.dart';
 import 'common.dart';
diff --git a/packages/oauth2/test/implicit_grant_test.dart b/packages/oauth2/test/implicit_grant_test.dart
index 4f7ff798..640725b0 100644
--- a/packages/oauth2/test/implicit_grant_test.dart
+++ b/packages/oauth2/test/implicit_grant_test.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'package:angel3_framework/angel3_framework.dart';
 import 'package:angel3_test/angel3_test.dart';
 import 'package:angel3_oauth2/angel3_oauth2.dart';
-import 'package:angel3_validate/angel3_validate.dart';
 import 'package:test/test.dart';
 import 'common.dart';