From 8e251e553a9d0ab38ca353fee5a11f41c2d551da Mon Sep 17 00:00:00 2001
From: thomashii <thomashii@dukefirehawk.com>
Date: Sun, 4 Jun 2023 13:20:42 +0800
Subject: [PATCH] Refactored

---
 packages/auth/lib/src/strategies/local.dart | 40 +++++++++++++++++----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/packages/auth/lib/src/strategies/local.dart b/packages/auth/lib/src/strategies/local.dart
index 778f0842..d2d58739 100644
--- a/packages/auth/lib/src/strategies/local.dart
+++ b/packages/auth/lib/src/strategies/local.dart
@@ -66,19 +66,44 @@ class LocalAuthStrategy<User> extends AuthStrategy<User> {
           return null;
         }
 
-        // Allow non-null to pass through
+        //Allow non-null to pass through
         //return verificationResult;
       }
+    } else {
+      var body = await req
+          .parseBody()
+          .then((_) => req.bodyAsMap)
+          .catchError((_) => <String, dynamic>{});
+      if (_validateString(body[usernameField]?.toString()) &&
+          _validateString(body[passwordField]?.toString())) {
+        verificationResult = await verifier(
+            body[usernameField]?.toString(), body[passwordField]?.toString());
+      }
     }
 
-    if (verificationResult == null) {
-      if (forceBasic) {
-        res.headers['www-authenticate'] = 'Basic realm="$realm"';
-        return null;
-      }
+    // User authentication succeeded
+    if (verificationResult == true ||
+        (verificationResult is Map && verificationResult.isNotEmpty)) {
+      return verificationResult;
+    }
+
+    // Force basic if set
+    if (forceBasic) {
+      res.headers['www-authenticate'] = 'Basic realm="$realm"';
       return null;
     }
 
+    // Redirect failed authentication
+    if (localOptions.failureRedirect != null &&
+        localOptions.failureRedirect!.isNotEmpty) {
+      await res.redirect(localOptions.failureRedirect, code: 401);
+      return null;
+    }
+
+    _log.info('Not authenticated');
+    throw AngelHttpException.notAuthenticated();
+
+    /*
     if (verificationResult is Map && verificationResult.isEmpty) {
       if (localOptions.failureRedirect != null &&
           localOptions.failureRedirect!.isNotEmpty) {
@@ -99,5 +124,8 @@ class LocalAuthStrategy<User> extends AuthStrategy<User> {
       _log.info('Not authenticated');
       throw AngelHttpException.notAuthenticated();
     }
+    */
   }
+
+  bool _validateString(String? str) => str != null && str.isNotEmpty;
 }