login working as expected

metager/app/Http/Controllers/LogsApiController.php

@@ -72,10 +72,14 @@ class LogsApiController extends Controller
 
     public function login(Request $request)
     {
-        if (!is_null(Auth::guard("logs")->user()->getAuthIdentifier())) {
+        if (!is_null(Auth::guard("logs")->user()) && !is_null(Auth::guard("logs")->user()->getAuthIdentifier())) {
             session()->flash("email", Auth::guard("logs")->user()->getAuthIdentifier());
         }
-        return view("logs.login", ['title' => __('titles.logs.login')]);
+        if ($request->filled("reset")) {
+            session()->flush();
+            return redirect(route("logs:login"));
+        }
+        return view("logs.login", ['title' => __('titles.logs.login')])->with(["css" => [mix("/css/logs.css")]]);
     }
     public function login_post(Request $request)
     {

metager/app/Providers/AppServiceProvider.php

@@ -42,7 +42,7 @@ class AppServiceProvider extends ServiceProvider
         });
 
         Auth::extend('logs', function (Application $app, string $name, array $config) {
-            return new LogsAuthGuard(Auth::createUserProvider($config['provider']), $app->make('request'));
+            return new LogsAuthGuard(Auth::createUserProvider($config['provider']), $app->make(\Illuminate\Http\Request::class));
         });
     }
 

metager/resources/less/metager/pages/logs.less

+#login {
+    >form {
+        display: grid;
+        row-gap: 0.5rem;
+
+        .input-group {
+            display: grid;
+
+            >label {
+                font-weight: normal;
+                font-size: .8rem;
+                margin: 0;
+            }
+        }
+
+        >a.reset {
+            text-align: center;
+            font-size: .8rem;
+        }
+    }
+}
\ No newline at end of file

metager/resources/views/logs/login.blade.php

@@ -3,39 +3,45 @@
 @section('title', $title)
 
 @section('content')
-<h1>MetaGer Logs API</h1>
-<p>Bitte melde dich an, um Zugriff auf dein Konto zu erhalten.</p>
-@if ($errors->any())
-    <div class="alert alert-danger">
-        <ul>
-            @foreach ($errors->all() as $error_message)
-                <li>{{ $error_message }}</li>
-            @endforeach
-        </ul>
-    </div>
-@endif
-<form action="{{ route("logs:login:post")}}" method="post">
-    <input type="hidden" name="_token" value="{{ csrf_token() }}" />
-    @if(session("email"))
-        <input type="hidden" name="email" value="{{session('email')}}">
+<div id="login">
+    <h1>MetaGer Logs API</h1>
+    @if ($errors->any())
+        <div class="alert alert-danger">
+            <ul>
+                @foreach ($errors->all() as $error_message)
+                    <li>{{ $error_message }}</li>
+                @endforeach
+            </ul>
+        </div>
     @endif
-    <div class="input-group">
-        <label for="email">Email Addresse</label>
+    <p>Bitte melde dich an, um Zugriff auf dein Konto zu erhalten.</p>
+    <form action="{{ route("logs:login:post")}}" method="post">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}" />
         @if(session("email"))
-            <input type="email" name="email" id="email" value="{{session('email')}}" placeholder="max@mustermann.de"
-                required disabled>
-        @else
-            <input type="email" name="email" id="email" value="{{old('email')}}" placeholder="max@mustermann.de" required>
+            <input type="hidden" name="email" value="{{session('email')}}">
         @endif
-    </div>
-    @if(session("email"))
-        <p>Falls dieser Account bereits registriert ist, haben wir dir soeben einen Login Code per Email gesendet. Bitte
-            trage diesen ein um dich anzumelden.</p>
         <div class="input-group">
-            <label for="code">Login Code</label>
-            <input type="text" name="code" id="code" placeholder="123456" required>
+            <label for="email">Email Addresse</label>
+            @if(session("email"))
+                <input type="email" name="email" id="email" value="{{session('email')}}" placeholder="max@mustermann.de"
+                    required disabled>
+            @else
+                <input type="email" name="email" id="email" value="{{old('email')}}" placeholder="max@mustermann.de"
+                    required>
+            @endif
         </div>
-    @endif
-    <button class="btn btn-default" type="submit">Abschicken</button>
-</form>
+        @if(session("email"))
+            <div class="input-group">
+                <label for="code">Login Code</label>
+                <input type="text" name="code" id="code" placeholder="123456" required>
+            </div>
+            <p>Falls dieser Account bereits registriert ist, haben wir dir einen Login Code per Email gesendet. Bitte
+                trage diesen ein um dich anzumelden.</p>
+        @endif
+        <button class="btn btn-default" type="submit">Abschicken</button>
+        @if(session("email"))
+            <a class="reset" href="{{ route('logs:login', ['reset' => '1']) }}">Neu Anmelden</a>
+        @endif
+    </form>
+</div>
 @endsection
\ No newline at end of file

metager/webpack.mix.js

@@ -72,6 +72,10 @@ mix
     "resources/less/metager/pages/admin/logs.less",
     "public/css/admin/logs.css"
   )
+  .less(
+    "resources/less/metager/pages/logs.less",
+    "public/css/logs.css"
+  )
   .less(
     "resources/less/metager/pages/help-easy-language.less",
     "public/css/help-easy-language.css"