From 8f7e7b08c4a8fcf410bc46aa19b3af3cacfa578e Mon Sep 17 00:00:00 2001
From: henrique <henrique.rebolho@gmail.com>
Date: Thu, 6 Mar 2025 04:15:55 +0100
Subject: [PATCH 1/2] Fixing some code smells AISS G3-L5-5

---
 app/Exceptions/UnknownPermissionException.php       | 13 +++++++++++++
 .../Middleware/AuthenticateWithTokenOnBasicAuth.php |  4 +---
 app/Http/Middleware/SanctumSetUser.php              |  4 +---
 app/Services/BaseService.php                        |  3 ++-
 database/factories/UserFactory.php                  | 12 ++----------
 resources/js/Components/Label.vue                   |  6 +++++-
 .../Settings/Notifications/Partials/Emails.vue      |  2 +-
 resources/js/bootstrap.js                           | 11 -----------
 8 files changed, 25 insertions(+), 30 deletions(-)
 create mode 100644 app/Exceptions/UnknownPermissionException.php

diff --git a/app/Exceptions/UnknownPermissionException.php b/app/Exceptions/UnknownPermissionException.php
new file mode 100644
index 00000000000..be3b7847d9f
--- /dev/null
+++ b/app/Exceptions/UnknownPermissionException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class UnknownPermissionException extends Exception
+{
+    public function __construct($message = "Unknown permission", $code = 400)
+    {
+        parent::__construct($message, $code);
+    }
+}
diff --git a/app/Http/Middleware/AuthenticateWithTokenOnBasicAuth.php b/app/Http/Middleware/AuthenticateWithTokenOnBasicAuth.php
index 9c16c261c1e..af7407ff0a1 100644
--- a/app/Http/Middleware/AuthenticateWithTokenOnBasicAuth.php
+++ b/app/Http/Middleware/AuthenticateWithTokenOnBasicAuth.php
@@ -79,9 +79,7 @@ private function sanctumUser(Request $request): ?User
     protected function sanctum(): RequestGuard
     {
         /** @var \Illuminate\Auth\RequestGuard */
-        $guard = $this->auth->guard('sanctum');
-
-        return $guard;
+        return $this->auth->guard('sanctum');
     }
 
     /**
diff --git a/app/Http/Middleware/SanctumSetUser.php b/app/Http/Middleware/SanctumSetUser.php
index 1b2d4b8742f..f79f899181d 100644
--- a/app/Http/Middleware/SanctumSetUser.php
+++ b/app/Http/Middleware/SanctumSetUser.php
@@ -37,8 +37,6 @@ public function handle(Request $request, Closure $next)
     protected function sanctum(): RequestGuard
     {
         /** @var \Illuminate\Auth\RequestGuard */
-        $guard = $this->auth->guard('sanctum');
-
-        return $guard;
+        return $this->auth->guard('sanctum');
     }
 }
diff --git a/app/Services/BaseService.php b/app/Services/BaseService.php
index 3acc8e9a334..a2fd6ab7c47 100644
--- a/app/Services/BaseService.php
+++ b/app/Services/BaseService.php
@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\Exceptions\NotEnoughPermissionException;
+use App\Exceptions\UnknownPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
 use App\Models\Group;
@@ -112,7 +113,7 @@ public function validateRules(array $data): bool
         }
 
         if (($e = $permissions->diff(collect(self::$permissionDependencies)->keys()))->isNotEmpty()) {
-            throw new \Exception('Unknown permission: '.$e->first());
+            throw new \UnknownPermissionException('Unknown permission: '.$e->first());
         }
 
         return true;
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 055a7a9ea12..4ae62f50dcf 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -42,11 +42,7 @@ public function definition(): array
      */
     public function unverified()
     {
-        return $this->state(function (array $attributes) {
-            return [
-                'email_verified_at' => null,
-            ];
-        });
+        return $this->state(function () => ['email_verified_at' => null,]);
     }
 
     /**
@@ -56,10 +52,6 @@ public function unverified()
      */
     public function administrator()
     {
-        return $this->state(function (array $attributes) {
-            return [
-                'is_account_administrator' => true,
-            ];
-        });
+        return $this->state(function () => ['is_account_administrator' => true]);
     }
 }
