Updates from octo core (#17)

* Updates from octo core * Add upgrades from octo-core
a2insights · Oct 22, 2023 · e8b7461 · e8b7461
1 parent 47fdbd5
commit e8b7461
Show file tree

Hide file tree

Showing 15 changed files with 718 additions and 346 deletions.
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -18,7 +18,9 @@
 use Octo\User\Settings;
 use Spatie\Permission\Traits\HasRoles;
 
-class User extends Authenticatable implements BannableContract, FilamentUser, HasAvatar, MustVerifyEmail
+class User extends Authenticatable implements BannableContract, FilamentUser, HasAvatar
+    // TODO: Waiting for filament breezy implementation
+    // MustVerifyEmail
 {
     use Bannable, HasApiTokens, HasFactory, HasRoles, Notifiable, SoftDeletes, TwoFactorAuthenticatable;
 
@@ -30,6 +32,8 @@ class User extends Authenticatable implements BannableContract, FilamentUser, Ha
     protected $fillable = [
         'name',
         'email',
+        'phone',
+        'username',
         'avatar_url',
         'password',
     ];
@@ -57,7 +61,9 @@ public function canAccessPanel(Panel $panel): bool
     {
         $settings = app(\Octo\Settings\Settings::class);
 
-        return ! in_array($this->id, $settings->restrict_users) && $this->hasVerifiedEmail();
+        return ! in_array($this->id, $settings->restrict_users);
+        // TODO: Waiting for filament breezy implementation
+        // $this->hasVerifiedEmail() && ;
     }
 
     public function getFilamentAvatarUrl(): ?string

diff --git a/app/Policies/ActivityPolicy.php b/app/Policies/ActivityPolicy.php
@@ -14,9 +14,9 @@ class ActivityPolicy
      * Determine whether the user can view any models.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function viewAny(User $user)
+    public function viewAny(User $user): bool
     {
         return $user->can('view_any_activity');
     }
@@ -26,9 +26,9 @@ public function viewAny(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \Spatie\Activitylog\Models\Activity  $activity
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function view(User $user, Activity $activity)
+    public function view(User $user, Activity $activity): bool
     {
         return $user->can('view_activity');
     }
@@ -37,9 +37,9 @@ public function view(User $user, Activity $activity)
      * Determine whether the user can create models.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function create(User $user)
+    public function create(User $user): bool
     {
         return $user->can('create_activity');
     }
@@ -49,9 +49,9 @@ public function create(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \Spatie\Activitylog\Models\Activity  $activity
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function update(User $user, Activity $activity)
+    public function update(User $user, Activity $activity): bool
     {
         return $user->can('update_activity');
     }
@@ -61,9 +61,9 @@ public function update(User $user, Activity $activity)
      *
      * @param  \App\Models\User  $user
      * @param  \Spatie\Activitylog\Models\Activity  $activity
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function delete(User $user, Activity $activity)
+    public function delete(User $user, Activity $activity): bool
     {
         return $user->can('delete_activity');
     }
@@ -72,9 +72,9 @@ public function delete(User $user, Activity $activity)
      * Determine whether the user can bulk delete.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function deleteAny(User $user)
+    public function deleteAny(User $user): bool
     {
         return $user->can('delete_any_activity');
     }
@@ -84,9 +84,9 @@ public function deleteAny(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \Spatie\Activitylog\Models\Activity  $activity
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function forceDelete(User $user, Activity $activity)
+    public function forceDelete(User $user, Activity $activity): bool
     {
         return $user->can('force_delete_activity');
     }
@@ -95,9 +95,9 @@ public function forceDelete(User $user, Activity $activity)
      * Determine whether the user can permanently bulk delete.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function forceDeleteAny(User $user)
+    public function forceDeleteAny(User $user): bool
     {
         return $user->can('force_delete_any_activity');
     }
@@ -107,9 +107,9 @@ public function forceDeleteAny(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \Spatie\Activitylog\Models\Activity  $activity
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function restore(User $user, Activity $activity)
+    public function restore(User $user, Activity $activity): bool
     {
         return $user->can('restore_activity');
     }
@@ -118,9 +118,9 @@ public function restore(User $user, Activity $activity)
      * Determine whether the user can bulk restore.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function restoreAny(User $user)
+    public function restoreAny(User $user): bool
     {
         return $user->can('restore_any_activity');
     }
@@ -130,9 +130,9 @@ public function restoreAny(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \Spatie\Activitylog\Models\Activity  $activity
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function replicate(User $user, Activity $activity)
+    public function replicate(User $user, Activity $activity): bool
     {
         return $user->can('replicate_activity');
     }
@@ -141,9 +141,9 @@ public function replicate(User $user, Activity $activity)
      * Determine whether the user can reorder.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function reorder(User $user)
+    public function reorder(User $user): bool
     {
         return $user->can('reorder_activity');
     }

diff --git a/app/Policies/ExceptionPolicy.php b/app/Policies/ExceptionPolicy.php
@@ -14,9 +14,9 @@ class ExceptionPolicy
      * Determine whether the user can view any models.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function viewAny(User $user)
+    public function viewAny(User $user): bool
     {
         return $user->can('view_any_exception');
     }
@@ -26,9 +26,9 @@ public function viewAny(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \BezhanSalleh\FilamentExceptions\Models\Exception  $exception
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function view(User $user, Exception $exception)
+    public function view(User $user, Exception $exception): bool
     {
         return $user->can('view_exception');
     }
@@ -37,9 +37,9 @@ public function view(User $user, Exception $exception)
      * Determine whether the user can create models.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function create(User $user)
+    public function create(User $user): bool
     {
         return $user->can('create_exception');
     }
@@ -49,9 +49,9 @@ public function create(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \BezhanSalleh\FilamentExceptions\Models\Exception  $exception
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function update(User $user, Exception $exception)
+    public function update(User $user, Exception $exception): bool
     {
         return $user->can('update_exception');
     }
@@ -61,9 +61,9 @@ public function update(User $user, Exception $exception)
      *
      * @param  \App\Models\User  $user
      * @param  \BezhanSalleh\FilamentExceptions\Models\Exception  $exception
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function delete(User $user, Exception $exception)
+    public function delete(User $user, Exception $exception): bool
     {
         return $user->can('delete_exception');
     }
@@ -72,9 +72,9 @@ public function delete(User $user, Exception $exception)
      * Determine whether the user can bulk delete.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function deleteAny(User $user)
+    public function deleteAny(User $user): bool
     {
         return $user->can('delete_any_exception');
     }
@@ -84,9 +84,9 @@ public function deleteAny(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \BezhanSalleh\FilamentExceptions\Models\Exception  $exception
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function forceDelete(User $user, Exception $exception)
+    public function forceDelete(User $user, Exception $exception): bool
     {
         return $user->can('force_delete_exception');
     }
@@ -95,9 +95,9 @@ public function forceDelete(User $user, Exception $exception)
      * Determine whether the user can permanently bulk delete.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function forceDeleteAny(User $user)
+    public function forceDeleteAny(User $user): bool
     {
         return $user->can('force_delete_any_exception');
     }
@@ -107,9 +107,9 @@ public function forceDeleteAny(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \BezhanSalleh\FilamentExceptions\Models\Exception  $exception
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function restore(User $user, Exception $exception)
+    public function restore(User $user, Exception $exception): bool
     {
         return $user->can('restore_exception');
     }
@@ -118,9 +118,9 @@ public function restore(User $user, Exception $exception)
      * Determine whether the user can bulk restore.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function restoreAny(User $user)
+    public function restoreAny(User $user): bool
     {
         return $user->can('restore_any_exception');
     }
@@ -130,9 +130,9 @@ public function restoreAny(User $user)
      *
      * @param  \App\Models\User  $user
      * @param  \BezhanSalleh\FilamentExceptions\Models\Exception  $exception
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function replicate(User $user, Exception $exception)
+    public function replicate(User $user, Exception $exception): bool
     {
         return $user->can('replicate_exception');
     }
@@ -141,9 +141,9 @@ public function replicate(User $user, Exception $exception)
      * Determine whether the user can reorder.
      *
      * @param  \App\Models\User  $user
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @return bool
      */
-    public function reorder(User $user)
+    public function reorder(User $user): bool
     {
         return $user->can('reorder_exception');
     }