From 32d4873715d4967d3b33ac13b07906546f049d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Tue, 29 Mar 2022 10:49:08 +0200 Subject: [PATCH] disabled 2fa set up in demo mode for howdy account --- src/App/Users/Models/User.php | 9 +++++++++ src/App/Users/Resources/UserResource.php | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/App/Users/Models/User.php b/src/App/Users/Models/User.php index 7003cca3..1934c887 100644 --- a/src/App/Users/Models/User.php +++ b/src/App/Users/Models/User.php @@ -221,5 +221,14 @@ class User extends Authenticatable implements MustVerifyEmail // Create user directory for his files Storage::makeDirectory("files/$user->id"); }); + + static::updating(function ($user) { + + // Prevent to set 2fa in demo mode + if (config('vuefilemanager.is_demo') && $user->email === 'howdy@hi5ve.digital') { + $user->two_factor_secret = null; + $user->two_factor_recovery_codes = null; + } + }); } } diff --git a/src/App/Users/Resources/UserResource.php b/src/App/Users/Resources/UserResource.php index b32a01e1..a68de301 100644 --- a/src/App/Users/Resources/UserResource.php +++ b/src/App/Users/Resources/UserResource.php @@ -36,8 +36,8 @@ class UserResource extends JsonResource 'avatar' => $this->settings->avatar, 'email' => is_demo() ? obfuscate_email($this->email) : $this->email, 'role' => $this->role, - 'two_factor_authentication' => $this->two_factor_secret ? true : false, - 'socialite_account' => $this->password ? false : true, + 'two_factor_authentication' => (bool)$this->two_factor_secret, + 'socialite_account' => !(bool)$this->password, 'storage' => $this->storage, 'created_at' => format_date($this->created_at, 'd. M. Y'), 'updated_at' => format_date($this->updated_at, 'd. M. Y'),