mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed auth analysis warnings

Browse source
This commit is contained in:
thomashii@dukefirehawk.com 2022-08-17 11:17:00 +08:00
parent ba26c88d6b
commit 5402fa55a9
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/auth/example/example.dart
View file

@ -17,6 +17,7 @@ void main() async {
// If authentication succeeds, return a User object. // If authentication succeeds, return a User object.
// //
// Otherwise, return `null`. // Otherwise, return `null`.
return null;
}); });
app.post('/auth/local', auth.authenticate('local')); app.post('/auth/local', auth.authenticate('local'));

6
packages/auth/lib/src/auth_token.dart
View file

@ -86,7 +86,7 @@ class AuthToken {
// var headerString = decodeBase64(split[0]); // var headerString = decodeBase64(split[0]);
var payloadString = decodeBase64(split[1]); var payloadString = decodeBase64(split[1]);
var data = split[0] + '.' + split[1]; var data = '${split[0]}.${split[1]}';
var signature = base64Url.encode(hmac.convert(data.codeUnits).bytes); var signature = base64Url.encode(hmac.convert(data.codeUnits).bytes);
if (signature != split[2]) { if (signature != split[2]) {
@ -102,9 +102,9 @@ class AuthToken {
String serialize(Hmac hmac) { String serialize(Hmac hmac) {
var headerString = base64Url.encode(json.encode(_header).codeUnits); var headerString = base64Url.encode(json.encode(_header).codeUnits);
var payloadString = base64Url.encode(json.encode(toJson()).codeUnits); var payloadString = base64Url.encode(json.encode(toJson()).codeUnits);
var data = headerString + '.' + payloadString; var data = '$headerString.$payloadString';
var signature = hmac.convert(data.codeUnits).bytes; var signature = hmac.convert(data.codeUnits).bytes;
return data + '.' + base64Url.encode(signature); return '$data.${base64Url.encode(signature)}';
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {

8
packages/auth/lib/src/strategies/local.dart
View file

@ -39,7 +39,7 @@ class LocalAuthStrategy<User> extends AuthStrategy<User> {
@override @override
Future<User?> authenticate(RequestContext req, ResponseContext res, Future<User?> authenticate(RequestContext req, ResponseContext res,
[AngelAuthOptions? options]) async { [AngelAuthOptions? options]) async {
var _options = options ?? AngelAuthOptions(); var localOptions = options ?? AngelAuthOptions();
User? verificationResult; User? verificationResult;
if (allowBasic) { if (allowBasic) {
@ -88,9 +88,9 @@ class LocalAuthStrategy<User> extends AuthStrategy<User> {
if (verificationResult == null || if (verificationResult == null ||
(verificationResult is Map && verificationResult.isEmpty)) { (verificationResult is Map && verificationResult.isEmpty)) {
if (_options.failureRedirect != null && if (localOptions.failureRedirect != null &&
_options.failureRedirect!.isNotEmpty) { localOptions.failureRedirect!.isNotEmpty) {
await res.redirect(_options.failureRedirect, code: 401); await res.redirect(localOptions.failureRedirect, code: 401);
return null; return null;
} }