Merge pull request #130 from kontenta/feature/login-autocomplete

Login improvements
kontenta · Jun 28, 2019 · 3626ed5 · 3626ed5
2 parents 4c41e6e + 3f0c96d
commit 3626ed5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -3,12 +3,16 @@
 
 @extends($view_manager->layout())
 
+<?php
+  $autofocusControlId = 'email';
+?>
+
 @section('kontourMain')
   <header>{{ __('Login') }}</header>
   <form method="POST" action="{{ route('kontour.login') }}">
     @csrf
-    @include('kontour::forms.input', ['name' => 'email', 'type' => 'email', 'controlAttributes' => ['required']])
-    @include('kontour::forms.input', ['name' => 'password', 'type' => 'password', 'controlAttributes' => ['required']])
+    @include('kontour::forms.input', ['name' => 'email', 'type' => 'email', 'controlAttributes' => ['required', 'autocomplete' => 'email']])
+    @include('kontour::forms.input', ['name' => 'password', 'type' => 'password', 'controlAttributes' => ['required', 'autocomplete' => 'current-password']])
     @include('kontour::forms.checkbox', ['name' => 'remember', 'label' => __('Remember Me')])
     @component('kontour::buttons.generic')
       {{ __('Login') }}

diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
@@ -2,14 +2,18 @@
 
 @extends($view_manager->layout())
 
+<?php
+  $autofocusControlId = 'email';
+?>
+
 @section('kontourMain')
   <header>{{ __('Reset Password') }}</header>
 
   {{ $messageWidget }}
 
   <form method="POST" action="{{ route('kontour.password.email') }}">
     @csrf
-    @include('kontour::forms.input', ['name' => 'email', 'type' => 'email', 'controlAttributes' => ['required']])
+    @include('kontour::forms.input', ['name' => 'email', 'type' => 'email', 'controlAttributes' => ['required', 'autocomplete' => 'email']])
     @component('kontour::buttons.generic')
       {{ __('Send Password Reset Link') }}
     @endcomponent

diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
@@ -2,14 +2,18 @@
 
 @extends($view_manager->layout())
 
+<?php
+  $autofocusControlId = array_merge(array_intersect(['email', 'password'], $errors->keys()), ['email'])[0];
+?>
+
 @section('kontourMain')
   <header>{{ __('Reset Password') }}</header>
   <form method="POST" action="{{ route('kontour.password.request') }}">
     @csrf
     <input type="hidden" name="token" value="{{ $token }}">
-    @include('kontour::forms.input', ['name' => 'email', 'type' => 'email', 'controlAttributes' => ['required']])
-    @include('kontour::forms.input', ['name' => 'password', 'type' => 'password', 'controlAttributes' => ['required']])
-    @include('kontour::forms.input', ['name' => 'password_confirmation', 'type' => 'password', 'controlAttributes' => ['required']])
+    @include('kontour::forms.input', ['name' => 'email', 'type' => 'email', 'controlAttributes' => ['required', 'autocomplete' => 'email']])
+    @include('kontour::forms.input', ['name' => 'password', 'type' => 'password', 'controlAttributes' => ['required', 'autocomplete' => 'new-password']])
+    @include('kontour::forms.input', ['name' => 'password_confirmation', 'type' => 'password', 'controlAttributes' => ['required', 'autocomplete' => 'new-password']])
     @component('kontour::buttons.generic')
       {{ __('Reset Password') }}
     @endcomponent

diff --git a/tests/Browser/AuthenticationTest.php b/tests/Browser/AuthenticationTest.php
@@ -37,7 +37,7 @@ public function test_logout()
              * @var $routeManager \Kontenta\Kontour\Contracts\AdminRouteManager
              */
             $routeManager = $this->app->make(\Kontenta\Kontour\Contracts\AdminRouteManager::class);
-            $browser->loginAs($this->user)->visit($routeManager->indexUrl())
+            $browser->loginAs($this->user, 'admin')->visit($routeManager->indexUrl())
                 ->press('Logout')
                 ->assertUrlIs($routeManager->loginUrl());
         });

diff --git a/tests/Browser/SkipToContentTest.php b/tests/Browser/SkipToContentTest.php
@@ -20,7 +20,7 @@ public function test_skip_to_content()
              * @var $routeManager \Kontenta\Kontour\Contracts\AdminRouteManager
              */
             $routeManager = $this->app->make(\Kontenta\Kontour\Contracts\AdminRouteManager::class);
-            $browser->visit($routeManager->loginUrl());
+            $browser->loginAs($this->user, 'admin')->visit($routeManager->indexUrl());
 
             $this->assertEquals('absolute', $browser->element($this->element)->getCSSValue('position'));