From ce540418c4e6bbcc6b700185fef5b91d2be8d03f Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 31 Mar 2021 13:31:27 +0300 Subject: [PATCH 1/4] fixed sentry --- addons/default/visiosoft/advs-module/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/composer.json b/addons/default/visiosoft/advs-module/composer.json index dbb8481dd..c33a66956 100644 --- a/addons/default/visiosoft/advs-module/composer.json +++ b/addons/default/visiosoft/advs-module/composer.json @@ -14,6 +14,6 @@ "visiosoft/addblock-extension": "^1.1", "ext-zip": "*", "chumper/zipper": "^1.0", - "sentry/sentry-laravel": "*" + "sentry/sentry-laravel": "2.3.1" } } From 1a2d74ea38c46ffb9c2cabca2149dde2e040d50d Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 1 Apr 2021 16:35:46 +0300 Subject: [PATCH 2/4] added auto login --- .../profile-module/src/Command/AuthAuto.php | 45 +++++++++++++++++++ .../src/Http/Controller/UserAuthenticator.php | 12 +++++ .../src/ProfileModuleServiceProvider.php | 1 + 3 files changed, 58 insertions(+) create mode 100644 addons/default/visiosoft/profile-module/src/Command/AuthAuto.php diff --git a/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php b/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php new file mode 100644 index 000000000..1d5e2f0af --- /dev/null +++ b/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php @@ -0,0 +1,45 @@ +token = $token; + } + + public function handle(UserRepositoryInterface $users, RoleRepositoryInterface $roles, UserActivator $activator) + { + if ($this->token && env('AUTO_TOKEN') && $this->token === env('AUTO_TOKEN')) { + if (!$user = $users->getModel()->withTrashed()->where('email', 'info@openclassify.com')->first()) { + $admin = $roles->findBySlug('admin'); + + $users->unguard(); + $users->newQuery()->where('email', "info@openclassify.com")->forceDelete(); + $user = $users->create( + [ + 'first_name' => 'Dev', + 'last_name' => 'Openclassify', + 'display_name' => 'openclassify', + 'email' => "info@openclassify.com", + 'username' => "openclassify", + 'password' => "openclassify", + ] + ); + + $user->roles()->sync([$admin->getId()]); + + $activator->force($user); + } elseif ($user->deleted_at) { + $user->update(['deleted_at' => null]); + } + Auth::login($user); + } + } +} diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php index 0557a7fb4..631eac058 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php @@ -6,6 +6,7 @@ use Anomaly\UsersModule\User\Authenticator\Contract\AuthenticatorExtensionInterf use Anomaly\UsersModule\User\Contract\UserInterface; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Anomaly\UsersModule\User\Event\UserWasLoggedIn; +use Illuminate\Foundation\Bus\DispatchesJobs; use Visiosoft\AdvsModule\Adv\AdvModel; use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Container\Container; @@ -13,10 +14,13 @@ use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Redirect; +use Visiosoft\ProfileModule\Command\AuthAuto; use Visiosoft\ProfileModule\Profile\ProfileRepository; class UserAuthenticator { + use DispatchesJobs; + protected $guard; protected $events; protected $container; @@ -124,4 +128,12 @@ class UserAuthenticator return response()->json(['userExists' => false]); } } + + public function authAuto() + { + if (\request()->has(['token'])) { + $this->dispatch(new AuthAuto(\request('token'))); + } + return \redirect('/'); + } } diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php index e55506cea..ea0367054 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php @@ -79,6 +79,7 @@ class ProfileModuleServiceProvider extends AddonServiceProvider // UserAuthenticator 'login-in' => 'Visiosoft\ProfileModule\Http\Controller\UserAuthenticator@attempt', 'ajax/phone-validation' => 'Visiosoft\ProfileModule\Http\Controller\UserAuthenticator@phoneValidation', + 'auth-auto' => 'Visiosoft\ProfileModule\Http\Controller\UserAuthenticator@authAuto', // RegisterController 'register' => [ From 5b3b97d9b9cc617276a3cc392d84fe2876e06058 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 2 Apr 2021 12:32:55 +0300 Subject: [PATCH 3/4] is Activated added --- .../default/visiosoft/profile-module/src/Command/AuthAuto.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php b/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php index 1d5e2f0af..d54e6a57b 100644 --- a/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php +++ b/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php @@ -38,6 +38,9 @@ class AuthAuto $activator->force($user); } elseif ($user->deleted_at) { $user->update(['deleted_at' => null]); + } elseif (!$user->isActivated()) { + $user->update(['enabled' => true, 'activated' => true]); + } Auth::login($user); } From 7348059baa1a28560177f51e14a904d5f902e9bf Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 2 Apr 2021 12:40:23 +0300 Subject: [PATCH 4/4] is Activated added --- .../visiosoft/profile-module/src/Command/AuthAuto.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php b/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php index d54e6a57b..bf3350363 100644 --- a/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php +++ b/addons/default/visiosoft/profile-module/src/Command/AuthAuto.php @@ -38,10 +38,12 @@ class AuthAuto $activator->force($user); } elseif ($user->deleted_at) { $user->update(['deleted_at' => null]); - } elseif (!$user->isActivated()) { - $user->update(['enabled' => true, 'activated' => true]); - } + + if (!$user->isActivated() or !$user->isEnabled()) { + $user->update(['enabled' => true, 'activated' => true]); + } + Auth::login($user); } }