mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-23 20:00:33 -04:00
Working on OAuth password protection routes
This commit is contained in:
parent
9c174984cf
commit
9b1b677e8e
@ -11,6 +11,8 @@
|
|||||||
|
|
||||||
namespace App\Http\Middleware;
|
namespace App\Http\Middleware;
|
||||||
|
|
||||||
|
use App\Libraries\MultiDB;
|
||||||
|
use App\Libraries\OAuth\Providers\Google;
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Cache;
|
use Illuminate\Support\Facades\Cache;
|
||||||
@ -34,16 +36,52 @@ class PasswordProtection
|
|||||||
'errors' => new stdClass,
|
'errors' => new stdClass,
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($request->header('X-API-PASSWORD')) {
|
if($request->header('X-API-OAUTH-PASSWORD')){
|
||||||
|
|
||||||
|
//user is attempting to reauth with OAuth - check the token value
|
||||||
|
//todo expand this to include all OAuth providers
|
||||||
|
$user = false;
|
||||||
|
$google = new Google();
|
||||||
|
$user = $google->getTokenResponse(request()->header('X-API-OAUTH-PASSWORD'));
|
||||||
|
|
||||||
|
if (is_array($user)) {
|
||||||
|
|
||||||
|
$query = [
|
||||||
|
'oauth_user_id' => $google->harvestSubField($user),
|
||||||
|
'oauth_provider_id'=> 'google',
|
||||||
|
];
|
||||||
|
|
||||||
|
/* Cannot allow duplicates! */
|
||||||
|
if ($existing_user = MultiDB::hasUser($query)) {
|
||||||
|
return $next($request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$error = [
|
||||||
|
'message' => 'Access denied',
|
||||||
|
'errors' => new stdClass,
|
||||||
|
];
|
||||||
|
|
||||||
|
return response()->json($error, 412);
|
||||||
|
|
||||||
|
|
||||||
|
}elseif ($request->header('X-API-PASSWORD')) {
|
||||||
|
|
||||||
|
//user is attempting to reauth with regular password
|
||||||
|
//
|
||||||
if (! Hash::check($request->header('X-API-PASSWORD'), auth()->user()->password)) {
|
if (! Hash::check($request->header('X-API-PASSWORD'), auth()->user()->password)) {
|
||||||
return response()->json($error, 403);
|
return response()->json($error, 403);
|
||||||
}
|
}
|
||||||
|
|
||||||
} elseif (Cache::get(auth()->user()->email.'_logged_in')) {
|
} elseif (Cache::get(auth()->user()->email.'_logged_in')) {
|
||||||
|
|
||||||
Cache::pull(auth()->user()->email.'_logged_in');
|
Cache::pull(auth()->user()->email.'_logged_in');
|
||||||
Cache::add(auth()->user()->email.'_logged_in', Str::random(64), now()->addMinutes(30));
|
Cache::add(auth()->user()->email.'_logged_in', Str::random(64), now()->addMinutes(30));
|
||||||
|
|
||||||
return $next($request);
|
return $next($request);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
$error = [
|
$error = [
|
||||||
'message' => 'Access denied',
|
'message' => 'Access denied',
|
||||||
'errors' => new stdClass,
|
'errors' => new stdClass,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user