From c6370ebe480544b5ec4c2aba2e593ceb55961d16 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 13 Oct 2018 21:45:12 +0200
Subject: [PATCH] Fix tests for login providers when dealing with LDAP.

---
 app/Http/Controllers/Auth/ForgotPasswordController.php | 7 ++++---
 app/Http/Controllers/Auth/LoginController.php          | 2 +-
 app/Http/Controllers/Auth/RegisterController.php       | 4 ++--
 app/Http/Controllers/Auth/ResetPasswordController.php  | 4 ++--
 resources/views/auth/login.twig                        | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 466c0dc67e..1ea84b992b 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -30,6 +30,7 @@ use FireflyIII\User;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;
+use Log;
 
 /**
  * Class ForgotPasswordController
@@ -58,10 +59,10 @@ class ForgotPasswordController extends Controller
      */
     public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
     {
-        $loginProvider = getenv('LOGIN_PROVIDER');
+        $loginProvider = env('LOGIN_PROVIDER','eloquent');
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
-
+            Log::error($message);
             return view('error', compact('message'));
         }
 
@@ -97,7 +98,7 @@ class ForgotPasswordController extends Controller
      */
     public function showLinkRequestForm()
     {
-        $loginProvider = getenv('LOGIN_PROVIDER');
+        $loginProvider = env('LOGIN_PROVIDER','eloquent');
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 6d57c321b6..74d37f86ea 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -130,7 +130,7 @@ class LoginController extends Controller
     public function showLoginForm(Request $request)
     {
         $count         = DB::table('users')->count();
-        $loginProvider = getenv('LOGIN_PROVIDER');
+        $loginProvider = env('LOGIN_PROVIDER','eloquent');
         if (0 === $count && 'eloquent' === $loginProvider) {
             return redirect(route('register')); // @codeCoverageIgnore
         }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 7976eb5d62..2078d1e1e4 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -72,7 +72,7 @@ class RegisterController extends Controller
     {
         // is allowed to?
         $allowRegistration = true;
-        $loginProvider     = getenv('LOGIN_PROVIDER');
+        $loginProvider     = env('LOGIN_PROVIDER','eloquent');
         $singleUserMode    = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $userCount         = User::count();
         if (true === $singleUserMode && $userCount > 0 && 'eloquent' === $loginProvider) {
@@ -113,7 +113,7 @@ class RegisterController extends Controller
     public function showRegistrationForm(Request $request)
     {
         $allowRegistration = true;
-        $loginProvider     = getenv('LOGIN_PROVIDER');
+        $loginProvider     = env('LOGIN_PROVIDER','eloquent');
         $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;
         $userCount         = User::count();
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 3f26235867..de1979c590 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -71,7 +71,7 @@ class ResetPasswordController extends Controller
      */
     public function showResetForm(Request $request, $token = null)
     {
-        $loginProvider = getenv('LOGIN_PROVIDER');
+        $loginProvider = env('LOGIN_PROVIDER','eloquent');
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
@@ -103,7 +103,7 @@ class ResetPasswordController extends Controller
      */
     public function reset(Request $request)
     {
-        $loginProvider = getenv('LOGIN_PROVIDER');
+        $loginProvider = env('LOGIN_PROVIDER','eloquent');
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig
index 3308e41329..53c545a1a6 100644
--- a/resources/views/auth/login.twig
+++ b/resources/views/auth/login.twig
@@ -54,7 +54,7 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
             <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') }}"/>
                 {% else %}
                     <input type="text" autocomplete="username" name="email" value="{{ email }}" class="form-control" placeholder="{{ trans('form.login_name') }}"/>