Merge pull request #43 from savannabits/1.0-dev

coolsam726 · web-flow · commit 9cdc18fd7f8a · 2022-04-28T07:52:15.000+03:00
User Role Assignment Update
diff --git a/publishes/acacia/Users/Http/Controllers/Api/UserController.php b/publishes/acacia/Users/Http/Controllers/Api/UserController.php
@@ -10,13 +10,16 @@
 use Acacia\Users\Http\Requests\User\StoreRequest;
 use Acacia\Users\Http\Requests\User\UpdateRequest;
 use Acacia\Users\Http\Requests\User\DestroyRequest;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Log;
 use Savannabits\Acacia\Helpers\ApiResponse;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Throwable;
 
 class UserController extends Controller
 {
@@ -38,8 +41,8 @@ public function index(IndexRequest $request): JsonResponse
                 ->message("List of Users")
                 ->payload($data)
                 ->send();
-        } catch (\Throwable $e) {
-            \Log::error($e);
+        } catch (Throwable $e) {
+            Log::error($e);
             return $this->api
                 ->failed()
                 ->code(500)
@@ -56,8 +59,8 @@ public function dt(DtRequest $request): LengthAwarePaginator|JsonResponse
     {
         try {
             return $this->repo->dt();
-        } catch (\Throwable $e) {
-            \Log::error($e);
+        } catch (Throwable $e) {
+            Log::error($e);
             return $this->api
                 ->failed()
                 ->code(500)
@@ -81,8 +84,8 @@ public function store(StoreRequest $request): JsonResponse
                 ->message($success)
                 ->payload($payload)
                 ->send();
-        } catch (\Throwable $e) {
-            \Log::error($e);
+        } catch (Throwable $e) {
+            Log::error($e);
             return $this->api
                 ->failed()
                 ->code(500)
@@ -107,8 +110,8 @@ public function show(ViewRequest $request, User $user): JsonResponse
                 ->message($success)
                 ->payload($payload)
                 ->send();
-        } catch (\Throwable $e) {
-            \Log::error($e);
+        } catch (Throwable $e) {
+            Log::error($e);
             return $this->api
                 ->failed()
                 ->code(500)
@@ -135,8 +138,8 @@ public function update(UpdateRequest $request, User $user): JsonResponse
                 ->message($success)
                 ->payload($payload)
                 ->send();
-        } catch (\Throwable $e) {
-            \Log::error($e);
+        } catch (Throwable $e) {
+            Log::error($e);
             return $this->api
                 ->failed()
                 ->code(500)
@@ -161,8 +164,37 @@ public function destroy(DestroyRequest $request, User $user): JsonResponse
                 ->message($success)
                 ->payload($payload)
                 ->send();
-        } catch (\Throwable $e) {
-            \Log::error($e);
+        } catch (Throwable $e) {
+            Log::error($e);
+            return $this->api
+                ->failed()
+                ->code(500)
+                ->message($e->getMessage())
+                ->send();
+        }
+    }
+
+    /**
+     * @throws AuthorizationException
+     */
+    public function toggleRole(Request $request, User $user): JsonResponse
+    {
+        $this->authorize('update',$user);
+        $validated = $request->validate([
+            'role_id' => ['required','integer'],
+            'assigned' => ['required','boolean'],
+        ]);
+        try {
+            $payload = $this->repo
+                ->setModel($user)
+                ->toggleRole((object) $validated);
+            $success = "Record updated successfully";
+            return $this->api
+                ->success()
+                ->message($success)
+                ->send();
+        } catch (Throwable $e) {
+            Log::error($e);
             return $this->api
                 ->failed()
                 ->code(500)
diff --git a/publishes/acacia/Users/Js/Pages/Partials/EditForm.vue b/publishes/acacia/Users/Js/Pages/Partials/EditForm.vue
@@ -70,7 +70,15 @@
                 </div>
             </form>
         </TabPanel>
-        <TabPanel header="Assign Roles"> Assign Roles </TabPanel>
+        <TabPanel header="Assign Roles">
+            <template v-for="role in model.assigned_roles">
+                <div class="field-checkbox flex items-center gap-2 gap-x-4">
+                    <Checkbox @update:modelValue="toggleRole($event,role)"  :id="role.id" v-model="role.assigned" :binary="true" />
+                    <label :for="role.id">{{role.name}}</label>
+                </div>
+                <Divider/>
+            </template>
+        </TabPanel>
     </TabView>
     <Message v-else severity="error"
         >You are not authorized to perform this action</Message
@@ -98,14 +106,33 @@ import TabPanel from "primevue/tabpanel";
 import InputText from "primevue/inputtext";
 import AcaciaDatepicker from "@/Components/AcaciaDatepicker.vue";
 import Password from "primevue/password";
+import Checkbox from "primevue/checkbox";
+import Divider from "primevue/divider";
 const emit = defineEmits(["updated", "error"]);
-const props = defineProps({ model: {} });
+const props = defineProps({ model: Object });
 const flash = computed(() => usePage().props?.value?.flash) as any;
 const existingTables = ref([]);
 const showModal = ref(false);
 const toast = useToast();
 const model = props.model;
 const form = useForm({ ...model });
+const toggleRole = async (value,role) => {
+    axios.post(route('api.v1.users.user.toggle-role',model),{role_id: role.id, assigned: value}).then(res => {
+        toast.add({
+            severity: "success",
+            summary: `Role ${value ? 'Assigned': 'Revoked'}`,
+            detail: `The role assignment has been successfully updated.`,
+            life: 1000,
+        });
+    }).catch(err => {
+        toast.add({
+            severity: "error",
+            summary: "Error",
+            detail: err?.response?.data?.message || err?.message || err,
+            life: 2000,
+        });
+    })
+}
 const updateModel = async () => {
     form.put(route("acacia.auth.users.update", model), {
         onSuccess: (res) => {
diff --git a/publishes/acacia/Users/Js/Pages/Partials/ShowForm.vue b/publishes/acacia/Users/Js/Pages/Partials/ShowForm.vue
@@ -54,7 +54,15 @@
                 </AcaciaDd>
             </dl>
         </TabPanel>
-        <TabPanel header="Roles"> Assigned Roles </TabPanel>
+        <TabPanel lazy header="Roles">
+            <template v-for="role in model.assigned_roles">
+                <div class="field-checkbox flex items-center gap-2 gap-x-4">
+                    <Checkbox :id="role.id" :disabled="true" v-model="role.assigned" :binary="true" />
+                    <label :for="role.id">{{role.name}}</label>
+                </div>
+                <Divider/>
+            </template>
+        </TabPanel>
     </TabView>
     <Message v-else severity="error"
         >You are not authorized to view this record</Message
@@ -78,6 +86,8 @@ import AcaciaDd from "@/Components/AcaciaDd.vue";
 import TabView from "primevue/tabview";
 import TabPanel from "primevue/tabpanel";
 import InputText from "primevue/inputtext";
+import Checkbox from "primevue/checkbox";
+import Divider from "primevue/divider";
 import AcaciaDatepicker from "@/Components/AcaciaDatepicker.vue";
 import Password from "primevue/password";
 const emit = defineEmits(["updated", "error"]);
diff --git a/publishes/acacia/Users/Models/User.php b/publishes/acacia/Users/Models/User.php
@@ -2,8 +2,10 @@
 
 namespace Acacia\Users\Models;
 
+use Acacia\Roles\Models\Role;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Acacia\Users\Database\Factories\UserFactory;
+use Illuminate\Support\Collection;
 use Laravel\Scout\Searchable;
 
 class User extends \App\Models\User
@@ -48,6 +50,16 @@ protected function getCanAttribute(): array
             ->toArray();
     }
 
+    public function getAssignedRolesAttribute(): \Illuminate\Database\Eloquent\Collection|Collection
+    {
+        $authUser = \App\Models\User::query()->find($this->id);
+        $roles = Role::all();
+        return $roles->map(function (Role $role) use (&$authUser) {
+            $role->assigned = $authUser->hasRole($role?->name);
+            return $role;
+        });
+    }
+
     protected static function newFactory(): UserFactory
     {
         return UserFactory::new();
diff --git a/publishes/acacia/Users/Repositories/Users.php b/publishes/acacia/Users/Repositories/Users.php
@@ -2,7 +2,11 @@
 
 namespace Acacia\Users\Repositories;
 
+use Acacia\Roles\Models\Role;
+use Hash;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+use PrimevueDatatables;
 use Throwable;
 use Illuminate\Support\Str;
 use Acacia\Users\Models\User;
@@ -43,6 +47,9 @@ public function store(object $data): ?User
     {
         $relationships = $this->relationships;
         $model = new User((array) $data);
+        if (isset($data->password) && $data->password) {
+            $model->password = Hash::make($data->password);
+        }
         foreach ($relationships as $relationship) {
             $method = Str::snake($relationship);
             if (isset($data->$method) && $data->$method?->id) {
@@ -57,6 +64,7 @@ public function show(): User
     {
         $relationships = $this->relationships;
         $this->model->load($relationships);
+        $this->model->append('assigned_roles');
         return $this->model;
     }
 
@@ -72,6 +80,9 @@ public function update(object $data): User
             }
         }
         $this->model->update((array) $data);
+        if (isset($data->password) && $data->password) {
+            $this->model->password = Hash::make($data->password);
+        }
 
         $this->model->saveOrFail();
         return $this->model;
@@ -81,9 +92,19 @@ public function destroy(): bool
     {
         return !!$this->model->delete();
     }
+    public function toggleRole(object $data): bool
+    {
+        $authUser = \App\Models\User::query()->find($this->model->id);
+        if ($data->assigned) {
+            $authUser->assignRole($data->role_id);
+        } else {
+            $authUser->removeRole($data->role_id);
+        }
+        return true;
+    }
     public function dt(): LengthAwarePaginator
     {
         $q = User::query();
-        return \PrimevueDatatables::of($q)->make();
+        return PrimevueDatatables::of($q)->make();
     }
 }
diff --git a/publishes/acacia/Users/Routes/api.php b/publishes/acacia/Users/Routes/api.php
@@ -17,6 +17,7 @@
     ->middleware(["auth:sanctum"])
     ->as("api.v1.")
     ->group(function () {
+        Route::match(['put','post'],'users/{user}/role',[\Acacia\Users\Http\Controllers\Api\UserController::class,'toggleRole'])->name('users.user.toggle-role');
         Route::get("users/dt", "Api\UserController@dt")->name("users.dt");
         Route::apiResource("users", "Api\UserController");
     });

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace Acacia\Users\Repositories;`
`4`	`4`
	`5`	`+use Acacia\Roles\Models\Role;`
	`6`	`+use Hash;`
`5`	`7`	`use Illuminate\Contracts\Pagination\LengthAwarePaginator;`
	`8`	`+use Illuminate\Support\Collection;`
	`9`	`+use PrimevueDatatables;`
`6`	`10`	`use Throwable;`
`7`	`11`	`use Illuminate\Support\Str;`
`8`	`12`	`use Acacia\Users\Models\User;`
`@@ -43,6 +47,9 @@ public function store(object $data): ?User`
`43`	`47`	`{`
`44`	`48`	`$relationships = $this->relationships;`
`45`	`49`	`$model = new User((array) $data);`
	`50`	`+ if (isset($data->password) && $data->password) {`
	`51`	`+ $model->password = Hash::make($data->password);`
	`52`	`+ }`
`46`	`53`	`foreach ($relationships as $relationship) {`
`47`	`54`	`$method = Str::snake($relationship);`
`48`	`55`	`if (isset($data->$method) && $data->$method?->id) {`
`@@ -57,6 +64,7 @@ public function show(): User`
`57`	`64`	`{`
`58`	`65`	`$relationships = $this->relationships;`
`59`	`66`	`$this->model->load($relationships);`
	`67`	`+ $this->model->append('assigned_roles');`
`60`	`68`	`return $this->model;`
`61`	`69`	`}`
`62`	`70`
`@@ -72,6 +80,9 @@ public function update(object $data): User`
`72`	`80`	`}`
`73`	`81`	`}`
`74`	`82`	`$this->model->update((array) $data);`
	`83`	`+ if (isset($data->password) && $data->password) {`
	`84`	`+ $this->model->password = Hash::make($data->password);`
	`85`	`+ }`
`75`	`86`
`76`	`87`	`$this->model->saveOrFail();`
`77`	`88`	`return $this->model;`
`@@ -81,9 +92,19 @@ public function destroy(): bool`
`81`	`92`	`{`
`82`	`93`	`return !!$this->model->delete();`
`83`	`94`	`}`
	`95`	`+ public function toggleRole(object $data): bool`
	`96`	`+ {`
	`97`	`+ $authUser = \App\Models\User::query()->find($this->model->id);`
	`98`	`+ if ($data->assigned) {`
	`99`	`+ $authUser->assignRole($data->role_id);`
	`100`	`+ } else {`
	`101`	`+ $authUser->removeRole($data->role_id);`
	`102`	`+ }`
	`103`	`+ return true;`
	`104`	`+ }`
`84`	`105`	`public function dt(): LengthAwarePaginator`
`85`	`106`	`{`
`86`	`107`	`$q = User::query();`
`87`		`- return \PrimevueDatatables::of($q)->make();`
	`108`	`+ return PrimevueDatatables::of($q)->make();`
`88`	`109`	`}`
`89`	`110`	`}`