@@ -21,7 +21,7 @@ |
||
21 | 21 | $table->unique(array('device_token', 'device_type')); |
22 | 22 | $table->softDeletes(); |
23 | 23 | $table->timestamps(); |
24 | - }); |
|
24 | + }); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /** |
|
6 | - * Here goes your notification messages. |
|
7 | - */ |
|
5 | + /** |
|
6 | + * Here goes your notification messages. |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | ]; |
10 | 10 | \ No newline at end of file |
@@ -29,6 +29,6 @@ |
||
29 | 29 | $group->permissions()->attach($permissionIds); |
30 | 30 | }); |
31 | 31 | |
32 | - return $this->find($groupId); |
|
32 | + return $this->find($groupId); |
|
33 | 33 | } |
34 | 34 | } |
@@ -4,365 +4,365 @@ |
||
4 | 4 | |
5 | 5 | class UserRepository extends AbstractRepository |
6 | 6 | { |
7 | - /** |
|
8 | - * Return the model full namespace. |
|
9 | - * |
|
10 | - * @return string |
|
11 | - */ |
|
12 | - protected function getModel() |
|
13 | - { |
|
14 | - return 'App\Modules\V1\Acl\AclUser'; |
|
15 | - } |
|
16 | - |
|
17 | - /** |
|
18 | - * Return the logged in user account. |
|
19 | - * |
|
20 | - * @param array $relations |
|
21 | - * @return boolean |
|
22 | - */ |
|
23 | - public function account($relations = []) |
|
24 | - { |
|
25 | - $permissions = []; |
|
26 | - $user = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id, $relations); |
|
27 | - foreach ($user->groups()->get() as $group) |
|
28 | - { |
|
29 | - $group->permissions->each(function ($permission) use (&$permissions){ |
|
30 | - $permissions[$permission->model][$permission->id] = $permission->name; |
|
31 | - }); |
|
32 | - } |
|
33 | - $user->permissions = $permissions; |
|
34 | - |
|
35 | - return $user; |
|
36 | - } |
|
37 | - |
|
38 | - /** |
|
39 | - * Check if the logged in user or the given user |
|
40 | - * has the given permissions on the given model. |
|
41 | - * |
|
42 | - * @param string $nameOfPermission |
|
43 | - * @param string $model |
|
44 | - * @param boolean $user |
|
45 | - * @return boolean |
|
46 | - */ |
|
47 | - public function can($nameOfPermission, $model, $user = false ) |
|
48 | - { |
|
49 | - $user = $user ?: \JWTAuth::parseToken()->authenticate(); |
|
50 | - $permissions = []; |
|
51 | - |
|
52 | - if ( ! $user = $this->find($user->id, ['groups.permissions'])) |
|
53 | - { |
|
54 | - \ErrorHandler::tokenExpired(); |
|
55 | - } |
|
56 | - |
|
57 | - $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){ |
|
58 | - $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); |
|
59 | - }); |
|
7 | + /** |
|
8 | + * Return the model full namespace. |
|
9 | + * |
|
10 | + * @return string |
|
11 | + */ |
|
12 | + protected function getModel() |
|
13 | + { |
|
14 | + return 'App\Modules\V1\Acl\AclUser'; |
|
15 | + } |
|
16 | + |
|
17 | + /** |
|
18 | + * Return the logged in user account. |
|
19 | + * |
|
20 | + * @param array $relations |
|
21 | + * @return boolean |
|
22 | + */ |
|
23 | + public function account($relations = []) |
|
24 | + { |
|
25 | + $permissions = []; |
|
26 | + $user = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id, $relations); |
|
27 | + foreach ($user->groups()->get() as $group) |
|
28 | + { |
|
29 | + $group->permissions->each(function ($permission) use (&$permissions){ |
|
30 | + $permissions[$permission->model][$permission->id] = $permission->name; |
|
31 | + }); |
|
32 | + } |
|
33 | + $user->permissions = $permissions; |
|
34 | + |
|
35 | + return $user; |
|
36 | + } |
|
37 | + |
|
38 | + /** |
|
39 | + * Check if the logged in user or the given user |
|
40 | + * has the given permissions on the given model. |
|
41 | + * |
|
42 | + * @param string $nameOfPermission |
|
43 | + * @param string $model |
|
44 | + * @param boolean $user |
|
45 | + * @return boolean |
|
46 | + */ |
|
47 | + public function can($nameOfPermission, $model, $user = false ) |
|
48 | + { |
|
49 | + $user = $user ?: \JWTAuth::parseToken()->authenticate(); |
|
50 | + $permissions = []; |
|
51 | + |
|
52 | + if ( ! $user = $this->find($user->id, ['groups.permissions'])) |
|
53 | + { |
|
54 | + \ErrorHandler::tokenExpired(); |
|
55 | + } |
|
56 | + |
|
57 | + $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){ |
|
58 | + $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); |
|
59 | + }); |
|
60 | 60 | |
61 | - return in_array($nameOfPermission, $permissions); |
|
62 | - } |
|
63 | - |
|
64 | - /** |
|
65 | - * Check if the logged in user has the given group. |
|
66 | - * |
|
67 | - * @param string $groupName |
|
68 | - * @return boolean |
|
69 | - */ |
|
70 | - public function hasGroup($groupName) |
|
71 | - { |
|
72 | - $groups = $this->find(\JWTAuth::parseToken()->authenticate()->id)->groups; |
|
73 | - return $groups->pluck('name')->search($groupName, true) === false ? false : true; |
|
74 | - } |
|
75 | - |
|
76 | - /** |
|
77 | - * Assign the given group ids to the given user. |
|
78 | - * |
|
79 | - * @param integer $user_id |
|
80 | - * @param array $group_ids |
|
81 | - * @return object |
|
82 | - */ |
|
83 | - public function assignGroups($user_id, $group_ids) |
|
84 | - { |
|
85 | - \DB::transaction(function () use ($user_id, $group_ids) { |
|
86 | - $user = $this->find($user_id); |
|
87 | - $user->groups()->detach(); |
|
88 | - $user->groups()->attach($group_ids); |
|
89 | - }); |
|
90 | - |
|
91 | - return $this->find($user_id); |
|
92 | - } |
|
93 | - |
|
94 | - /** |
|
95 | - * Handle a login request to the application. |
|
96 | - * |
|
97 | - * @param array $credentials |
|
98 | - * @param boolean $adminLogin |
|
99 | - * @return array |
|
100 | - */ |
|
101 | - public function login($credentials, $adminLogin = false) |
|
102 | - { |
|
103 | - if ( ! $user = $this->first(['email' => $credentials['email']])) |
|
104 | - { |
|
105 | - \ErrorHandler::loginFailed(); |
|
106 | - } |
|
107 | - else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) |
|
108 | - { |
|
109 | - \ErrorHandler::loginFailed(); |
|
110 | - } |
|
111 | - else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) |
|
112 | - { |
|
113 | - \ErrorHandler::loginFailed(); |
|
114 | - } |
|
115 | - else if ($user->blocked) |
|
116 | - { |
|
117 | - \ErrorHandler::userIsBlocked(); |
|
118 | - } |
|
119 | - else if ($token = \JWTAuth::attempt($credentials)) |
|
120 | - { |
|
121 | - return ['token' => $token]; |
|
122 | - } |
|
123 | - else |
|
124 | - { |
|
125 | - \ErrorHandler::loginFailed(); |
|
126 | - } |
|
127 | - } |
|
128 | - |
|
129 | - /** |
|
130 | - * Handle a social login request of the none admin to the application. |
|
131 | - * |
|
132 | - * @param array $credentials |
|
133 | - * @return array |
|
134 | - */ |
|
135 | - public function loginSocial($credentials) |
|
136 | - { |
|
137 | - $access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token']; |
|
138 | - $user = \Socialite::driver($credentials['type'])->userFromToken($access_token); |
|
139 | - |
|
140 | - if ( ! $user->email) |
|
141 | - { |
|
142 | - \ErrorHandler::noSocialEmail(); |
|
143 | - } |
|
144 | - |
|
145 | - if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) |
|
146 | - { |
|
147 | - $data = ['email' => $user->email, 'password' => '']; |
|
148 | - return $this->register($data); |
|
149 | - } |
|
150 | - else |
|
151 | - { |
|
152 | - if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => ''])) |
|
153 | - { |
|
154 | - \ErrorHandler::userAlreadyRegistered(); |
|
155 | - } |
|
156 | - return $this->login(['email' => $registeredUser->email, 'password' => ''], false); |
|
157 | - } |
|
158 | - } |
|
61 | + return in_array($nameOfPermission, $permissions); |
|
62 | + } |
|
63 | + |
|
64 | + /** |
|
65 | + * Check if the logged in user has the given group. |
|
66 | + * |
|
67 | + * @param string $groupName |
|
68 | + * @return boolean |
|
69 | + */ |
|
70 | + public function hasGroup($groupName) |
|
71 | + { |
|
72 | + $groups = $this->find(\JWTAuth::parseToken()->authenticate()->id)->groups; |
|
73 | + return $groups->pluck('name')->search($groupName, true) === false ? false : true; |
|
74 | + } |
|
75 | + |
|
76 | + /** |
|
77 | + * Assign the given group ids to the given user. |
|
78 | + * |
|
79 | + * @param integer $user_id |
|
80 | + * @param array $group_ids |
|
81 | + * @return object |
|
82 | + */ |
|
83 | + public function assignGroups($user_id, $group_ids) |
|
84 | + { |
|
85 | + \DB::transaction(function () use ($user_id, $group_ids) { |
|
86 | + $user = $this->find($user_id); |
|
87 | + $user->groups()->detach(); |
|
88 | + $user->groups()->attach($group_ids); |
|
89 | + }); |
|
90 | + |
|
91 | + return $this->find($user_id); |
|
92 | + } |
|
93 | + |
|
94 | + /** |
|
95 | + * Handle a login request to the application. |
|
96 | + * |
|
97 | + * @param array $credentials |
|
98 | + * @param boolean $adminLogin |
|
99 | + * @return array |
|
100 | + */ |
|
101 | + public function login($credentials, $adminLogin = false) |
|
102 | + { |
|
103 | + if ( ! $user = $this->first(['email' => $credentials['email']])) |
|
104 | + { |
|
105 | + \ErrorHandler::loginFailed(); |
|
106 | + } |
|
107 | + else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) |
|
108 | + { |
|
109 | + \ErrorHandler::loginFailed(); |
|
110 | + } |
|
111 | + else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) |
|
112 | + { |
|
113 | + \ErrorHandler::loginFailed(); |
|
114 | + } |
|
115 | + else if ($user->blocked) |
|
116 | + { |
|
117 | + \ErrorHandler::userIsBlocked(); |
|
118 | + } |
|
119 | + else if ($token = \JWTAuth::attempt($credentials)) |
|
120 | + { |
|
121 | + return ['token' => $token]; |
|
122 | + } |
|
123 | + else |
|
124 | + { |
|
125 | + \ErrorHandler::loginFailed(); |
|
126 | + } |
|
127 | + } |
|
128 | + |
|
129 | + /** |
|
130 | + * Handle a social login request of the none admin to the application. |
|
131 | + * |
|
132 | + * @param array $credentials |
|
133 | + * @return array |
|
134 | + */ |
|
135 | + public function loginSocial($credentials) |
|
136 | + { |
|
137 | + $access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token']; |
|
138 | + $user = \Socialite::driver($credentials['type'])->userFromToken($access_token); |
|
139 | + |
|
140 | + if ( ! $user->email) |
|
141 | + { |
|
142 | + \ErrorHandler::noSocialEmail(); |
|
143 | + } |
|
144 | + |
|
145 | + if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) |
|
146 | + { |
|
147 | + $data = ['email' => $user->email, 'password' => '']; |
|
148 | + return $this->register($data); |
|
149 | + } |
|
150 | + else |
|
151 | + { |
|
152 | + if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => ''])) |
|
153 | + { |
|
154 | + \ErrorHandler::userAlreadyRegistered(); |
|
155 | + } |
|
156 | + return $this->login(['email' => $registeredUser->email, 'password' => ''], false); |
|
157 | + } |
|
158 | + } |
|
159 | 159 | |
160 | - /** |
|
161 | - * Handle a registration request. |
|
162 | - * |
|
163 | - * @param array $credentials |
|
164 | - * @return array |
|
165 | - */ |
|
166 | - public function register($credentials) |
|
167 | - { |
|
168 | - return ['token' => \JWTAuth::fromUser($this->model->create($credentials))]; |
|
169 | - } |
|
170 | - |
|
171 | - /** |
|
172 | - * Logout the user. |
|
173 | - * |
|
174 | - * @return boolean |
|
175 | - */ |
|
176 | - public function logout() |
|
177 | - { |
|
178 | - return \JWTAuth::invalidate(\JWTAuth::getToken()); |
|
179 | - } |
|
180 | - |
|
181 | - /** |
|
182 | - * Block the user. |
|
183 | - * |
|
184 | - * @param integer $user_id |
|
185 | - * @return object |
|
186 | - */ |
|
187 | - public function block($user_id) |
|
188 | - { |
|
189 | - if ( ! $user = $this->find($user_id)) |
|
190 | - { |
|
191 | - \ErrorHandler::notFound('user'); |
|
192 | - } |
|
193 | - if ( ! $this->hasGroup('Admin')) |
|
194 | - { |
|
195 | - \ErrorHandler::noPermissions(); |
|
196 | - } |
|
197 | - else if (\JWTAuth::parseToken()->authenticate()->id == $user_id) |
|
198 | - { |
|
199 | - \ErrorHandler::noPermissions(); |
|
200 | - } |
|
201 | - else if ($user->groups->pluck('name')->search('Admin', true) !== false) |
|
202 | - { |
|
203 | - \ErrorHandler::noPermissions(); |
|
204 | - } |
|
205 | - |
|
206 | - $user->blocked = 1; |
|
207 | - $user->save(); |
|
160 | + /** |
|
161 | + * Handle a registration request. |
|
162 | + * |
|
163 | + * @param array $credentials |
|
164 | + * @return array |
|
165 | + */ |
|
166 | + public function register($credentials) |
|
167 | + { |
|
168 | + return ['token' => \JWTAuth::fromUser($this->model->create($credentials))]; |
|
169 | + } |
|
170 | + |
|
171 | + /** |
|
172 | + * Logout the user. |
|
173 | + * |
|
174 | + * @return boolean |
|
175 | + */ |
|
176 | + public function logout() |
|
177 | + { |
|
178 | + return \JWTAuth::invalidate(\JWTAuth::getToken()); |
|
179 | + } |
|
180 | + |
|
181 | + /** |
|
182 | + * Block the user. |
|
183 | + * |
|
184 | + * @param integer $user_id |
|
185 | + * @return object |
|
186 | + */ |
|
187 | + public function block($user_id) |
|
188 | + { |
|
189 | + if ( ! $user = $this->find($user_id)) |
|
190 | + { |
|
191 | + \ErrorHandler::notFound('user'); |
|
192 | + } |
|
193 | + if ( ! $this->hasGroup('Admin')) |
|
194 | + { |
|
195 | + \ErrorHandler::noPermissions(); |
|
196 | + } |
|
197 | + else if (\JWTAuth::parseToken()->authenticate()->id == $user_id) |
|
198 | + { |
|
199 | + \ErrorHandler::noPermissions(); |
|
200 | + } |
|
201 | + else if ($user->groups->pluck('name')->search('Admin', true) !== false) |
|
202 | + { |
|
203 | + \ErrorHandler::noPermissions(); |
|
204 | + } |
|
205 | + |
|
206 | + $user->blocked = 1; |
|
207 | + $user->save(); |
|
208 | 208 | |
209 | - return $user; |
|
210 | - } |
|
211 | - |
|
212 | - /** |
|
213 | - * Unblock the user. |
|
214 | - * |
|
215 | - * @param integer $user_id |
|
216 | - * @return object |
|
217 | - */ |
|
218 | - public function unblock($user_id) |
|
219 | - { |
|
220 | - if ( ! $this->hasGroup('Admin')) |
|
221 | - { |
|
222 | - \ErrorHandler::noPermissions(); |
|
223 | - } |
|
224 | - |
|
225 | - $user = $this->find($user_id); |
|
226 | - $user->blocked = 0; |
|
227 | - $user->save(); |
|
228 | - |
|
229 | - return $user; |
|
230 | - } |
|
231 | - |
|
232 | - /** |
|
233 | - * Send a reset link to the given user. |
|
234 | - * |
|
235 | - * @param string $url |
|
236 | - * @param string $email |
|
237 | - * @return void |
|
238 | - */ |
|
239 | - public function sendReset($email, $url) |
|
240 | - { |
|
241 | - view()->composer('auth.emails.password', function($view) use ($url) { |
|
242 | - $view->with(['url' => $url]); |
|
243 | - }); |
|
244 | - |
|
245 | - $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) { |
|
246 | - $message->subject('Your Password Reset Link'); |
|
247 | - }); |
|
248 | - |
|
249 | - switch ($response) |
|
250 | - { |
|
251 | - case \Password::INVALID_USER: |
|
252 | - \ErrorHandler::notFound('email'); |
|
253 | - } |
|
254 | - } |
|
255 | - |
|
256 | - /** |
|
257 | - * Reset the given user's password. |
|
258 | - * |
|
259 | - * @param array $credentials |
|
260 | - * @return array |
|
261 | - */ |
|
262 | - public function resetPassword($credentials) |
|
263 | - { |
|
264 | - $token = false; |
|
265 | - $response = \Password::reset($credentials, function ($user, $password) use (&$token) { |
|
266 | - $user->password = bcrypt($password); |
|
267 | - $user->save(); |
|
268 | - |
|
269 | - $token = \JWTAuth::fromUser($user); |
|
270 | - }); |
|
271 | - |
|
272 | - switch ($response) { |
|
273 | - case \Password::PASSWORD_RESET: |
|
274 | - return ['token' => $token]; |
|
209 | + return $user; |
|
210 | + } |
|
211 | + |
|
212 | + /** |
|
213 | + * Unblock the user. |
|
214 | + * |
|
215 | + * @param integer $user_id |
|
216 | + * @return object |
|
217 | + */ |
|
218 | + public function unblock($user_id) |
|
219 | + { |
|
220 | + if ( ! $this->hasGroup('Admin')) |
|
221 | + { |
|
222 | + \ErrorHandler::noPermissions(); |
|
223 | + } |
|
224 | + |
|
225 | + $user = $this->find($user_id); |
|
226 | + $user->blocked = 0; |
|
227 | + $user->save(); |
|
228 | + |
|
229 | + return $user; |
|
230 | + } |
|
231 | + |
|
232 | + /** |
|
233 | + * Send a reset link to the given user. |
|
234 | + * |
|
235 | + * @param string $url |
|
236 | + * @param string $email |
|
237 | + * @return void |
|
238 | + */ |
|
239 | + public function sendReset($email, $url) |
|
240 | + { |
|
241 | + view()->composer('auth.emails.password', function($view) use ($url) { |
|
242 | + $view->with(['url' => $url]); |
|
243 | + }); |
|
244 | + |
|
245 | + $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) { |
|
246 | + $message->subject('Your Password Reset Link'); |
|
247 | + }); |
|
248 | + |
|
249 | + switch ($response) |
|
250 | + { |
|
251 | + case \Password::INVALID_USER: |
|
252 | + \ErrorHandler::notFound('email'); |
|
253 | + } |
|
254 | + } |
|
255 | + |
|
256 | + /** |
|
257 | + * Reset the given user's password. |
|
258 | + * |
|
259 | + * @param array $credentials |
|
260 | + * @return array |
|
261 | + */ |
|
262 | + public function resetPassword($credentials) |
|
263 | + { |
|
264 | + $token = false; |
|
265 | + $response = \Password::reset($credentials, function ($user, $password) use (&$token) { |
|
266 | + $user->password = bcrypt($password); |
|
267 | + $user->save(); |
|
268 | + |
|
269 | + $token = \JWTAuth::fromUser($user); |
|
270 | + }); |
|
271 | + |
|
272 | + switch ($response) { |
|
273 | + case \Password::PASSWORD_RESET: |
|
274 | + return ['token' => $token]; |
|
275 | 275 | |
276 | - case \Password::INVALID_TOKEN: |
|
277 | - \ErrorHandler::invalidResetToken('token'); |
|
278 | - |
|
279 | - case \Password::INVALID_PASSWORD: |
|
280 | - \ErrorHandler::invalidResetPassword('email'); |
|
281 | - |
|
282 | - case \Password::INVALID_USER: |
|
283 | - \ErrorHandler::notFound('user'); |
|
284 | - |
|
285 | - default: |
|
286 | - \ErrorHandler::generalError(); |
|
287 | - } |
|
288 | - } |
|
289 | - |
|
290 | - /** |
|
291 | - * Change the logged in user password. |
|
292 | - * |
|
293 | - * @param array $credentials |
|
294 | - * @return void |
|
295 | - */ |
|
296 | - public function changePassword($credentials) |
|
297 | - { |
|
298 | - $user = $this->find(\JWTAuth::parseToken()->authenticate()->id); |
|
299 | - if ( ! \Hash::check($credentials['old_password'], $user->password)) |
|
300 | - { |
|
301 | - \ErrorHandler::invalidOldPassword(); |
|
302 | - } |
|
303 | - |
|
304 | - $user->password = $credentials['password']; |
|
305 | - $user->save(); |
|
306 | - } |
|
307 | - |
|
308 | - /** |
|
309 | - * Refresh the expired login token. |
|
310 | - * |
|
311 | - * @return array |
|
312 | - */ |
|
313 | - public function refreshtoken() |
|
314 | - { |
|
315 | - $token = \JWTAuth::parseToken()->refresh(); |
|
316 | - |
|
317 | - return ['token' => $token]; |
|
318 | - } |
|
319 | - |
|
320 | - /** |
|
321 | - * Paginate all users in the given group based on the given conditions. |
|
322 | - * |
|
323 | - * @param string $groupName |
|
324 | - * @param array $relations |
|
325 | - * @param integer $perPage |
|
326 | - * @param string $sortBy |
|
327 | - * @param boolean $desc |
|
328 | - * @return \Illuminate\Http\Response |
|
329 | - */ |
|
330 | - public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc) |
|
331 | - { |
|
332 | - unset($conditions['page']); |
|
333 | - $conditions = $this->constructConditions($conditions, $this->model); |
|
334 | - $sort = $desc ? 'desc' : 'asc'; |
|
335 | - $model = call_user_func_array("{$this->getModel()}::with", array($relations)); |
|
336 | - |
|
337 | - $model->whereHas('groups', function($q) use ($groupName){ |
|
338 | - $q->where('name', $groupName); |
|
339 | - }); |
|
276 | + case \Password::INVALID_TOKEN: |
|
277 | + \ErrorHandler::invalidResetToken('token'); |
|
278 | + |
|
279 | + case \Password::INVALID_PASSWORD: |
|
280 | + \ErrorHandler::invalidResetPassword('email'); |
|
281 | + |
|
282 | + case \Password::INVALID_USER: |
|
283 | + \ErrorHandler::notFound('user'); |
|
284 | + |
|
285 | + default: |
|
286 | + \ErrorHandler::generalError(); |
|
287 | + } |
|
288 | + } |
|
289 | + |
|
290 | + /** |
|
291 | + * Change the logged in user password. |
|
292 | + * |
|
293 | + * @param array $credentials |
|
294 | + * @return void |
|
295 | + */ |
|
296 | + public function changePassword($credentials) |
|
297 | + { |
|
298 | + $user = $this->find(\JWTAuth::parseToken()->authenticate()->id); |
|
299 | + if ( ! \Hash::check($credentials['old_password'], $user->password)) |
|
300 | + { |
|
301 | + \ErrorHandler::invalidOldPassword(); |
|
302 | + } |
|
303 | + |
|
304 | + $user->password = $credentials['password']; |
|
305 | + $user->save(); |
|
306 | + } |
|
307 | + |
|
308 | + /** |
|
309 | + * Refresh the expired login token. |
|
310 | + * |
|
311 | + * @return array |
|
312 | + */ |
|
313 | + public function refreshtoken() |
|
314 | + { |
|
315 | + $token = \JWTAuth::parseToken()->refresh(); |
|
316 | + |
|
317 | + return ['token' => $token]; |
|
318 | + } |
|
319 | + |
|
320 | + /** |
|
321 | + * Paginate all users in the given group based on the given conditions. |
|
322 | + * |
|
323 | + * @param string $groupName |
|
324 | + * @param array $relations |
|
325 | + * @param integer $perPage |
|
326 | + * @param string $sortBy |
|
327 | + * @param boolean $desc |
|
328 | + * @return \Illuminate\Http\Response |
|
329 | + */ |
|
330 | + public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc) |
|
331 | + { |
|
332 | + unset($conditions['page']); |
|
333 | + $conditions = $this->constructConditions($conditions, $this->model); |
|
334 | + $sort = $desc ? 'desc' : 'asc'; |
|
335 | + $model = call_user_func_array("{$this->getModel()}::with", array($relations)); |
|
336 | + |
|
337 | + $model->whereHas('groups', function($q) use ($groupName){ |
|
338 | + $q->where('name', $groupName); |
|
339 | + }); |
|
340 | 340 | |
341 | 341 | |
342 | - if (count($conditions['conditionValues'])) |
|
343 | - { |
|
344 | - $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']); |
|
345 | - } |
|
346 | - |
|
347 | - if ($perPage) |
|
348 | - { |
|
349 | - return $model->orderBy($sortBy, $sort)->paginate($perPage); |
|
350 | - } |
|
351 | - |
|
352 | - return $model->orderBy($sortBy, $sort)->get(); |
|
353 | - } |
|
354 | - |
|
355 | - /** |
|
356 | - * Save the given data to the logged in user. |
|
357 | - * |
|
358 | - * @param array $credentials |
|
359 | - * @return object |
|
360 | - */ |
|
361 | - public function saveProfile($credentials) |
|
362 | - { |
|
363 | - $user = \JWTAuth::parseToken()->authenticate(); |
|
364 | - $user->save($credentials); |
|
365 | - |
|
366 | - return $user; |
|
367 | - } |
|
342 | + if (count($conditions['conditionValues'])) |
|
343 | + { |
|
344 | + $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']); |
|
345 | + } |
|
346 | + |
|
347 | + if ($perPage) |
|
348 | + { |
|
349 | + return $model->orderBy($sortBy, $sort)->paginate($perPage); |
|
350 | + } |
|
351 | + |
|
352 | + return $model->orderBy($sortBy, $sort)->get(); |
|
353 | + } |
|
354 | + |
|
355 | + /** |
|
356 | + * Save the given data to the logged in user. |
|
357 | + * |
|
358 | + * @param array $credentials |
|
359 | + * @return object |
|
360 | + */ |
|
361 | + public function saveProfile($credentials) |
|
362 | + { |
|
363 | + $user = \JWTAuth::parseToken()->authenticate(); |
|
364 | + $user->save($credentials); |
|
365 | + |
|
366 | + return $user; |
|
367 | + } |
|
368 | 368 | } |
@@ -4,66 +4,66 @@ |
||
4 | 4 | |
5 | 5 | class ReportRepository extends AbstractRepository |
6 | 6 | { |
7 | - /** |
|
8 | - * Return the model full namespace. |
|
9 | - * |
|
10 | - * @return string |
|
11 | - */ |
|
12 | - protected function getModel() |
|
13 | - { |
|
14 | - return 'App\Modules\V1\Reporting\Report'; |
|
15 | - } |
|
7 | + /** |
|
8 | + * Return the model full namespace. |
|
9 | + * |
|
10 | + * @return string |
|
11 | + */ |
|
12 | + protected function getModel() |
|
13 | + { |
|
14 | + return 'App\Modules\V1\Reporting\Report'; |
|
15 | + } |
|
16 | 16 | |
17 | - /** |
|
18 | - * Render the given report db view based on the given |
|
19 | - * condition. |
|
20 | - * |
|
21 | - * @param string $reportName |
|
22 | - * @param array $conditions array of conditions |
|
23 | - * @param integer $perPage |
|
24 | - * @param array $relations |
|
25 | - * @return object |
|
26 | - */ |
|
27 | - public function getReport($reportName, $conditions = false, $perPage = 0, $relations = []) |
|
28 | - { |
|
29 | - /** |
|
30 | - * Fetch the report from db. |
|
31 | - */ |
|
32 | - $reportConditions = $this->constructConditions(['report_name' => $reportName], $this->model); |
|
33 | - $report = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first(); |
|
17 | + /** |
|
18 | + * Render the given report db view based on the given |
|
19 | + * condition. |
|
20 | + * |
|
21 | + * @param string $reportName |
|
22 | + * @param array $conditions array of conditions |
|
23 | + * @param integer $perPage |
|
24 | + * @param array $relations |
|
25 | + * @return object |
|
26 | + */ |
|
27 | + public function getReport($reportName, $conditions = false, $perPage = 0, $relations = []) |
|
28 | + { |
|
29 | + /** |
|
30 | + * Fetch the report from db. |
|
31 | + */ |
|
32 | + $reportConditions = $this->constructConditions(['report_name' => $reportName], $this->model); |
|
33 | + $report = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first(); |
|
34 | 34 | |
35 | - /** |
|
36 | - * Check report existance and permission. |
|
37 | - */ |
|
38 | - if ( ! $report) |
|
39 | - { |
|
40 | - \ErrorHandler::notFound('report'); |
|
41 | - } |
|
42 | - else if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
43 | - { |
|
44 | - \ErrorHandler::noPermissions(); |
|
45 | - } |
|
35 | + /** |
|
36 | + * Check report existance and permission. |
|
37 | + */ |
|
38 | + if ( ! $report) |
|
39 | + { |
|
40 | + \ErrorHandler::notFound('report'); |
|
41 | + } |
|
42 | + else if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
43 | + { |
|
44 | + \ErrorHandler::noPermissions(); |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * Fetch data from the report based on the given conditions. |
|
49 | - */ |
|
50 | - $report = \DB::table($report->view_name); |
|
51 | - unset($conditions['page']); |
|
52 | - if (count($conditions)) |
|
53 | - { |
|
54 | - $conditions = $this->constructConditions($conditions, $this->model); |
|
55 | - $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']); |
|
56 | - } |
|
57 | - /** |
|
58 | - * Paginate or all data. |
|
59 | - */ |
|
60 | - if ($perPage) |
|
61 | - { |
|
62 | - return $report->paginate($perPage); |
|
63 | - } |
|
64 | - else |
|
65 | - { |
|
66 | - return $report->get(); |
|
67 | - } |
|
68 | - } |
|
47 | + /** |
|
48 | + * Fetch data from the report based on the given conditions. |
|
49 | + */ |
|
50 | + $report = \DB::table($report->view_name); |
|
51 | + unset($conditions['page']); |
|
52 | + if (count($conditions)) |
|
53 | + { |
|
54 | + $conditions = $this->constructConditions($conditions, $this->model); |
|
55 | + $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']); |
|
56 | + } |
|
57 | + /** |
|
58 | + * Paginate or all data. |
|
59 | + */ |
|
60 | + if ($perPage) |
|
61 | + { |
|
62 | + return $report->paginate($perPage); |
|
63 | + } |
|
64 | + else |
|
65 | + { |
|
66 | + return $report->get(); |
|
67 | + } |
|
68 | + } |
|
69 | 69 | } |
@@ -4,39 +4,39 @@ |
||
4 | 4 | |
5 | 5 | abstract class AbstractRepositoryContainer implements RepositoryContainerInterface |
6 | 6 | { |
7 | - /** |
|
8 | - * Construct the repository class name based on |
|
9 | - * the method name called, search in the |
|
10 | - * given namespaces for the class and |
|
11 | - * return an instance. |
|
12 | - * |
|
13 | - * @param string $name the called method name |
|
14 | - * @param array $arguments the method arguments |
|
15 | - * @return object |
|
16 | - */ |
|
17 | - public function __call($name, $arguments) |
|
18 | - { |
|
19 | - foreach ($this->getRepoNameSpace() as $repoNameSpace) |
|
20 | - { |
|
21 | - $class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository'; |
|
22 | - if (class_exists($class)) |
|
23 | - { |
|
24 | - \App::singleton($class, function ($app) use ($class) { |
|
7 | + /** |
|
8 | + * Construct the repository class name based on |
|
9 | + * the method name called, search in the |
|
10 | + * given namespaces for the class and |
|
11 | + * return an instance. |
|
12 | + * |
|
13 | + * @param string $name the called method name |
|
14 | + * @param array $arguments the method arguments |
|
15 | + * @return object |
|
16 | + */ |
|
17 | + public function __call($name, $arguments) |
|
18 | + { |
|
19 | + foreach ($this->getRepoNameSpace() as $repoNameSpace) |
|
20 | + { |
|
21 | + $class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository'; |
|
22 | + if (class_exists($class)) |
|
23 | + { |
|
24 | + \App::singleton($class, function ($app) use ($class) { |
|
25 | 25 | |
26 | - return new \App\Modules\V1\Core\Decorators\CachingDecorator(new $class, $app['cache.store']); |
|
27 | - }); |
|
26 | + return new \App\Modules\V1\Core\Decorators\CachingDecorator(new $class, $app['cache.store']); |
|
27 | + }); |
|
28 | 28 | |
29 | - return \App::make($class); |
|
30 | - } |
|
31 | - } |
|
32 | - } |
|
29 | + return \App::make($class); |
|
30 | + } |
|
31 | + } |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * Abstract methods that return the necessary |
|
36 | - * information (repositories namespaces) |
|
37 | - * needed to preform the previous actions. |
|
38 | - * |
|
39 | - * @return array |
|
40 | - */ |
|
41 | - abstract protected function getRepoNameSpace(); |
|
34 | + /** |
|
35 | + * Abstract methods that return the necessary |
|
36 | + * information (repositories namespaces) |
|
37 | + * needed to preform the previous actions. |
|
38 | + * |
|
39 | + * @return array |
|
40 | + */ |
|
41 | + abstract protected function getRepoNameSpace(); |
|
42 | 42 | } |
43 | 43 | \ No newline at end of file |
@@ -13,13 +13,13 @@ |
||
13 | 13 | public function up() |
14 | 14 | { |
15 | 15 | Schema::create('settings', function (Blueprint $table) { |
16 | - $table->increments('id'); |
|
17 | - $table->string('name',100); |
|
18 | - $table->string('key',100)->unique(); |
|
19 | - $table->text('value')->nullable(); |
|
20 | - $table->softDeletes(); |
|
21 | - $table->timestamps(); |
|
22 | - }); |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('name',100); |
|
18 | + $table->string('key',100)->unique(); |
|
19 | + $table->text('value')->nullable(); |
|
20 | + $table->softDeletes(); |
|
21 | + $table->timestamps(); |
|
22 | + }); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | /** |
@@ -8,20 +8,20 @@ |
||
8 | 8 | |
9 | 9 | class SettingsController 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 = 'settings'; |
|
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 = 'settings'; |
|
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|string|max:100', |
|
25 | - 'value' => 'required|string' |
|
26 | - ]; |
|
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|string|max:100', |
|
25 | + 'value' => 'required|string' |
|
26 | + ]; |
|
27 | 27 | } |
@@ -3,14 +3,14 @@ discard block |
||
3 | 3 | |
4 | 4 | class CoreConfig |
5 | 5 | { |
6 | - public function getConfig() |
|
7 | - { |
|
8 | - $customSettings = []; |
|
9 | - Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){ |
|
10 | - $customSettings[$setting['key']] = $setting['value']; |
|
11 | - }); |
|
6 | + public function getConfig() |
|
7 | + { |
|
8 | + $customSettings = []; |
|
9 | + Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){ |
|
10 | + $customSettings[$setting['key']] = $setting['value']; |
|
11 | + }); |
|
12 | 12 | |
13 | - return array_merge($customSettings, [ |
|
13 | + return array_merge($customSettings, [ |
|
14 | 14 | /** |
15 | 15 | * Specify what relations should be used for every model. |
16 | 16 | */ |
@@ -149,5 +149,5 @@ discard block |
||
149 | 149 | ] |
150 | 150 | ] |
151 | 151 | ]); |
152 | - } |
|
152 | + } |
|
153 | 153 | } |
154 | 154 | \ No newline at end of file |