mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Multi-db fixes
This commit is contained in:
parent
a488d6a40f
commit
1e018f1ba9
@ -261,6 +261,7 @@ class UserController extends BaseController
|
|||||||
|
|
||||||
if ($user->public_id) {
|
if ($user->public_id) {
|
||||||
Auth::logout();
|
Auth::logout();
|
||||||
|
Session::flush();
|
||||||
$token = Password::getRepository()->create($user);
|
$token = Password::getRepository()->create($user);
|
||||||
|
|
||||||
return Redirect::to("/password/reset/{$token}");
|
return Redirect::to("/password/reset/{$token}");
|
||||||
|
@ -20,15 +20,15 @@ class DatabaseLookup
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($guard == 'user') {
|
if ($guard == 'user') {
|
||||||
if (Auth::check() && $server = session(SESSION_DB_SERVER)) {
|
if ($code = $request->confirmation_code) {
|
||||||
|
LookupUser::setServerByField('confirmation_code', $code);
|
||||||
|
} elseif ($server = session(SESSION_DB_SERVER)) {
|
||||||
config(['database.default' => $server]);
|
config(['database.default' => $server]);
|
||||||
$user = Auth::user()->fresh();
|
$user = Auth::user()->fresh();
|
||||||
$user->load('account');
|
$user->load('account');
|
||||||
Auth::setUser($user);
|
Auth::setUser($user);
|
||||||
} elseif ($email = $request->email) {
|
} elseif ($email = $request->email) {
|
||||||
LookupUser::setServerByField('email', $email);
|
LookupUser::setServerByField('email', $email);
|
||||||
} elseif ($code = $request->confirmation_code) {
|
|
||||||
LookupUser::setServerByField('confirmation_code', $code);
|
|
||||||
}
|
}
|
||||||
} elseif ($guard == 'api') {
|
} elseif ($guard == 'api') {
|
||||||
if ($token = $request->header('X-Ninja-Token')) {
|
if ($token = $request->header('X-Ninja-Token')) {
|
||||||
|
@ -66,7 +66,7 @@ class LookupModel extends Eloquent
|
|||||||
$className = get_called_class();
|
$className = get_called_class();
|
||||||
$className = str_replace('Lookup', '', $className);
|
$className = str_replace('Lookup', '', $className);
|
||||||
$key = sprintf('server:%s:%s:%s', $className, $field, $value);
|
$key = sprintf('server:%s:%s:%s', $className, $field, $value);
|
||||||
$isUser = $className == 'App\Models\User';
|
$isUser = ($className == 'App\Models\User' && $field == 'email');
|
||||||
|
|
||||||
// check if we've cached this lookup
|
// check if we've cached this lookup
|
||||||
if (env('MULTI_DB_CACHE_ENABLED') && $server = Cache::get($key)) {
|
if (env('MULTI_DB_CACHE_ENABLED') && $server = Cache::get($key)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user