@@ -11,68 +11,68 @@ |
||
11 | 11 | |
12 | 12 | class CheckPermissions |
13 | 13 | { |
14 | - protected $route; |
|
15 | - protected $auth; |
|
16 | - protected $authMiddleware; |
|
17 | - protected $userService; |
|
18 | - protected $arr; |
|
14 | + protected $route; |
|
15 | + protected $auth; |
|
16 | + protected $authMiddleware; |
|
17 | + protected $userService; |
|
18 | + protected $arr; |
|
19 | 19 | |
20 | - /** |
|
21 | - * Init new object. |
|
22 | - * |
|
23 | - * @param Route $route |
|
24 | - * @param Auth $auth |
|
25 | - * @param AuthMiddleware $authMiddleware |
|
26 | - * @param UserService $userService |
|
27 | - * @param Arr $arr |
|
28 | - * |
|
29 | - * @return void |
|
30 | - */ |
|
31 | - public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr) |
|
32 | - { |
|
33 | - $this->route = $route; |
|
34 | - $this->auth = $auth; |
|
35 | - $this->authMiddleware = $authMiddleware; |
|
36 | - $this->userService = $userService; |
|
37 | - $this->arr = $arr; |
|
38 | - } |
|
20 | + /** |
|
21 | + * Init new object. |
|
22 | + * |
|
23 | + * @param Route $route |
|
24 | + * @param Auth $auth |
|
25 | + * @param AuthMiddleware $authMiddleware |
|
26 | + * @param UserService $userService |
|
27 | + * @param Arr $arr |
|
28 | + * |
|
29 | + * @return void |
|
30 | + */ |
|
31 | + public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr) |
|
32 | + { |
|
33 | + $this->route = $route; |
|
34 | + $this->auth = $auth; |
|
35 | + $this->authMiddleware = $authMiddleware; |
|
36 | + $this->userService = $userService; |
|
37 | + $this->arr = $arr; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Handle an incoming request. |
|
42 | - * |
|
43 | - * @param \Illuminate\Http\Request $request |
|
44 | - * @param \Closure $next |
|
45 | - * @return mixed |
|
46 | - */ |
|
47 | - public function handle($request, Closure $next) |
|
48 | - { |
|
49 | - $routeActions = explode('@', $this->route->currentRouteAction()); |
|
50 | - $reflectionClass = new \ReflectionClass($routeActions[0]); |
|
51 | - $classProperties = $reflectionClass->getDefaultProperties(); |
|
52 | - $skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []); |
|
53 | - $skipLoginCheck = $this->arr->get($classProperties, 'skipLoginCheck', []); |
|
54 | - $modelName = explode('\\', $routeActions[0]); |
|
55 | - $modelName = lcfirst(str_replace('Controller', '', end($modelName))); |
|
56 | - $permission = $routeActions[1]; |
|
40 | + /** |
|
41 | + * Handle an incoming request. |
|
42 | + * |
|
43 | + * @param \Illuminate\Http\Request $request |
|
44 | + * @param \Closure $next |
|
45 | + * @return mixed |
|
46 | + */ |
|
47 | + public function handle($request, Closure $next) |
|
48 | + { |
|
49 | + $routeActions = explode('@', $this->route->currentRouteAction()); |
|
50 | + $reflectionClass = new \ReflectionClass($routeActions[0]); |
|
51 | + $classProperties = $reflectionClass->getDefaultProperties(); |
|
52 | + $skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []); |
|
53 | + $skipLoginCheck = $this->arr->get($classProperties, 'skipLoginCheck', []); |
|
54 | + $modelName = explode('\\', $routeActions[0]); |
|
55 | + $modelName = lcfirst(str_replace('Controller', '', end($modelName))); |
|
56 | + $permission = $routeActions[1]; |
|
57 | 57 | |
58 | - $this->auth->shouldUse('api'); |
|
59 | - if (! in_array($permission, $skipLoginCheck)) { |
|
60 | - $this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $skipLoginCheck, $permission) { |
|
61 | - $user = $this->auth->user(); |
|
62 | - $isPasswordClient = $user->token()->client->password_client; |
|
58 | + $this->auth->shouldUse('api'); |
|
59 | + if (! in_array($permission, $skipLoginCheck)) { |
|
60 | + $this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $skipLoginCheck, $permission) { |
|
61 | + $user = $this->auth->user(); |
|
62 | + $isPasswordClient = $user->token()->client->password_client; |
|
63 | 63 | |
64 | - if ($user->blocked) { |
|
65 | - \Errors::userIsBlocked(); |
|
66 | - } |
|
64 | + if ($user->blocked) { |
|
65 | + \Errors::userIsBlocked(); |
|
66 | + } |
|
67 | 67 | |
68 | - if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) { |
|
69 | - } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) { |
|
70 | - } else { |
|
71 | - \Errors::noPermissions(); |
|
72 | - } |
|
73 | - }); |
|
74 | - } |
|
68 | + if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) { |
|
69 | + } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) { |
|
70 | + } else { |
|
71 | + \Errors::noPermissions(); |
|
72 | + } |
|
73 | + }); |
|
74 | + } |
|
75 | 75 | |
76 | - return $next($request); |
|
77 | - } |
|
76 | + return $next($request); |
|
77 | + } |
|
78 | 78 | } |
@@ -8,53 +8,53 @@ |
||
8 | 8 | |
9 | 9 | class UpdateLocaleAndTimezone |
10 | 10 | { |
11 | - protected $session; |
|
12 | - protected $auth; |
|
11 | + protected $session; |
|
12 | + protected $auth; |
|
13 | 13 | |
14 | - /** |
|
15 | - * Init new object. |
|
16 | - * |
|
17 | - * @param Session $session |
|
18 | - * @param Auth $auth |
|
19 | - * @param Errors $errors |
|
20 | - * |
|
21 | - * @return void |
|
22 | - */ |
|
23 | - public function __construct(Session $session, Auth $auth) |
|
24 | - { |
|
25 | - $this->session = $session; |
|
26 | - $this->auth = $auth; |
|
27 | - } |
|
14 | + /** |
|
15 | + * Init new object. |
|
16 | + * |
|
17 | + * @param Session $session |
|
18 | + * @param Auth $auth |
|
19 | + * @param Errors $errors |
|
20 | + * |
|
21 | + * @return void |
|
22 | + */ |
|
23 | + public function __construct(Session $session, Auth $auth) |
|
24 | + { |
|
25 | + $this->session = $session; |
|
26 | + $this->auth = $auth; |
|
27 | + } |
|
28 | 28 | |
29 | - /** |
|
30 | - * Handle an incoming request. |
|
31 | - * |
|
32 | - * @param \Illuminate\Http\Request $request |
|
33 | - * @param \Closure $next |
|
34 | - * @return mixed |
|
35 | - */ |
|
36 | - public function handle($request, Closure $next) |
|
37 | - { |
|
38 | - $update = false; |
|
39 | - $user = $this->auth->user(); |
|
40 | - if ($user) { |
|
41 | - $locale = $this->session->get('locale'); |
|
42 | - $timezone = $this->session->get('time-zone'); |
|
43 | - if ($locale && $locale !== 'all' && $locale !== $user->locale) { |
|
44 | - $user->locale = $locale; |
|
45 | - $update = true; |
|
46 | - } |
|
29 | + /** |
|
30 | + * Handle an incoming request. |
|
31 | + * |
|
32 | + * @param \Illuminate\Http\Request $request |
|
33 | + * @param \Closure $next |
|
34 | + * @return mixed |
|
35 | + */ |
|
36 | + public function handle($request, Closure $next) |
|
37 | + { |
|
38 | + $update = false; |
|
39 | + $user = $this->auth->user(); |
|
40 | + if ($user) { |
|
41 | + $locale = $this->session->get('locale'); |
|
42 | + $timezone = $this->session->get('time-zone'); |
|
43 | + if ($locale && $locale !== 'all' && $locale !== $user->locale) { |
|
44 | + $user->locale = $locale; |
|
45 | + $update = true; |
|
46 | + } |
|
47 | 47 | |
48 | - if ($timezone && $timezone !== $user->timezone) { |
|
49 | - $user->timezone = $timezone; |
|
50 | - $update = true; |
|
51 | - } |
|
48 | + if ($timezone && $timezone !== $user->timezone) { |
|
49 | + $user->timezone = $timezone; |
|
50 | + $update = true; |
|
51 | + } |
|
52 | 52 | |
53 | - if ($update) { |
|
54 | - $user->save(); |
|
55 | - } |
|
56 | - } |
|
53 | + if ($update) { |
|
54 | + $user->save(); |
|
55 | + } |
|
56 | + } |
|
57 | 57 | |
58 | - return $next($request); |
|
59 | - } |
|
58 | + return $next($request); |
|
59 | + } |
|
60 | 60 | } |
@@ -10,57 +10,57 @@ |
||
10 | 10 | |
11 | 11 | class DummyController extends BaseApiController |
12 | 12 | { |
13 | - /** |
|
14 | - * Path of the model resource |
|
15 | - * |
|
16 | - * @var string |
|
17 | - */ |
|
18 | - protected $modelResource = 'App\Modules\DummyModule\Http\Resources\DummyModel'; |
|
13 | + /** |
|
14 | + * Path of the model resource |
|
15 | + * |
|
16 | + * @var string |
|
17 | + */ |
|
18 | + protected $modelResource = 'App\Modules\DummyModule\Http\Resources\DummyModel'; |
|
19 | 19 | |
20 | - /** |
|
21 | - * List of all route actions that the base api controller |
|
22 | - * will skip permissions check for them. |
|
23 | - * @var array |
|
24 | - */ |
|
25 | - protected $skipPermissionCheck = []; |
|
20 | + /** |
|
21 | + * List of all route actions that the base api controller |
|
22 | + * will skip permissions check for them. |
|
23 | + * @var array |
|
24 | + */ |
|
25 | + protected $skipPermissionCheck = []; |
|
26 | 26 | |
27 | - /** |
|
28 | - * List of all route actions that the base api controller |
|
29 | - * will skip login check for them. |
|
30 | - * @var array |
|
31 | - */ |
|
32 | - protected $skipLoginCheck = []; |
|
27 | + /** |
|
28 | + * List of all route actions that the base api controller |
|
29 | + * will skip login check for them. |
|
30 | + * @var array |
|
31 | + */ |
|
32 | + protected $skipLoginCheck = []; |
|
33 | 33 | |
34 | - /** |
|
35 | - * Init new object. |
|
36 | - * |
|
37 | - * @param DummyService $service |
|
38 | - * @return void |
|
39 | - */ |
|
40 | - public function __construct(DummyService $service) |
|
41 | - { |
|
42 | - parent::__construct($service); |
|
43 | - } |
|
34 | + /** |
|
35 | + * Init new object. |
|
36 | + * |
|
37 | + * @param DummyService $service |
|
38 | + * @return void |
|
39 | + */ |
|
40 | + public function __construct(DummyService $service) |
|
41 | + { |
|
42 | + parent::__construct($service); |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * Insert the given model to storage. |
|
47 | - * |
|
48 | - * @param InsertDummy $request |
|
49 | - * @return \Illuminate\Http\Response |
|
50 | - */ |
|
51 | - public function insert(InsertDummy $request) |
|
52 | - { |
|
53 | - return new $this->modelResource($this->service->save($request->all())); |
|
54 | - } |
|
45 | + /** |
|
46 | + * Insert the given model to storage. |
|
47 | + * |
|
48 | + * @param InsertDummy $request |
|
49 | + * @return \Illuminate\Http\Response |
|
50 | + */ |
|
51 | + public function insert(InsertDummy $request) |
|
52 | + { |
|
53 | + return new $this->modelResource($this->service->save($request->all())); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * Update the given model to storage. |
|
58 | - * |
|
59 | - * @param UpdateDummy $request |
|
60 | - * @return \Illuminate\Http\Response |
|
61 | - */ |
|
62 | - public function update(UpdateDummy $request) |
|
63 | - { |
|
64 | - return new $this->modelResource($this->service->save($request->all())); |
|
65 | - } |
|
56 | + /** |
|
57 | + * Update the given model to storage. |
|
58 | + * |
|
59 | + * @param UpdateDummy $request |
|
60 | + * @return \Illuminate\Http\Response |
|
61 | + */ |
|
62 | + public function update(UpdateDummy $request) |
|
63 | + { |
|
64 | + return new $this->modelResource($this->service->save($request->all())); |
|
65 | + } |
|
66 | 66 | } |
@@ -5,14 +5,14 @@ |
||
5 | 5 | |
6 | 6 | class DummyService extends BaseService |
7 | 7 | { |
8 | - /** |
|
9 | - * Init new object. |
|
10 | - * |
|
11 | - * @param DummyRepository $repo |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function __construct(DummyRepository $repo) |
|
15 | - { |
|
16 | - parent::__construct($repo); |
|
17 | - } |
|
8 | + /** |
|
9 | + * Init new object. |
|
10 | + * |
|
11 | + * @param DummyRepository $repo |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function __construct(DummyRepository $repo) |
|
15 | + { |
|
16 | + parent::__construct($repo); |
|
17 | + } |
|
18 | 18 | } |
@@ -6,67 +6,67 @@ |
||
6 | 6 | class SettingsObserver |
7 | 7 | { |
8 | 8 | |
9 | - public function saving($model) |
|
10 | - { |
|
11 | - // |
|
12 | - } |
|
9 | + public function saving($model) |
|
10 | + { |
|
11 | + // |
|
12 | + } |
|
13 | 13 | |
14 | - public function saved($model) |
|
15 | - { |
|
16 | - // |
|
17 | - } |
|
14 | + public function saved($model) |
|
15 | + { |
|
16 | + // |
|
17 | + } |
|
18 | 18 | |
19 | - /** |
|
20 | - * Prevent the creating of the settings. |
|
21 | - * |
|
22 | - * @param object $model the model beign created. |
|
23 | - * @return void |
|
24 | - */ |
|
25 | - public function creating($model) |
|
26 | - { |
|
27 | - \Errors::cannotCreateSetting(); |
|
28 | - } |
|
19 | + /** |
|
20 | + * Prevent the creating of the settings. |
|
21 | + * |
|
22 | + * @param object $model the model beign created. |
|
23 | + * @return void |
|
24 | + */ |
|
25 | + public function creating($model) |
|
26 | + { |
|
27 | + \Errors::cannotCreateSetting(); |
|
28 | + } |
|
29 | 29 | |
30 | - public function created($model) |
|
31 | - { |
|
32 | - // |
|
33 | - } |
|
30 | + public function created($model) |
|
31 | + { |
|
32 | + // |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * Prevent updating of the setting key. |
|
37 | - * |
|
38 | - * @param object $model the model beign updated. |
|
39 | - * @return void |
|
40 | - */ |
|
41 | - public function updating($model) |
|
42 | - { |
|
43 | - if ($model->getOriginal('key') !== $model->key) { |
|
44 | - \Errors::cannotUpdateSettingKey(); |
|
45 | - } |
|
46 | - } |
|
35 | + /** |
|
36 | + * Prevent updating of the setting key. |
|
37 | + * |
|
38 | + * @param object $model the model beign updated. |
|
39 | + * @return void |
|
40 | + */ |
|
41 | + public function updating($model) |
|
42 | + { |
|
43 | + if ($model->getOriginal('key') !== $model->key) { |
|
44 | + \Errors::cannotUpdateSettingKey(); |
|
45 | + } |
|
46 | + } |
|
47 | 47 | |
48 | - public function updated($model) |
|
49 | - { |
|
50 | - // |
|
51 | - } |
|
48 | + public function updated($model) |
|
49 | + { |
|
50 | + // |
|
51 | + } |
|
52 | 52 | |
53 | - public function deleting($model) |
|
54 | - { |
|
55 | - // |
|
56 | - } |
|
53 | + public function deleting($model) |
|
54 | + { |
|
55 | + // |
|
56 | + } |
|
57 | 57 | |
58 | - public function deleted($model) |
|
59 | - { |
|
60 | - // |
|
61 | - } |
|
58 | + public function deleted($model) |
|
59 | + { |
|
60 | + // |
|
61 | + } |
|
62 | 62 | |
63 | - public function restoring($model) |
|
64 | - { |
|
65 | - // |
|
66 | - } |
|
63 | + public function restoring($model) |
|
64 | + { |
|
65 | + // |
|
66 | + } |
|
67 | 67 | |
68 | - public function restored($model) |
|
69 | - { |
|
70 | - // |
|
71 | - } |
|
68 | + public function restored($model) |
|
69 | + { |
|
70 | + // |
|
71 | + } |
|
72 | 72 | } |
@@ -5,102 +5,102 @@ |
||
5 | 5 | |
6 | 6 | class CachingDecorator |
7 | 7 | { |
8 | - /** |
|
9 | - * @var string |
|
10 | - */ |
|
11 | - public $repo; |
|
8 | + /** |
|
9 | + * @var string |
|
10 | + */ |
|
11 | + public $repo; |
|
12 | 12 | |
13 | - /** |
|
14 | - * @var Cache |
|
15 | - */ |
|
16 | - protected $cache; |
|
13 | + /** |
|
14 | + * @var Cache |
|
15 | + */ |
|
16 | + protected $cache; |
|
17 | 17 | |
18 | - /** |
|
19 | - * @var string |
|
20 | - */ |
|
21 | - public $modelKey; |
|
18 | + /** |
|
19 | + * @var string |
|
20 | + */ |
|
21 | + public $modelKey; |
|
22 | 22 | |
23 | - /** |
|
24 | - * @var string |
|
25 | - */ |
|
26 | - public $model; |
|
23 | + /** |
|
24 | + * @var string |
|
25 | + */ |
|
26 | + public $model; |
|
27 | 27 | |
28 | - /** |
|
29 | - * @var string |
|
30 | - */ |
|
31 | - public $modelClass; |
|
28 | + /** |
|
29 | + * @var string |
|
30 | + */ |
|
31 | + public $modelClass; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @var mixed |
|
35 | - */ |
|
36 | - public $cacheConfig; |
|
33 | + /** |
|
34 | + * @var mixed |
|
35 | + */ |
|
36 | + public $cacheConfig; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @var string |
|
40 | - */ |
|
41 | - public $cacheTag; |
|
38 | + /** |
|
39 | + * @var string |
|
40 | + */ |
|
41 | + public $cacheTag; |
|
42 | 42 | |
43 | - /** |
|
44 | - * Init new object. |
|
45 | - * |
|
46 | - * @param string $repo |
|
47 | - * @param Cache $cache |
|
48 | - * |
|
49 | - * @return void |
|
50 | - */ |
|
51 | - public function __construct($repo, Cache $cache) |
|
52 | - { |
|
53 | - $this->repo = $repo; |
|
54 | - $this->cache = $cache; |
|
55 | - $this->model = $this->repo->model; |
|
56 | - $this->modelClass = get_class($this->model); |
|
57 | - $repoClass = explode('\\', get_class($this->repo)); |
|
58 | - $repoName = end($repoClass); |
|
59 | - $this->cacheTag = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))); |
|
60 | - } |
|
43 | + /** |
|
44 | + * Init new object. |
|
45 | + * |
|
46 | + * @param string $repo |
|
47 | + * @param Cache $cache |
|
48 | + * |
|
49 | + * @return void |
|
50 | + */ |
|
51 | + public function __construct($repo, Cache $cache) |
|
52 | + { |
|
53 | + $this->repo = $repo; |
|
54 | + $this->cache = $cache; |
|
55 | + $this->model = $this->repo->model; |
|
56 | + $this->modelClass = get_class($this->model); |
|
57 | + $repoClass = explode('\\', get_class($this->repo)); |
|
58 | + $repoName = end($repoClass); |
|
59 | + $this->cacheTag = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * Handle the cache mechanism for the called method |
|
64 | - * based the configurations. |
|
65 | - * |
|
66 | - * @param string $name the called method name |
|
67 | - * @param array $arguments the method arguments |
|
68 | - * @return object |
|
69 | - */ |
|
70 | - public function __call($name, $arguments) |
|
71 | - { |
|
72 | - $this->setCacheConfig($name); |
|
62 | + /** |
|
63 | + * Handle the cache mechanism for the called method |
|
64 | + * based the configurations. |
|
65 | + * |
|
66 | + * @param string $name the called method name |
|
67 | + * @param array $arguments the method arguments |
|
68 | + * @return object |
|
69 | + */ |
|
70 | + public function __call($name, $arguments) |
|
71 | + { |
|
72 | + $this->setCacheConfig($name); |
|
73 | 73 | |
74 | - if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
|
75 | - $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
|
76 | - $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
|
77 | - return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
78 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
79 | - }); |
|
80 | - } elseif ($this->cacheConfig && $this->cacheConfig == 'clear') { |
|
81 | - $this->cache->tags($this->cacheConfig)->flush(); |
|
82 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
83 | - } |
|
74 | + if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
|
75 | + $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
|
76 | + $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
|
77 | + return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
78 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
79 | + }); |
|
80 | + } elseif ($this->cacheConfig && $this->cacheConfig == 'clear') { |
|
81 | + $this->cache->tags($this->cacheConfig)->flush(); |
|
82 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
83 | + } |
|
84 | 84 | |
85 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
86 | - } |
|
85 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * Set cache config based on the called method. |
|
90 | - * |
|
91 | - * @param string $name |
|
92 | - * @return void |
|
93 | - */ |
|
94 | - private function setCacheConfig($name) |
|
95 | - { |
|
96 | - $config = \CoreConfig::getConfig(); |
|
97 | - $cacheConfig = Arr::get($config['cacheConfig'], $this->cacheTag, false); |
|
98 | - $this->cacheConfig = false; |
|
88 | + /** |
|
89 | + * Set cache config based on the called method. |
|
90 | + * |
|
91 | + * @param string $name |
|
92 | + * @return void |
|
93 | + */ |
|
94 | + private function setCacheConfig($name) |
|
95 | + { |
|
96 | + $config = \CoreConfig::getConfig(); |
|
97 | + $cacheConfig = Arr::get($config['cacheConfig'], $this->cacheTag, false); |
|
98 | + $this->cacheConfig = false; |
|
99 | 99 | |
100 | - if ($cacheConfig && in_array($name, $cacheConfig['cache'])) { |
|
101 | - $this->cacheConfig = 'cache'; |
|
102 | - } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) { |
|
103 | - $this->cacheConfig = $cacheConfig['clear'][$name]; |
|
104 | - } |
|
105 | - } |
|
100 | + if ($cacheConfig && in_array($name, $cacheConfig['cache'])) { |
|
101 | + $this->cacheConfig = 'cache'; |
|
102 | + } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) { |
|
103 | + $this->cacheConfig = $cacheConfig['clear'][$name]; |
|
104 | + } |
|
105 | + } |
|
106 | 106 | } |
@@ -5,64 +5,64 @@ |
||
5 | 5 | |
6 | 6 | class LoginProxy |
7 | 7 | { |
8 | - /** |
|
9 | - * Attempt to create an access token using user credentials. |
|
10 | - * |
|
11 | - * @param string $email |
|
12 | - * @param string $password |
|
13 | - * @return array |
|
14 | - */ |
|
15 | - public function login($email, $password) |
|
16 | - { |
|
17 | - return $this->proxy('password', [ |
|
18 | - 'username' => $email, |
|
19 | - 'password' => $password |
|
20 | - ]); |
|
21 | - } |
|
8 | + /** |
|
9 | + * Attempt to create an access token using user credentials. |
|
10 | + * |
|
11 | + * @param string $email |
|
12 | + * @param string $password |
|
13 | + * @return array |
|
14 | + */ |
|
15 | + public function login($email, $password) |
|
16 | + { |
|
17 | + return $this->proxy('password', [ |
|
18 | + 'username' => $email, |
|
19 | + 'password' => $password |
|
20 | + ]); |
|
21 | + } |
|
22 | 22 | |
23 | - /** |
|
24 | - * Attempt to refresh the access token using the given refresh token. |
|
25 | - * |
|
26 | - * @param string $refreshToken |
|
27 | - * @return array |
|
28 | - */ |
|
29 | - public function refreshToken($refreshToken) |
|
30 | - { |
|
31 | - return $this->proxy('refresh_token', [ |
|
32 | - 'refresh_token' => $refreshToken |
|
33 | - ]); |
|
34 | - } |
|
23 | + /** |
|
24 | + * Attempt to refresh the access token using the given refresh token. |
|
25 | + * |
|
26 | + * @param string $refreshToken |
|
27 | + * @return array |
|
28 | + */ |
|
29 | + public function refreshToken($refreshToken) |
|
30 | + { |
|
31 | + return $this->proxy('refresh_token', [ |
|
32 | + 'refresh_token' => $refreshToken |
|
33 | + ]); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * Proxy a request to the OAuth server. |
|
38 | - * |
|
39 | - * @param string $grantType what type of grant type should be proxied |
|
40 | - * @param array |
|
41 | - */ |
|
42 | - public function proxy($grantType, array $data = []) |
|
43 | - { |
|
44 | - $data = array_merge($data, [ |
|
45 | - 'client_id' => config('skeleton.passport_client_id'), |
|
46 | - 'client_secret' => config('skeleton.passport_client_secret'), |
|
47 | - 'grant_type' => $grantType |
|
48 | - ]); |
|
36 | + /** |
|
37 | + * Proxy a request to the OAuth server. |
|
38 | + * |
|
39 | + * @param string $grantType what type of grant type should be proxied |
|
40 | + * @param array |
|
41 | + */ |
|
42 | + public function proxy($grantType, array $data = []) |
|
43 | + { |
|
44 | + $data = array_merge($data, [ |
|
45 | + 'client_id' => config('skeleton.passport_client_id'), |
|
46 | + 'client_secret' => config('skeleton.passport_client_secret'), |
|
47 | + 'grant_type' => $grantType |
|
48 | + ]); |
|
49 | 49 | |
50 | - $response = \ApiConsumer::post('/oauth/token', $data); |
|
50 | + $response = \ApiConsumer::post('/oauth/token', $data); |
|
51 | 51 | |
52 | - if (! $response->isSuccessful()) { |
|
53 | - if ($grantType == 'refresh_token') { |
|
54 | - \Errors::invalidRefreshToken(); |
|
55 | - } |
|
52 | + if (! $response->isSuccessful()) { |
|
53 | + if ($grantType == 'refresh_token') { |
|
54 | + \Errors::invalidRefreshToken(); |
|
55 | + } |
|
56 | 56 | |
57 | - \Errors::loginFailed(); |
|
58 | - } |
|
57 | + \Errors::loginFailed(); |
|
58 | + } |
|
59 | 59 | |
60 | - $data = json_decode($response->getContent()); |
|
60 | + $data = json_decode($response->getContent()); |
|
61 | 61 | |
62 | - return [ |
|
63 | - 'access_token' => $data->access_token, |
|
64 | - 'refresh_token' => $data->refresh_token, |
|
65 | - 'expires_in' => $data->expires_in |
|
66 | - ]; |
|
67 | - } |
|
62 | + return [ |
|
63 | + 'access_token' => $data->access_token, |
|
64 | + 'refresh_token' => $data->refresh_token, |
|
65 | + 'expires_in' => $data->expires_in |
|
66 | + ]; |
|
67 | + } |
|
68 | 68 | } |
@@ -6,61 +6,61 @@ |
||
6 | 6 | class AclUserObserver |
7 | 7 | { |
8 | 8 | |
9 | - public function saving($model) |
|
10 | - { |
|
11 | - if ($model->isDirty('profile_picture')) { |
|
12 | - \Media::deleteImage($model->getOriginal('profile_picture')); |
|
13 | - } |
|
14 | - } |
|
9 | + public function saving($model) |
|
10 | + { |
|
11 | + if ($model->isDirty('profile_picture')) { |
|
12 | + \Media::deleteImage($model->getOriginal('profile_picture')); |
|
13 | + } |
|
14 | + } |
|
15 | 15 | |
16 | - public function saved($model) |
|
17 | - { |
|
18 | - // |
|
19 | - } |
|
16 | + public function saved($model) |
|
17 | + { |
|
18 | + // |
|
19 | + } |
|
20 | 20 | |
21 | - public function creating($model) |
|
22 | - { |
|
23 | - // |
|
24 | - } |
|
21 | + public function creating($model) |
|
22 | + { |
|
23 | + // |
|
24 | + } |
|
25 | 25 | |
26 | - public function created($model) |
|
27 | - { |
|
28 | - // |
|
29 | - } |
|
26 | + public function created($model) |
|
27 | + { |
|
28 | + // |
|
29 | + } |
|
30 | 30 | |
31 | - public function updating($model) |
|
32 | - { |
|
33 | - // |
|
34 | - } |
|
31 | + public function updating($model) |
|
32 | + { |
|
33 | + // |
|
34 | + } |
|
35 | 35 | |
36 | - public function updated($model) |
|
37 | - { |
|
38 | - if ($model->isDirty('blocked') && $model->blocked) { |
|
39 | - $model->tokens()->each(function ($token) { |
|
40 | - \Core::oauthClients()->revokeAccessToken($token); |
|
41 | - }); |
|
42 | - } |
|
43 | - } |
|
36 | + public function updated($model) |
|
37 | + { |
|
38 | + if ($model->isDirty('blocked') && $model->blocked) { |
|
39 | + $model->tokens()->each(function ($token) { |
|
40 | + \Core::oauthClients()->revokeAccessToken($token); |
|
41 | + }); |
|
42 | + } |
|
43 | + } |
|
44 | 44 | |
45 | - public function deleting($model) |
|
46 | - { |
|
47 | - if ($model->getOriginal('id') == \Auth::id()) { |
|
48 | - \Errors::noPermissions(); |
|
49 | - } |
|
50 | - } |
|
45 | + public function deleting($model) |
|
46 | + { |
|
47 | + if ($model->getOriginal('id') == \Auth::id()) { |
|
48 | + \Errors::noPermissions(); |
|
49 | + } |
|
50 | + } |
|
51 | 51 | |
52 | - public function deleted($model) |
|
53 | - { |
|
54 | - // |
|
55 | - } |
|
52 | + public function deleted($model) |
|
53 | + { |
|
54 | + // |
|
55 | + } |
|
56 | 56 | |
57 | - public function restoring($model) |
|
58 | - { |
|
59 | - // |
|
60 | - } |
|
57 | + public function restoring($model) |
|
58 | + { |
|
59 | + // |
|
60 | + } |
|
61 | 61 | |
62 | - public function restored($model) |
|
63 | - { |
|
64 | - // |
|
65 | - } |
|
62 | + public function restored($model) |
|
63 | + { |
|
64 | + // |
|
65 | + } |
|
66 | 66 | } |
@@ -6,53 +6,53 @@ |
||
6 | 6 | class ReportObserver |
7 | 7 | { |
8 | 8 | |
9 | - public function saving($model) |
|
10 | - { |
|
11 | - // |
|
12 | - } |
|
13 | - |
|
14 | - public function saved($model) |
|
15 | - { |
|
16 | - // |
|
17 | - } |
|
18 | - |
|
19 | - public function creating($model) |
|
20 | - { |
|
21 | - // |
|
22 | - } |
|
23 | - |
|
24 | - public function created($model) |
|
25 | - { |
|
26 | - // |
|
27 | - } |
|
28 | - |
|
29 | - public function updating($model) |
|
30 | - { |
|
31 | - // |
|
32 | - } |
|
33 | - |
|
34 | - public function updated($model) |
|
35 | - { |
|
36 | - // |
|
37 | - } |
|
38 | - |
|
39 | - public function deleting($model) |
|
40 | - { |
|
41 | - // |
|
42 | - } |
|
43 | - |
|
44 | - public function deleted($model) |
|
45 | - { |
|
46 | - // |
|
47 | - } |
|
48 | - |
|
49 | - public function restoring($model) |
|
50 | - { |
|
51 | - // |
|
52 | - } |
|
53 | - |
|
54 | - public function restored($model) |
|
55 | - { |
|
56 | - // |
|
57 | - } |
|
9 | + public function saving($model) |
|
10 | + { |
|
11 | + // |
|
12 | + } |
|
13 | + |
|
14 | + public function saved($model) |
|
15 | + { |
|
16 | + // |
|
17 | + } |
|
18 | + |
|
19 | + public function creating($model) |
|
20 | + { |
|
21 | + // |
|
22 | + } |
|
23 | + |
|
24 | + public function created($model) |
|
25 | + { |
|
26 | + // |
|
27 | + } |
|
28 | + |
|
29 | + public function updating($model) |
|
30 | + { |
|
31 | + // |
|
32 | + } |
|
33 | + |
|
34 | + public function updated($model) |
|
35 | + { |
|
36 | + // |
|
37 | + } |
|
38 | + |
|
39 | + public function deleting($model) |
|
40 | + { |
|
41 | + // |
|
42 | + } |
|
43 | + |
|
44 | + public function deleted($model) |
|
45 | + { |
|
46 | + // |
|
47 | + } |
|
48 | + |
|
49 | + public function restoring($model) |
|
50 | + { |
|
51 | + // |
|
52 | + } |
|
53 | + |
|
54 | + public function restored($model) |
|
55 | + { |
|
56 | + // |
|
57 | + } |
|
58 | 58 | } |