role_id is now role_ids

Author: sarthaksavvy

.phpunit.result.cache

@@ -45,6 +45,8 @@ in as a user and an admin, without conflicts!
 13. Install command - include publishing migration, publishing factories, running all migration and seeding initial super admin with role and permissions.
 14. Role permissions are added to role resource
 15. While creating role, permissions also stored
+16. adminFormRequest is now having role_ids instead of role_id
+17. while store or update admin, directPermissions can also be synced
 
 ## Installation
 

README.md

@@ -83,8 +83,9 @@ public function update(Admin $admin, AdminRequest $request)
     {
         $adminResource = config('multiauth.resources.admin');
         $this->authorize('UpdateAdmin', $this->adminModel);
-        $admin->update($request->except('role_id'));
-        $admin->roles()->sync(request('role_id'));
+        $admin->update($request->except('role_ids', 'permission_ids'));
+        $admin->roles()->sync(request('role_ids'));
+        $admin->directPermissions()->sync(request('permission_ids'));
         return response(new $adminResource($admin), Response::HTTP_ACCEPTED);
     }
 

src/Http/Controllers/AdminController.php

@@ -38,7 +38,8 @@ protected function register(AdminRequest $data)
         }
 
         $admin->save();
-        $admin->roles()->sync(request('role_id'));
+        $admin->roles()->sync(request('role_ids'));
+        $admin->addDirectPermission(request('permission_ids'));
         $this->sendConfirmationNotification($admin, request('password'));
         $resource = config('multiauth.resources.admin');
         return new $resource($admin);

src/Http/Controllers/RegisterController.php

@@ -27,10 +27,10 @@ public function rules()
     {
         $admin_id = request('admin.id');
         $rules    = [
-            'name'     => 'required|max:255',
-            'email'    => "required|email|max:255|unique:admins,email,{$admin_id}",
-            'password' => 'required|min:6|confirmed',
-            'role_id'  => 'required',
+            'name'      => 'required|max:255',
+            'email'     => "required|email|max:255|unique:admins,email,{$admin_id}",
+            'password'  => 'required|min:6|confirmed',
+            'role_ids'  => 'required',
         ];
         $rules = $this->mergeClientRules($rules);
         $rules = $this->checkForUpdate($rules);

src/Http/Requests/AdminRequest.php

@@ -70,7 +70,7 @@ public function admin_mode_need_rules()
             'password'              => 'secret',
             'password_confirmation' => 'secret',
         ]);
-        $response->assertSessionHasErrors('role_id');
+        $response->assertSessionHasErrors('role_ids');
     }
 
     /**
@@ -81,6 +81,6 @@ public function while_update_admin_mode_need_validation()
         $this->loginSuperAdmin();
         $admin    = $this->createAdmin();
         $response = $this->patch(route('admin.update', $admin->id), []);
-        $response->assertSessionHasErrors(['role_id', 'email', 'name']);
+        $response->assertSessionHasErrors(['role_ids', 'email', 'name']);
     }
 }

tests/Feature/AdminValidationTest.php

@@ -2,12 +2,12 @@
 
 namespace Bitfumes\Multiauth\Tests\Feature;
 
-use Bitfumes\Multiauth\Model\Admin;
 use Bitfumes\Multiauth\Model\Role;
-use Bitfumes\Multiauth\Notifications\RegistrationNotification;
+use Bitfumes\Multiauth\Model\Admin;
 use Bitfumes\Multiauth\Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Support\Facades\Notification;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Bitfumes\Multiauth\Notifications\RegistrationNotification;
 
 class AdminTest extends TestCase
 {
@@ -34,11 +34,11 @@ protected function createNewAdminWithRole()
         $role = factory(Role::class)->create(['name' => 'editor']);
 
         return $this->postJson(route('admin.register'), [
-            'name'                  => 'sarthak',
-            'email'                 => 'sarthak@gmail.com',
-            'password'              => 'secret',
-            'password_confirmation' => 'secret',
-            'role_id'               => $role->id,
+            'name'                   => 'sarthak',
+            'email'                  => 'sarthak@gmail.com',
+            'password'               => 'secret',
+            'password_confirmation'  => 'secret',
+            'role_ids'               => $role->id,
         ]);
     }
 }

tests/Feature/NotificationTest.php

@@ -14,11 +14,11 @@ public function api_can_register_a_new_admin_by_super_user_only()
     {
         $this->loginSuperAdmin();
         $res = $this->postJson(route('admin.register'), [
-            'name'                 => 'Sarthak',
-            'email'                => 'sarthak@bitfumes.com',
-            'password'             => '123456',
-            'password_confirmation'=> '123456',
-            'role_id'              => 1,
+            'name'                  => 'Sarthak',
+            'email'                 => 'sarthak@bitfumes.com',
+            'password'              => '123456',
+            'password_confirmation' => '123456',
+            'role_ids'              => 1,
         ])
         ->assertSuccessful()->json();
         $this->assertEquals($res['data']['email'], 'sarthak@bitfumes.com');
@@ -31,11 +31,11 @@ public function normal_admin_can_not_create_new_admin()
         $this->logInAdmin();
         $this->withExceptionHandling();
         $res = $this->postJson(route('admin.register'), [
-            'name'                 => 'Sarthak',
-            'email'                => 'sarthak@bitfumes.com',
-            'password'             => '123456',
-            'password_confirmation'=> '123456',
-            'role_id'              => 1,
+            'name'                  => 'Sarthak',
+            'email'                 => 'sarthak@bitfumes.com',
+            'password'              => '123456',
+            'password_confirmation' => '123456',
+            'role_ids'              => 1,
         ])->assertStatus(403);
         $this->assertDatabaseMissing('admins', ['email'=>'sarthak@bitfumes.com']);
     }
@@ -77,9 +77,9 @@ public function api_can_update_admin_by_super_admin()
         $this->loginSuperAdmin();
         $admin = $this->createAdmin();
         $this->patchJson(route('admin.update', $admin->id), [
-            'email'  => 'sarthak@bitfumes.com',
-            'name'   => 'Sarthak',
-            'role_id'=> 1,
+            'email'   => 'sarthak@bitfumes.com',
+            'name'    => 'Sarthak',
+            'role_ids'=> 1,
         ])->assertStatus(202);
         $this->assertDatabaseHas('admins', ['email' => 'sarthak@bitfumes.com']);
     }
@@ -91,9 +91,9 @@ public function normal_admin_can_not_update_admins()
         $admin = $this->createAdmin();
         $this->withExceptionHandling();
         $this->patchJson(route('admin.update', $admin->id), [
-            'email'  => 'sarthak@bitfumes.com',
-            'name'   => 'Sarthak',
-            'role_id'=> 1,
+            'email'   => 'sarthak@bitfumes.com',
+            'name'    => 'Sarthak',
+            'role_ids'=> 1,
         ])->assertStatus(403);
         $this->assertDatabaseMissing('admins', ['email' => 'sarthak@bitfumes.com']);
     }