[collection] publish policy

app/Http/Controllers/CollectionController.php

@@ -62,7 +62,9 @@ public function store()
         if ($v->passes()) {
             $collection = new Collection();
 
-            $collection->frontends = array_intersect($input['frontends'] ?? [], \auth()->user()->frontends);
+            if (Gate::allows('publish', $collection)) {
+                $collection->frontends = array_intersect($input['frontends'] ?? [], \auth()->user()->frontends);
+            }
 
             // store translatable attributes
             foreach (\Config::get('translatable.locales') as $i => $locale) {
@@ -151,9 +153,11 @@ public function update($id)
 
             $collection = Collection::find($id);
 
-            $currentOutOfScope = array_diff($collection->frontends, \auth()->user()->frontends);
-            $newInScope = array_intersect($input['frontends'] ?? [], \auth()->user()->frontends);
-            $collection->frontends = array_merge($currentOutOfScope, $newInScope);
+            if (Gate::allows('publish', $collection)) {
+                $currentOutOfScope = array_diff($collection->frontends, \auth()->user()->frontends);
+                $newInScope = array_intersect($input['frontends'] ?? [], \auth()->user()->frontends);
+                $collection->frontends = array_merge($currentOutOfScope, $newInScope);
+            }
 
             foreach (\Config::get('translatable.locales') as $i => $locale) {
                 if (hasTranslationValue($locale, $collection->translatedAttributes)) {

app/Policies/CollectionPolicy.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Policies;
+
+use App\User;
+
+class CollectionPolicy
+{
+    public function publish(User $user)
+    {
+        return in_array('publisher', $user->roles, true);
+    }
+}

app/Providers/AuthServiceProvider.php

@@ -24,19 +24,19 @@ class AuthServiceProvider extends ServiceProvider
     public function boot()
     {
         Gate::define('administer', function ($user) {
-            return $user->role === 'admin';
+            return in_array('admin', $user->roles, true);
         });
 
         Gate::define('edit', function ($user) {
-            return $user->role === 'editor';
+            return in_array('editor', $user->roles, true);
         });
 
         Gate::define('import', function ($user) {
-            return $user->role === 'importer';
+            return in_array('importer', $user->roles, true);
         });
 
         Gate::before(function ($user) {
-            if ($user->role === 'admin') {
+            if (in_array('admin', $user->roles, true)) {
                 return true;
             }
         });

app/User.php

@@ -8,9 +8,9 @@
 class User extends Authenticatable
 {
     use HasFactory;
-    public static $roles = ['admin', 'editor', 'importer'];
+    public static $roles = ['admin', 'editor', 'importer', 'publisher'];
 
-    protected $fillable = ['name', 'email', 'role', 'username', 'frontends'];
+    protected $fillable = ['name', 'email', 'roles', 'username', 'frontends'];
 
     /**
      * The attributes that should be hidden for arrays.
@@ -21,12 +21,14 @@ class User extends Authenticatable
 
     public static $rules = [
         'name' => 'required',
-        'role' => 'in:admin,editor,importer|required',
+        'roles' => 'array|required',
+        'roles.*' => 'in:admin,editor,importer,publisher',
         'email' => 'email|required',
         'username' => 'required',
     ];
 
     protected $casts = [
+        'roles' => 'array',
         'frontends' => 'array',
     ];
 }

database/migrations/2024_04_01_220614_add_frontends_to_collections_table.php

@@ -12,7 +12,8 @@
      */
     public function up(): void
     {
-        DB::statement("ALTER TABLE collections ADD COLUMN frontends JSON DEFAULT (JSON_ARRAY('webumenia'))");
+        DB::statement("ALTER TABLE collections ADD COLUMN frontends JSON DEFAULT (JSON_ARRAY())");
+        DB::table('collections')->update(['frontends' => '["webumenia"]']);
     }
 
     /**

database/migrations/2024_04_11_003601_change_role_to_roles_in_users_table.php

@@ -0,0 +1,50 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::statement("ALTER TABLE users ADD COLUMN roles JSON DEFAULT (JSON_ARRAY())");
+
+        DB::table('users')
+            ->eachById(function ($user) {
+                DB::table('users')
+                    ->where('id', $user->id)
+                    ->update(['roles' => json_encode([$user->role])]);
+            });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('role');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('role');
+        });
+
+        DB::table('users')
+            ->eachById(function ($user) {
+                $roles = json_decode($user->roles);
+                DB::table('users')
+                    ->where('id', $user->id)
+                    ->update(['role' => $roles[0]]);
+            });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('roles');
+        });
+    }
+};

resources/views/collections/form.blade.php

@@ -34,6 +34,7 @@
 <!-- translatable -->
 <div class="col-md-12">
 
+	@can('publish', $collection ?? App\Collection::class)
 	<div class="form-group">
 		{{ Form::label('frontends[]', 'Publikovať na') }}
 		<div>
@@ -44,6 +45,7 @@
 			@endforeach
 		</div>
 	</div>
+	@endcan
 
 	<!-- Nav tabs -->
 	<ul class="nav nav-tabs top-space" role="tablist">
@@ -108,7 +110,7 @@
 		@endif
 	</div>
 </div>
-@can('administer')
+@can('publish', $collection ?? App\Collection::class)
 <div class="col-md-6">
 	<div class="form-group checkbox">
 		{!! Form::label('published_at', 'Publikovať') !!}

resources/views/users/form.blade.php

@@ -24,11 +24,11 @@
 </div>
 <div class="col-md-12">
 	<div class="form-group">
-		{!! Form::label('role', 'Skupina') !!}
+		{!! Form::label('roles[]', 'Skupina') !!}
 		<div>
 			@foreach(\App\User::$roles as $role)
 				<label class="radio-inline">
-					{{ Form::radio('role', $role, options: ['class' => 'form-control']) }} {{ $role }}
+					{{ Form::checkbox('roles[]', $role, options: ['class' => 'form-control']) }} {{ $role }}
 				</label>
 			@endforeach
 		</div>