From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 1 Sep 2018 01:35:37 +0000 (+0200)
Subject: Fix wrong string being used on login failure when using LDAP (#8534)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=50f226348fabbbef2084258406816b75ccc56763;p=mastodon.git

Fix wrong string being used on login failure when using LDAP (#8534)

Fix #8527
---

diff --git a/lib/devise/ldap_authenticatable.rb b/lib/devise/ldap_authenticatable.rb
index 534c7a851..6903d468d 100644
--- a/lib/devise/ldap_authenticatable.rb
+++ b/lib/devise/ldap_authenticatable.rb
@@ -25,11 +25,12 @@ module Devise
           )
 
           filter = format(Devise.ldap_search_filter, uid: Devise.ldap_uid, email: email)
+
           if (user_info = ldap.bind_as(base: Devise.ldap_base, filter: filter, password: password))
             user = User.ldap_get_user(user_info.first)
             success!(user)
           else
-            return fail(:invalid_login)
+            return fail(:invalid)
           end
         end
       end