Update and use Validation class

1 files changed, 5 insertions, 5 deletions

diff --git a/app/Http/RequestHandlers/LoginAction.php b/app/Http/RequestHandlers/LoginAction.php
index 337dc59ff1..26aab30ba5 100644
--- a/app/Http/RequestHandlers/LoginAction.php
+++ b/app/Http/RequestHandlers/LoginAction.php
@@ -67,12 +67,12 @@ class LoginAction implements RequestHandlerInterface
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $tree        = $request->getAttribute('tree');
-        $base_url    = $request->getAttribute('base_url');
+        $tree        = Validator::attributes($request)->treeOptional();
+        $base_url    = Validator::attributes($request)->string('base_url');
         $default_url = route(HomePage::class);
-        $username    = Validator::parsedBody($request)->string('username') ?? '';
-        $password    = Validator::parsedBody($request)->string('password') ?? '';
-        $url         = Validator::parsedBody($request)->isLocalUrl($base_url)->string('url') ?? $default_url;
+        $username    = Validator::parsedBody($request)->optionalString('username') ?? '';
+        $password    = Validator::parsedBody($request)->optionalString('password') ?? '';
+        $url         = Validator::parsedBody($request)->isLocalUrl($base_url)->optionalString('url') ?? $default_url;
 
         try {
             $this->doLogin($username, $password);