From acc587c3e9da2a878923a42ae70b26512824f162 Mon Sep 17 00:00:00 2001 From: Nadir Hamid Date: Fri, 12 Jun 2026 22:22:57 +0000 Subject: [PATCH] rename some permission attributes --- .../Helpers/WorkflowTraits/DIDNumber/DIDNumberWorkflow.php | 2 +- .../Helpers/WorkflowTraits/Extension/ExtensionWorkflow.php | 2 +- app/app/Helpers/WorkflowTraits/SIPTrunk/SIPTrunkWorkflow.php | 2 +- app/app/Helpers/WorkspaceHelper.php | 4 ++-- .../Http/Controllers/Api/BYO/Carrier/BYOCarrierController.php | 2 +- app/app/Http/Controllers/Api/Flow/FlowController.php | 2 +- app/app/Http/Controllers/Api/Phone/PhoneController.php | 2 +- .../Api/PhoneGlobalSetting/PhoneGlobalSettingController.php | 2 +- .../Http/Controllers/Api/PhoneGroup/PhoneGroupController.php | 2 +- .../PhoneIndividualSettingController.php | 2 +- app/app/WorkspaceUser.php | 4 ++-- .../2022_12_01_213043_add_trunk_perms_workspaces.php | 2 +- .../2026_06_12_213117_add_new_workspace_user_delete_perms.php | 4 ++-- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/app/Helpers/WorkflowTraits/DIDNumber/DIDNumberWorkflow.php b/app/app/Helpers/WorkflowTraits/DIDNumber/DIDNumberWorkflow.php index b184d7092..501f2822d 100755 --- a/app/app/Helpers/WorkflowTraits/DIDNumber/DIDNumberWorkflow.php +++ b/app/app/Helpers/WorkflowTraits/DIDNumber/DIDNumberWorkflow.php @@ -86,7 +86,7 @@ public function deleteNumber(Request $request, $numberId) { $data = $request->json()->all(); $number = DIDNumber::where('public_id', '=', $numberId)->firstOrFail(); - if (!$this->hasPermissions($request, $number, 'manage_dids')) { + if (!$this->hasPermissions($request, $number, 'delete_did')) { return $this->response->errorForbidden(); } //add unrenting diff --git a/app/app/Helpers/WorkflowTraits/Extension/ExtensionWorkflow.php b/app/app/Helpers/WorkflowTraits/Extension/ExtensionWorkflow.php index d06369eba..ce82b01a5 100755 --- a/app/app/Helpers/WorkflowTraits/Extension/ExtensionWorkflow.php +++ b/app/app/Helpers/WorkflowTraits/Extension/ExtensionWorkflow.php @@ -168,7 +168,7 @@ public function deleteExtension(Request $request, $extensionId) $data = $request->all(); $workspace = $this->getWorkspace($request); $extension = Extension::where('public_id', '=', $extensionId)->firstOrFail(); - if (!$this->hasPermissions($request, $extension, 'manage_extensions')) { + if (!$this->hasPermissions($request, $extension, 'delete_extension')) { return $this->response->errorForbidden(); } $user = $this->getUser($request); diff --git a/app/app/Helpers/WorkflowTraits/SIPTrunk/SIPTrunkWorkflow.php b/app/app/Helpers/WorkflowTraits/SIPTrunk/SIPTrunkWorkflow.php index 72fa10ce5..e2858b36f 100755 --- a/app/app/Helpers/WorkflowTraits/SIPTrunk/SIPTrunkWorkflow.php +++ b/app/app/Helpers/WorkflowTraits/SIPTrunk/SIPTrunkWorkflow.php @@ -305,7 +305,7 @@ public function deleteTrunk(Request $request, $trunkId) $data = $request->json()->all(); $trunk = SIPTrunk::where('public_id', $trunkId)->firstOrFail(); $user = $this->getUser($request); - if (!$this->hasPermissions($request, $trunk, 'manage_trunks')) { + if (!$this->hasPermissions($request, $trunk, 'delete_trunk')) { return $this->response->errorForbidden(); } $term_settings = SIPTrunkTermination::where('trunk_id', $trunk->id)->firstOrFail(); diff --git a/app/app/Helpers/WorkspaceHelper.php b/app/app/Helpers/WorkspaceHelper.php index 57cb3d9d3..9f5760134 100755 --- a/app/app/Helpers/WorkspaceHelper.php +++ b/app/app/Helpers/WorkspaceHelper.php @@ -98,8 +98,8 @@ public static function canPerformAction($user, $workspace, $action) { case 'manage_trunks': return $settings->manage_trunks; break; -case 'create_trunks': - return $settings->create_trunks; +case 'create_trunk': + return $settings->create_trunk; break; diff --git a/app/app/Http/Controllers/Api/BYO/Carrier/BYOCarrierController.php b/app/app/Http/Controllers/Api/BYO/Carrier/BYOCarrierController.php index f57966dce..1d74be5ba 100755 --- a/app/app/Http/Controllers/Api/BYO/Carrier/BYOCarrierController.php +++ b/app/app/Http/Controllers/Api/BYO/Carrier/BYOCarrierController.php @@ -44,7 +44,7 @@ public function listCarriers(Request $request) public function deleteCarrier(Request $request, $carrierId) { $carrier = BYOCarrier::where('public_id', $carrierId)->firstOrFail(); - if (!$this->hasPermissions($request, $carrier, 'manage_byo_carriers')) { + if (!$this->hasPermissions($request, $carrier, 'delete_byo_carrier')) { return $this->response->errorForbidden(); } $carrier->delete(); diff --git a/app/app/Http/Controllers/Api/Flow/FlowController.php b/app/app/Http/Controllers/Api/Flow/FlowController.php index 96635f35b..f30fb8837 100755 --- a/app/app/Http/Controllers/Api/Flow/FlowController.php +++ b/app/app/Http/Controllers/Api/Flow/FlowController.php @@ -106,7 +106,7 @@ public function deleteFlow(Request $request, $flowId) { $data = $request->json()->all(); $flow = Flow::findOrFail($flowId); - if (!$this->hasPermissions($request, $flow, 'manage_flows')) { + if (!$this->hasPermissions($request, $flow, 'delete_flow')) { return $this->response->errorForbidden(); } $flow->delete(); diff --git a/app/app/Http/Controllers/Api/Phone/PhoneController.php b/app/app/Http/Controllers/Api/Phone/PhoneController.php index 236a672fe..38b21d14c 100755 --- a/app/app/Http/Controllers/Api/Phone/PhoneController.php +++ b/app/app/Http/Controllers/Api/Phone/PhoneController.php @@ -52,7 +52,7 @@ public function listPhones(Request $request) public function deletePhone(Request $request, $phoneId) { $phone = Phone::findOrFail($phoneId); - if (!$this->hasPermissions($request, $phone, 'manage_phones')) { + if (!$this->hasPermissions($request, $phone, 'delete_phone')) { return $this->response->errorForbidden(); } $phone->delete(); diff --git a/app/app/Http/Controllers/Api/PhoneGlobalSetting/PhoneGlobalSettingController.php b/app/app/Http/Controllers/Api/PhoneGlobalSetting/PhoneGlobalSettingController.php index 6f61485fb..354a15ad3 100755 --- a/app/app/Http/Controllers/Api/PhoneGlobalSetting/PhoneGlobalSettingController.php +++ b/app/app/Http/Controllers/Api/PhoneGlobalSetting/PhoneGlobalSettingController.php @@ -43,7 +43,7 @@ public function listPhoneGlobalSettings(Request $request) public function deletePhoneGlobalSetting(Request $request, $phoneSettingId) { $phoneSettings = PhoneGlobalSetting::findOrFail($phoneSettingId); - if (!$this->hasPermissions($request, $phoneSettings, 'manage_phoneglobalsettings')) { + if (!$this->hasPermissions($request, $phoneSettings, 'delete_phoneglobalsetting')) { return $this->response->errorForbidden(); } $phoneSettings->delete(); diff --git a/app/app/Http/Controllers/Api/PhoneGroup/PhoneGroupController.php b/app/app/Http/Controllers/Api/PhoneGroup/PhoneGroupController.php index 92a07e232..6887dc16e 100755 --- a/app/app/Http/Controllers/Api/PhoneGroup/PhoneGroupController.php +++ b/app/app/Http/Controllers/Api/PhoneGroup/PhoneGroupController.php @@ -38,7 +38,7 @@ public function listPhoneGroups(Request $request) public function deletePhoneGroup(Request $request, $phoneGroupId) { $phoneGroup = PhoneGroup::findOrFail($phoneGroupId); - if (!$this->hasPermissions($request, $phoneGroup, 'manage_phonegroups')) { + if (!$this->hasPermissions($request, $phoneGroup, 'delete_phonegroup')) { return $this->response->errorForbidden(); } $phoneGroup->delete(); diff --git a/app/app/Http/Controllers/Api/PhoneIndividualSetting/PhoneIndividualSettingController.php b/app/app/Http/Controllers/Api/PhoneIndividualSetting/PhoneIndividualSettingController.php index 096577540..dc78977aa 100755 --- a/app/app/Http/Controllers/Api/PhoneIndividualSetting/PhoneIndividualSettingController.php +++ b/app/app/Http/Controllers/Api/PhoneIndividualSetting/PhoneIndividualSettingController.php @@ -48,7 +48,7 @@ public function listPhoneIndividualSettings(Request $request) public function deletePhoneIndividualSetting(Request $request, $phoneSettingId) { $phoneSettings = PhoneIndividualSetting::findOrFail($phoneSettingId); - if (!$this->hasPermissions($request, $phoneSettings, 'manage_phoneindividualsettings')) { + if (!$this->hasPermissions($request, $phoneSettings, 'delete_phoneindividualsetting')) { return $this->response->errorForbidden(); } $phoneSettings->delete(); diff --git a/app/app/WorkspaceUser.php b/app/app/WorkspaceUser.php index dece6057d..d8e0c37f4 100755 --- a/app/app/WorkspaceUser.php +++ b/app/app/WorkspaceUser.php @@ -46,7 +46,7 @@ class WorkspaceUser extends PublicResource { 'manage_byo_did_numbers' => 'bool', 'create_byo_did_number' => 'bool', 'manage_trunks' => 'bool', - 'create_trunks' => 'bool', + 'create_trunk' => 'bool', @@ -85,7 +85,7 @@ class WorkspaceUser extends PublicResource { 'manage_byo_did_numbers', 'create_byo_did_number', 'manage_trunks', - 'create_trunks' + 'create_trunk' ]; public static function createSuperAdmin($workspace, $user, $extras=[]) { diff --git a/app/database/migrations/2022_12_01_213043_add_trunk_perms_workspaces.php b/app/database/migrations/2022_12_01_213043_add_trunk_perms_workspaces.php index 1e32d64cc..91dc947ab 100755 --- a/app/database/migrations/2022_12_01_213043_add_trunk_perms_workspaces.php +++ b/app/database/migrations/2022_12_01_213043_add_trunk_perms_workspaces.php @@ -14,7 +14,7 @@ public function up() { Schema::table('workspaces_users', function (Blueprint $table) { // - $table->boolean('create_trunks'); + $table->boolean('create_trunk'); $table->boolean('manage_trunks'); }); } diff --git a/app/database/migrations/2026_06_12_213117_add_new_workspace_user_delete_perms.php b/app/database/migrations/2026_06_12_213117_add_new_workspace_user_delete_perms.php index ef0b967a6..a5ad6c278 100644 --- a/app/database/migrations/2026_06_12_213117_add_new_workspace_user_delete_perms.php +++ b/app/database/migrations/2026_06_12_213117_add_new_workspace_user_delete_perms.php @@ -24,7 +24,7 @@ public function up() $table->boolean('delete_phoneindividualsetting')->default(0)->after('create_phoneindividualsetting'); $table->boolean('delete_byo_carrier')->default(0)->after('create_byo_carrier'); $table->boolean('delete_byo_did_number')->default(0)->after('create_byo_did_number'); - $table->boolean('delete_trunks')->default(0)->after('create_trunks'); + $table->boolean('delete_trunk')->default(0)->after('create_trunk'); }); } @@ -47,7 +47,7 @@ public function down() 'delete_phoneindividualsetting', 'delete_byo_carrier', 'delete_byo_did_number', - 'delete_trunks' + 'delete_trunk' ]); }); }