@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | $factory->define(App\Modules\Permissions\AclPermission::class, function (Faker\Generator $faker) { |
| 4 | - return [ |
|
| 5 | - 'name' => $faker->randomElement(['save', 'delete', 'find', 'paginate']), |
|
| 6 | - 'model' => $faker->randomElement(['users', 'groups', 'settings', 'notifications']), |
|
| 7 | - 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 8 | - 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 9 | - ]; |
|
| 4 | + return [ |
|
| 5 | + 'name' => $faker->randomElement(['save', 'delete', 'find', 'paginate']), |
|
| 6 | + 'model' => $faker->randomElement(['users', 'groups', 'settings', 'notifications']), |
|
| 7 | + 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 8 | + 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 9 | + ]; |
|
| 10 | 10 | }); |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -$factory->define(App\Modules\Permissions\AclPermission::class, function (Faker\Generator $faker) { |
|
| 3 | +$factory->define(App\Modules\Permissions\AclPermission::class, function(Faker\Generator $faker) { |
|
| 4 | 4 | return [ |
| 5 | 5 | 'name' => $faker->randomElement(['save', 'delete', 'find', 'paginate']), |
| 6 | 6 | 'model' => $faker->randomElement(['users', 'groups', 'settings', 'notifications']), |
@@ -6,15 +6,15 @@ |
||
| 6 | 6 | |
| 7 | 7 | class PermissionsDatabaseSeeder extends Seeder |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the database seeds. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function run() |
|
| 15 | - { |
|
| 16 | - $this->call(ClearDataSeeder::class); |
|
| 17 | - $this->call(PermissionsTableSeeder::class); |
|
| 18 | - $this->call(AssignRelationsSeeder::class); |
|
| 19 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $this->call(ClearDataSeeder::class); |
|
| 17 | + $this->call(PermissionsTableSeeder::class); |
|
| 18 | + $this->call(AssignRelationsSeeder::class); |
|
| 19 | + } |
|
| 20 | 20 | } |
@@ -6,27 +6,27 @@ |
||
| 6 | 6 | |
| 7 | 7 | class AssignRelationsSeeder extends Seeder |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the database seeds. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function run() |
|
| 15 | - { |
|
| 16 | - $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id; |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id; |
|
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Assign the permissions to the admin group. |
|
| 20 | - */ |
|
| 21 | - \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['permission'])->each(function ($permission) use ($adminGroupId) { |
|
| 22 | - \DB::table('groups_permissions')->insert( |
|
| 23 | - [ |
|
| 24 | - 'permission_id' => $permission->id, |
|
| 25 | - 'group_id' => $adminGroupId, |
|
| 26 | - 'created_at' => \DB::raw('NOW()'), |
|
| 27 | - 'updated_at' => \DB::raw('NOW()') |
|
| 28 | - ] |
|
| 29 | - ); |
|
| 30 | - }); |
|
| 31 | - } |
|
| 18 | + /** |
|
| 19 | + * Assign the permissions to the admin group. |
|
| 20 | + */ |
|
| 21 | + \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['permission'])->each(function ($permission) use ($adminGroupId) { |
|
| 22 | + \DB::table('groups_permissions')->insert( |
|
| 23 | + [ |
|
| 24 | + 'permission_id' => $permission->id, |
|
| 25 | + 'group_id' => $adminGroupId, |
|
| 26 | + 'created_at' => \DB::raw('NOW()'), |
|
| 27 | + 'updated_at' => \DB::raw('NOW()') |
|
| 28 | + ] |
|
| 29 | + ); |
|
| 30 | + }); |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | /** |
| 19 | 19 | * Assign the permissions to the admin group. |
| 20 | 20 | */ |
| 21 | - \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['permission'])->each(function ($permission) use ($adminGroupId) { |
|
| 21 | + \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['permission'])->each(function($permission) use ($adminGroupId) { |
|
| 22 | 22 | \DB::table('groups_permissions')->insert( |
| 23 | 23 | [ |
| 24 | 24 | 'permission_id' => $permission->id, |
@@ -6,15 +6,15 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ClearDataSeeder extends Seeder |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the database seeds. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function run() |
|
| 15 | - { |
|
| 16 | - $permissions = \DB::table('permissions')->whereIn('model', ['permission']); |
|
| 17 | - \DB::table('groups_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete(); |
|
| 18 | - $permissions->delete(); |
|
| 19 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $permissions = \DB::table('permissions')->whereIn('model', ['permission']); |
|
| 17 | + \DB::table('groups_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete(); |
|
| 18 | + $permissions->delete(); |
|
| 19 | + } |
|
| 20 | 20 | } |
@@ -7,24 +7,24 @@ |
||
| 7 | 7 | |
| 8 | 8 | class AclPermission extends JsonResource |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * Transform the resource into an array. |
|
| 12 | - * |
|
| 13 | - * @param Request $request |
|
| 14 | - * @return array |
|
| 15 | - */ |
|
| 16 | - public function toArray($request) |
|
| 17 | - { |
|
| 18 | - if (! $this->resource) { |
|
| 19 | - return []; |
|
| 20 | - } |
|
| 10 | + /** |
|
| 11 | + * Transform the resource into an array. |
|
| 12 | + * |
|
| 13 | + * @param Request $request |
|
| 14 | + * @return array |
|
| 15 | + */ |
|
| 16 | + public function toArray($request) |
|
| 17 | + { |
|
| 18 | + if (! $this->resource) { |
|
| 19 | + return []; |
|
| 20 | + } |
|
| 21 | 21 | |
| 22 | - return [ |
|
| 23 | - 'id' => $this->id, |
|
| 24 | - 'name' => $this->name, |
|
| 25 | - 'groups' => GroupResource::collection($this->whenLoaded('groups')), |
|
| 26 | - 'created_at' => $this->created_at, |
|
| 27 | - 'updated_at' => $this->updated_at, |
|
| 28 | - ]; |
|
| 29 | - } |
|
| 22 | + return [ |
|
| 23 | + 'id' => $this->id, |
|
| 24 | + 'name' => $this->name, |
|
| 25 | + 'groups' => GroupResource::collection($this->whenLoaded('groups')), |
|
| 26 | + 'created_at' => $this->created_at, |
|
| 27 | + 'updated_at' => $this->updated_at, |
|
| 28 | + ]; |
|
| 29 | + } |
|
| 30 | 30 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function toArray($request) |
| 17 | 17 | { |
| 18 | - if (! $this->resource) { |
|
| 18 | + if ( ! $this->resource) { |
|
| 19 | 19 | return []; |
| 20 | 20 | } |
| 21 | 21 | |
@@ -8,15 +8,15 @@ |
||
| 8 | 8 | |
| 9 | 9 | class PermissionController extends BaseApiController |
| 10 | 10 | { |
| 11 | - /** |
|
| 12 | - * Init new object. |
|
| 13 | - * |
|
| 14 | - * @param PermissionRepository $repo |
|
| 15 | - * @param CoreConfig $config |
|
| 16 | - * @return void |
|
| 17 | - */ |
|
| 18 | - public function __construct(PermissionRepository $repo, CoreConfig $config) |
|
| 19 | - { |
|
| 20 | - parent::__construct($repo, $config, 'App\Modules\Permissions\Http\Resources\AclPermission'); |
|
| 21 | - } |
|
| 11 | + /** |
|
| 12 | + * Init new object. |
|
| 13 | + * |
|
| 14 | + * @param PermissionRepository $repo |
|
| 15 | + * @param CoreConfig $config |
|
| 16 | + * @return void |
|
| 17 | + */ |
|
| 18 | + public function __construct(PermissionRepository $repo, CoreConfig $config) |
|
| 19 | + { |
|
| 20 | + parent::__construct($repo, $config, 'App\Modules\Permissions\Http\Resources\AclPermission'); |
|
| 21 | + } |
|
| 22 | 22 | } |
@@ -6,28 +6,28 @@ |
||
| 6 | 6 | |
| 7 | 7 | class OauthClient extends Client |
| 8 | 8 | { |
| 9 | - protected $dates = ['created_at', 'updated_at']; |
|
| 10 | - protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked']; |
|
| 11 | - public $searchable = ['name']; |
|
| 9 | + protected $dates = ['created_at', 'updated_at']; |
|
| 10 | + protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked']; |
|
| 11 | + public $searchable = ['name']; |
|
| 12 | 12 | |
| 13 | - public function getCreatedAtAttribute($value) |
|
| 14 | - { |
|
| 15 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 16 | - } |
|
| 13 | + public function getCreatedAtAttribute($value) |
|
| 14 | + { |
|
| 15 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 16 | + } |
|
| 17 | 17 | |
| 18 | - public function getUpdatedAtAttribute($value) |
|
| 19 | - { |
|
| 20 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 21 | - } |
|
| 18 | + public function getUpdatedAtAttribute($value) |
|
| 19 | + { |
|
| 20 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - public function user() |
|
| 24 | - { |
|
| 25 | - return $this->belongsTo('App\Modules\Users\AclUser'); |
|
| 26 | - } |
|
| 23 | + public function user() |
|
| 24 | + { |
|
| 25 | + return $this->belongsTo('App\Modules\Users\AclUser'); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - public static function boot() |
|
| 29 | - { |
|
| 30 | - parent::boot(); |
|
| 31 | - OauthClient::observe(\App::make('App\Modules\OauthClients\ModelObservers\OauthClientObserver')); |
|
| 32 | - } |
|
| 28 | + public static function boot() |
|
| 29 | + { |
|
| 30 | + parent::boot(); |
|
| 31 | + OauthClient::observe(\App::make('App\Modules\OauthClients\ModelObservers\OauthClientObserver')); |
|
| 32 | + } |
|
| 33 | 33 | } |
@@ -13,10 +13,10 @@ |
||
| 13 | 13 | |
| 14 | 14 | Route::group(['prefix' => 'oauth/clients'], function () { |
| 15 | 15 | |
| 16 | - Route::get('/', 'OauthClientController@index'); |
|
| 17 | - Route::get('/{id}', 'OauthClientController@find'); |
|
| 18 | - Route::post('/', 'OauthClientController@insert'); |
|
| 19 | - Route::put('/', 'OauthClientController@update'); |
|
| 20 | - Route::get('revoke/{id}', 'OauthClientController@revoke'); |
|
| 21 | - Route::get('unrevoke/{id}', 'OauthClientController@unRevoke'); |
|
| 16 | + Route::get('/', 'OauthClientController@index'); |
|
| 17 | + Route::get('/{id}', 'OauthClientController@find'); |
|
| 18 | + Route::post('/', 'OauthClientController@insert'); |
|
| 19 | + Route::put('/', 'OauthClientController@update'); |
|
| 20 | + Route::get('revoke/{id}', 'OauthClientController@revoke'); |
|
| 21 | + Route::get('unrevoke/{id}', 'OauthClientController@unRevoke'); |
|
| 22 | 22 | }); |
| 23 | 23 | \ No newline at end of file |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | | |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | -Route::group(['prefix' => 'oauth/clients'], function () { |
|
| 14 | +Route::group(['prefix' => 'oauth/clients'], function() { |
|
| 15 | 15 | |
| 16 | 16 | Route::get('/', 'OauthClientController@index'); |
| 17 | 17 | Route::get('/{id}', 'OauthClientController@find'); |
@@ -6,27 +6,27 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ModuleServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Bootstrap the module services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'oauth-clients'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'oauth-clients'); |
|
| 9 | + /** |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'oauth-clients'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'oauth-clients'); |
|
| 18 | 18 | |
| 19 | - $this->loadMigrationsFrom(module_path('oauth-clients', 'Database/Migrations', 'app')); |
|
| 20 | - $this->loadFactoriesFrom(module_path('oauth-clients', 'Database/Factories', 'app')); |
|
| 21 | - } |
|
| 19 | + $this->loadMigrationsFrom(module_path('oauth-clients', 'Database/Migrations', 'app')); |
|
| 20 | + $this->loadFactoriesFrom(module_path('oauth-clients', 'Database/Factories', 'app')); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Register the module services. |
|
| 25 | - * |
|
| 26 | - * @return void |
|
| 27 | - */ |
|
| 28 | - public function register() |
|
| 29 | - { |
|
| 30 | - $this->app->register(RouteServiceProvider::class); |
|
| 31 | - } |
|
| 23 | + /** |
|
| 24 | + * Register the module services. |
|
| 25 | + * |
|
| 26 | + * @return void |
|
| 27 | + */ |
|
| 28 | + public function register() |
|
| 29 | + { |
|
| 30 | + $this->app->register(RouteServiceProvider::class); |
|
| 31 | + } |
|
| 32 | 32 | } |