@@ -25,7 +25,7 @@ |
||
25 | 25 | { |
26 | 26 | $this->registerPolicies(); |
27 | 27 | |
28 | - Passport::routes(function ($router) { |
|
28 | + Passport::routes(function($router) { |
|
29 | 29 | $router->forAuthorization(); |
30 | 30 | $router->forAccessTokens(); |
31 | 31 | $router->forPersonalAccessTokens(); |
@@ -7,31 +7,31 @@ |
||
7 | 7 | |
8 | 8 | class AuthServiceProvider extends ServiceProvider |
9 | 9 | { |
10 | - /** |
|
11 | - * The policy mappings for the application. |
|
12 | - * |
|
13 | - * @var array |
|
14 | - */ |
|
15 | - protected $policies = [ |
|
16 | - 'App\Model' => 'App\Policies\ModelPolicy', |
|
17 | - ]; |
|
10 | + /** |
|
11 | + * The policy mappings for the application. |
|
12 | + * |
|
13 | + * @var array |
|
14 | + */ |
|
15 | + protected $policies = [ |
|
16 | + 'App\Model' => 'App\Policies\ModelPolicy', |
|
17 | + ]; |
|
18 | 18 | |
19 | - /** |
|
20 | - * Register any authentication / authorization services. |
|
21 | - * |
|
22 | - * @return void |
|
23 | - */ |
|
24 | - public function boot() |
|
25 | - { |
|
26 | - $this->registerPolicies(); |
|
19 | + /** |
|
20 | + * Register any authentication / authorization services. |
|
21 | + * |
|
22 | + * @return void |
|
23 | + */ |
|
24 | + public function boot() |
|
25 | + { |
|
26 | + $this->registerPolicies(); |
|
27 | 27 | |
28 | - Passport::routes(function ($router) { |
|
29 | - $router->forAuthorization(); |
|
30 | - $router->forAccessTokens(); |
|
31 | - $router->forPersonalAccessTokens(); |
|
32 | - $router->forTransientTokens(); |
|
33 | - }); |
|
34 | - Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(60)); |
|
35 | - Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addMinutes(14400)); |
|
36 | - } |
|
28 | + Passport::routes(function ($router) { |
|
29 | + $router->forAuthorization(); |
|
30 | + $router->forAccessTokens(); |
|
31 | + $router->forPersonalAccessTokens(); |
|
32 | + $router->forTransientTokens(); |
|
33 | + }); |
|
34 | + Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(60)); |
|
35 | + Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addMinutes(14400)); |
|
36 | + } |
|
37 | 37 | } |
@@ -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 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | |
50 | 50 | $response = \ApiConsumer::post('/oauth/token', $data); |
51 | 51 | |
52 | - if (! $response->isSuccessful()) { |
|
52 | + if ( ! $response->isSuccessful()) { |
|
53 | 53 | if ($grantType == 'refresh_token') { |
54 | 54 | \Errors::invalidRefreshToken(); |
55 | 55 | } |
@@ -7,64 +7,64 @@ |
||
7 | 7 | |
8 | 8 | class LoginProxy |
9 | 9 | { |
10 | - /** |
|
11 | - * Attempt to create an access token using user credentials. |
|
12 | - * |
|
13 | - * @param string $email |
|
14 | - * @param string $password |
|
15 | - * @return array |
|
16 | - */ |
|
17 | - public function login($email, $password) |
|
18 | - { |
|
19 | - return $this->proxy('password', [ |
|
20 | - 'username' => $email, |
|
21 | - 'password' => $password |
|
22 | - ]); |
|
23 | - } |
|
10 | + /** |
|
11 | + * Attempt to create an access token using user credentials. |
|
12 | + * |
|
13 | + * @param string $email |
|
14 | + * @param string $password |
|
15 | + * @return array |
|
16 | + */ |
|
17 | + public function login($email, $password) |
|
18 | + { |
|
19 | + return $this->proxy('password', [ |
|
20 | + 'username' => $email, |
|
21 | + 'password' => $password |
|
22 | + ]); |
|
23 | + } |
|
24 | 24 | |
25 | - /** |
|
26 | - * Attempt to refresh the access token using the given refresh token. |
|
27 | - * |
|
28 | - * @param string $refreshToken |
|
29 | - * @return array |
|
30 | - */ |
|
31 | - public function refreshToken($refreshToken) |
|
32 | - { |
|
33 | - return $this->proxy('refresh_token', [ |
|
34 | - 'refresh_token' => $refreshToken |
|
35 | - ]); |
|
36 | - } |
|
25 | + /** |
|
26 | + * Attempt to refresh the access token using the given refresh token. |
|
27 | + * |
|
28 | + * @param string $refreshToken |
|
29 | + * @return array |
|
30 | + */ |
|
31 | + public function refreshToken($refreshToken) |
|
32 | + { |
|
33 | + return $this->proxy('refresh_token', [ |
|
34 | + 'refresh_token' => $refreshToken |
|
35 | + ]); |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * Proxy a request to the OAuth server. |
|
40 | - * |
|
41 | - * @param string $grantType what type of grant type should be proxied |
|
42 | - * @param array |
|
43 | - */ |
|
44 | - public function proxy($grantType, array $data = []) |
|
45 | - { |
|
46 | - $data = array_merge($data, [ |
|
47 | - 'client_id' => config('user.passport_client_id'), |
|
48 | - 'client_secret' => config('user.passport_client_secret'), |
|
49 | - 'grant_type' => $grantType |
|
50 | - ]); |
|
38 | + /** |
|
39 | + * Proxy a request to the OAuth server. |
|
40 | + * |
|
41 | + * @param string $grantType what type of grant type should be proxied |
|
42 | + * @param array |
|
43 | + */ |
|
44 | + public function proxy($grantType, array $data = []) |
|
45 | + { |
|
46 | + $data = array_merge($data, [ |
|
47 | + 'client_id' => config('user.passport_client_id'), |
|
48 | + 'client_secret' => config('user.passport_client_secret'), |
|
49 | + 'grant_type' => $grantType |
|
50 | + ]); |
|
51 | 51 | |
52 | - $response = \ApiConsumer::post('/oauth/token', $data); |
|
52 | + $response = \ApiConsumer::post('/oauth/token', $data); |
|
53 | 53 | |
54 | - if (! $response->isSuccessful()) { |
|
55 | - if ($grantType == 'refresh_token') { |
|
56 | - \Errors::invalidRefreshToken(); |
|
57 | - } |
|
54 | + if (! $response->isSuccessful()) { |
|
55 | + if ($grantType == 'refresh_token') { |
|
56 | + \Errors::invalidRefreshToken(); |
|
57 | + } |
|
58 | 58 | |
59 | - \Errors::loginFailed(); |
|
60 | - } |
|
59 | + \Errors::loginFailed(); |
|
60 | + } |
|
61 | 61 | |
62 | - $data = json_decode($response->getContent()); |
|
62 | + $data = json_decode($response->getContent()); |
|
63 | 63 | |
64 | - return [ |
|
65 | - 'access_token' => $data->access_token, |
|
66 | - 'refresh_token' => $data->refresh_token, |
|
67 | - 'expires_in' => $data->expires_in |
|
68 | - ]; |
|
69 | - } |
|
64 | + return [ |
|
65 | + 'access_token' => $data->access_token, |
|
66 | + 'refresh_token' => $data->refresh_token, |
|
67 | + 'expires_in' => $data->expires_in |
|
68 | + ]; |
|
69 | + } |
|
70 | 70 | } |
@@ -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 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | public function updated($model) |
37 | 37 | { |
38 | 38 | if ($model->isDirty('blocked') && $model->blocked) { |
39 | - $model->tokens()->each(function ($token) { |
|
39 | + $model->tokens()->each(function($token) { |
|
40 | 40 | \Core::oauthClients()->revokeAccessToken($token); |
41 | 41 | }); |
42 | 42 | } |
@@ -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 | } |
@@ -43,9 +43,9 @@ |
||
43 | 43 | /** |
44 | 44 | * Check report existance and permission. |
45 | 45 | */ |
46 | - if (! $report) { |
|
46 | + if ( ! $report) { |
|
47 | 47 | \Errors::notFound('report'); |
48 | - } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
48 | + } elseif ( ! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
49 | 49 | \Errors::noPermissions(); |
50 | 50 | } |
51 | 51 |
@@ -8,49 +8,49 @@ |
||
8 | 8 | |
9 | 9 | class ReportService extends BaseService |
10 | 10 | { |
11 | - /** |
|
12 | - * @var UserService |
|
13 | - */ |
|
14 | - protected $userService; |
|
11 | + /** |
|
12 | + * @var UserService |
|
13 | + */ |
|
14 | + protected $userService; |
|
15 | 15 | |
16 | - /** |
|
17 | - * Init new object. |
|
18 | - * |
|
19 | - * @param ReportRepository $repo |
|
20 | - * @return void |
|
21 | - */ |
|
22 | - public function __construct(ReportRepository $repo, UserService $userService) |
|
23 | - { |
|
24 | - $this->userService = $userService; |
|
25 | - parent::__construct($repo); |
|
26 | - } |
|
16 | + /** |
|
17 | + * Init new object. |
|
18 | + * |
|
19 | + * @param ReportRepository $repo |
|
20 | + * @return void |
|
21 | + */ |
|
22 | + public function __construct(ReportRepository $repo, UserService $userService) |
|
23 | + { |
|
24 | + $this->userService = $userService; |
|
25 | + parent::__construct($repo); |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * Render the given report db view based on the given |
|
30 | - * condition. |
|
31 | - * |
|
32 | - * @param string $reportName |
|
33 | - * @param array $conditions |
|
34 | - * @param integer $perPage |
|
35 | - * @param boolean $skipPermission |
|
36 | - * @return object |
|
37 | - */ |
|
38 | - public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false) |
|
39 | - { |
|
40 | - /** |
|
41 | - * Fetch the report from db. |
|
42 | - */ |
|
43 | - $report = $this->repo->first(['report_name' => $reportName]); |
|
28 | + /** |
|
29 | + * Render the given report db view based on the given |
|
30 | + * condition. |
|
31 | + * |
|
32 | + * @param string $reportName |
|
33 | + * @param array $conditions |
|
34 | + * @param integer $perPage |
|
35 | + * @param boolean $skipPermission |
|
36 | + * @return object |
|
37 | + */ |
|
38 | + public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false) |
|
39 | + { |
|
40 | + /** |
|
41 | + * Fetch the report from db. |
|
42 | + */ |
|
43 | + $report = $this->repo->first(['report_name' => $reportName]); |
|
44 | 44 | |
45 | - /** |
|
46 | - * Check report existance and permission. |
|
47 | - */ |
|
48 | - if (! $report) { |
|
49 | - \Errors::notFound('report'); |
|
50 | - } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
51 | - \Errors::noPermissions(); |
|
52 | - } |
|
45 | + /** |
|
46 | + * Check report existance and permission. |
|
47 | + */ |
|
48 | + if (! $report) { |
|
49 | + \Errors::notFound('report'); |
|
50 | + } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
51 | + \Errors::noPermissions(); |
|
52 | + } |
|
53 | 53 | |
54 | - return $this->repo->renderReport($report, $conditions, $perPage); |
|
55 | - } |
|
54 | + return $this->repo->renderReport($report, $conditions, $perPage); |
|
55 | + } |
|
56 | 56 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Password Reset Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,10 +13,10 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'password' => 'Passwords must be at least six characters and match the confirmation.', |
|
17 | - 'reset' => 'Your password has been reset!', |
|
18 | - 'sent' => 'We have e-mailed your password reset link!', |
|
19 | - 'token' => 'This password reset token is invalid.', |
|
20 | - 'user' => "We can't find a user with that e-mail address.", |
|
16 | + 'password' => 'Passwords must be at least six characters and match the confirmation.', |
|
17 | + 'reset' => 'Your password has been reset!', |
|
18 | + 'sent' => 'We have e-mailed your password reset link!', |
|
19 | + 'token' => 'This password reset token is invalid.', |
|
20 | + 'user' => "We can't find a user with that e-mail address.", |
|
21 | 21 | |
22 | 22 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Pagination Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'previous' => '« Previous', |
|
17 | - 'next' => 'Next »', |
|
16 | + 'previous' => '« Previous', |
|
17 | + 'next' => 'Next »', |
|
18 | 18 | |
19 | 19 | ]; |