FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix formatting and interfaces in nearly every file

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-19 20:50:40 -05:00
parent 04c5b9e7bf
commit ccf56ddec1
331 changed files with 3282 additions and 2492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Middleware/ApiAuth.php
View File

@@ -16,14 +16,14 @@ class ApiAuth
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
// Check if Authorization header is in place
$api_key = $request->header('x-api-key', null);
if($api_key === null) {
if ($api_key === null) {
$api_key = $request->header('Authorization', null);
if ($api_key === null) {
return $this->unauthorized('X-API-KEY header missing');
@@ -32,11 +32,11 @@ class ApiAuth
// Try to find the user via API key. Cache this lookup
$user = User::where('api_key', $api_key)->first();
if($user === null) {
if ($user === null) {
return $this->unauthorized('User not found with key "'.$api_key.'"');
}
if($user->state !== UserState::ACTIVE) {
if ($user->state !== UserState::ACTIVE) {
return $this->unauthorized('User is not ACTIVE, please contact an administrator');
}
@@ -54,13 +54,13 @@ class ApiAuth
* Return an unauthorized message
* @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
*/
private function unauthorized($details='')
private function unauthorized($details = '')
{
return response([
'error' => [
'code' => '401',
'code' => '401',
'http_code' => 'Unauthorized',
'message' => 'Invalid or missing API key ('. $details .')',
'message' => 'Invalid or missing API key ('.$details.')',
],
], 401);
}

1
app/Http/Middleware/JsonResponse.php
View File

@@ -13,6 +13,7 @@ class JsonResponse
{
$response = $next($request);
$response->headers->set('Content-Type', 'application/json');
return $response;
}
}

6
app/Http/Middleware/MeasureExecutionTime.php
View File

@@ -21,7 +21,7 @@ class MeasureExecutionTime
{
// Get the response
$response = $next($request);
if(!defined('LUMEN_START')) {
if (!defined('LUMEN_START')) {
return $response;
}
@@ -31,8 +31,8 @@ class MeasureExecutionTime
// I assume you're using valid json in your responses
// Then I manipulate them below
$content = json_decode($response->getContent(), true) + [
'execution_time' => $executionTime,
];
'execution_time' => $executionTime,
];
// Change the content of your response
$response->setData($content);

6
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@@ -10,9 +10,9 @@ class RedirectIfAuthenticated
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)