@@ -6,67 +6,67 @@ |
||
6 | 6 | |
7 | 7 | class AclUser extends User { |
8 | 8 | |
9 | - use SoftDeletes; |
|
10 | - protected $table = 'users'; |
|
11 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
12 | - protected $hidden = ['password', 'remember_token','deleted_at']; |
|
13 | - protected $guarded = ['id']; |
|
14 | - protected $fillable = ['name', 'email', 'password']; |
|
15 | - protected $appends = ['permissions']; |
|
16 | - public $searchable = ['name', 'email']; |
|
9 | + use SoftDeletes; |
|
10 | + protected $table = 'users'; |
|
11 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
12 | + protected $hidden = ['password', 'remember_token','deleted_at']; |
|
13 | + protected $guarded = ['id']; |
|
14 | + protected $fillable = ['name', 'email', 'password']; |
|
15 | + protected $appends = ['permissions']; |
|
16 | + public $searchable = ['name', 'email']; |
|
17 | 17 | |
18 | - public function getCreatedAtAttribute($value) |
|
19 | - { |
|
20 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
21 | - } |
|
18 | + public function getCreatedAtAttribute($value) |
|
19 | + { |
|
20 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
21 | + } |
|
22 | 22 | |
23 | - public function getUpdatedAtAttribute($value) |
|
24 | - { |
|
25 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
26 | - } |
|
23 | + public function getUpdatedAtAttribute($value) |
|
24 | + { |
|
25 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
26 | + } |
|
27 | 27 | |
28 | - public function getDeletedAtAttribute($value) |
|
29 | - { |
|
30 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
31 | - } |
|
28 | + public function getDeletedAtAttribute($value) |
|
29 | + { |
|
30 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
31 | + } |
|
32 | 32 | |
33 | - /** |
|
34 | - * Encrypt the password attribute before |
|
35 | - * saving it in the storage. |
|
36 | - * |
|
37 | - * @param string $value |
|
38 | - */ |
|
39 | - public function setPasswordAttribute($value) |
|
40 | - { |
|
41 | - $this->attributes['password'] = bcrypt($value); |
|
42 | - } |
|
33 | + /** |
|
34 | + * Encrypt the password attribute before |
|
35 | + * saving it in the storage. |
|
36 | + * |
|
37 | + * @param string $value |
|
38 | + */ |
|
39 | + public function setPasswordAttribute($value) |
|
40 | + { |
|
41 | + $this->attributes['password'] = bcrypt($value); |
|
42 | + } |
|
43 | 43 | |
44 | - public function logs() |
|
45 | - { |
|
46 | - return $this->hasMany('App\Modules\V1\Core\Log', 'user_id'); |
|
47 | - } |
|
44 | + public function logs() |
|
45 | + { |
|
46 | + return $this->hasMany('App\Modules\V1\Core\Log', 'user_id'); |
|
47 | + } |
|
48 | 48 | |
49 | - public function groups() |
|
50 | - { |
|
51 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
52 | - } |
|
49 | + public function groups() |
|
50 | + { |
|
51 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
52 | + } |
|
53 | 53 | |
54 | - public function getPermissionsAttribute() |
|
55 | - { |
|
56 | - $permissions = []; |
|
57 | - foreach ($this->groups as $group) |
|
58 | - { |
|
59 | - $group->permissions->each(function ($permission) use (&$permissions){ |
|
60 | - $permissions[$permission->model][$permission->id] = $permission->name; |
|
61 | - }); |
|
62 | - } |
|
54 | + public function getPermissionsAttribute() |
|
55 | + { |
|
56 | + $permissions = []; |
|
57 | + foreach ($this->groups as $group) |
|
58 | + { |
|
59 | + $group->permissions->each(function ($permission) use (&$permissions){ |
|
60 | + $permissions[$permission->model][$permission->id] = $permission->name; |
|
61 | + }); |
|
62 | + } |
|
63 | 63 | |
64 | - return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
65 | - } |
|
64 | + return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
65 | + } |
|
66 | 66 | |
67 | - public static function boot() |
|
68 | - { |
|
69 | - parent::boot(); |
|
70 | - parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver')); |
|
71 | - } |
|
67 | + public static function boot() |
|
68 | + { |
|
69 | + parent::boot(); |
|
70 | + parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver')); |
|
71 | + } |
|
72 | 72 | } |
@@ -4,232 +4,232 @@ |
||
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 | - * Check if the logged in user or the given user |
|
19 | - * has the given permissions on the given model. |
|
20 | - * |
|
21 | - * @param string $nameOfPermission |
|
22 | - * @param string $model |
|
23 | - * @param boolean $user |
|
24 | - * @return boolean |
|
25 | - */ |
|
26 | - public function can($nameOfPermission, $model, $user = false ) |
|
27 | - { |
|
28 | - $user = $user ?: \JWTAuth::parseToken()->authenticate(); |
|
29 | - $permissions = []; |
|
30 | - \Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){ |
|
31 | - $permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); |
|
32 | - }); |
|
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 | + * Check if the logged in user or the given user |
|
19 | + * has the given permissions on the given model. |
|
20 | + * |
|
21 | + * @param string $nameOfPermission |
|
22 | + * @param string $model |
|
23 | + * @param boolean $user |
|
24 | + * @return boolean |
|
25 | + */ |
|
26 | + public function can($nameOfPermission, $model, $user = false ) |
|
27 | + { |
|
28 | + $user = $user ?: \JWTAuth::parseToken()->authenticate(); |
|
29 | + $permissions = []; |
|
30 | + \Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){ |
|
31 | + $permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); |
|
32 | + }); |
|
33 | 33 | |
34 | - return in_array($nameOfPermission, $permissions); |
|
35 | - } |
|
36 | - |
|
37 | - /** |
|
38 | - * Check if the logged in user has the given group. |
|
39 | - * |
|
40 | - * @param string $groupName |
|
41 | - * @return boolean |
|
42 | - */ |
|
43 | - public function hasGroup($groupName) |
|
44 | - { |
|
45 | - $groups = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id)->groups; |
|
46 | - return $groups->lists('name')->search($groupName, true) === false ? false : true; |
|
47 | - } |
|
48 | - |
|
49 | - /** |
|
50 | - * Assign the given group ids to the given user. |
|
51 | - * |
|
52 | - * @param integer $user_id |
|
53 | - * @param array $group_ids |
|
54 | - * @return object |
|
55 | - */ |
|
56 | - public function assignGroups($user_id, $group_ids) |
|
57 | - { |
|
58 | - \DB::transaction(function () use ($user_id, $group_ids) { |
|
59 | - $user = \Core::users()->find($user_id); |
|
60 | - $user->groups()->detach(); |
|
61 | - $user->groups()->attach($group_ids); |
|
62 | - }); |
|
63 | - |
|
64 | - return \Core::users()->find($user_id); |
|
65 | - } |
|
66 | - |
|
67 | - /** |
|
68 | - * Handle a login request to the application. |
|
69 | - * |
|
70 | - * @param array $credentials |
|
71 | - * @param boolean $adminLogin |
|
72 | - * @return string |
|
73 | - */ |
|
74 | - public function login($credentials, $adminLogin = false) |
|
75 | - { |
|
76 | - if ( ! $user = \Core::users()->first(['email' => $credentials['email']])) |
|
77 | - { |
|
78 | - \ErrorHandler::loginFailed(); |
|
79 | - } |
|
80 | - else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) |
|
81 | - { |
|
82 | - \ErrorHandler::loginFailed(); |
|
83 | - } |
|
84 | - else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) |
|
85 | - { |
|
86 | - \ErrorHandler::loginFailed(); |
|
87 | - } |
|
88 | - else if ($user->blocked) |
|
89 | - { |
|
90 | - \ErrorHandler::userIsBlocked(); |
|
91 | - } |
|
92 | - else if ($token = \JWTAuth::attempt($credentials)) |
|
93 | - { |
|
94 | - return ['token' => $token]; |
|
95 | - } |
|
96 | - else |
|
97 | - { |
|
98 | - \ErrorHandler::loginFailed(); |
|
99 | - } |
|
100 | - } |
|
101 | - |
|
102 | - /** |
|
103 | - * Handle a registration request. |
|
104 | - * |
|
105 | - * @param array $credentials |
|
106 | - * @return string |
|
107 | - */ |
|
108 | - public function register($credentials) |
|
109 | - { |
|
110 | - $user = \Core::users()->model->create($credentials); |
|
111 | - $this->assignGroups($user->id, \Core::groups()->model->where('name', 'User')->select('id')->lists('id')->toArray()); |
|
112 | - |
|
113 | - return ['token' => \JWTAuth::fromUser($user)]; |
|
114 | - } |
|
115 | - |
|
116 | - /** |
|
117 | - * Logout the user. |
|
118 | - * |
|
119 | - * @return boolean |
|
120 | - */ |
|
121 | - public function logout() |
|
122 | - { |
|
123 | - return \JWTAuth::invalidate(\JWTAuth::getToken()); |
|
124 | - } |
|
125 | - |
|
126 | - /** |
|
127 | - * Block the user. |
|
128 | - * |
|
129 | - * @param integer $user_id |
|
130 | - * @return object |
|
131 | - */ |
|
132 | - public function block($user_id) |
|
133 | - { |
|
134 | - if ( ! $user = \Core::users()->find($user_id)) |
|
135 | - { |
|
136 | - \ErrorHandler::notFound('user'); |
|
137 | - } |
|
138 | - if ( ! $this->hasGroup('Admin')) |
|
139 | - { |
|
140 | - \ErrorHandler::noPermissions(); |
|
141 | - } |
|
142 | - else if (\JWTAuth::parseToken()->authenticate()->id == $user_id) |
|
143 | - { |
|
144 | - \ErrorHandler::noPermissions(); |
|
145 | - } |
|
146 | - else if ($user->groups->lists('name')->search('Admin', true) !== false) |
|
147 | - { |
|
148 | - \ErrorHandler::noPermissions(); |
|
149 | - } |
|
150 | - |
|
151 | - $user->blocked = 1; |
|
152 | - $user->save(); |
|
34 | + return in_array($nameOfPermission, $permissions); |
|
35 | + } |
|
36 | + |
|
37 | + /** |
|
38 | + * Check if the logged in user has the given group. |
|
39 | + * |
|
40 | + * @param string $groupName |
|
41 | + * @return boolean |
|
42 | + */ |
|
43 | + public function hasGroup($groupName) |
|
44 | + { |
|
45 | + $groups = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id)->groups; |
|
46 | + return $groups->lists('name')->search($groupName, true) === false ? false : true; |
|
47 | + } |
|
48 | + |
|
49 | + /** |
|
50 | + * Assign the given group ids to the given user. |
|
51 | + * |
|
52 | + * @param integer $user_id |
|
53 | + * @param array $group_ids |
|
54 | + * @return object |
|
55 | + */ |
|
56 | + public function assignGroups($user_id, $group_ids) |
|
57 | + { |
|
58 | + \DB::transaction(function () use ($user_id, $group_ids) { |
|
59 | + $user = \Core::users()->find($user_id); |
|
60 | + $user->groups()->detach(); |
|
61 | + $user->groups()->attach($group_ids); |
|
62 | + }); |
|
63 | + |
|
64 | + return \Core::users()->find($user_id); |
|
65 | + } |
|
66 | + |
|
67 | + /** |
|
68 | + * Handle a login request to the application. |
|
69 | + * |
|
70 | + * @param array $credentials |
|
71 | + * @param boolean $adminLogin |
|
72 | + * @return string |
|
73 | + */ |
|
74 | + public function login($credentials, $adminLogin = false) |
|
75 | + { |
|
76 | + if ( ! $user = \Core::users()->first(['email' => $credentials['email']])) |
|
77 | + { |
|
78 | + \ErrorHandler::loginFailed(); |
|
79 | + } |
|
80 | + else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) |
|
81 | + { |
|
82 | + \ErrorHandler::loginFailed(); |
|
83 | + } |
|
84 | + else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) |
|
85 | + { |
|
86 | + \ErrorHandler::loginFailed(); |
|
87 | + } |
|
88 | + else if ($user->blocked) |
|
89 | + { |
|
90 | + \ErrorHandler::userIsBlocked(); |
|
91 | + } |
|
92 | + else if ($token = \JWTAuth::attempt($credentials)) |
|
93 | + { |
|
94 | + return ['token' => $token]; |
|
95 | + } |
|
96 | + else |
|
97 | + { |
|
98 | + \ErrorHandler::loginFailed(); |
|
99 | + } |
|
100 | + } |
|
101 | + |
|
102 | + /** |
|
103 | + * Handle a registration request. |
|
104 | + * |
|
105 | + * @param array $credentials |
|
106 | + * @return string |
|
107 | + */ |
|
108 | + public function register($credentials) |
|
109 | + { |
|
110 | + $user = \Core::users()->model->create($credentials); |
|
111 | + $this->assignGroups($user->id, \Core::groups()->model->where('name', 'User')->select('id')->lists('id')->toArray()); |
|
112 | + |
|
113 | + return ['token' => \JWTAuth::fromUser($user)]; |
|
114 | + } |
|
115 | + |
|
116 | + /** |
|
117 | + * Logout the user. |
|
118 | + * |
|
119 | + * @return boolean |
|
120 | + */ |
|
121 | + public function logout() |
|
122 | + { |
|
123 | + return \JWTAuth::invalidate(\JWTAuth::getToken()); |
|
124 | + } |
|
125 | + |
|
126 | + /** |
|
127 | + * Block the user. |
|
128 | + * |
|
129 | + * @param integer $user_id |
|
130 | + * @return object |
|
131 | + */ |
|
132 | + public function block($user_id) |
|
133 | + { |
|
134 | + if ( ! $user = \Core::users()->find($user_id)) |
|
135 | + { |
|
136 | + \ErrorHandler::notFound('user'); |
|
137 | + } |
|
138 | + if ( ! $this->hasGroup('Admin')) |
|
139 | + { |
|
140 | + \ErrorHandler::noPermissions(); |
|
141 | + } |
|
142 | + else if (\JWTAuth::parseToken()->authenticate()->id == $user_id) |
|
143 | + { |
|
144 | + \ErrorHandler::noPermissions(); |
|
145 | + } |
|
146 | + else if ($user->groups->lists('name')->search('Admin', true) !== false) |
|
147 | + { |
|
148 | + \ErrorHandler::noPermissions(); |
|
149 | + } |
|
150 | + |
|
151 | + $user->blocked = 1; |
|
152 | + $user->save(); |
|
153 | 153 | |
154 | - return $user; |
|
155 | - } |
|
156 | - |
|
157 | - /** |
|
158 | - * Unblock the user. |
|
159 | - * |
|
160 | - * @param integer $user_id |
|
161 | - * @return object |
|
162 | - */ |
|
163 | - public function unblock($user_id) |
|
164 | - { |
|
165 | - if ( ! $this->hasGroup('Admin')) |
|
166 | - { |
|
167 | - \ErrorHandler::noPermissions(); |
|
168 | - } |
|
169 | - |
|
170 | - $user = \Core::users()->find($user_id); |
|
171 | - $user->blocked = 0; |
|
172 | - $user->save(); |
|
173 | - |
|
174 | - return $user; |
|
175 | - } |
|
176 | - |
|
177 | - /** |
|
178 | - * Send a reset link to the given user. |
|
179 | - * |
|
180 | - * @param string $url |
|
181 | - * @param string $email |
|
182 | - * @return void |
|
183 | - */ |
|
184 | - public function sendReset($email, $url) |
|
185 | - { |
|
186 | - view()->composer('auth.emails.password', function($view) use ($url) { |
|
187 | - $view->with(['url' => $url]); |
|
188 | - }); |
|
189 | - |
|
190 | - $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) { |
|
191 | - $message->subject('Your Password Reset Link'); |
|
192 | - }); |
|
193 | - |
|
194 | - switch ($response) |
|
195 | - { |
|
196 | - case \Password::INVALID_USER: |
|
197 | - \ErrorHandler::notFound('email'); |
|
198 | - } |
|
199 | - } |
|
200 | - |
|
201 | - /** |
|
202 | - * Reset the given user's password. |
|
203 | - * |
|
204 | - * @param array $credentials |
|
205 | - * @return integer |
|
206 | - */ |
|
207 | - public function resetPassword($credentials) |
|
208 | - { |
|
209 | - $token = false; |
|
210 | - $response = \Password::reset($credentials, function ($user, $password) use (&$token) { |
|
211 | - $user->password = bcrypt($password); |
|
212 | - $user->save(); |
|
213 | - |
|
214 | - $token = \JWTAuth::fromUser($user); |
|
215 | - }); |
|
216 | - |
|
217 | - |
|
218 | - switch ($response) { |
|
219 | - case \Password::PASSWORD_RESET: |
|
220 | - return $token; |
|
154 | + return $user; |
|
155 | + } |
|
156 | + |
|
157 | + /** |
|
158 | + * Unblock the user. |
|
159 | + * |
|
160 | + * @param integer $user_id |
|
161 | + * @return object |
|
162 | + */ |
|
163 | + public function unblock($user_id) |
|
164 | + { |
|
165 | + if ( ! $this->hasGroup('Admin')) |
|
166 | + { |
|
167 | + \ErrorHandler::noPermissions(); |
|
168 | + } |
|
169 | + |
|
170 | + $user = \Core::users()->find($user_id); |
|
171 | + $user->blocked = 0; |
|
172 | + $user->save(); |
|
173 | + |
|
174 | + return $user; |
|
175 | + } |
|
176 | + |
|
177 | + /** |
|
178 | + * Send a reset link to the given user. |
|
179 | + * |
|
180 | + * @param string $url |
|
181 | + * @param string $email |
|
182 | + * @return void |
|
183 | + */ |
|
184 | + public function sendReset($email, $url) |
|
185 | + { |
|
186 | + view()->composer('auth.emails.password', function($view) use ($url) { |
|
187 | + $view->with(['url' => $url]); |
|
188 | + }); |
|
189 | + |
|
190 | + $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) { |
|
191 | + $message->subject('Your Password Reset Link'); |
|
192 | + }); |
|
193 | + |
|
194 | + switch ($response) |
|
195 | + { |
|
196 | + case \Password::INVALID_USER: |
|
197 | + \ErrorHandler::notFound('email'); |
|
198 | + } |
|
199 | + } |
|
200 | + |
|
201 | + /** |
|
202 | + * Reset the given user's password. |
|
203 | + * |
|
204 | + * @param array $credentials |
|
205 | + * @return integer |
|
206 | + */ |
|
207 | + public function resetPassword($credentials) |
|
208 | + { |
|
209 | + $token = false; |
|
210 | + $response = \Password::reset($credentials, function ($user, $password) use (&$token) { |
|
211 | + $user->password = bcrypt($password); |
|
212 | + $user->save(); |
|
213 | + |
|
214 | + $token = \JWTAuth::fromUser($user); |
|
215 | + }); |
|
216 | + |
|
217 | + |
|
218 | + switch ($response) { |
|
219 | + case \Password::PASSWORD_RESET: |
|
220 | + return $token; |
|
221 | 221 | |
222 | - case \Password::INVALID_TOKEN: |
|
223 | - \ErrorHandler::invalidResetToken('token'); |
|
222 | + case \Password::INVALID_TOKEN: |
|
223 | + \ErrorHandler::invalidResetToken('token'); |
|
224 | 224 | |
225 | - case \Password::INVALID_PASSWORD: |
|
226 | - \ErrorHandler::invalidResetPassword('email'); |
|
225 | + case \Password::INVALID_PASSWORD: |
|
226 | + \ErrorHandler::invalidResetPassword('email'); |
|
227 | 227 | |
228 | - case \Password::INVALID_USER: |
|
229 | - \ErrorHandler::notFound('user'); |
|
228 | + case \Password::INVALID_USER: |
|
229 | + \ErrorHandler::notFound('user'); |
|
230 | 230 | |
231 | - default: |
|
232 | - \ErrorHandler::generalError(); |
|
233 | - } |
|
234 | - } |
|
231 | + default: |
|
232 | + \ErrorHandler::generalError(); |
|
233 | + } |
|
234 | + } |
|
235 | 235 | } |
@@ -5,37 +5,37 @@ |
||
5 | 5 | |
6 | 6 | class AclPermission extends Model { |
7 | 7 | |
8 | - use SoftDeletes; |
|
9 | - protected $table = 'permissions'; |
|
10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | - protected $hidden = ['deleted_at']; |
|
12 | - protected $guarded = ['id']; |
|
13 | - protected $fillable = ['name', 'model']; |
|
14 | - public $searchable = ['name', 'model']; |
|
8 | + use SoftDeletes; |
|
9 | + protected $table = 'permissions'; |
|
10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | + protected $hidden = ['deleted_at']; |
|
12 | + protected $guarded = ['id']; |
|
13 | + protected $fillable = ['name', 'model']; |
|
14 | + public $searchable = ['name', 'model']; |
|
15 | 15 | |
16 | - public function getCreatedAtAttribute($value) |
|
17 | - { |
|
18 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
19 | - } |
|
16 | + public function getCreatedAtAttribute($value) |
|
17 | + { |
|
18 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
19 | + } |
|
20 | 20 | |
21 | - public function getUpdatedAtAttribute($value) |
|
22 | - { |
|
23 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
24 | - } |
|
21 | + public function getUpdatedAtAttribute($value) |
|
22 | + { |
|
23 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
24 | + } |
|
25 | 25 | |
26 | - public function getDeletedAtAttribute($value) |
|
27 | - { |
|
28 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
29 | - } |
|
26 | + public function getDeletedAtAttribute($value) |
|
27 | + { |
|
28 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
29 | + } |
|
30 | 30 | |
31 | - public function groups() |
|
32 | - { |
|
33 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
34 | - } |
|
31 | + public function groups() |
|
32 | + { |
|
33 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
34 | + } |
|
35 | 35 | |
36 | - public static function boot() |
|
37 | - { |
|
38 | - parent::boot(); |
|
39 | - parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclPermissionObserver')); |
|
40 | - } |
|
36 | + public static function boot() |
|
37 | + { |
|
38 | + parent::boot(); |
|
39 | + parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclPermissionObserver')); |
|
40 | + } |
|
41 | 41 | } |
@@ -12,203 +12,203 @@ discard block |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - /** |
|
16 | - * Delete previous permissions. |
|
17 | - */ |
|
15 | + /** |
|
16 | + * Delete previous permissions. |
|
17 | + */ |
|
18 | 18 | DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->delete(); |
19 | 19 | |
20 | 20 | /** |
21 | - * Insert the permissions related to this module. |
|
22 | - */ |
|
23 | - DB::table('permissions')->insert( |
|
24 | - [ |
|
25 | - /** |
|
26 | - * Users model permissions. |
|
27 | - */ |
|
28 | - [ |
|
29 | - 'name' => 'save', |
|
30 | - 'model' => 'users', |
|
31 | - 'created_at' => \DB::raw('NOW()'), |
|
32 | - 'updated_at' => \DB::raw('NOW()') |
|
33 | - ], |
|
34 | - [ |
|
35 | - 'name' => 'delete', |
|
36 | - 'model' => 'users', |
|
37 | - 'created_at' => \DB::raw('NOW()'), |
|
38 | - 'updated_at' => \DB::raw('NOW()') |
|
39 | - ], |
|
40 | - [ |
|
41 | - 'name' => 'find', |
|
42 | - 'model' => 'users', |
|
43 | - 'created_at' => \DB::raw('NOW()'), |
|
44 | - 'updated_at' => \DB::raw('NOW()') |
|
45 | - ], |
|
46 | - [ |
|
47 | - 'name' => 'list', |
|
48 | - 'model' => 'users', |
|
49 | - 'created_at' => \DB::raw('NOW()'), |
|
50 | - 'updated_at' => \DB::raw('NOW()') |
|
51 | - ], |
|
52 | - [ |
|
53 | - 'name' => 'search', |
|
54 | - 'model' => 'users', |
|
55 | - 'created_at' => \DB::raw('NOW()'), |
|
56 | - 'updated_at' => \DB::raw('NOW()') |
|
57 | - ], |
|
58 | - [ |
|
59 | - 'name' => 'findby', |
|
60 | - 'model' => 'users', |
|
61 | - 'created_at' => \DB::raw('NOW()'), |
|
62 | - 'updated_at' => \DB::raw('NOW()') |
|
63 | - ], |
|
64 | - [ |
|
65 | - 'name' => 'first', |
|
66 | - 'model' => 'users', |
|
67 | - 'created_at' => \DB::raw('NOW()'), |
|
68 | - 'updated_at' => \DB::raw('NOW()') |
|
69 | - ], |
|
70 | - [ |
|
71 | - 'name' => 'paginate', |
|
72 | - 'model' => 'users', |
|
73 | - 'created_at' => \DB::raw('NOW()'), |
|
74 | - 'updated_at' => \DB::raw('NOW()') |
|
75 | - ], |
|
76 | - [ |
|
77 | - 'name' => 'paginateby', |
|
78 | - 'model' => 'users', |
|
79 | - 'created_at' => \DB::raw('NOW()'), |
|
80 | - 'updated_at' => \DB::raw('NOW()') |
|
81 | - ], |
|
82 | - [ |
|
83 | - 'name' => 'assigngroups', |
|
84 | - 'model' => 'users', |
|
85 | - 'created_at' => \DB::raw('NOW()'), |
|
86 | - 'updated_at' => \DB::raw('NOW()') |
|
87 | - ], |
|
88 | - [ |
|
89 | - 'name' => 'block', |
|
90 | - 'model' => 'users', |
|
91 | - 'created_at' => \DB::raw('NOW()'), |
|
92 | - 'updated_at' => \DB::raw('NOW()') |
|
93 | - ], |
|
94 | - [ |
|
95 | - 'name' => 'unblock', |
|
96 | - 'model' => 'users', |
|
97 | - 'created_at' => \DB::raw('NOW()'), |
|
98 | - 'updated_at' => \DB::raw('NOW()') |
|
99 | - ], |
|
21 | + * Insert the permissions related to this module. |
|
22 | + */ |
|
23 | + DB::table('permissions')->insert( |
|
24 | + [ |
|
25 | + /** |
|
26 | + * Users model permissions. |
|
27 | + */ |
|
28 | + [ |
|
29 | + 'name' => 'save', |
|
30 | + 'model' => 'users', |
|
31 | + 'created_at' => \DB::raw('NOW()'), |
|
32 | + 'updated_at' => \DB::raw('NOW()') |
|
33 | + ], |
|
34 | + [ |
|
35 | + 'name' => 'delete', |
|
36 | + 'model' => 'users', |
|
37 | + 'created_at' => \DB::raw('NOW()'), |
|
38 | + 'updated_at' => \DB::raw('NOW()') |
|
39 | + ], |
|
40 | + [ |
|
41 | + 'name' => 'find', |
|
42 | + 'model' => 'users', |
|
43 | + 'created_at' => \DB::raw('NOW()'), |
|
44 | + 'updated_at' => \DB::raw('NOW()') |
|
45 | + ], |
|
46 | + [ |
|
47 | + 'name' => 'list', |
|
48 | + 'model' => 'users', |
|
49 | + 'created_at' => \DB::raw('NOW()'), |
|
50 | + 'updated_at' => \DB::raw('NOW()') |
|
51 | + ], |
|
52 | + [ |
|
53 | + 'name' => 'search', |
|
54 | + 'model' => 'users', |
|
55 | + 'created_at' => \DB::raw('NOW()'), |
|
56 | + 'updated_at' => \DB::raw('NOW()') |
|
57 | + ], |
|
58 | + [ |
|
59 | + 'name' => 'findby', |
|
60 | + 'model' => 'users', |
|
61 | + 'created_at' => \DB::raw('NOW()'), |
|
62 | + 'updated_at' => \DB::raw('NOW()') |
|
63 | + ], |
|
64 | + [ |
|
65 | + 'name' => 'first', |
|
66 | + 'model' => 'users', |
|
67 | + 'created_at' => \DB::raw('NOW()'), |
|
68 | + 'updated_at' => \DB::raw('NOW()') |
|
69 | + ], |
|
70 | + [ |
|
71 | + 'name' => 'paginate', |
|
72 | + 'model' => 'users', |
|
73 | + 'created_at' => \DB::raw('NOW()'), |
|
74 | + 'updated_at' => \DB::raw('NOW()') |
|
75 | + ], |
|
76 | + [ |
|
77 | + 'name' => 'paginateby', |
|
78 | + 'model' => 'users', |
|
79 | + 'created_at' => \DB::raw('NOW()'), |
|
80 | + 'updated_at' => \DB::raw('NOW()') |
|
81 | + ], |
|
82 | + [ |
|
83 | + 'name' => 'assigngroups', |
|
84 | + 'model' => 'users', |
|
85 | + 'created_at' => \DB::raw('NOW()'), |
|
86 | + 'updated_at' => \DB::raw('NOW()') |
|
87 | + ], |
|
88 | + [ |
|
89 | + 'name' => 'block', |
|
90 | + 'model' => 'users', |
|
91 | + 'created_at' => \DB::raw('NOW()'), |
|
92 | + 'updated_at' => \DB::raw('NOW()') |
|
93 | + ], |
|
94 | + [ |
|
95 | + 'name' => 'unblock', |
|
96 | + 'model' => 'users', |
|
97 | + 'created_at' => \DB::raw('NOW()'), |
|
98 | + 'updated_at' => \DB::raw('NOW()') |
|
99 | + ], |
|
100 | 100 | |
101 | - /** |
|
102 | - * Permissions model permissions. |
|
103 | - */ |
|
104 | - [ |
|
105 | - 'name' => 'find', |
|
106 | - 'model' => 'permissions', |
|
107 | - 'created_at' => \DB::raw('NOW()'), |
|
108 | - 'updated_at' => \DB::raw('NOW()') |
|
109 | - ], |
|
110 | - [ |
|
111 | - 'name' => 'search', |
|
112 | - 'model' => 'permissions', |
|
113 | - 'created_at' => \DB::raw('NOW()'), |
|
114 | - 'updated_at' => \DB::raw('NOW()') |
|
115 | - ], |
|
116 | - [ |
|
117 | - 'name' => 'list', |
|
118 | - 'model' => 'permissions', |
|
119 | - 'created_at' => \DB::raw('NOW()'), |
|
120 | - 'updated_at' => \DB::raw('NOW()') |
|
121 | - ], |
|
122 | - [ |
|
123 | - 'name' => 'findby', |
|
124 | - 'model' => 'permissions', |
|
125 | - 'created_at' => \DB::raw('NOW()'), |
|
126 | - 'updated_at' => \DB::raw('NOW()') |
|
127 | - ], |
|
128 | - [ |
|
129 | - 'name' => 'first', |
|
130 | - 'model' => 'permissions', |
|
131 | - 'created_at' => \DB::raw('NOW()'), |
|
132 | - 'updated_at' => \DB::raw('NOW()') |
|
133 | - ], |
|
134 | - [ |
|
135 | - 'name' => 'paginate', |
|
136 | - 'model' => 'permissions', |
|
137 | - 'created_at' => \DB::raw('NOW()'), |
|
138 | - 'updated_at' => \DB::raw('NOW()') |
|
139 | - ], |
|
140 | - [ |
|
141 | - 'name' => 'paginateby', |
|
142 | - 'model' => 'permissions', |
|
143 | - 'created_at' => \DB::raw('NOW()'), |
|
144 | - 'updated_at' => \DB::raw('NOW()') |
|
145 | - ], |
|
101 | + /** |
|
102 | + * Permissions model permissions. |
|
103 | + */ |
|
104 | + [ |
|
105 | + 'name' => 'find', |
|
106 | + 'model' => 'permissions', |
|
107 | + 'created_at' => \DB::raw('NOW()'), |
|
108 | + 'updated_at' => \DB::raw('NOW()') |
|
109 | + ], |
|
110 | + [ |
|
111 | + 'name' => 'search', |
|
112 | + 'model' => 'permissions', |
|
113 | + 'created_at' => \DB::raw('NOW()'), |
|
114 | + 'updated_at' => \DB::raw('NOW()') |
|
115 | + ], |
|
116 | + [ |
|
117 | + 'name' => 'list', |
|
118 | + 'model' => 'permissions', |
|
119 | + 'created_at' => \DB::raw('NOW()'), |
|
120 | + 'updated_at' => \DB::raw('NOW()') |
|
121 | + ], |
|
122 | + [ |
|
123 | + 'name' => 'findby', |
|
124 | + 'model' => 'permissions', |
|
125 | + 'created_at' => \DB::raw('NOW()'), |
|
126 | + 'updated_at' => \DB::raw('NOW()') |
|
127 | + ], |
|
128 | + [ |
|
129 | + 'name' => 'first', |
|
130 | + 'model' => 'permissions', |
|
131 | + 'created_at' => \DB::raw('NOW()'), |
|
132 | + 'updated_at' => \DB::raw('NOW()') |
|
133 | + ], |
|
134 | + [ |
|
135 | + 'name' => 'paginate', |
|
136 | + 'model' => 'permissions', |
|
137 | + 'created_at' => \DB::raw('NOW()'), |
|
138 | + 'updated_at' => \DB::raw('NOW()') |
|
139 | + ], |
|
140 | + [ |
|
141 | + 'name' => 'paginateby', |
|
142 | + 'model' => 'permissions', |
|
143 | + 'created_at' => \DB::raw('NOW()'), |
|
144 | + 'updated_at' => \DB::raw('NOW()') |
|
145 | + ], |
|
146 | 146 | |
147 | - /** |
|
148 | - * Groups model permissions. |
|
149 | - */ |
|
150 | - [ |
|
151 | - 'name' => 'save', |
|
152 | - 'model' => 'groups', |
|
153 | - 'created_at' => \DB::raw('NOW()'), |
|
154 | - 'updated_at' => \DB::raw('NOW()') |
|
155 | - ], |
|
156 | - [ |
|
157 | - 'name' => 'delete', |
|
158 | - 'model' => 'groups', |
|
159 | - 'created_at' => \DB::raw('NOW()'), |
|
160 | - 'updated_at' => \DB::raw('NOW()') |
|
161 | - ], |
|
162 | - [ |
|
163 | - 'name' => 'find', |
|
164 | - 'model' => 'groups', |
|
165 | - 'created_at' => \DB::raw('NOW()'), |
|
166 | - 'updated_at' => \DB::raw('NOW()') |
|
167 | - ], |
|
168 | - [ |
|
169 | - 'name' => 'search', |
|
170 | - 'model' => 'groups', |
|
171 | - 'created_at' => \DB::raw('NOW()'), |
|
172 | - 'updated_at' => \DB::raw('NOW()') |
|
173 | - ], |
|
174 | - [ |
|
175 | - 'name' => 'list', |
|
176 | - 'model' => 'groups', |
|
177 | - 'created_at' => \DB::raw('NOW()'), |
|
178 | - 'updated_at' => \DB::raw('NOW()') |
|
179 | - ], |
|
180 | - [ |
|
181 | - 'name' => 'findby', |
|
182 | - 'model' => 'groups', |
|
183 | - 'created_at' => \DB::raw('NOW()'), |
|
184 | - 'updated_at' => \DB::raw('NOW()') |
|
185 | - ], |
|
186 | - [ |
|
187 | - 'name' => 'first', |
|
188 | - 'model' => 'groups', |
|
189 | - 'created_at' => \DB::raw('NOW()'), |
|
190 | - 'updated_at' => \DB::raw('NOW()') |
|
191 | - ], |
|
192 | - [ |
|
193 | - 'name' => 'paginate', |
|
194 | - 'model' => 'groups', |
|
195 | - 'created_at' => \DB::raw('NOW()'), |
|
196 | - 'updated_at' => \DB::raw('NOW()') |
|
197 | - ], |
|
198 | - [ |
|
199 | - 'name' => 'paginateby', |
|
200 | - 'model' => 'groups', |
|
201 | - 'created_at' => \DB::raw('NOW()'), |
|
202 | - 'updated_at' => \DB::raw('NOW()') |
|
203 | - ], |
|
204 | - [ |
|
205 | - 'name' => 'assignpermissions', |
|
206 | - 'model' => 'groups', |
|
207 | - 'created_at' => \DB::raw('NOW()'), |
|
208 | - 'updated_at' => \DB::raw('NOW()') |
|
209 | - ], |
|
210 | - ] |
|
211 | - ); |
|
147 | + /** |
|
148 | + * Groups model permissions. |
|
149 | + */ |
|
150 | + [ |
|
151 | + 'name' => 'save', |
|
152 | + 'model' => 'groups', |
|
153 | + 'created_at' => \DB::raw('NOW()'), |
|
154 | + 'updated_at' => \DB::raw('NOW()') |
|
155 | + ], |
|
156 | + [ |
|
157 | + 'name' => 'delete', |
|
158 | + 'model' => 'groups', |
|
159 | + 'created_at' => \DB::raw('NOW()'), |
|
160 | + 'updated_at' => \DB::raw('NOW()') |
|
161 | + ], |
|
162 | + [ |
|
163 | + 'name' => 'find', |
|
164 | + 'model' => 'groups', |
|
165 | + 'created_at' => \DB::raw('NOW()'), |
|
166 | + 'updated_at' => \DB::raw('NOW()') |
|
167 | + ], |
|
168 | + [ |
|
169 | + 'name' => 'search', |
|
170 | + 'model' => 'groups', |
|
171 | + 'created_at' => \DB::raw('NOW()'), |
|
172 | + 'updated_at' => \DB::raw('NOW()') |
|
173 | + ], |
|
174 | + [ |
|
175 | + 'name' => 'list', |
|
176 | + 'model' => 'groups', |
|
177 | + 'created_at' => \DB::raw('NOW()'), |
|
178 | + 'updated_at' => \DB::raw('NOW()') |
|
179 | + ], |
|
180 | + [ |
|
181 | + 'name' => 'findby', |
|
182 | + 'model' => 'groups', |
|
183 | + 'created_at' => \DB::raw('NOW()'), |
|
184 | + 'updated_at' => \DB::raw('NOW()') |
|
185 | + ], |
|
186 | + [ |
|
187 | + 'name' => 'first', |
|
188 | + 'model' => 'groups', |
|
189 | + 'created_at' => \DB::raw('NOW()'), |
|
190 | + 'updated_at' => \DB::raw('NOW()') |
|
191 | + ], |
|
192 | + [ |
|
193 | + 'name' => 'paginate', |
|
194 | + 'model' => 'groups', |
|
195 | + 'created_at' => \DB::raw('NOW()'), |
|
196 | + 'updated_at' => \DB::raw('NOW()') |
|
197 | + ], |
|
198 | + [ |
|
199 | + 'name' => 'paginateby', |
|
200 | + 'model' => 'groups', |
|
201 | + 'created_at' => \DB::raw('NOW()'), |
|
202 | + 'updated_at' => \DB::raw('NOW()') |
|
203 | + ], |
|
204 | + [ |
|
205 | + 'name' => 'assignpermissions', |
|
206 | + 'model' => 'groups', |
|
207 | + 'created_at' => \DB::raw('NOW()'), |
|
208 | + 'updated_at' => \DB::raw('NOW()') |
|
209 | + ], |
|
210 | + ] |
|
211 | + ); |
|
212 | 212 | |
213 | 213 | /** |
214 | 214 | * Delete previous data. |
@@ -236,29 +236,29 @@ discard block |
||
236 | 236 | * Create Default users. |
237 | 237 | */ |
238 | 238 | $adminUserId = DB::table('users')->insertGetId( |
239 | - [ |
|
239 | + [ |
|
240 | 240 | 'email' => '[email protected]', |
241 | 241 | 'password' => bcrypt('123456'), |
242 | 242 | 'created_at' => \DB::raw('NOW()'), |
243 | 243 | 'updated_at' => \DB::raw('NOW()') |
244 | 244 | ] |
245 | - ); |
|
245 | + ); |
|
246 | 246 | |
247 | 247 | /** |
248 | 248 | * Assign users to groups. |
249 | 249 | */ |
250 | 250 | DB::table('users_groups')->insert( |
251 | - [ |
|
252 | - [ |
|
251 | + [ |
|
252 | + [ |
|
253 | 253 | 'user_id' => $adminUserId, |
254 | 254 | 'group_id' => $adminGroupId, |
255 | 255 | 'created_at' => \DB::raw('NOW()'), |
256 | 256 | 'updated_at' => \DB::raw('NOW()') |
257 | - ] |
|
258 | - ] |
|
259 | - ); |
|
257 | + ] |
|
258 | + ] |
|
259 | + ); |
|
260 | 260 | |
261 | - /** |
|
261 | + /** |
|
262 | 262 | * Assign the permissions to the admin group. |
263 | 263 | */ |
264 | 264 | $permissionIds = DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->select('id')->lists('id'); |
@@ -5,44 +5,44 @@ |
||
5 | 5 | */ |
6 | 6 | class LogObserver { |
7 | 7 | |
8 | - public function saving($model) |
|
9 | - { |
|
10 | - // |
|
11 | - } |
|
12 | - |
|
13 | - public function saved($model) |
|
14 | - { |
|
15 | - // |
|
16 | - } |
|
17 | - |
|
18 | - public function creating($model) |
|
19 | - { |
|
20 | - // |
|
21 | - } |
|
22 | - |
|
23 | - public function created($model) |
|
24 | - { |
|
25 | - // |
|
26 | - } |
|
27 | - |
|
28 | - public function updating($model) |
|
29 | - { |
|
30 | - // |
|
31 | - } |
|
32 | - |
|
33 | - public function updated($model) |
|
34 | - { |
|
35 | - // |
|
36 | - } |
|
37 | - |
|
38 | - public function deleting($model) |
|
39 | - { |
|
40 | - // |
|
41 | - } |
|
42 | - |
|
43 | - public function deleted($model) |
|
44 | - { |
|
45 | - // |
|
46 | - } |
|
8 | + public function saving($model) |
|
9 | + { |
|
10 | + // |
|
11 | + } |
|
12 | + |
|
13 | + public function saved($model) |
|
14 | + { |
|
15 | + // |
|
16 | + } |
|
17 | + |
|
18 | + public function creating($model) |
|
19 | + { |
|
20 | + // |
|
21 | + } |
|
22 | + |
|
23 | + public function created($model) |
|
24 | + { |
|
25 | + // |
|
26 | + } |
|
27 | + |
|
28 | + public function updating($model) |
|
29 | + { |
|
30 | + // |
|
31 | + } |
|
32 | + |
|
33 | + public function updated($model) |
|
34 | + { |
|
35 | + // |
|
36 | + } |
|
37 | + |
|
38 | + public function deleting($model) |
|
39 | + { |
|
40 | + // |
|
41 | + } |
|
42 | + |
|
43 | + public function deleted($model) |
|
44 | + { |
|
45 | + // |
|
46 | + } |
|
47 | 47 | |
48 | 48 | } |
49 | 49 | \ No newline at end of file |
@@ -5,62 +5,62 @@ |
||
5 | 5 | */ |
6 | 6 | class AclGroupObserver { |
7 | 7 | |
8 | - public function saving($model) |
|
9 | - { |
|
10 | - // |
|
11 | - } |
|
8 | + public function saving($model) |
|
9 | + { |
|
10 | + // |
|
11 | + } |
|
12 | 12 | |
13 | - public function saved($model) |
|
14 | - { |
|
15 | - // |
|
16 | - } |
|
13 | + public function saved($model) |
|
14 | + { |
|
15 | + // |
|
16 | + } |
|
17 | 17 | |
18 | - public function creating($model) |
|
19 | - { |
|
20 | - // |
|
21 | - } |
|
18 | + public function creating($model) |
|
19 | + { |
|
20 | + // |
|
21 | + } |
|
22 | 22 | |
23 | - public function created($model) |
|
24 | - { |
|
25 | - // |
|
26 | - } |
|
23 | + public function created($model) |
|
24 | + { |
|
25 | + // |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * Prevent updating of the admin group. |
|
30 | - * |
|
31 | - * @param object $model the model beign updated. |
|
32 | - * @return void |
|
33 | - */ |
|
34 | - public function updating($model) |
|
35 | - { |
|
36 | - if ($model->getOriginal()['name'] == 'Admin') |
|
37 | - { |
|
38 | - \ErrorHandler::noPermissions(); |
|
39 | - } |
|
40 | - } |
|
28 | + /** |
|
29 | + * Prevent updating of the admin group. |
|
30 | + * |
|
31 | + * @param object $model the model beign updated. |
|
32 | + * @return void |
|
33 | + */ |
|
34 | + public function updating($model) |
|
35 | + { |
|
36 | + if ($model->getOriginal()['name'] == 'Admin') |
|
37 | + { |
|
38 | + \ErrorHandler::noPermissions(); |
|
39 | + } |
|
40 | + } |
|
41 | 41 | |
42 | - public function updated($model) |
|
43 | - { |
|
44 | - // |
|
45 | - } |
|
42 | + public function updated($model) |
|
43 | + { |
|
44 | + // |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * Prevent deleting the admin group. |
|
49 | - * |
|
50 | - * @param object $model the delted model. |
|
51 | - * @return void |
|
52 | - */ |
|
53 | - public function deleting($model) |
|
54 | - { |
|
55 | - if ($model->getOriginal()['name'] == 'Admin') |
|
56 | - { |
|
57 | - \ErrorHandler::noPermissions(); |
|
58 | - } |
|
59 | - } |
|
47 | + /** |
|
48 | + * Prevent deleting the admin group. |
|
49 | + * |
|
50 | + * @param object $model the delted model. |
|
51 | + * @return void |
|
52 | + */ |
|
53 | + public function deleting($model) |
|
54 | + { |
|
55 | + if ($model->getOriginal()['name'] == 'Admin') |
|
56 | + { |
|
57 | + \ErrorHandler::noPermissions(); |
|
58 | + } |
|
59 | + } |
|
60 | 60 | |
61 | - public function deleted($model) |
|
62 | - { |
|
63 | - // |
|
64 | - } |
|
61 | + public function deleted($model) |
|
62 | + { |
|
63 | + // |
|
64 | + } |
|
65 | 65 | |
66 | 66 | } |
67 | 67 | \ No newline at end of file |
@@ -5,54 +5,54 @@ |
||
5 | 5 | */ |
6 | 6 | class AclUserObserver { |
7 | 7 | |
8 | - public function saving($model) |
|
9 | - { |
|
10 | - // |
|
11 | - } |
|
12 | - |
|
13 | - public function saved($model) |
|
14 | - { |
|
15 | - // |
|
16 | - } |
|
17 | - |
|
18 | - public function creating($model) |
|
19 | - { |
|
20 | - // |
|
21 | - } |
|
22 | - |
|
23 | - public function created($model) |
|
24 | - { |
|
25 | - // |
|
26 | - } |
|
27 | - |
|
28 | - public function updating($model) |
|
29 | - { |
|
30 | - // |
|
31 | - } |
|
32 | - |
|
33 | - public function updated($model) |
|
34 | - { |
|
35 | - // |
|
36 | - } |
|
37 | - |
|
38 | - /** |
|
39 | - * Soft delete user logs. |
|
40 | - * |
|
41 | - * @param object $model the delted model. |
|
42 | - * @return void |
|
43 | - */ |
|
44 | - public function deleting($model) |
|
45 | - { |
|
46 | - if ($model->getOriginal()['id'] == \JWTAuth::parseToken()->authenticate()->id) |
|
47 | - { |
|
48 | - \ErrorHandler::noPermissions(); |
|
49 | - } |
|
50 | - $model->logs()->delete(); |
|
51 | - } |
|
52 | - |
|
53 | - public function deleted($model) |
|
54 | - { |
|
55 | - // |
|
56 | - } |
|
8 | + public function saving($model) |
|
9 | + { |
|
10 | + // |
|
11 | + } |
|
12 | + |
|
13 | + public function saved($model) |
|
14 | + { |
|
15 | + // |
|
16 | + } |
|
17 | + |
|
18 | + public function creating($model) |
|
19 | + { |
|
20 | + // |
|
21 | + } |
|
22 | + |
|
23 | + public function created($model) |
|
24 | + { |
|
25 | + // |
|
26 | + } |
|
27 | + |
|
28 | + public function updating($model) |
|
29 | + { |
|
30 | + // |
|
31 | + } |
|
32 | + |
|
33 | + public function updated($model) |
|
34 | + { |
|
35 | + // |
|
36 | + } |
|
37 | + |
|
38 | + /** |
|
39 | + * Soft delete user logs. |
|
40 | + * |
|
41 | + * @param object $model the delted model. |
|
42 | + * @return void |
|
43 | + */ |
|
44 | + public function deleting($model) |
|
45 | + { |
|
46 | + if ($model->getOriginal()['id'] == \JWTAuth::parseToken()->authenticate()->id) |
|
47 | + { |
|
48 | + \ErrorHandler::noPermissions(); |
|
49 | + } |
|
50 | + $model->logs()->delete(); |
|
51 | + } |
|
52 | + |
|
53 | + public function deleted($model) |
|
54 | + { |
|
55 | + // |
|
56 | + } |
|
57 | 57 | |
58 | 58 | } |
59 | 59 | \ No newline at end of file |
@@ -7,157 +7,157 @@ |
||
7 | 7 | |
8 | 8 | class UsersController extends BaseApiController |
9 | 9 | { |
10 | - /** |
|
11 | - * The name of the model that is used by the base api controller |
|
12 | - * to preform actions like (add, edit ... etc). |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - protected $model = 'users'; |
|
16 | - |
|
17 | - /** |
|
18 | - * List of all route actions that the base api controller |
|
19 | - * will skip permissions check for them. |
|
20 | - * @var array |
|
21 | - */ |
|
22 | - protected $skipPermissionCheck = ['account', 'logout', 'sendreset']; |
|
23 | - |
|
24 | - /** |
|
25 | - * List of all route actions that the base api controller |
|
26 | - * will skip login check for them. |
|
27 | - * @var array |
|
28 | - */ |
|
29 | - protected $skipLoginCheck = ['login', 'register', 'sendreset', 'resetpassword']; |
|
30 | - |
|
31 | - /** |
|
32 | - * The validations rules used by the base api controller |
|
33 | - * to check before add. |
|
34 | - * @var array |
|
35 | - */ |
|
36 | - protected $validationRules = [ |
|
37 | - 'email' => 'required|email|unique:users,email,{id}', |
|
38 | - 'password' => 'min:6' |
|
39 | - ]; |
|
40 | - |
|
41 | - /** |
|
42 | - * Return the logged in user account. |
|
43 | - * |
|
44 | - * @return \Illuminate\Http\Response |
|
45 | - */ |
|
46 | - public function account() |
|
47 | - { |
|
48 | - $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : []; |
|
49 | - return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200); |
|
50 | - } |
|
51 | - |
|
52 | - /** |
|
53 | - * Block the user. |
|
54 | - * |
|
55 | - * @param integer $id |
|
56 | - * @return \Illuminate\Http\Response |
|
57 | - */ |
|
58 | - public function block($id) |
|
59 | - { |
|
60 | - return \Response::json(\Core::users()->block($id), 200); |
|
61 | - } |
|
62 | - |
|
63 | - /** |
|
64 | - * Unblock the user. |
|
65 | - * |
|
66 | - * @param integer $id |
|
67 | - * @return \Illuminate\Http\Response |
|
68 | - */ |
|
69 | - public function unblock($id) |
|
70 | - { |
|
71 | - return \Response::json(\Core::users()->unblock($id), 200); |
|
72 | - } |
|
73 | - |
|
74 | - /** |
|
75 | - * Logout the user. |
|
76 | - * |
|
77 | - * @return \Illuminate\Http\Response |
|
78 | - */ |
|
79 | - public function logout() |
|
80 | - { |
|
81 | - return \Response::json(\Core::users()->logout(), 200); |
|
82 | - } |
|
83 | - |
|
84 | - /** |
|
85 | - * Handle a registration request. |
|
86 | - * |
|
87 | - * @param \Illuminate\Http\Request $request |
|
88 | - * @return \Illuminate\Http\Response |
|
89 | - */ |
|
90 | - public function register(Request $request) |
|
91 | - { |
|
92 | - $this->validate($request, [ |
|
93 | - 'email' => 'required|email|unique:users,email,{id}', |
|
94 | - 'password' => 'required|min:6' |
|
95 | - ]); |
|
96 | - |
|
97 | - return \Response::json(\Core::users()->register($request->only('email', 'password')), 200); |
|
98 | - } |
|
99 | - |
|
100 | - /** |
|
101 | - * Handle a login request of the none admin to the application. |
|
102 | - * |
|
103 | - * @param \Illuminate\Http\Request $request |
|
104 | - * @return \Illuminate\Http\Response |
|
105 | - */ |
|
106 | - public function login(Request $request) |
|
107 | - { |
|
108 | - $this->validate($request, [ |
|
109 | - 'email' => 'required|email', |
|
110 | - 'password' => 'required|min:6', |
|
111 | - 'admin' => 'boolean' |
|
112 | - ]); |
|
113 | - |
|
114 | - return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200); |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * Handle an assign groups to user request. |
|
119 | - * |
|
120 | - * @param \Illuminate\Http\Request $request |
|
121 | - * @return \Illuminate\Http\Response |
|
122 | - */ |
|
123 | - public function assigngroups(Request $request) |
|
124 | - { |
|
125 | - $this->validate($request, [ |
|
126 | - 'group_ids' => 'required|exists:groups,id', |
|
127 | - 'user_id' => 'required|exists:users,id' |
|
128 | - ]); |
|
129 | - |
|
130 | - return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200); |
|
131 | - } |
|
132 | - |
|
133 | - /** |
|
134 | - * Send a reset link to the given user. |
|
135 | - * |
|
136 | - * @param \Illuminate\Http\Request $request |
|
137 | - * @return \Illuminate\Http\Response |
|
138 | - */ |
|
139 | - public function sendreset(Request $request) |
|
140 | - { |
|
141 | - $this->validate($request, ['email' => 'required|email', 'url' => 'required|url']); |
|
142 | - |
|
143 | - return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200); |
|
144 | - } |
|
145 | - |
|
146 | - /** |
|
147 | - * Reset the given user's password. |
|
148 | - * |
|
149 | - * @param \Illuminate\Http\Request $request |
|
150 | - * @return \Illuminate\Http\Response |
|
151 | - */ |
|
152 | - public function resetpassword(Request $request) |
|
153 | - { |
|
154 | - $this->validate($request, [ |
|
155 | - 'token' => 'required', |
|
156 | - 'email' => 'required|email', |
|
157 | - 'password' => 'required|confirmed|min:6', |
|
158 | - 'password_confirmation' => 'required', |
|
159 | - ]); |
|
160 | - |
|
161 | - return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200); |
|
162 | - } |
|
10 | + /** |
|
11 | + * The name of the model that is used by the base api controller |
|
12 | + * to preform actions like (add, edit ... etc). |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + protected $model = 'users'; |
|
16 | + |
|
17 | + /** |
|
18 | + * List of all route actions that the base api controller |
|
19 | + * will skip permissions check for them. |
|
20 | + * @var array |
|
21 | + */ |
|
22 | + protected $skipPermissionCheck = ['account', 'logout', 'sendreset']; |
|
23 | + |
|
24 | + /** |
|
25 | + * List of all route actions that the base api controller |
|
26 | + * will skip login check for them. |
|
27 | + * @var array |
|
28 | + */ |
|
29 | + protected $skipLoginCheck = ['login', 'register', 'sendreset', 'resetpassword']; |
|
30 | + |
|
31 | + /** |
|
32 | + * The validations rules used by the base api controller |
|
33 | + * to check before add. |
|
34 | + * @var array |
|
35 | + */ |
|
36 | + protected $validationRules = [ |
|
37 | + 'email' => 'required|email|unique:users,email,{id}', |
|
38 | + 'password' => 'min:6' |
|
39 | + ]; |
|
40 | + |
|
41 | + /** |
|
42 | + * Return the logged in user account. |
|
43 | + * |
|
44 | + * @return \Illuminate\Http\Response |
|
45 | + */ |
|
46 | + public function account() |
|
47 | + { |
|
48 | + $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : []; |
|
49 | + return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200); |
|
50 | + } |
|
51 | + |
|
52 | + /** |
|
53 | + * Block the user. |
|
54 | + * |
|
55 | + * @param integer $id |
|
56 | + * @return \Illuminate\Http\Response |
|
57 | + */ |
|
58 | + public function block($id) |
|
59 | + { |
|
60 | + return \Response::json(\Core::users()->block($id), 200); |
|
61 | + } |
|
62 | + |
|
63 | + /** |
|
64 | + * Unblock the user. |
|
65 | + * |
|
66 | + * @param integer $id |
|
67 | + * @return \Illuminate\Http\Response |
|
68 | + */ |
|
69 | + public function unblock($id) |
|
70 | + { |
|
71 | + return \Response::json(\Core::users()->unblock($id), 200); |
|
72 | + } |
|
73 | + |
|
74 | + /** |
|
75 | + * Logout the user. |
|
76 | + * |
|
77 | + * @return \Illuminate\Http\Response |
|
78 | + */ |
|
79 | + public function logout() |
|
80 | + { |
|
81 | + return \Response::json(\Core::users()->logout(), 200); |
|
82 | + } |
|
83 | + |
|
84 | + /** |
|
85 | + * Handle a registration request. |
|
86 | + * |
|
87 | + * @param \Illuminate\Http\Request $request |
|
88 | + * @return \Illuminate\Http\Response |
|
89 | + */ |
|
90 | + public function register(Request $request) |
|
91 | + { |
|
92 | + $this->validate($request, [ |
|
93 | + 'email' => 'required|email|unique:users,email,{id}', |
|
94 | + 'password' => 'required|min:6' |
|
95 | + ]); |
|
96 | + |
|
97 | + return \Response::json(\Core::users()->register($request->only('email', 'password')), 200); |
|
98 | + } |
|
99 | + |
|
100 | + /** |
|
101 | + * Handle a login request of the none admin to the application. |
|
102 | + * |
|
103 | + * @param \Illuminate\Http\Request $request |
|
104 | + * @return \Illuminate\Http\Response |
|
105 | + */ |
|
106 | + public function login(Request $request) |
|
107 | + { |
|
108 | + $this->validate($request, [ |
|
109 | + 'email' => 'required|email', |
|
110 | + 'password' => 'required|min:6', |
|
111 | + 'admin' => 'boolean' |
|
112 | + ]); |
|
113 | + |
|
114 | + return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200); |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * Handle an assign groups to user request. |
|
119 | + * |
|
120 | + * @param \Illuminate\Http\Request $request |
|
121 | + * @return \Illuminate\Http\Response |
|
122 | + */ |
|
123 | + public function assigngroups(Request $request) |
|
124 | + { |
|
125 | + $this->validate($request, [ |
|
126 | + 'group_ids' => 'required|exists:groups,id', |
|
127 | + 'user_id' => 'required|exists:users,id' |
|
128 | + ]); |
|
129 | + |
|
130 | + return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200); |
|
131 | + } |
|
132 | + |
|
133 | + /** |
|
134 | + * Send a reset link to the given user. |
|
135 | + * |
|
136 | + * @param \Illuminate\Http\Request $request |
|
137 | + * @return \Illuminate\Http\Response |
|
138 | + */ |
|
139 | + public function sendreset(Request $request) |
|
140 | + { |
|
141 | + $this->validate($request, ['email' => 'required|email', 'url' => 'required|url']); |
|
142 | + |
|
143 | + return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200); |
|
144 | + } |
|
145 | + |
|
146 | + /** |
|
147 | + * Reset the given user's password. |
|
148 | + * |
|
149 | + * @param \Illuminate\Http\Request $request |
|
150 | + * @return \Illuminate\Http\Response |
|
151 | + */ |
|
152 | + public function resetpassword(Request $request) |
|
153 | + { |
|
154 | + $this->validate($request, [ |
|
155 | + 'token' => 'required', |
|
156 | + 'email' => 'required|email', |
|
157 | + 'password' => 'required|confirmed|min:6', |
|
158 | + 'password_confirmation' => 'required', |
|
159 | + ]); |
|
160 | + |
|
161 | + return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200); |
|
162 | + } |
|
163 | 163 | } |
@@ -5,42 +5,42 @@ |
||
5 | 5 | |
6 | 6 | class Log extends Model{ |
7 | 7 | |
8 | - use SoftDeletes; |
|
9 | - protected $table = 'logs'; |
|
10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | - protected $hidden = ['deleted_at', 'item_type']; |
|
12 | - protected $guarded = ['id']; |
|
13 | - protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id']; |
|
14 | - public $searchable = ['action', 'item_name', 'item_type']; |
|
15 | - |
|
16 | - public function getCreatedAtAttribute($value) |
|
17 | - { |
|
18 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
19 | - } |
|
20 | - |
|
21 | - public function getUpdatedAtAttribute($value) |
|
22 | - { |
|
23 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
24 | - } |
|
25 | - |
|
26 | - public function getDeletedAtAttribute($value) |
|
27 | - { |
|
28 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
29 | - } |
|
8 | + use SoftDeletes; |
|
9 | + protected $table = 'logs'; |
|
10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | + protected $hidden = ['deleted_at', 'item_type']; |
|
12 | + protected $guarded = ['id']; |
|
13 | + protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id']; |
|
14 | + public $searchable = ['action', 'item_name', 'item_type']; |
|
15 | + |
|
16 | + public function getCreatedAtAttribute($value) |
|
17 | + { |
|
18 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
19 | + } |
|
20 | + |
|
21 | + public function getUpdatedAtAttribute($value) |
|
22 | + { |
|
23 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
24 | + } |
|
25 | + |
|
26 | + public function getDeletedAtAttribute($value) |
|
27 | + { |
|
28 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
29 | + } |
|
30 | 30 | |
31 | - public function user() |
|
32 | - { |
|
33 | - return $this->belongsTo('App\Modules\V1\Acl\AclUser'); |
|
34 | - } |
|
35 | - |
|
36 | - public function item() |
|
37 | - { |
|
38 | - return $this->morphTo(); |
|
39 | - } |
|
40 | - |
|
41 | - public static function boot() |
|
42 | - { |
|
43 | - parent::boot(); |
|
44 | - parent::observe(\App::make('App\Modules\V1\Core\ModelObservers\LogObserver')); |
|
45 | - } |
|
31 | + public function user() |
|
32 | + { |
|
33 | + return $this->belongsTo('App\Modules\V1\Acl\AclUser'); |
|
34 | + } |
|
35 | + |
|
36 | + public function item() |
|
37 | + { |
|
38 | + return $this->morphTo(); |
|
39 | + } |
|
40 | + |
|
41 | + public static function boot() |
|
42 | + { |
|
43 | + parent::boot(); |
|
44 | + parent::observe(\App::make('App\Modules\V1\Core\ModelObservers\LogObserver')); |
|
45 | + } |
|
46 | 46 | } |