diff --git a/app/Http/Middleware/PasswordProtection.php b/app/Http/Middleware/PasswordProtection.php index 21e9c4a0da94..f910b96b0664 100644 --- a/app/Http/Middleware/PasswordProtection.php +++ b/app/Http/Middleware/PasswordProtection.php @@ -58,6 +58,9 @@ class PasswordProtection $google = new Google(); $user = $google->getTokenResponse(request()->header('X-API-OAUTH-PASSWORD')); + nlog("user"); + nlog($user); + if (is_array($user)) { $query = [ @@ -65,15 +68,21 @@ class PasswordProtection 'oauth_provider_id'=> 'google' ]; + nlog($query); + //If OAuth and user also has a password set - check both if ($existing_user = MultiDB::hasUser($query) && auth()->user()->has_password && Hash::check(auth()->user()->password, $request->header('X-API-PASSWORD'))) { + nlog("existing user with password"); + Cache::put(auth()->user()->hashed_id.'_'.auth()->user()->account_id.'_logged_in', Str::random(64), $timeout); return $next($request); } elseif($existing_user = MultiDB::hasUser($query) && !auth()->user()->has_password){ + nlog("existing user without password"); + Cache::put(auth()->user()->hashed_id.'_'.auth()->user()->account_id.'_logged_in', Str::random(64), $timeout); return $next($request); }