This removes api authentification with token in favor of signature method. Refactorize code and clean up. It add more unit test plus code coverage in test/converage. - Added config.api.timestampTimeout - Added Helper::signRequest This calculates the request signature - Added more unit tests and extend code coverage. - Added rate limiter for web routes - Added RemoveSpaces Sanitizer on api requests - Added stress test suite - Changed AuthServiceProvider api-token to api-hmac - Changed CustomerSeeder to have at least of customer activated (for unit tests) - Changed used transation for saveing multiple models - Changed, in ServiceController generateApiToken to generateServicePassword - Changed, timestamp has to be send in request with a DateTime format, it also has to a UTC value - Composer added brianium/paratest - Composer update - Fixed case where removing single optin could be the wrong one (not for the good service) - Fixed customer delete - Fixed customer would not be resolved by brand. - Fixed Really check that request is json checking body content, preventing sending malformed requests - Remove ApiError::needAuth - Removed api_token - Removed ApiController::authenticate - Removed config.api.tokenTimeout - Removed Header check or usage because of HAProxy doing weird stuff - Removed lock files from gitignore - Removed memcached dependency - Removed unused questions resources api routes - Removed workspace file Migrations - Added unique index on services.bearer_token - Changed customer_id on customer_answer is nullable - Changed services.bearer_pwd length to 312 (the size of the token) - Dropped services.api_token and service.api_token_date
58 lines
1.6 KiB
PHP
58 lines
1.6 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Middleware;
|
|
|
|
use App\Lib\Helper;
|
|
use App\Models\Service;
|
|
use Closure;
|
|
use Illuminate\Auth\Middleware\Authenticate as Middleware;
|
|
|
|
/**
|
|
* Updated for ApiV2
|
|
*/
|
|
class Authenticate extends Middleware
|
|
{
|
|
/**
|
|
* Handle an incoming request.
|
|
*
|
|
* @param mixed $request
|
|
* @param \Closure $next
|
|
* @param mixed ...$guards
|
|
* @return mixed
|
|
*
|
|
* @throws \Illuminate\Auth\AuthenticationException If authentification fails.
|
|
*/
|
|
public function handle($request, Closure $next, ...$guards)
|
|
{
|
|
if (Helper::isRequestForApiV1($request)) {
|
|
// @codeCoverageIgnoreStart
|
|
// Use patched v1 Auth mecanism (without bearer reimplementation).
|
|
$bearerToken = Helper::getBearerTokenFromRequest($request) ?? $request->api_token ?? '';
|
|
$service = Service::getFromBearerToken($bearerToken);
|
|
$request->request->add(['brand_id' => $service->brand->id]);
|
|
$response = $next($request);
|
|
// @codeCoverageIgnoreEnd
|
|
} else {
|
|
// Use Laravel auth check mecanism.
|
|
$response = \call_user_func_array(
|
|
[$this, 'parent::' . __FUNCTION__],
|
|
array_merge([$request, $next], $guards)
|
|
);
|
|
}
|
|
|
|
return $response;
|
|
}
|
|
/**
|
|
* Get the path the user should be redirected to when they are not authenticated.
|
|
*
|
|
* @param mixed $request
|
|
* @return string|null
|
|
* @codeCoverageIgnore
|
|
*/
|
|
protected function redirectTo($request)
|
|
{
|
|
if (! $request->expectsJson()) {
|
|
return route('login');
|
|
}
|
|
}
|
|
}
|