Merge branch 'api' into staging

Victor Costa
2 parents f76f09c3 a3678363
Showing 1 changed file with 14 additions and 21 deletions Show diff stats
lib/noosfero/api/session.rb
@@ -13,7 +13,11 @@ module Noosfero
       # Example Request:
       #  POST http://localhost:3000/api/v1/login?login=adminuser&password=admin
       post "/login" do
-        user ||= User.authenticate(params[:login], params[:password], environment)
+        begin
+          user ||= User.authenticate(params[:login], params[:password], environment)
+        rescue NoosferoExceptions::UserNotActivated => e
+          render_api_error!(e.message, 401)
+        end
         return unauthorized! unless user
         user.generate_private_token!
@@ -42,27 +46,16 @@ module Noosfero
         # this return is just to improve the clarity of the execution path
         return unless test_captcha(remote_ip, params, environment)
         user = User.new(attrs)
-        if params[:name].present?
-          #adds user and person
-          person = Person.new(name: params[:name], identifier: user.login)
-          user.person = person
-          if user.signup
-              user.generate_private_token! if user.activated?
-              present user, :with => Entities::UserLogin
-          else
-            user.destroy
-            message = user.errors.as_json.merge(person.errors.as_json).to_json
-            render_api_error!(message, 400)
-          end
+        params[:name].present? ? name = params[:name] : name = attrs[:email]
+        person = Person.new(name: name, identifier: user.login)
+        user.person = person
+        if user.signup
+          user.generate_private_token! if user.activated?
+          present user, :with => Entities::UserLogin
         else
-          #adds user only
-          if user.save
-              user.generate_private_token! if user.activated?
-              present user, :with => Entities::UserLogin
-          else
-            message = user.errors.to_json
-            render_api_error!(message, 400)
-          end
+          user.destroy
+          message = user.errors.as_json.merge(person.errors.as_json).to_json
+          render_api_error!(message, 400)
         end
       end