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
54 lines
1.7 KiB
PHP
54 lines
1.7 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Resources\Api\V2;
|
|
|
|
use App\Models\Answer;
|
|
use App\Models\Question;
|
|
use Illuminate\Http\Resources\Json\ResourceCollection as JsonResourceCollection;
|
|
use Illuminate\Support\Collection;
|
|
|
|
class QuestionsResource extends JsonResourceCollection
|
|
{
|
|
/** @var \Illuminate\Support\Collection */
|
|
protected $userAnwsers = null;
|
|
|
|
/**
|
|
* Create a new resource instance.
|
|
*
|
|
* @param mixed $resource
|
|
* @param \Illuminate\Support\Collection $userAnwsers
|
|
* @return void
|
|
*/
|
|
public function __construct($resource, Collection $userAnwsers = null)
|
|
{
|
|
$this->userAnwsers = $userAnwsers;
|
|
parent::__construct($resource);
|
|
}
|
|
|
|
/**
|
|
* Transform the resource into an array.
|
|
*
|
|
* @param mixed $request
|
|
* @return array
|
|
*/
|
|
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass, Squiz.Commenting.FunctionComment.Missing
|
|
public function toArray($request)
|
|
{
|
|
return $this->collection->map(function (Question $question) {
|
|
/** @var \Illuminate\Support\Collection */
|
|
$answers = $question->answers;
|
|
$question = [
|
|
'id' => $question->id,
|
|
'type' => $question->type->value,
|
|
'question' => $question->question,
|
|
'answers' => new AnswersResource($answers)
|
|
];
|
|
if ($this->userAnwsers) {
|
|
$question['customerAnswers'] = new AnswersResource($answers->filter(function (Answer $answer) {
|
|
return $this->userAnwsers->keyBy('id')->has($answer->id);
|
|
}));
|
|
}
|
|
return $question;
|
|
});
|
|
}
|
|
}
|