kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-03 04:41:41 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2017-02-25 05:57:01 +01:00
parent 444439fdab
commit 8c6972d12d
35 changed files with 133 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
View File

@@ -14,11 +14,11 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Middleware;
use Closure;
use Cookie;
use Illuminate\Support\Facades\Auth;
use Preferences;
use Session;
use Log;
use Cookie;
/**
* Class RedirectIfTwoFactorAuthenticated
*

36
app/Http/Middleware/Sandstorm.php
View File

@@ -35,6 +35,7 @@ class Sandstorm
* @param string|null $guard
*
* @return mixed
* @throws FireflyException
*/
public function handle(Request $request, Closure $next, $guard = null)
{
@@ -59,30 +60,34 @@ class Sandstorm
// and any other differences there may be between these users.
if ($count === 1 && strlen($userId) > 0) {
// login as first user user.
$user = User::first();
$user = User::first();
Auth::guard($guard)->login($user);
View::share('SANDSTORM_ANON', false);
return $next($request);
}
if ($count === 1 && strlen($userId) === 0) {
// login but indicate anonymous
$user = User::first();
$user = User::first();
Auth::guard($guard)->login($user);
View::share('SANDSTORM_ANON', true);
return $next($request);
}
if ($count === 0 && strlen($userId) > 0) {
// create new user.
$email = $userId . '@firefly';
$user = User::create(
/** @var User $user */
$user = User::create(
[
'email' => $email,
'password' => str_random(16),
]
);
Auth::guard($guard)->login($user);
return $next($request);
}
@@ -91,30 +96,7 @@ class Sandstorm
}
if ($count > 1) {
die('Cannot happen.');
}
exit;
if (strlen($userId) > 0) {
// find user?
$email = $userId . '@firefly';
$user = User::whereEmail($email)->first();
if (is_null($user)) {
$user = User::create(
[
'email' => $email,
'password' => str_random(16),
]
);
}
// login user:
Auth::guard($guard)->login($user);
} else {
echo 'user id no length, guest?';
exit;
throw new FireflyException('Your Firefly III installation has more than one user, which is weird.');
}
}