Skip to content
This repository was archived by the owner on Feb 20, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions src/Level3/Silex/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class Controller
private $processor;
private $requestFactory;
private $allowedOrigin = '';
private $allowedMethods = '';

public function __construct(RequestProcessor $processor, RequestFactory $requestFactory)
{
Expand All @@ -33,16 +34,28 @@ public function setAllowedOrigin($allowedOrigin)
$this->allowedOrigin = $allowedOrigin;
}

public function setAllowedMethods($allowedMethods)
{
$this->allowedMethods = $allowedMethods;
}

protected function allowOrigin(Response $response, $method){
$response->setHeader('Access-Control-Allow-Origin',$this->allowedOrigin);
$response->setHeader('Access-Control-Allow-Methods',$this->allowedMethods);
return $response;
}

public function options(Request $request)
{
$headers = $request->headers->all();
$headers['Access-Control-Allow-Origin'] = $this->allowedOrigin;

$headers['Access-Control-Allow-Methods'] = $this->allowedMethods;
if (isset($headers['access-control-request-headers'])) {
$headers['Access-Control-Allow-Headers'] = $headers['access-control-request-headers'];
}

unset($headers['access-control-request-headers']);
unset($headers['access-control-request-method']);
unset($headers['user-agent']);
unset($headers['origin']);
unset($headers['accept']);
Expand All @@ -56,46 +69,39 @@ public function find(Request $request)
{
$level3Request = $this->createLevel3Request($request);
$response = $this->processor->find($level3Request);

$response->addHeader('Access-Control-Allow-Origin', '*');
$this->allowOrigin($response,'find');
return $response;
}

public function get(Request $request)
{
$level3Request = $this->createLevel3Request($request);
$response = $this->processor->get($level3Request);

$response->addHeader('Access-Control-Allow-Origin', '*');
$this->allowOrigin($response,'get');
return $response;
}

public function post(Request $request)
{
$level3Request = $this->createLevel3Request($request);
$response = $this->processor->post($level3Request);

$response->addHeader('Access-Control-Allow-Origin', '*');
$this->allowOrigin($response,'post');
return $response;
}

public function put(Request $request)
{
$level3Request = $this->createLevel3Request($request);

$response = $this->processor->put($level3Request);

$response->addHeader('Access-Control-Allow-Origin', '*');
$this->allowOrigin($response,'put');
return $response;
}

public function delete(Request $request)
{
$level3Request = $this->createLevel3Request($request);

$response = $this->processor->delete($level3Request);

$response->addHeader('Access-Control-Allow-Origin', '*');
$this->allowOrigin($response,'delete');
return $response;
}

Expand Down
4 changes: 2 additions & 2 deletions src/Level3/Silex/RepositoryMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ public function mapGet($resourceKey, $uri)
public function mapPost($resourceKey, $uri)
{
$this->app->
post($uri, 'level3.controller:post')->
put($uri, 'level3.controller:post')->
bind(sprintf('%s:post', $resourceKey));
}

public function mapPut($resourceKey, $uri)
{
$this->app->
put($uri, 'level3.controller:put')->
post($uri, 'level3.controller:put')->
bind(sprintf('%s:put', $resourceKey));
}

Expand Down