Completed
Push — master ( ae7a17...a23113 )
by Sherif
14:07
created
Database/Migrations/2016_06_01_000002_create_oauth_access_tokens_table.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -6,32 +6,32 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
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');
Please login to merge, or discard this patch.
Acl/Database/Migrations/2016_06_01_000004_create_oauth_clients_table.php 2 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -6,33 +6,33 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
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');
Please login to merge, or discard this patch.
Migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -6,27 +6,27 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.
src/Modules/Acl/Database/Factories/OauthClientFactory.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $factory->define(App\Modules\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
 block discarded – undo
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
 });
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\Acl\OauthClient::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\Acl\OauthClient::class, function(Faker\Generator $faker) {
4 4
     return [
5 5
     	'user_id'                => $faker->randomDigit(),
6 6
 		'name'                   => $faker->name(),
Please login to merge, or discard this patch.
src/Modules/Acl/Database/Factories/UserFactory.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $factory->define(App\Modules\Acl\AclUser::class, function (Faker\Generator $faker) {
4
-    return [
4
+	return [
5 5
 		'profile_picture' => 'http://lorempixel.com/400/200/',
6 6
 		'name'            => $faker->name(),
7 7
 		'email'           => $faker->safeEmail(),
8 8
 		'password'        => 123456,
9 9
 		'created_at'      => $faker->dateTimeBetween('-1 years', 'now'),
10 10
 		'updated_at'      => $faker->dateTimeBetween('-1 years', 'now')
11
-    ];
11
+	];
12 12
 });
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\Acl\AclUser::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\Acl\AclUser::class, function(Faker\Generator $faker) {
4 4
     return [
5 5
 		'profile_picture' => 'http://lorempixel.com/400/200/',
6 6
 		'name'            => $faker->name(),
Please login to merge, or discard this patch.
src/Modules/Acl/Database/Factories/GroupFactory.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $factory->define(App\Modules\Acl\AclGroup::class, function (Faker\Generator $faker) {
4
-    return [
4
+	return [
5 5
 		'name'       => $faker->unique->word(),
6 6
 		'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
7 7
 		'updated_at' => $faker->dateTimeBetween('-1 years', 'now')
8
-    ];
8
+	];
9 9
 });
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\Acl\AclGroup::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\Acl\AclGroup::class, function(Faker\Generator $faker) {
4 4
     return [
5 5
 		'name'       => $faker->unique->word(),
6 6
 		'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
Please login to merge, or discard this patch.
src/Modules/Acl/Database/Factories/PermissionFactory.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $factory->define(App\Modules\Acl\AclPermission::class, function (Faker\Generator $faker) {
4
-    return [
4
+	return [
5 5
 		'name'       => $faker->randomElement(['save', 'delete', 'find', 'paginate']),
6 6
 		'model'      => $faker->randomElement(['users', 'groups', 'settings', 'notifications']),
7 7
 		'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
8 8
 		'updated_at' => $faker->dateTimeBetween('-1 years', 'now')
9
-    ];
9
+	];
10 10
 });
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\Acl\AclPermission::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\Acl\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']),
Please login to merge, or discard this patch.
src/Modules/Acl/Http/Controllers/OauthClientsController.php 2 patches
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -8,44 +8,44 @@
 block discarded – undo
8 8
 
9 9
 class OauthClientsController extends BaseApiController
10 10
 {
11
-    /**
12
-     * The name of the model that is used by the base api controller 
13
-     * to preform actions like (add, edit ... etc).
14
-     * @var string
15
-     */
16
-    protected $model               = 'oauthClients';
11
+	/**
12
+	 * The name of the model that is used by the base api controller 
13
+	 * to preform actions like (add, edit ... etc).
14
+	 * @var string
15
+	 */
16
+	protected $model               = 'oauthClients';
17 17
 
18
-    /**
19
-     * The validations rules used by the base api controller
20
-     * to check before add.
21
-     * @var array
22
-     */
23
-    protected $validationRules  = [
24
-        'name'     => 'required|max:255',
25
-        'redirect' => 'required|url',
26
-        'user_id'  => 'required|exists:users,id',
27
-        'revoked'  => 'boolean'
28
-    ];
18
+	/**
19
+	 * The validations rules used by the base api controller
20
+	 * to check before add.
21
+	 * @var array
22
+	 */
23
+	protected $validationRules  = [
24
+		'name'     => 'required|max:255',
25
+		'redirect' => 'required|url',
26
+		'user_id'  => 'required|exists:users,id',
27
+		'revoked'  => 'boolean'
28
+	];
29 29
 
30
-    /**
31
-     * Revoke the given client.
32
-     *
33
-     * @param  integer  $clientId Id of the client
34
-     * @return \Illuminate\Http\Response
35
-     */
36
-    public function revoke($clientId)
37
-    {
38
-        return \Response::json($this->repo->revoke($clientId), 200);
39
-    }
30
+	/**
31
+	 * Revoke the given client.
32
+	 *
33
+	 * @param  integer  $clientId Id of the client
34
+	 * @return \Illuminate\Http\Response
35
+	 */
36
+	public function revoke($clientId)
37
+	{
38
+		return \Response::json($this->repo->revoke($clientId), 200);
39
+	}
40 40
 
41
-    /**
42
-     * Un revoke the given client.
43
-     *
44
-     * @param  integer  $clientId Id of the client
45
-     * @return \Illuminate\Http\Response
46
-     */
47
-    public function unRevoke($clientId)
48
-    {
49
-        return \Response::json($this->repo->unRevoke($clientId), 200);
50
-    }
41
+	/**
42
+	 * Un revoke the given client.
43
+	 *
44
+	 * @param  integer  $clientId Id of the client
45
+	 * @return \Illuminate\Http\Response
46
+	 */
47
+	public function unRevoke($clientId)
48
+	{
49
+		return \Response::json($this->repo->unRevoke($clientId), 200);
50
+	}
51 51
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,14 +13,14 @@
 block discarded – undo
13 13
      * to preform actions like (add, edit ... etc).
14 14
      * @var string
15 15
      */
16
-    protected $model               = 'oauthClients';
16
+    protected $model = 'oauthClients';
17 17
 
18 18
     /**
19 19
      * The validations rules used by the base api controller
20 20
      * to check before add.
21 21
      * @var array
22 22
      */
23
-    protected $validationRules  = [
23
+    protected $validationRules = [
24 24
         'name'     => 'required|max:255',
25 25
         'redirect' => 'required|url',
26 26
         'user_id'  => 'required|exists:users,id',
Please login to merge, or discard this patch.
src/Modules/Acl/Http/Controllers/UsersController.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
      * to preform actions like (add, edit ... etc).
14 14
      * @var string
15 15
      */
16
-    protected $model               = 'users';
16
+    protected $model = 'users';
17 17
 
18 18
     /**
19 19
      * List of all route actions that the base api controller
@@ -27,14 +27,14 @@  discard block
 block discarded – undo
27 27
      * will skip login check for them.
28 28
      * @var array
29 29
      */
30
-    protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
30
+    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
31 31
 
32 32
     /**
33 33
      * The validations rules used by the base api controller
34 34
      * to check before add.
35 35
      * @var array
36 36
      */
37
-    protected $validationRules     = [
37
+    protected $validationRules = [
38 38
         'name'     => 'nullable|string', 
39 39
         'email'    => 'required|email|unique:users,email,{id}', 
40 40
         'password' => 'nullable|min:6'
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
         $this->validate($request, [
282 282
             'profile_picture' => 'nullable|base64image',
283 283
             'name'            => 'nullable|string', 
284
-            'email'           => 'required|email|unique:users,email,' . \Auth::id()
284
+            'email'           => 'required|email|unique:users,email,'.\Auth::id()
285 285
         ]);
286 286
 
287 287
         return \Response::json($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')), 200);
Please login to merge, or discard this patch.
Indentation   +278 added lines, -278 removed lines patch added patch discarded remove patch
@@ -8,282 +8,282 @@
 block discarded – undo
8 8
 
9 9
 class UsersController extends BaseApiController
10 10
 {
11
-    /**
12
-     * The name of the model that is used by the base api controller 
13
-     * to preform actions like (add, edit ... etc).
14
-     * @var string
15
-     */
16
-    protected $model               = 'users';
17
-
18
-    /**
19
-     * List of all route actions that the base api controller
20
-     * will skip permissions check for them.
21
-     * @var array
22
-     */
23
-    protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile', 'account'];
24
-
25
-    /**
26
-     * List of all route actions that the base api controller
27
-     * will skip login check for them.
28
-     * @var array
29
-     */
30
-    protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
31
-
32
-    /**
33
-     * The validations rules used by the base api controller
34
-     * to check before add.
35
-     * @var array
36
-     */
37
-    protected $validationRules     = [
38
-        'name'     => 'nullable|string', 
39
-        'email'    => 'required|email|unique:users,email,{id}', 
40
-        'password' => 'nullable|min:6'
41
-    ];
42
-
43
-    /**
44
-     * The loginProxy implementation.
45
-     * 
46
-     * @var \App\Modules\Acl\Proxy\LoginProxy
47
-     */
48
-    protected $loginProxy;
49
-
50
-    public function __construct(LoginProxy $loginProxy)
51
-    {        
52
-        $this->loginProxy = $loginProxy;
53
-        parent::__construct();
54
-    }
55
-
56
-    /**
57
-     * Return the logged in user account.
58
-     * 
59
-     * @return \Illuminate\Http\Response
60
-     */
61
-    public function account()
62
-    {
63
-        return \Response::json($this->repo->account($this->relations), 200);
64
-    }
65
-
66
-    /**
67
-     * Block the user.
68
-     *
69
-     * @param  integer  $id Id of the user.
70
-     * @return \Illuminate\Http\Response
71
-     */
72
-    public function block($id)
73
-    {
74
-        return \Response::json($this->repo->block($id), 200);
75
-    }
76
-
77
-    /**
78
-     * Unblock the user.
79
-     *
80
-     * @param  integer  $id Id of the user.
81
-     * @return \Illuminate\Http\Response
82
-     */
83
-    public function unblock($id)
84
-    {
85
-        return \Response::json($this->repo->unblock($id), 200);
86
-    }
87
-
88
-    /**
89
-     * Logout the user.
90
-     * 
91
-     * @return \Illuminate\Http\Response
92
-     */
93
-    public function logout()
94
-    {
95
-        return \Response::json($this->loginProxy->logout(), 200);
96
-    }
97
-
98
-    /**
99
-     * Handle a registration request.
100
-     *
101
-     * @param  \Illuminate\Http\Request  $request
102
-     * @return \Illuminate\Http\Response
103
-     */
104
-    public function register(Request $request)
105
-    {
106
-        $this->validate($request, [
107
-            'name'     => 'nullable|string', 
108
-            'email'    => 'required|email|unique:users,email,{id}', 
109
-            'password' => 'required|min:6'
110
-            ]);
111
-
112
-        return \Response::json($this->repo->register($request->only('name', 'email', 'password')), 200);
113
-    }
114
-
115
-    /**
116
-     * Handle a login request to the application.
117
-     *
118
-     * @param  \Illuminate\Http\Request  $request
119
-     * @return \Illuminate\Http\Response
120
-     */
121
-    public function login(Request $request)
122
-    {
123
-        $this->validate($request, [
124
-            'email'    => 'required|email', 
125
-            'password' => 'required|min:6', 
126
-            'admin'    => 'nullable|boolean'
127
-            ]);
128
-
129
-        return \Response::json($this->loginProxy->login($request->only('email', 'password'), $request->get('admin')), 200);
130
-    }
131
-
132
-    /**
133
-     * Handle a social login request of the none admin to the application.
134
-     *
135
-     * @param  \Illuminate\Http\Request  $request
136
-     * @return \Illuminate\Http\Response
137
-     */
138
-    public function loginSocial(Request $request)
139
-    {
140
-        $this->validate($request, [
141
-            'auth_code'    => 'required_without:access_token',
142
-            'access_token' => 'required_without:auth_code',
143
-            'type'         => 'required|in:facebook,google'
144
-            ]);
145
-
146
-        return \Response::json($this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'))), 200);
147
-    }
148
-
149
-    /**
150
-     * Assign the given groups to the given user.
151
-     *
152
-     * @param  \Illuminate\Http\Request  $request
153
-     * @return \Illuminate\Http\Response
154
-     */
155
-    public function assigngroups(Request $request)
156
-    {
157
-        $this->validate($request, [
158
-            'group_ids' => 'required|exists:groups,id', 
159
-            'user_id'   => 'required|exists:users,id'
160
-            ]);
161
-
162
-        return \Response::json($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
163
-    }
164
-
165
-    /**
166
-     * Send a reset link to the given user.
167
-     *
168
-     * @param  \Illuminate\Http\Request  $request
169
-     * @return \Illuminate\Http\Response
170
-     */
171
-    public function sendreset(Request $request)
172
-    {
173
-        $this->validate($request, ['email' => 'required|email']);
174
-
175
-        return \Response::json($this->repo->sendReset($request->get('email')), 200);
176
-    }
177
-
178
-    /**
179
-     * Reset the given user's password.
180
-     *
181
-     * @param  \Illuminate\Http\Request  $request
182
-     * @return \Illuminate\Http\Response
183
-     */
184
-    public function resetpassword(Request $request)
185
-    {
186
-        $this->validate($request, [
187
-            'token'                 => 'required',
188
-            'email'                 => 'required|email',
189
-            'password'              => 'required|confirmed|min:6',
190
-            'password_confirmation' => 'required',
191
-        ]);
192
-
193
-        return \Response::json($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
194
-    }
195
-
196
-    /**
197
-     * Change the logged in user password.
198
-     *
199
-     * @param  \Illuminate\Http\Request  $request
200
-     * @return \Illuminate\Http\Response
201
-     */
202
-    public function changePassword(Request $request)
203
-    {
204
-        $this->validate($request, [
205
-            'old_password'          => 'required',
206
-            'password'              => 'required|confirmed|min:6',
207
-            'password_confirmation' => 'required',
208
-        ]);
209
-
210
-        return \Response::json($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
211
-    }
212
-
213
-    /**
214
-     * Confirm email using the confirmation code.
215
-     *
216
-     * @param  \Illuminate\Http\Request  $request
217
-     * @return \Illuminate\Http\Response
218
-     */
219
-    public function confirmEmail(Request $request)
220
-    {
221
-        $this->validate($request, [
222
-            'confirmation_code' => 'required|string|exists:users,confirmation_code'
223
-        ]);
224
-
225
-        return \Response::json($this->repo->confirmEmail($request->only('confirmation_code')), 200);
226
-    }
227
-
228
-    /**
229
-     * Resend the email confirmation mail.
230
-     *
231
-     * @param  \Illuminate\Http\Request  $request
232
-     * @return \Illuminate\Http\Response
233
-     */
234
-    public function resendEmailConfirmation(Request $request)
235
-    {
236
-        $this->validate($request, [
237
-            'email' => 'required|exists:users,email'
238
-        ]);
239
-
240
-        return \Response::json($this->repo->sendConfirmationEmail($request->get('email')), 200);
241
-    }
242
-
243
-    /**
244
-     * Refresh the expired login token.
245
-     *
246
-     * @param  \Illuminate\Http\Request  $request
247
-     * @return \Illuminate\Http\Response
248
-     */
249
-    public function refreshtoken(Request $request)
250
-    {
251
-        $this->validate($request, [
252
-            'refreshtoken' => 'required',
253
-        ]);
254
-
255
-        return \Response::json($this->loginProxy->refreshtoken($request->get('refreshtoken')), 200);
256
-    }
257
-
258
-    /**
259
-     * Paginate all users with in the given group.
260
-     * 
261
-     * @param  \Illuminate\Http\Request  $request
262
-     * @param  string $groupName The name of the requested group.
263
-     * @param  integer $perPage  Number of rows per page default 15.
264
-     * @param  string  $sortBy   The name of the column to sort by.
265
-     * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
266
-     * @return \Illuminate\Http\Response
267
-     */
268
-    public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
269
-    {
270
-        return \Response::json($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc), 200);
271
-    }
272
-
273
-    /**
274
-     * Save the given data to the logged in user.
275
-     *
276
-     * @param  \Illuminate\Http\Request  $request
277
-     * @return \Illuminate\Http\Response
278
-     */
279
-    public function saveProfile(Request $request) 
280
-    {
281
-        $this->validate($request, [
282
-            'profile_picture' => 'nullable|base64image',
283
-            'name'            => 'nullable|string', 
284
-            'email'           => 'required|email|unique:users,email,' . \Auth::id()
285
-        ]);
286
-
287
-        return \Response::json($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')), 200);
288
-    }
11
+	/**
12
+	 * The name of the model that is used by the base api controller 
13
+	 * to preform actions like (add, edit ... etc).
14
+	 * @var string
15
+	 */
16
+	protected $model               = 'users';
17
+
18
+	/**
19
+	 * List of all route actions that the base api controller
20
+	 * will skip permissions check for them.
21
+	 * @var array
22
+	 */
23
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile', 'account'];
24
+
25
+	/**
26
+	 * List of all route actions that the base api controller
27
+	 * will skip login check for them.
28
+	 * @var array
29
+	 */
30
+	protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
31
+
32
+	/**
33
+	 * The validations rules used by the base api controller
34
+	 * to check before add.
35
+	 * @var array
36
+	 */
37
+	protected $validationRules     = [
38
+		'name'     => 'nullable|string', 
39
+		'email'    => 'required|email|unique:users,email,{id}', 
40
+		'password' => 'nullable|min:6'
41
+	];
42
+
43
+	/**
44
+	 * The loginProxy implementation.
45
+	 * 
46
+	 * @var \App\Modules\Acl\Proxy\LoginProxy
47
+	 */
48
+	protected $loginProxy;
49
+
50
+	public function __construct(LoginProxy $loginProxy)
51
+	{        
52
+		$this->loginProxy = $loginProxy;
53
+		parent::__construct();
54
+	}
55
+
56
+	/**
57
+	 * Return the logged in user account.
58
+	 * 
59
+	 * @return \Illuminate\Http\Response
60
+	 */
61
+	public function account()
62
+	{
63
+		return \Response::json($this->repo->account($this->relations), 200);
64
+	}
65
+
66
+	/**
67
+	 * Block the user.
68
+	 *
69
+	 * @param  integer  $id Id of the user.
70
+	 * @return \Illuminate\Http\Response
71
+	 */
72
+	public function block($id)
73
+	{
74
+		return \Response::json($this->repo->block($id), 200);
75
+	}
76
+
77
+	/**
78
+	 * Unblock the user.
79
+	 *
80
+	 * @param  integer  $id Id of the user.
81
+	 * @return \Illuminate\Http\Response
82
+	 */
83
+	public function unblock($id)
84
+	{
85
+		return \Response::json($this->repo->unblock($id), 200);
86
+	}
87
+
88
+	/**
89
+	 * Logout the user.
90
+	 * 
91
+	 * @return \Illuminate\Http\Response
92
+	 */
93
+	public function logout()
94
+	{
95
+		return \Response::json($this->loginProxy->logout(), 200);
96
+	}
97
+
98
+	/**
99
+	 * Handle a registration request.
100
+	 *
101
+	 * @param  \Illuminate\Http\Request  $request
102
+	 * @return \Illuminate\Http\Response
103
+	 */
104
+	public function register(Request $request)
105
+	{
106
+		$this->validate($request, [
107
+			'name'     => 'nullable|string', 
108
+			'email'    => 'required|email|unique:users,email,{id}', 
109
+			'password' => 'required|min:6'
110
+			]);
111
+
112
+		return \Response::json($this->repo->register($request->only('name', 'email', 'password')), 200);
113
+	}
114
+
115
+	/**
116
+	 * Handle a login request to the application.
117
+	 *
118
+	 * @param  \Illuminate\Http\Request  $request
119
+	 * @return \Illuminate\Http\Response
120
+	 */
121
+	public function login(Request $request)
122
+	{
123
+		$this->validate($request, [
124
+			'email'    => 'required|email', 
125
+			'password' => 'required|min:6', 
126
+			'admin'    => 'nullable|boolean'
127
+			]);
128
+
129
+		return \Response::json($this->loginProxy->login($request->only('email', 'password'), $request->get('admin')), 200);
130
+	}
131
+
132
+	/**
133
+	 * Handle a social login request of the none admin to the application.
134
+	 *
135
+	 * @param  \Illuminate\Http\Request  $request
136
+	 * @return \Illuminate\Http\Response
137
+	 */
138
+	public function loginSocial(Request $request)
139
+	{
140
+		$this->validate($request, [
141
+			'auth_code'    => 'required_without:access_token',
142
+			'access_token' => 'required_without:auth_code',
143
+			'type'         => 'required|in:facebook,google'
144
+			]);
145
+
146
+		return \Response::json($this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'))), 200);
147
+	}
148
+
149
+	/**
150
+	 * Assign the given groups to the given user.
151
+	 *
152
+	 * @param  \Illuminate\Http\Request  $request
153
+	 * @return \Illuminate\Http\Response
154
+	 */
155
+	public function assigngroups(Request $request)
156
+	{
157
+		$this->validate($request, [
158
+			'group_ids' => 'required|exists:groups,id', 
159
+			'user_id'   => 'required|exists:users,id'
160
+			]);
161
+
162
+		return \Response::json($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
163
+	}
164
+
165
+	/**
166
+	 * Send a reset link to the given user.
167
+	 *
168
+	 * @param  \Illuminate\Http\Request  $request
169
+	 * @return \Illuminate\Http\Response
170
+	 */
171
+	public function sendreset(Request $request)
172
+	{
173
+		$this->validate($request, ['email' => 'required|email']);
174
+
175
+		return \Response::json($this->repo->sendReset($request->get('email')), 200);
176
+	}
177
+
178
+	/**
179
+	 * Reset the given user's password.
180
+	 *
181
+	 * @param  \Illuminate\Http\Request  $request
182
+	 * @return \Illuminate\Http\Response
183
+	 */
184
+	public function resetpassword(Request $request)
185
+	{
186
+		$this->validate($request, [
187
+			'token'                 => 'required',
188
+			'email'                 => 'required|email',
189
+			'password'              => 'required|confirmed|min:6',
190
+			'password_confirmation' => 'required',
191
+		]);
192
+
193
+		return \Response::json($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
194
+	}
195
+
196
+	/**
197
+	 * Change the logged in user password.
198
+	 *
199
+	 * @param  \Illuminate\Http\Request  $request
200
+	 * @return \Illuminate\Http\Response
201
+	 */
202
+	public function changePassword(Request $request)
203
+	{
204
+		$this->validate($request, [
205
+			'old_password'          => 'required',
206
+			'password'              => 'required|confirmed|min:6',
207
+			'password_confirmation' => 'required',
208
+		]);
209
+
210
+		return \Response::json($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
211
+	}
212
+
213
+	/**
214
+	 * Confirm email using the confirmation code.
215
+	 *
216
+	 * @param  \Illuminate\Http\Request  $request
217
+	 * @return \Illuminate\Http\Response
218
+	 */
219
+	public function confirmEmail(Request $request)
220
+	{
221
+		$this->validate($request, [
222
+			'confirmation_code' => 'required|string|exists:users,confirmation_code'
223
+		]);
224
+
225
+		return \Response::json($this->repo->confirmEmail($request->only('confirmation_code')), 200);
226
+	}
227
+
228
+	/**
229
+	 * Resend the email confirmation mail.
230
+	 *
231
+	 * @param  \Illuminate\Http\Request  $request
232
+	 * @return \Illuminate\Http\Response
233
+	 */
234
+	public function resendEmailConfirmation(Request $request)
235
+	{
236
+		$this->validate($request, [
237
+			'email' => 'required|exists:users,email'
238
+		]);
239
+
240
+		return \Response::json($this->repo->sendConfirmationEmail($request->get('email')), 200);
241
+	}
242
+
243
+	/**
244
+	 * Refresh the expired login token.
245
+	 *
246
+	 * @param  \Illuminate\Http\Request  $request
247
+	 * @return \Illuminate\Http\Response
248
+	 */
249
+	public function refreshtoken(Request $request)
250
+	{
251
+		$this->validate($request, [
252
+			'refreshtoken' => 'required',
253
+		]);
254
+
255
+		return \Response::json($this->loginProxy->refreshtoken($request->get('refreshtoken')), 200);
256
+	}
257
+
258
+	/**
259
+	 * Paginate all users with in the given group.
260
+	 * 
261
+	 * @param  \Illuminate\Http\Request  $request
262
+	 * @param  string $groupName The name of the requested group.
263
+	 * @param  integer $perPage  Number of rows per page default 15.
264
+	 * @param  string  $sortBy   The name of the column to sort by.
265
+	 * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
266
+	 * @return \Illuminate\Http\Response
267
+	 */
268
+	public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
269
+	{
270
+		return \Response::json($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc), 200);
271
+	}
272
+
273
+	/**
274
+	 * Save the given data to the logged in user.
275
+	 *
276
+	 * @param  \Illuminate\Http\Request  $request
277
+	 * @return \Illuminate\Http\Response
278
+	 */
279
+	public function saveProfile(Request $request) 
280
+	{
281
+		$this->validate($request, [
282
+			'profile_picture' => 'nullable|base64image',
283
+			'name'            => 'nullable|string', 
284
+			'email'           => 'required|email|unique:users,email,' . \Auth::id()
285
+		]);
286
+
287
+		return \Response::json($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')), 200);
288
+	}
289 289
 }
Please login to merge, or discard this patch.