Completed
Push — master ( a2ea8b...2c4876 )
by Sherif
02:24
created
src/Modules/V1/Core/Database/Seeds/SettingsTableSeeder.php 1 patch
Indentation   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -6,76 +6,76 @@
 block discarded – undo
6 6
 
7 7
 class SettingsTableSeeder extends Seeder
8 8
 {
9
-    /**
10
-     * Run the database seeds.
11
-     *
12
-     * @return void
13
-     */
14
-    public function run()
15
-    {
16
-    	/**
17
-         * Insert the permissions related to settings table.
18
-         */
19
-        \DB::table('permissions')->insert(
20
-        	[
21
-        		/**
22
-        		 * Settings model permissions.
23
-        		 */
24
-	        	[
25
-	        	'name'       => 'save',
26
-	        	'model'      => 'settings',
27
-	        	'created_at' => \DB::raw('NOW()'),
28
-	        	'updated_at' => \DB::raw('NOW()')
29
-	        	],
30
-	        	[
31
-	        	'name'       => 'find',
32
-	        	'model'      => 'settings',
33
-	        	'created_at' => \DB::raw('NOW()'),
34
-	        	'updated_at' => \DB::raw('NOW()')
35
-	        	],
36
-	        	[
37
-	        	'name'       => 'search',
38
-	        	'model'      => 'settings',
39
-	        	'created_at' => \DB::raw('NOW()'),
40
-	        	'updated_at' => \DB::raw('NOW()')
41
-	        	],
42
-	        	[
43
-	        	'name'       => 'list',
44
-	        	'model'      => 'settings',
45
-	        	'created_at' => \DB::raw('NOW()'),
46
-	        	'updated_at' => \DB::raw('NOW()')
47
-	        	],
48
-	        	[
49
-	        	'name'       => 'findby',
50
-	        	'model'      => 'settings',
51
-	        	'created_at' => \DB::raw('NOW()'),
52
-	        	'updated_at' => \DB::raw('NOW()')
53
-	        	],
54
-	        	[
55
-	        	'name'       => 'first',
56
-	        	'model'      => 'settings',
57
-	        	'created_at' => \DB::raw('NOW()'),
58
-	        	'updated_at' => \DB::raw('NOW()')
59
-	        	],
60
-	        	[
61
-	        	'name'       => 'paginate',
62
-	        	'model'      => 'settings',
63
-	        	'created_at' => \DB::raw('NOW()'),
64
-	        	'updated_at' => \DB::raw('NOW()')
65
-	        	],
66
-	        	[
67
-	        	'name'       => 'paginateby',
68
-	        	'model'      => 'settings',
69
-	        	'created_at' => \DB::raw('NOW()'),
70
-	        	'updated_at' => \DB::raw('NOW()')
71
-	        	],
72
-	        	[
73
-	        	'name'       => 'saveMany',
74
-	        	'model'      => 'settings',
75
-	        	'created_at' => \DB::raw('NOW()'),
76
-	        	'updated_at' => \DB::raw('NOW()')
77
-	        	]
78
-        	]
79
-        );
80
-    }
9
+	/**
10
+	 * Run the database seeds.
11
+	 *
12
+	 * @return void
13
+	 */
14
+	public function run()
15
+	{
16
+		/**
17
+		 * Insert the permissions related to settings table.
18
+		 */
19
+		\DB::table('permissions')->insert(
20
+			[
21
+				/**
22
+				 * Settings model permissions.
23
+				 */
24
+				[
25
+				'name'       => 'save',
26
+				'model'      => 'settings',
27
+				'created_at' => \DB::raw('NOW()'),
28
+				'updated_at' => \DB::raw('NOW()')
29
+				],
30
+				[
31
+				'name'       => 'find',
32
+				'model'      => 'settings',
33
+				'created_at' => \DB::raw('NOW()'),
34
+				'updated_at' => \DB::raw('NOW()')
35
+				],
36
+				[
37
+				'name'       => 'search',
38
+				'model'      => 'settings',
39
+				'created_at' => \DB::raw('NOW()'),
40
+				'updated_at' => \DB::raw('NOW()')
41
+				],
42
+				[
43
+				'name'       => 'list',
44
+				'model'      => 'settings',
45
+				'created_at' => \DB::raw('NOW()'),
46
+				'updated_at' => \DB::raw('NOW()')
47
+				],
48
+				[
49
+				'name'       => 'findby',
50
+				'model'      => 'settings',
51
+				'created_at' => \DB::raw('NOW()'),
52
+				'updated_at' => \DB::raw('NOW()')
53
+				],
54
+				[
55
+				'name'       => 'first',
56
+				'model'      => 'settings',
57
+				'created_at' => \DB::raw('NOW()'),
58
+				'updated_at' => \DB::raw('NOW()')
59
+				],
60
+				[
61
+				'name'       => 'paginate',
62
+				'model'      => 'settings',
63
+				'created_at' => \DB::raw('NOW()'),
64
+				'updated_at' => \DB::raw('NOW()')
65
+				],
66
+				[
67
+				'name'       => 'paginateby',
68
+				'model'      => 'settings',
69
+				'created_at' => \DB::raw('NOW()'),
70
+				'updated_at' => \DB::raw('NOW()')
71
+				],
72
+				[
73
+				'name'       => 'saveMany',
74
+				'model'      => 'settings',
75
+				'created_at' => \DB::raw('NOW()'),
76
+				'updated_at' => \DB::raw('NOW()')
77
+				]
78
+			]
79
+		);
80
+	}
81 81
 }
