mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-05 18:52:44 +01:00
Merge pull request #4978 from turbo124/v5-develop
OAuth password protection routes
This commit is contained in:
commit
67ab0b9ad4
@ -1 +1 @@
|
||||
5.1.8
|
||||
5.1.9
|
@ -11,6 +11,8 @@
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use App\Libraries\MultiDB;
|
||||
use App\Libraries\OAuth\Providers\Google;
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
@ -34,16 +36,52 @@ class PasswordProtection
|
||||
'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)) {
|
||||
return response()->json($error, 403);
|
||||
}
|
||||
|
||||
} elseif (Cache::get(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));
|
||||
|
||||
return $next($request);
|
||||
|
||||
} else {
|
||||
|
||||
$error = [
|
||||
'message' => 'Access denied',
|
||||
'errors' => new stdClass,
|
||||
|
@ -13,7 +13,7 @@ return [
|
||||
'require_https' => env('REQUIRE_HTTPS', true),
|
||||
'app_url' => rtrim(env('APP_URL', ''), '/'),
|
||||
'app_domain' => env('APP_DOMAIN', ''),
|
||||
'app_version' => '5.1.8',
|
||||
'app_version' => '5.1.9',
|
||||
'minimum_client_version' => '5.0.16',
|
||||
'terms_version' => '1.0.1',
|
||||
'api_secret' => env('API_SECRET', false),
|
||||
|
Loading…
Reference in New Issue
Block a user