fixes #811 ensure friendly error on invalid creds

Stephen Crosby
1 parent dd14f778
Showing 3 changed files with 5 additions and 16 deletions Show diff stats
config/initializers/overrides.rb
lib/overrides/devise/failure_app.rb
spec/controllers/devise_sessions_controller_spec.rb
-require Rails.root.join('lib/overrides/devise/failure_app')
 require Rails.root.join('lib/overrides/hoptoad_notifier/hoptoad_notifier')
 class BSON::ObjectId
@@ -1,15 +0,0 @@
-Devise::FailureApp.class_eval do
-  protected
-    # Handles both 'email_invalid' and 'username_invalid' messages.
-    def i18n_message(default = nil)
-      message = warden.message || warden_options[:message] || default || :unauthenticated
-
-      if message.is_a?(Symbol)
-        I18n.t(:"#{scope}.#{Devise.authentication_keys.first}_#{message}", :resource_name => scope,
-               :scope => "devise.failure", :default => [message, message.to_s])
-      else
-        message.to_s
-      end
-    end
-end
-
@@ -19,5 +19,10 @@ describe Devise::SessionsController, type: &#39;controller&#39; do
       post :create, { :user => { 'email' => user.email, 'password' => user.password } }
       expect(response).to redirect_to(app_path(app))
     end
+
+    it 'displays a friendly error when credentials are invalid' do
+      post :create, { :user => { 'email' => 'whatever', 'password' => 'somethinginvalid' } }
+      expect(request.flash["alert"]).to eq(I18n.t 'devise.failure.user.email_invalid')
+    end
   end
 end
1	-require Rails.root.join('lib/overrides/devise/failure_app')
2	require Rails.root.join('lib/overrides/hoptoad_notifier/hoptoad_notifier')	1	require Rails.root.join('lib/overrides/hoptoad_notifier/hoptoad_notifier')
3		2
4	class BSON::ObjectId	3	class BSON::ObjectId
	@@ -1,15 +0,0 @@	@@ -1,15 +0,0 @@
1	-Devise::FailureApp.class_eval do
2	- protected
3	- # Handles both 'email_invalid' and 'username_invalid' messages.
4	- def i18n_message(default = nil)
5	- message = warden.message \|\| warden_options[:message] \|\| default \|\| :unauthenticated
6	-
7	- if message.is_a?(Symbol)
8	- I18n.t(:"#{scope}.#{Devise.authentication_keys.first}_#{message}", :resource_name => scope,
9	- :scope => "devise.failure", :default => [message, message.to_s])
10	- else
11	- message.to_s
12	- end
13	- end
14	-end
15	-
	@@ -19,5 +19,10 @@ describe Devise::SessionsController, type: 'controller' do		@@ -19,5 +19,10 @@ describe Devise::SessionsController, type: 'controller' do
19	post :create, { :user => { 'email' => user.email, 'password' => user.password } }	19	post :create, { :user => { 'email' => user.email, 'password' => user.password } }
20	expect(response).to redirect_to(app_path(app))	20	expect(response).to redirect_to(app_path(app))
21	end	21	end
		22	+
		23	+ it 'displays a friendly error when credentials are invalid' do
		24	+ post :create, { :user => { 'email' => 'whatever', 'password' => 'somethinginvalid' } }
		25	+ expect(request.flash["alert"]).to eq(I18n.t 'devise.failure.user.email_invalid')
		26	+ end
22	end	27	end
23	end	28	end