Please login to merge, or discard this patch.
src/Modules/V1/Core/Traits/Translatable.php 1 patch
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -2,51 +2,51 @@
 block discarded – undo
2 2
 
3 3
 trait Translatable  
4 4
 {
5
-    /**
6
-     * Create a new model instance that is existing.
7
-     *
8
-     * @param  array  $attributes
9
-     * @param  string|null  $connection
10
-     * @return static
11
-     */
12
-    public function newFromBuilder($attributes = [], $connection = null)
13
-    {
14
-        $model = parent::newFromBuilder($attributes, $connection);
5
+	/**
6
+	 * Create a new model instance that is existing.
7
+	 *
8
+	 * @param  array  $attributes
9
+	 * @param  string|null  $connection
10
+	 * @return static
11
+	 */
12
+	public function newFromBuilder($attributes = [], $connection = null)
13
+	{
14
+		$model = parent::newFromBuilder($attributes, $connection);
15 15
 
16
-        foreach ($model->attributes AS $key => $value)
17
-        {
18
-            if (isset($this->translatable) && in_array($key, $this->translatable)) 
19
-            {
20
-                $model->$key = $this->getTranslatedAttribute($key, $value);
21
-            }
22
-        }
16
+		foreach ($model->attributes AS $key => $value)
17
+		{
18
+			if (isset($this->translatable) && in_array($key, $this->translatable)) 
19
+			{
20
+				$model->$key = $this->getTranslatedAttribute($key, $value);
21
+			}
22
+		}
23 23
 
24
-        return $model;
25
-    }
24
+		return $model;
25
+	}
26 26
 
27
-    /**
28
-     * Returns a translatable model attribute based on the application's locale settings.
29
-     *
30
-     * @param $key
31
-     * @param $values
32
-     * @return string
33
-     */
34
-    protected function getTranslatedAttribute($key, $values)
35
-    {
36
-        $values         = json_decode($values);
37
-        $primaryLocale  = \Session::get('locale');
38
-        $fallbackLocale = 'en';
27
+	/**
28
+	 * Returns a translatable model attribute based on the application's locale settings.
29
+	 *
30
+	 * @param $key
31
+	 * @param $values
32
+	 * @return string
33
+	 */
34
+	protected function getTranslatedAttribute($key, $values)
35
+	{
36
+		$values         = json_decode($values);
37
+		$primaryLocale  = \Session::get('locale');
38
+		$fallbackLocale = 'en';
39 39
 
40
-        if ($primaryLocale == 'all') 
41
-        {
42
-            return $values;
43
-        }
40
+		if ($primaryLocale == 'all') 
41
+		{
42
+			return $values;
43
+		}
44 44
 
45
-        if ( ! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) 
46
-        {
47
-            return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
48
-        }
45
+		if ( ! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) 
46
+		{
47
+			return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
48
+		}
49 49
 
50
-        return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
51
-    }
50
+		return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
51
+	}
52 52
 }
53 53
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/V1/Acl/Http/Controllers/UsersController.php 2 patches
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\V1\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->only('auth_code', 'access_token', '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->only('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->only('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\V1\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->only('auth_code', 'access_token', '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->only('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->only('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.
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.