From c8192f392b862bbea9b2dc4b044fa399e9083e49 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 15 Nov 2017 21:09:43 +0200 Subject: [PATCH] Use subdomain in db lookup --- app/Http/Middleware/DatabaseLookup.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Http/Middleware/DatabaseLookup.php b/app/Http/Middleware/DatabaseLookup.php index d76f56e69515..345a063805a2 100644 --- a/app/Http/Middleware/DatabaseLookup.php +++ b/app/Http/Middleware/DatabaseLookup.php @@ -10,6 +10,7 @@ use App\Models\LookupInvitation; use App\Models\LookupAccountToken; use App\Models\LookupUser; use Auth; +use Utils; class DatabaseLookup { @@ -46,6 +47,11 @@ class DatabaseLookup LookupContact::setServerByField('contact_key', $key); } elseif ($key = request()->account_key) { LookupAccount::setServerByField('account_key', $key); + } else { + $subdomain = Utils::getSubdomain(\Request::server('HTTP_HOST')); + if ($subdomain != 'app') { + LookupAccount::setServerByField('subdomain', $subdomain); + } } } elseif ($guard == 'postmark') { LookupInvitation::setServerByField('message_id', request()->MessageID);