From 647c9c5eb027440e29c6a3b86f731640df9c0d36 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 7 Nov 2020 17:22:11 +0100 Subject: [PATCH] Fix #4023 --- app/Http/Controllers/Admin/HomeController.php | 5 ++--- app/Support/Authentication/RemoteUserGuard.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 2add59ac7e..8e28465697 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -61,11 +61,10 @@ class HomeController extends Controller $mainTitleIcon = 'fa-hand-spock-o'; $email = auth()->user()->email; $pref = app('preferences')->get('remote_guard_alt_email', null); - if(null !== $pref) { + if(null !== $pref && is_string($pref->data)) { $email = $pref->data; } - - + Log::debug('Email is ', [$email]); return view('admin.index', compact('title', 'mainTitleIcon','email')); } diff --git a/app/Support/Authentication/RemoteUserGuard.php b/app/Support/Authentication/RemoteUserGuard.php index 3f7b049253..cf8d4688ce 100644 --- a/app/Support/Authentication/RemoteUserGuard.php +++ b/app/Support/Authentication/RemoteUserGuard.php @@ -80,7 +80,7 @@ class RemoteUserGuard implements Guard // store email address if present in header and not already set. $header = config('auth.guard_email'); - $emailAddress = request()->server($header) ?? null; + $emailAddress = (string) (request()->server($header) ?? null); $preference = app('preferences')->getForUser($retrievedUser, 'remote_guard_alt_email', null); if (null !== $emailAddress && null === $preference && $emailAddress !== $userID) {