dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #4007 from coollabsio/fix-2-step-deletion

Browse Source 
Fix 2 step deletion
This commit is contained in:
Andras Bacsai
2024-10-25 09:46:40 +02:00
committed by GitHub
parent e66522308e d2066dd2dc
commit cb9b485332
11 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Livewire/NavbarDeleteTeam.php
View File

@@ -19,7 +19,7 @@ class NavbarDeleteTeam extends Component
public function delete($password) public function delete($password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');

2
app/Livewire/Project/Database/BackupEdit.php
View File

@@ -59,7 +59,7 @@ class BackupEdit extends Component
public function delete($password) public function delete($password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');

2
app/Livewire/Project/Database/BackupExecutions.php
View File

@@ -42,7 +42,7 @@ class BackupExecutions extends Component
public function deleteBackup($executionId, $password) public function deleteBackup($executionId, $password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');

2
app/Livewire/Project/Service/FileStorage.php
View File

@@ -88,7 +88,7 @@ class FileStorage extends Component
public function delete($password) public function delete($password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');

2
app/Livewire/Project/Service/ServiceApplicationView.php
View File

@@ -50,7 +50,7 @@ class ServiceApplicationView extends Component
public function delete($password) public function delete($password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');

2
app/Livewire/Project/Shared/Danger.php
View File

@@ -92,7 +92,7 @@ class Danger extends Component
public function delete($password) public function delete($password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');

2
app/Livewire/Project/Shared/Destination.php
View File

@@ -119,7 +119,7 @@ class Destination extends Component
public function removeServer(int $network_id, int $server_id, $password) public function removeServer(int $network_id, int $server_id, $password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');

2
app/Livewire/Project/Shared/Storages/Show.php
View File

@@ -41,7 +41,7 @@ class Show extends Component
public function delete($password) public function delete($password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');

2
app/Livewire/Server/Delete.php
View File

@@ -17,7 +17,7 @@ class Delete extends Component
public function delete($password) public function delete($password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');

10
app/Livewire/Settings/Index.php
View File

@@ -5,6 +5,8 @@ namespace App\Livewire\Settings;
use App\Jobs\CheckForUpdatesJob; use App\Jobs\CheckForUpdatesJob;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use App\Models\Server; use App\Models\Server;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Livewire\Component; use Livewire\Component;
class Index extends Component class Index extends Component
@@ -185,8 +187,14 @@ class Index extends Component
return view('livewire.settings.index'); return view('livewire.settings.index');
} }
public function toggleTwoStepConfirmation() public function toggleTwoStepConfirmation($password)
{ {
if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.');
return;
}
$this->settings->disable_two_step_confirmation = true; $this->settings->disable_two_step_confirmation = true;
$this->settings->save(); $this->settings->save();
$this->disable_two_step_confirmation = true; $this->disable_two_step_confirmation = true;

2
app/Livewire/Team/AdminView.php
View File

@@ -78,7 +78,7 @@ class AdminView extends Component
public function delete($id, $password) public function delete($id, $password)
{ {
if (! InstanceSettings::get('disable_two_step_confirmation')) { if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
if (! Hash::check($password, Auth::user()->password)) { if (! Hash::check($password, Auth::user()->password)) {
$this->addError('password', 'The provided password is incorrect.'); $this->addError('password', 'The provided password is incorrect.');