api: fix user registration

Victor Costa
1 parent c2c835ac
Showing 3 changed files with 8 additions and 12 deletions Show diff stats
app/models/user.rb
lib/noosfero/api/session.rb
test/unit/api/session_test.rb
@@ -102,12 +102,6 @@ class User &lt; ActiveRecord::Base
     end
   end
  
-  def signup
-    User.transaction do
-      self.person.save if self.save
-    end
-  end
-
   has_one :person, :dependent => :destroy
   belongs_to :environment
  
@@ -45,14 +45,16 @@ 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)
+
         name = params[:name].present? ? params[:name] : attrs[:email]
         user = User.new(attrs.merge(:name => name))
-        if user.signup!
+
+        begin
+          user.signup!
           user.generate_private_token! if user.activated?
           present user, :with => Entities::UserLogin
-        else
-          user.destroy
-          message = user.errors.as_json.merge(user.person.errors.as_json).to_json
+        rescue ActiveRecord::RecordInvalid
+          message = user.errors.as_json.merge((user.person.present? ? user.person.errors : {}).as_json).to_json
           render_api_error!(message, 400)
         end
       end
@@ -27,8 +27,8 @@ class SessionTest &lt; ActiveSupport::TestCase
     assert_equal 201, last_response.status
     json = JSON.parse(last_response.body)
     assert User['newuserapi'].activated?
-    assert json['user']['activated']
-    assert json['user']['private_token'].present?
+    assert json['activated']
+    assert json['private_token'].present?
   end
  
   should 'register a user with name' do
...	...	@@ -102,12 +102,6 @@ class User < ActiveRecord::Base
102	102	end
103	103	end
104	104
105		- def signup
106		- User.transaction do
107		- self.person.save if self.save
108		- end
109		- end
110		-
111	105	has_one :person, :dependent => :destroy
112	106	belongs_to :environment
113	107
...	...
...	...	@@ -45,14 +45,16 @@ module Noosfero
45	45	# test_captcha will render_api_error! and exit in case of any problem
46	46	# this return is just to improve the clarity of the execution path
47	47	return unless test_captcha(remote_ip, params, environment)
	48	+
48	49	name = params[:name].present? ? params[:name] : attrs[:email]
49	50	user = User.new(attrs.merge(:name => name))
50		- if user.signup!
	51	+
	52	+ begin
	53	+ user.signup!
51	54	user.generate_private_token! if user.activated?
52	55	present user, :with => Entities::UserLogin
53		- else
54		- user.destroy
55		- message = user.errors.as_json.merge(user.person.errors.as_json).to_json
	56	+ rescue ActiveRecord::RecordInvalid
	57	+ message = user.errors.as_json.merge((user.person.present? ? user.person.errors : {}).as_json).to_json
56	58	render_api_error!(message, 400)
57	59	end
58	60	end
...	...
...	...	@@ -27,8 +27,8 @@ class SessionTest < ActiveSupport::TestCase
27	27	assert_equal 201, last_response.status
28	28	json = JSON.parse(last_response.body)
29	29	assert User['newuserapi'].activated?
30		- assert json['user']['activated']
31		- assert json['user']['private_token'].present?
	30	+ assert json['activated']
	31	+ assert json['private_token'].present?
32	32	end
33	33
34	34	should 'register a user with name' do
...	...