@@ -2,7 +2,6 @@ |
||
| 2 | 2 | namespace App\Modules\V1\Core\Http\Controllers; |
| 3 | 3 | |
| 4 | 4 | use App\Http\Controllers\Controller; |
| 5 | -use Illuminate\Http\Request; |
|
| 6 | 5 | |
| 7 | 6 | class ApiDocumentController extends Controller |
| 8 | 7 | { |
@@ -20,27 +20,27 @@ discard block |
||
| 20 | 20 | ], |
| 21 | 21 | [ |
| 22 | 22 | 'title' => 'email equal [email protected] and user is blocked:', |
| 23 | - 'content' => ['and' => ['email' => '[email protected]','blocked' => 1]] |
|
| 23 | + 'content' => ['and' => ['email' => '[email protected]', 'blocked' => 1]] |
|
| 24 | 24 | ], |
| 25 | 25 | [ |
| 26 | 26 | 'title' => 'email equal [email protected] or user is blocked:', |
| 27 | - 'content' => ['or' => ['email' => '[email protected]','blocked' => 1]] |
|
| 27 | + 'content' => ['or' => ['email' => '[email protected]', 'blocked' => 1]] |
|
| 28 | 28 | ], |
| 29 | 29 | [ |
| 30 | 30 | 'title' => 'email contain John:', |
| 31 | - 'content' => ['email' => ['op' => 'like','val' => '%John%']] |
|
| 31 | + 'content' => ['email' => ['op' => 'like', 'val' => '%John%']] |
|
| 32 | 32 | ], |
| 33 | 33 | [ |
| 34 | 34 | 'title' => 'user created after 2016-10-25:', |
| 35 | - 'content' => ['created_at' => ['op' => '>','val' => '2016-10-25']] |
|
| 35 | + 'content' => ['created_at' => ['op' => '>', 'val' => '2016-10-25']] |
|
| 36 | 36 | ], |
| 37 | 37 | [ |
| 38 | 38 | 'title' => 'user created between 2016-10-20 and 2016-10-25:', |
| 39 | - 'content' => ['created_at' => ['op' => 'between','val1' => '2016-10-20','val2' => '2016-10-25']] |
|
| 39 | + 'content' => ['created_at' => ['op' => 'between', 'val1' => '2016-10-20', 'val2' => '2016-10-25']] |
|
| 40 | 40 | ], |
| 41 | 41 | [ |
| 42 | 42 | 'title' => 'user id in 1,2,3:', |
| 43 | - 'content' => ['id' => ['op' => 'in','val' => [1, 2, 3]]] |
|
| 43 | + 'content' => ['id' => ['op' => 'in', 'val' => [1, 2, 3]]] |
|
| 44 | 44 | ], |
| 45 | 45 | [ |
| 46 | 46 | 'title' => 'user name is null:', |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | ], |
| 53 | 53 | [ |
| 54 | 54 | 'title' => 'user has group admin:', |
| 55 | - 'content' => ['groups' => ['op' => 'has','val' => ['name' => 'Admin']]] |
|
| 55 | + 'content' => ['groups' => ['op' => 'has', 'val' => ['name' => 'Admin']]] |
|
| 56 | 56 | ] |
| 57 | 57 | ]; |
| 58 | 58 | |
@@ -5,53 +5,53 @@ |
||
| 5 | 5 | */ |
| 6 | 6 | class OauthClientObserver { |
| 7 | 7 | |
| 8 | - public function saving($model) |
|
| 9 | - { |
|
| 10 | - // |
|
| 11 | - } |
|
| 12 | - |
|
| 13 | - public function saved($model) |
|
| 14 | - { |
|
| 15 | - // |
|
| 16 | - } |
|
| 17 | - |
|
| 18 | - public function creating($model) |
|
| 19 | - { |
|
| 20 | - $model->secret = str_random(40); |
|
| 21 | - } |
|
| 22 | - |
|
| 23 | - public function created($model) |
|
| 24 | - { |
|
| 25 | - // |
|
| 26 | - } |
|
| 27 | - |
|
| 28 | - public function updating($model) |
|
| 29 | - { |
|
| 30 | - // |
|
| 31 | - } |
|
| 32 | - |
|
| 33 | - public function updated($model) |
|
| 34 | - { |
|
| 35 | - // |
|
| 36 | - } |
|
| 37 | - |
|
| 38 | - public function deleting($model) |
|
| 39 | - { |
|
| 40 | - // |
|
| 41 | - } |
|
| 42 | - |
|
| 43 | - public function deleted($model) |
|
| 44 | - { |
|
| 45 | - // |
|
| 46 | - } |
|
| 47 | - |
|
| 48 | - public function restoring($model) |
|
| 49 | - { |
|
| 50 | - // |
|
| 51 | - } |
|
| 52 | - |
|
| 53 | - public function restored($model) |
|
| 54 | - { |
|
| 55 | - // |
|
| 56 | - } |
|
| 8 | + public function saving($model) |
|
| 9 | + { |
|
| 10 | + // |
|
| 11 | + } |
|
| 12 | + |
|
| 13 | + public function saved($model) |
|
| 14 | + { |
|
| 15 | + // |
|
| 16 | + } |
|
| 17 | + |
|
| 18 | + public function creating($model) |
|
| 19 | + { |
|
| 20 | + $model->secret = str_random(40); |
|
| 21 | + } |
|
| 22 | + |
|
| 23 | + public function created($model) |
|
| 24 | + { |
|
| 25 | + // |
|
| 26 | + } |
|
| 27 | + |
|
| 28 | + public function updating($model) |
|
| 29 | + { |
|
| 30 | + // |
|
| 31 | + } |
|
| 32 | + |
|
| 33 | + public function updated($model) |
|
| 34 | + { |
|
| 35 | + // |
|
| 36 | + } |
|
| 37 | + |
|
| 38 | + public function deleting($model) |
|
| 39 | + { |
|
| 40 | + // |
|
| 41 | + } |
|
| 42 | + |
|
| 43 | + public function deleted($model) |
|
| 44 | + { |
|
| 45 | + // |
|
| 46 | + } |
|
| 47 | + |
|
| 48 | + public function restoring($model) |
|
| 49 | + { |
|
| 50 | + // |
|
| 51 | + } |
|
| 52 | + |
|
| 53 | + public function restored($model) |
|
| 54 | + { |
|
| 55 | + // |
|
| 56 | + } |
|
| 57 | 57 | } |
| 58 | 58 | \ No newline at end of file |
@@ -6,18 +6,18 @@ |
||
| 6 | 6 | |
| 7 | 7 | class AclDatabaseSeeder 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(UsersTableSeeder::class); |
|
| 18 | - $this->call(GroupsTableSeeder::class); |
|
| 19 | - $this->call(PermissionsTableSeeder::class); |
|
| 20 | - $this->call(OauthClientsTableSeeder::class); |
|
| 21 | - $this->call(AssignRelationsSeeder::class); |
|
| 22 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $this->call(ClearDataSeeder::class); |
|
| 17 | + $this->call(UsersTableSeeder::class); |
|
| 18 | + $this->call(GroupsTableSeeder::class); |
|
| 19 | + $this->call(PermissionsTableSeeder::class); |
|
| 20 | + $this->call(OauthClientsTableSeeder::class); |
|
| 21 | + $this->call(AssignRelationsSeeder::class); |
|
| 22 | + } |
|
| 23 | 23 | } |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | $factory->define(App\Modules\V1\Acl\OauthClient::class, function (Faker\Generator $faker) { |
| 4 | - return [ |
|
| 5 | - 'user_id' => $faker->randomDigit(), |
|
| 4 | + return [ |
|
| 5 | + 'user_id' => $faker->randomDigit(), |
|
| 6 | 6 | 'name' => $faker->name(), |
| 7 | 7 | 'secret' => str_random(40), |
| 8 | 8 | 'redirect' => $faker->url(), |
@@ -11,5 +11,5 @@ discard block |
||
| 11 | 11 | 'revoked' => $faker->boolean(), |
| 12 | 12 | 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
| 13 | 13 | 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
| 14 | - ]; |
|
| 14 | + ]; |
|
| 15 | 15 | }); |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -$factory->define(App\Modules\V1\Acl\OauthClient::class, function (Faker\Generator $faker) { |
|
| 3 | +$factory->define(App\Modules\V1\Acl\OauthClient::class, function(Faker\Generator $faker) { |
|
| 4 | 4 | return [ |
| 5 | 5 | 'user_id' => $faker->randomDigit(), |
| 6 | 6 | 'name' => $faker->name(), |
@@ -6,32 +6,32 @@ |
||
| 6 | 6 | |
| 7 | 7 | class CreateOauthAccessTokensTable extends Migration |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the migrations. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function up() |
|
| 15 | - { |
|
| 16 | - Schema::create('oauth_access_tokens', function (Blueprint $table) { |
|
| 17 | - $table->string('id', 100)->primary(); |
|
| 18 | - $table->integer('user_id')->index()->nullable(); |
|
| 19 | - $table->integer('client_id'); |
|
| 20 | - $table->string('name')->nullable(); |
|
| 21 | - $table->text('scopes')->nullable(); |
|
| 22 | - $table->boolean('revoked'); |
|
| 23 | - $table->timestamps(); |
|
| 24 | - $table->dateTime('expires_at')->nullable(); |
|
| 25 | - }); |
|
| 26 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the migrations. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function up() |
|
| 15 | + { |
|
| 16 | + Schema::create('oauth_access_tokens', function (Blueprint $table) { |
|
| 17 | + $table->string('id', 100)->primary(); |
|
| 18 | + $table->integer('user_id')->index()->nullable(); |
|
| 19 | + $table->integer('client_id'); |
|
| 20 | + $table->string('name')->nullable(); |
|
| 21 | + $table->text('scopes')->nullable(); |
|
| 22 | + $table->boolean('revoked'); |
|
| 23 | + $table->timestamps(); |
|
| 24 | + $table->dateTime('expires_at')->nullable(); |
|
| 25 | + }); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Reverse the migrations. |
|
| 30 | - * |
|
| 31 | - * @return void |
|
| 32 | - */ |
|
| 33 | - public function down() |
|
| 34 | - { |
|
| 35 | - Schema::drop('oauth_access_tokens'); |
|
| 36 | - } |
|
| 28 | + /** |
|
| 29 | + * Reverse the migrations. |
|
| 30 | + * |
|
| 31 | + * @return void |
|
| 32 | + */ |
|
| 33 | + public function down() |
|
| 34 | + { |
|
| 35 | + Schema::drop('oauth_access_tokens'); |
|
| 36 | + } |
|
| 37 | 37 | } |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('oauth_access_tokens', function (Blueprint $table) { |
|
| 16 | + Schema::create('oauth_access_tokens', function(Blueprint $table) { |
|
| 17 | 17 | $table->string('id', 100)->primary(); |
| 18 | 18 | $table->integer('user_id')->index()->nullable(); |
| 19 | 19 | $table->integer('client_id'); |
@@ -6,27 +6,27 @@ |
||
| 6 | 6 | |
| 7 | 7 | class CreateOauthPersonalAccessClientsTable extends Migration |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the migrations. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function up() |
|
| 15 | - { |
|
| 16 | - Schema::create('oauth_personal_access_clients', function (Blueprint $table) { |
|
| 17 | - $table->increments('id'); |
|
| 18 | - $table->integer('client_id')->index(); |
|
| 19 | - $table->timestamps(); |
|
| 20 | - }); |
|
| 21 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the migrations. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function up() |
|
| 15 | + { |
|
| 16 | + Schema::create('oauth_personal_access_clients', function (Blueprint $table) { |
|
| 17 | + $table->increments('id'); |
|
| 18 | + $table->integer('client_id')->index(); |
|
| 19 | + $table->timestamps(); |
|
| 20 | + }); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Reverse the migrations. |
|
| 25 | - * |
|
| 26 | - * @return void |
|
| 27 | - */ |
|
| 28 | - public function down() |
|
| 29 | - { |
|
| 30 | - Schema::drop('oauth_personal_access_clients'); |
|
| 31 | - } |
|
| 23 | + /** |
|
| 24 | + * Reverse the migrations. |
|
| 25 | + * |
|
| 26 | + * @return void |
|
| 27 | + */ |
|
| 28 | + public function down() |
|
| 29 | + { |
|
| 30 | + Schema::drop('oauth_personal_access_clients'); |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('oauth_personal_access_clients', function (Blueprint $table) { |
|
| 16 | + Schema::create('oauth_personal_access_clients', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->integer('client_id')->index(); |
| 19 | 19 | $table->timestamps(); |
@@ -6,28 +6,28 @@ |
||
| 6 | 6 | |
| 7 | 7 | class CreateOauthRefreshTokensTable extends Migration |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the migrations. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function up() |
|
| 15 | - { |
|
| 16 | - Schema::create('oauth_refresh_tokens', function (Blueprint $table) { |
|
| 17 | - $table->string('id', 100)->primary(); |
|
| 18 | - $table->string('access_token_id', 100)->index(); |
|
| 19 | - $table->boolean('revoked'); |
|
| 20 | - $table->dateTime('expires_at')->nullable(); |
|
| 21 | - }); |
|
| 22 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the migrations. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function up() |
|
| 15 | + { |
|
| 16 | + Schema::create('oauth_refresh_tokens', function (Blueprint $table) { |
|
| 17 | + $table->string('id', 100)->primary(); |
|
| 18 | + $table->string('access_token_id', 100)->index(); |
|
| 19 | + $table->boolean('revoked'); |
|
| 20 | + $table->dateTime('expires_at')->nullable(); |
|
| 21 | + }); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * Reverse the migrations. |
|
| 26 | - * |
|
| 27 | - * @return void |
|
| 28 | - */ |
|
| 29 | - public function down() |
|
| 30 | - { |
|
| 31 | - Schema::drop('oauth_refresh_tokens'); |
|
| 32 | - } |
|
| 24 | + /** |
|
| 25 | + * Reverse the migrations. |
|
| 26 | + * |
|
| 27 | + * @return void |
|
| 28 | + */ |
|
| 29 | + public function down() |
|
| 30 | + { |
|
| 31 | + Schema::drop('oauth_refresh_tokens'); |
|
| 32 | + } |
|
| 33 | 33 | } |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('oauth_refresh_tokens', function (Blueprint $table) { |
|
| 16 | + Schema::create('oauth_refresh_tokens', function(Blueprint $table) { |
|
| 17 | 17 | $table->string('id', 100)->primary(); |
| 18 | 18 | $table->string('access_token_id', 100)->index(); |
| 19 | 19 | $table->boolean('revoked'); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('oauth_clients', function (Blueprint $table) { |
|
| 16 | + Schema::create('oauth_clients', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->integer('user_id')->index()->nullable(); |
| 19 | 19 | $table->string('name'); |
@@ -6,33 +6,33 @@ |
||
| 6 | 6 | |
| 7 | 7 | class CreateOauthClientsTable extends Migration |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the migrations. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function up() |
|
| 15 | - { |
|
| 16 | - Schema::create('oauth_clients', function (Blueprint $table) { |
|
| 17 | - $table->increments('id'); |
|
| 18 | - $table->integer('user_id')->index()->nullable(); |
|
| 19 | - $table->string('name'); |
|
| 20 | - $table->string('secret', 100); |
|
| 21 | - $table->text('redirect'); |
|
| 22 | - $table->boolean('personal_access_client')->default(0); |
|
| 23 | - $table->boolean('password_client')->default(0); |
|
| 24 | - $table->boolean('revoked')->default(0); |
|
| 25 | - $table->timestamps(); |
|
| 26 | - }); |
|
| 27 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the migrations. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function up() |
|
| 15 | + { |
|
| 16 | + Schema::create('oauth_clients', function (Blueprint $table) { |
|
| 17 | + $table->increments('id'); |
|
| 18 | + $table->integer('user_id')->index()->nullable(); |
|
| 19 | + $table->string('name'); |
|
| 20 | + $table->string('secret', 100); |
|
| 21 | + $table->text('redirect'); |
|
| 22 | + $table->boolean('personal_access_client')->default(0); |
|
| 23 | + $table->boolean('password_client')->default(0); |
|
| 24 | + $table->boolean('revoked')->default(0); |
|
| 25 | + $table->timestamps(); |
|
| 26 | + }); |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * Reverse the migrations. |
|
| 31 | - * |
|
| 32 | - * @return void |
|
| 33 | - */ |
|
| 34 | - public function down() |
|
| 35 | - { |
|
| 36 | - Schema::drop('oauth_clients'); |
|
| 37 | - } |
|
| 29 | + /** |
|
| 30 | + * Reverse the migrations. |
|
| 31 | + * |
|
| 32 | + * @return void |
|
| 33 | + */ |
|
| 34 | + public function down() |
|
| 35 | + { |
|
| 36 | + Schema::drop('oauth_clients'); |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -6,30 +6,30 @@ |
||
| 6 | 6 | |
| 7 | 7 | class CreateOauthAuthCodesTable extends Migration |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the migrations. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function up() |
|
| 15 | - { |
|
| 16 | - Schema::create('oauth_auth_codes', function (Blueprint $table) { |
|
| 17 | - $table->string('id', 100)->primary(); |
|
| 18 | - $table->integer('user_id'); |
|
| 19 | - $table->integer('client_id'); |
|
| 20 | - $table->text('scopes')->nullable(); |
|
| 21 | - $table->boolean('revoked'); |
|
| 22 | - $table->dateTime('expires_at')->nullable(); |
|
| 23 | - }); |
|
| 24 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the migrations. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function up() |
|
| 15 | + { |
|
| 16 | + Schema::create('oauth_auth_codes', function (Blueprint $table) { |
|
| 17 | + $table->string('id', 100)->primary(); |
|
| 18 | + $table->integer('user_id'); |
|
| 19 | + $table->integer('client_id'); |
|
| 20 | + $table->text('scopes')->nullable(); |
|
| 21 | + $table->boolean('revoked'); |
|
| 22 | + $table->dateTime('expires_at')->nullable(); |
|
| 23 | + }); |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Reverse the migrations. |
|
| 28 | - * |
|
| 29 | - * @return void |
|
| 30 | - */ |
|
| 31 | - public function down() |
|
| 32 | - { |
|
| 33 | - Schema::drop('oauth_auth_codes'); |
|
| 34 | - } |
|
| 26 | + /** |
|
| 27 | + * Reverse the migrations. |
|
| 28 | + * |
|
| 29 | + * @return void |
|
| 30 | + */ |
|
| 31 | + public function down() |
|
| 32 | + { |
|
| 33 | + Schema::drop('oauth_auth_codes'); |
|
| 34 | + } |
|
| 35 | 35 | } |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('oauth_auth_codes', function (Blueprint $table) { |
|
| 16 | + Schema::create('oauth_auth_codes', function(Blueprint $table) { |
|
| 17 | 17 | $table->string('id', 100)->primary(); |
| 18 | 18 | $table->integer('user_id'); |
| 19 | 19 | $table->integer('client_id'); |