diff --git a/resources/js/Components/Label.vue b/resources/js/Components/Label.vue
index c6bdf5be096..ae28bd94b06 100644
--- a/resources/js/Components/Label.vue
+++ b/resources/js/Components/Label.vue
@@ -1,11 +1,15 @@
 <script setup>
 defineProps({
   value: String,
+  forId: String,
 });
 </script>
 
 <template>
-  <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+  <label>
+    :for=forId
+    class = "block text-sm font-medium text-gray-700 dark:text-gray-300"
+  >
     <span v-if="value">
       {{ value }}
     </span>
diff --git a/resources/js/Pages/Settings/Notifications/Partials/Emails.vue b/resources/js/Pages/Settings/Notifications/Partials/Emails.vue
index 67fba0f9620..39eb6b4e950 100644
--- a/resources/js/Pages/Settings/Notifications/Partials/Emails.vue
+++ b/resources/js/Pages/Settings/Notifications/Partials/Emails.vue
@@ -310,7 +310,7 @@ export default {
           .delete(channel.url.destroy)
           .then(() => {
             this.flash(this.$t('The email address has been deleted'), 'success');
-            var id = this.localEmails.findIndex((x) => x.id === channel.id);
+            let id = this.localEmails.findIndex((x) => x.id === channel.id);
             this.localEmails.splice(id, 1);
           })
           .catch((error) => {
diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
index 7e155ec1b32..8eda8239709 100644
--- a/resources/js/bootstrap.js
+++ b/resources/js/bootstrap.js
@@ -17,14 +17,3 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
  * for events that are broadcast by Laravel. Echo and event broadcasting
  * allows your team to easily build robust real-time web applications.
  */
-
-// import Echo from 'laravel-echo';
-
-// window.Pusher = require('pusher-js');
-
-// window.Echo = new Echo({
-//     broadcaster: 'pusher',
-//     key: process.env.MIX_PUSHER_APP_KEY,
-//     cluster: process.env.MIX_PUSHER_APP_CLUSTER,
-//     forceTLS: true
-// });

From 110c4c7e2fa10ef7765b0a227bcbd4aa5cc76b8a Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Sat, 19 Apr 2025 10:46:56 +0200
Subject: [PATCH 2/2] Apply suggestions from code review

---
 app/Services/BaseService.php       | 2 +-
 database/factories/UserFactory.php | 4 ++--
 resources/js/Components/Label.vue  | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/Services/BaseService.php b/app/Services/BaseService.php
index a2fd6ab7c47..cff77d5b61f 100644
--- a/app/Services/BaseService.php
+++ b/app/Services/BaseService.php
@@ -113,7 +113,7 @@ public function validateRules(array $data): bool
         }
 
         if (($e = $permissions->diff(collect(self::$permissionDependencies)->keys()))->isNotEmpty()) {
-            throw new \UnknownPermissionException('Unknown permission: '.$e->first());
+            throw new UnknownPermissionException('Unknown permission: '.$e->first());
         }
 
         return true;
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 4ae62f50dcf..9bd79f46d15 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -42,7 +42,7 @@ public function definition(): array
      */
     public function unverified()
     {
-        return $this->state(function () => ['email_verified_at' => null,]);
+        return $this->state(fn () => ['email_verified_at' => null,]);
     }
 
     /**
@@ -52,6 +52,6 @@ public function unverified()
      */
     public function administrator()
     {
-        return $this->state(function () => ['is_account_administrator' => true]);
+        return $this->state(fn () => ['is_account_administrator' => true]);
     }
 }
diff --git a/resources/js/Components/Label.vue b/resources/js/Components/Label.vue
index ae28bd94b06..c788d5210f3 100644
--- a/resources/js/Components/Label.vue
+++ b/resources/js/Components/Label.vue
@@ -6,10 +6,7 @@ defineProps({
 </script>
 
 <template>
-  <label>
-    :for=forId
-    class = "block text-sm font-medium text-gray-700 dark:text-gray-300"
-  >
+  <label :for="forId" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
     <span v-if="value">
       {{ value }}
     </span>