Skip to content
This repository has been archived by the owner on Mar 9, 2019. It is now read-only.

Commit

Permalink
Merge pull request #16 from andrey-helldar/analysis-XNDmEE
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
Andrey Helldar committed Apr 26, 2017
2 parents 6943a29 + 0b5ce76 commit cbe4749
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions src/Controllers/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class AuthController extends Controller
public function auth()
{
return redirect()->to(str_finish($this->url_auth, '?').http_build_query(array(
'client_id' => env('VK_CLIENT_ID'),
'redirect_uri' => route('vk::auth'),
'display' => config('vk.display'),
'client_id' => env('VK_CLIENT_ID'),
'redirect_uri' => route('vk::auth'),
'display' => config('vk.display'),
'response_type' => 'code',
'scope' => implode(',', config('vk.scope', array())),
'v' => config('vk.version', 5.63),
'scope' => implode(',', config('vk.scope', array())),
'v' => config('vk.version', 5.63),
)));
}

Expand All @@ -45,14 +45,14 @@ public function auth()
public function getAccessToken(Request $request)
{
try {
$client = new \GuzzleHttp\Client();
$client = new \GuzzleHttp\Client();
$response = $client->request('POST', $this->url_access_token, array(
'form_params' => array(
'client_id' => env('VK_CLIENT_ID'),
'client_id' => env('VK_CLIENT_ID'),
'client_secret' => env('VK_CLIENT_SECRET'),
'secret_key' => env('VK_SECRET_KEY'),
'redirect_uri' => route('vk::auth'),
'code' => $request->code,
'secret_key' => env('VK_SECRET_KEY'),
'redirect_uri' => route('vk::auth'),
'code' => $request->code,
),
));

Expand All @@ -62,7 +62,7 @@ public function getAccessToken(Request $request)
} catch (\Exception $e) {
return array(
'code' => $e->getCode(),
'msg' => $e->getMessage(),
'msg' => $e->getMessage(),
);
}
}
Expand All @@ -78,24 +78,24 @@ protected function saveToken($data)
{
$validator = \Validator::make($data->all(), array(
'access_token' => 'required|string|max:255',
'expires_in' => 'numeric',
'user_id' => 'numeric',
'email' => 'email',
'expires_in' => 'numeric',
'user_id' => 'numeric',
'email' => 'email',
));

if ($validator->fails()) {
return redirect()->to(config('vk.redirect_error', '/'));
}

$item = VkUser::withTrashed()->firstOrNew(array(
'user_id' => $this->user->id,
'user_id' => $this->user->id,
'vk_user_id' => $data->get('user_id'),
));

$item->access_token = $data->get('access_token');
$item->content = json_encode($data->all());
$item->expired_at = $data->get('expires_in') ? Carbon::now()->addSeconds($data->get('expires_in')) : Carbon::now()->addYears(10);
$item->deleted_at = null;
$item->content = json_encode($data->all());
$item->expired_at = $data->get('expires_in') ? Carbon::now()->addSeconds($data->get('expires_in')) : Carbon::now()->addYears(10);
$item->deleted_at = null;
$item->save();

return redirect()->to(config('vk.redirect_success', '/'));
Expand Down

0 comments on commit cbe4749

Please sign in to comment.