Merge branch 'fix_api_login' into 'master'

api: fix validation of inactive users in login See merge request !866

Merge branch 'fix_api_login' into 'master'
api: fix validation of inactive users in login See merge request !866
Leandro Santos
2 parents b2165f89 464f8ef6
Showing 2 changed files with 8 additions and 1 deletions Show diff stats
lib/noosfero/api/session.rb
test/api/session_test.rb
@@ -15,7 +15,7 @@ module Noosfero
       post "/login" do
         begin
           user ||= User.authenticate(params[:login], params[:password], environment)
-        rescue NoosferoExceptions::UserNotActivated => e
+        rescue User::UserNotActivated => e
           render_api_error!(e.message, 401)
         end
  
@@ -20,6 +20,13 @@ class SessionTest &lt; ActiveSupport::TestCase
     assert_equal 401, last_response.status
   end
  
+  should 'return 401 when login with an user that was not activated' do
+    user.deactivate
+    params = {:login => "testapi", :password => "testapi"}
+    post "/api/v1/login?#{params.to_query}"
+    assert_equal 401, last_response.status
+  end
+
   should 'register a user' do
     Environment.default.enable('skip_new_user_email_confirmation')
     params = {:login => "newuserapi", :password => "newuserapi", :password_confirmation => "newuserapi", :email => "newuserapi@email.com" }
...	...	@@ -15,7 +15,7 @@ module Noosfero
15	15	post "/login" do
16	16	begin
17	17	user \|\|= User.authenticate(params[:login], params[:password], environment)
18		- rescue NoosferoExceptions::UserNotActivated => e
	18	+ rescue User::UserNotActivated => e
19	19	render_api_error!(e.message, 401)
20	20	end
21	21
...	...
...	...	@@ -20,6 +20,13 @@ class SessionTest < ActiveSupport::TestCase
20	20	assert_equal 401, last_response.status
21	21	end
22	22
	23	+ should 'return 401 when login with an user that was not activated' do
	24	+ user.deactivate
	25	+ params = {:login => "testapi", :password => "testapi"}
	26	+ post "/api/v1/login?#{params.to_query}"
	27	+ assert_equal 401, last_response.status
	28	+ end
	29	+
23	30	should 'register a user' do
24	31	Environment.default.enable('skip_new_user_email_confirmation')
25	32	params = {:login => "newuserapi", :password => "newuserapi", :password_confirmation => "newuserapi", :email => "newuserapi@email.com" }
...	...