diff --git a/Config/config.php b/Config/config.php index c055c3f..16ef003 100644 --- a/Config/config.php +++ b/Config/config.php @@ -1,5 +1,5 @@ 'UserManager' + 'name' => 'Usermanager' ]; diff --git a/DataTables/PermissionsDataTable.php b/DataTables/PermissionsDataTable.php index 41394e4..5dc7325 100644 --- a/DataTables/PermissionsDataTable.php +++ b/DataTables/PermissionsDataTable.php @@ -1,8 +1,8 @@ id(); - $table->foreignIdFor('Modules\CetakLabel\Entities\Directorat', 'directorat_id')->nullable(); - $table->foreignIdFor('Modules\CetakLabel\Entities\SubDirectorat', 'sub_directorat_id')->nullable(); + $table->foreignIdFor('Modules\Cetaklabel\Entities\Directorat', 'directorat_id')->nullable(); + $table->foreignIdFor('Modules\Cetaklabel\Entities\SubDirectorat', 'sub_directorat_id')->nullable(); $table->string('name'); $table->string('email')->unique(); $table->timestamp('email_verified_at')->nullable(); diff --git a/Database/Migrations/2023_04_15_225909_update_permissions_table.php b/Database/Migrations/2023_04_15_225909_update_permissions_table.php index 88967cb..3fb30a1 100644 --- a/Database/Migrations/2023_04_15_225909_update_permissions_table.php +++ b/Database/Migrations/2023_04_15_225909_update_permissions_table.php @@ -2,7 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Support\Facades\Schema; - use Modules\UserManager\Entities\PermissionGroup; + use Modules\Usermanager\Entities\PermissionGroup; return new class extends Migration { diff --git a/Database/Seeders/PermissionGroupSeeder.php b/Database/Seeders/PermissionGroupSeeder.php index 98d8676..82f987b 100644 --- a/Database/Seeders/PermissionGroupSeeder.php +++ b/Database/Seeders/PermissionGroupSeeder.php @@ -1,9 +1,9 @@ forgetCachedPermissions(); + //app()[\Spatie\Permission\PermissionRegistrar::class]->forgetCachedPermissions(); $data = $this->data(); foreach ($data as $value) { $permission = Permission::create([ - 'name' => $value['name'], + 'name' => $value['name'], + 'guard_name' => 'web', // or 'api 'permission_group_id' => $value['group'] ]); $roles = Role::all(); foreach ($roles as $role) { - if($role->name == 'administrator'){ + if ($role->name == 'administrator') { $role->givePermissionTo($permission); } else { - if($permission->name == 'user.read' || $permission->name == 'role.read' || $permission->name == 'permission.read'){ + if ($permission->name == 'user.read' || $permission->name == 'role.read' || $permission->name == 'permission.read') { $role->givePermissionTo($permission); } } @@ -45,10 +46,10 @@ // list of model permission $model = ['user', 'role', 'permission']; - $i=1; + $i = 1; foreach ($model as $value) { foreach ($this->crudActions($value) as $action) { - $data[] = ['name' => $action,'group'=>$i]; + $data[] = ['name' => $action, 'group' => $i]; } $i++; } @@ -60,10 +61,10 @@ { $actions = []; // list of permission actions - $crud = ['create', 'read', 'update', 'delete','authorize','report']; + $crud = ['create', 'read', 'update', 'delete', 'authorize', 'report']; foreach ($crud as $value) { - $actions[] = $name.'.'.$value; + $actions[] = $name . '.' . $value; } return $actions; diff --git a/Database/Seeders/RolesSeeder.php b/Database/Seeders/RolesSeeder.php index 01a4687..a53ef8d 100644 --- a/Database/Seeders/RolesSeeder.php +++ b/Database/Seeders/RolesSeeder.php @@ -1,6 +1,6 @@ now(), ]); - $admin->assignRole($roleAdmin); + $admin->assignRole($roleAdmin,); $user->assignRole($roleUser); } } diff --git a/Database/factories/UserFactory.php b/Database/factories/UserFactory.php new file mode 100644 index 0000000..18472e7 --- /dev/null +++ b/Database/factories/UserFactory.php @@ -0,0 +1,40 @@ + + */ +class UserFactory extends Factory +{ + /** + * Define the model's default state. + * + * @return array + */ + public function definition() + { + return [ + 'name' => fake()->name(), + 'email' => fake()->unique()->safeEmail(), + 'email_verified_at' => now(), + 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password + 'remember_token' => Str::random(10), + ]; + } + + /** + * Indicate that the model's email address should be unverified. + * + * @return static + */ + public function unverified() + { + return $this->state(fn (array $attributes) => [ + 'email_verified_at' => null, + ]); + } +} diff --git a/Entities/BaseModel.php b/Entities/BaseModel.php index 8b38625..8c3cb79 100644 --- a/Entities/BaseModel.php +++ b/Entities/BaseModel.php @@ -1,6 +1,6 @@ namespace($this->moduleNamespace) - ->group(module_path('UserManager', '/Routes/web.php')); + ->group(module_path('Usermanager', '/Routes/web.php')); } /** @@ -63,6 +63,6 @@ class RouteServiceProvider extends ServiceProvider Route::prefix('api') ->middleware('api') ->namespace($this->moduleNamespace) - ->group(module_path('UserManager', '/Routes/api.php')); + ->group(module_path('Usermanager', '/Routes/api.php')); } } diff --git a/Providers/UserManagerServiceProvider.php b/Providers/UserManagerServiceProvider.php index 59830b7..7bf3564 100644 --- a/Providers/UserManagerServiceProvider.php +++ b/Providers/UserManagerServiceProvider.php @@ -1,16 +1,16 @@ group(function () { Route::resource('roles', RoleController::class); }); + + Route::post('register', [AuthApiController::class, 'register']); + Route::post('login', [AuthApiController::class, 'login']); + + Route::middleware('auth:sanctum')->get('/user', function (Request $request) { + return $request->user(); + }); diff --git a/Routes/auth.php b/Routes/auth.php index 55d5126..70a65da 100644 --- a/Routes/auth.php +++ b/Routes/auth.php @@ -1,14 +1,14 @@ group(function () { Route::get('register', [RegisteredUserController::class, 'create']) diff --git a/Routes/web.php b/Routes/web.php index c3eb8e8..e3eef30 100644 --- a/Routes/web.php +++ b/Routes/web.php @@ -11,9 +11,9 @@ | */ - use Modules\UserManager\Http\Controllers\Users\PermissionsController; - use Modules\UserManager\Http\Controllers\Users\RolesController; - use Modules\UserManager\Http\Controllers\Users\UsersController; + use Modules\Usermanager\Http\Controllers\Users\PermissionsController; + use Modules\Usermanager\Http\Controllers\Users\RolesController; + use Modules\Usermanager\Http\Controllers\Users\UsersController; // Users Management Route::group(['middleware' => ['auth', 'verified']], function () { diff --git a/composer.json b/composer.json index 32bc509..01c1b51 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ }, "autoload": { "psr-4": { - "Modules\\UserManager\\": "" + "Modules\\Usermanager\\": "" } } } diff --git a/module.json b/module.json index e490efd..c474433 100644 --- a/module.json +++ b/module.json @@ -1,12 +1,12 @@ { - "name": "UserManager", + "name": "Usermanager", "alias": "usermanager", "database": "", "description": "", "keywords": [], "priority": 99, "providers": [ - "Modules\\UserManager\\Providers\\UserManagerServiceProvider" + "Modules\\Usermanager\\Providers\\UsermanagerServiceProvider" ], "files": [] }