api: fix user registration

Victor Costa
1 parent fec92470
Showing 2 changed files with 7 additions and 8 deletions Show diff stats
lib/noosfero/api/session.rb
test/unit/api/session_test.rb
@@ -45,16 +45,14 @@ module Noosfero
         # test_captcha will render_api_error! and exit in case of any problem
         # this return is just to improve the clarity of the execution path
         return unless test_captcha(remote_ip, params, environment)
-        user = User.new(attrs)
-        params[:name].present? ? name = params[:name] : name = attrs[:email]
-        person = Person.new(name: name, identifier: user.login)
-        user.person = person
-        if user.signup
+        name = params[:name].present? ? params[:name] : attrs[:email]
+        user = User.new(attrs.merge(:name => name))
+        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
+          message = user.errors.as_json.merge(user.person.errors.as_json).to_json
           render_api_error!(message, 400)
         end
       end
@@ -26,8 +26,9 @@ class SessionTest &lt; ActiveSupport::TestCase
     post "/api/v1/register?#{params.to_query}"
     assert_equal 201, last_response.status
     json = JSON.parse(last_response.body)
-    assert json['activated']
-    assert json['private_token'].present?
+    assert User['newuserapi'].activated?
+    assert json['user']['activated']
+    assert json['user']['private_token'].present?
   end
   should 'register a user with name' do