IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests for login providers when dealing with LDAP.

Browse Source
This commit is contained in:
James Cole 2018-10-13 21:45:12 +02:00
parent 3bc38570a2
commit c6370ebe48
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@ -30,6 +30,7 @@ use FireflyIII\User;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails; use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Password; use Illuminate\Support\Facades\Password;
use Log;
/** /**
* Class ForgotPasswordController * Class ForgotPasswordController
@ -58,10 +59,10 @@ class ForgotPasswordController extends Controller
*/ */
public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository) public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
{ {
$loginProvider = getenv('LOGIN_PROVIDER'); $loginProvider = env('LOGIN_PROVIDER','eloquent');
if ('eloquent' !== $loginProvider) { if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider); $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
Log::error($message);
return view('error', compact('message')); return view('error', compact('message'));
} }
@ -97,7 +98,7 @@ class ForgotPasswordController extends Controller
*/ */
public function showLinkRequestForm() public function showLinkRequestForm()
{ {
$loginProvider = getenv('LOGIN_PROVIDER'); $loginProvider = env('LOGIN_PROVIDER','eloquent');
if ('eloquent' !== $loginProvider) { if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider); $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -130,7 +130,7 @@ class LoginController extends Controller
public function showLoginForm(Request $request) public function showLoginForm(Request $request)
{ {
$count = DB::table('users')->count(); $count = DB::table('users')->count();
$loginProvider = getenv('LOGIN_PROVIDER'); $loginProvider = env('LOGIN_PROVIDER','eloquent');
if (0 === $count && 'eloquent' === $loginProvider) { if (0 === $count && 'eloquent' === $loginProvider) {
return redirect(route('register')); // @codeCoverageIgnore return redirect(route('register')); // @codeCoverageIgnore
} }

4
app/Http/Controllers/Auth/RegisterController.php
View File

@ -72,7 +72,7 @@ class RegisterController extends Controller
{ {
// is allowed to? // is allowed to?
$allowRegistration = true; $allowRegistration = true;
$loginProvider = getenv('LOGIN_PROVIDER'); $loginProvider = env('LOGIN_PROVIDER','eloquent');
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count(); $userCount = User::count();
if (true === $singleUserMode && $userCount > 0 && 'eloquent' === $loginProvider) { if (true === $singleUserMode && $userCount > 0 && 'eloquent' === $loginProvider) {
@ -113,7 +113,7 @@ class RegisterController extends Controller
public function showRegistrationForm(Request $request) public function showRegistrationForm(Request $request)
{ {
$allowRegistration = true; $allowRegistration = true;
$loginProvider = getenv('LOGIN_PROVIDER'); $loginProvider = env('LOGIN_PROVIDER','eloquent');
$isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count(); $userCount = User::count();

4
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@ -71,7 +71,7 @@ class ResetPasswordController extends Controller
*/ */
public function showResetForm(Request $request, $token = null) public function showResetForm(Request $request, $token = null)
{ {
$loginProvider = getenv('LOGIN_PROVIDER'); $loginProvider = env('LOGIN_PROVIDER','eloquent');
if ('eloquent' !== $loginProvider) { if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider); $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
@ -103,7 +103,7 @@ class ResetPasswordController extends Controller
*/ */
public function reset(Request $request) public function reset(Request $request)
{ {
$loginProvider = getenv('LOGIN_PROVIDER'); $loginProvider = env('LOGIN_PROVIDER','eloquent');
if ('eloquent' !== $loginProvider) { if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider); $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);

2
resources/views/auth/login.twig
View File

@ -54,7 +54,7 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
{% if env('LOGIN_PROVIDER', '') == 'eloquent' %} {% if env('LOGIN_PROVIDER', 'eloquent') == 'eloquent' %}
<input type="email" autocomplete="email" name="email" value="{{ email }}" class="form-control" placeholder="{{ trans('form.email') }}"/> <input type="email" autocomplete="email" name="email" value="{{ email }}" class="form-control" placeholder="{{ trans('form.email') }}"/>
{% else %} {% else %}
<input type="text" autocomplete="username" name="email" value="{{ email }}" class="form-control" placeholder="{{ trans('form.login_name') }}"/> <input type="text" autocomplete="username" name="email" value="{{ email }}" class="form-control" placeholder="{{ trans('form.login_name') }}"/>