Skip to content
Snippets Groups Projects
Commit 7b510145 authored by Davide Aprea's avatar Davide Aprea
Browse files

fixed provider and middleware

parent e598ed08
No related branches found
No related tags found
3 merge requests!1895Development,!1747Development,!1731Resolve "removing integration of obsolete resultpage formats"
......@@ -6,8 +6,16 @@ use Closure;
use Cookie;
use App\Models\Key;
//use KeyServiceProvider;
class KeyValidation
{
protected $key;
public function __construct(Key $key){
$this->key = $key;
}
/**
* Handle an incoming request.
*
......@@ -15,19 +23,24 @@ class KeyValidation
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next, Key $key)
public function handle($request, Closure $next)
{
if(isset($key) && $key->getStatus()) {
return $next($request);
} elseif(isset($key) && !$key->getStatus()) {
//dd($this->key->key, $this->key->getStatus());
if($this->key->key !== '' && $this->key->getStatus()) {
return response('valid key');
//return $next($request);
} elseif($this->key->key !== '' && !$this->key->getStatus()) {
if($request->filled('key')){
return redirect($request->except('key'));
return response('invalid key (parameter)');
//return redirect($request->except('key'));
} else {
Cookie::queue('key', '', 0, '/', null, false, false);
return redirect($request);
return response('invalid key (cookie)');
//return redirect($request);
}
} else {
return redirect($request);
return response('no key');
//return redirect($request);
}
}
}
......@@ -5,6 +5,7 @@ namespace App\Providers;
use Illuminate\Support\ServiceProvider;
use Request;
use Cookie;
use App\Models\Key;
class KeyServiceProvider extends ServiceProvider
{
......@@ -16,11 +17,11 @@ class KeyServiceProvider extends ServiceProvider
public function register()
{
$key = "";
if(Cookie::get('key')) {
if(Cookie::has('key')) {
$key = Cookie::get('key');
}
if(isset($request->key)) {
$key = $request->key;
if(Request::filled('key')) {
$key = Request::input('key');
}
$this->app->singleton(Key::class, function ($app) use ($key) {
return new Key($key);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment