Merge branch 'staging' of gitlab.com:participa/noosfero into staging

Leandro Santos
2 parents a02043aa 8cd9e28b
Showing 4 changed files with 10 additions and 15 deletions Show diff stats
app/models/user.rb
lib/noosfero/api/session.rb
plugins/dialoga
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,16 +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)
-        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))
+
+        begin
+          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
+        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
-Subproject commit d3e59ff7da949cf01cf659d8d4e8aaae3060a121
+Subproject commit 7fb05fecf22a0692a94c8fdd4c45545d21cb7999
@@ -26,6 +26,7 @@ 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 User['newuserapi'].activated?
     assert json['activated']
     assert json['private_token'].present?
   end
...	...	@@ -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,16 +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		- user = User.new(attrs)
49		- params[:name].present? ? name = params[:name] : name = attrs[:email]
50		- person = Person.new(name: name, identifier: user.login)
51		- user.person = person
52		- if user.signup
	48	+
	49	+ name = params[:name].present? ? params[:name] : attrs[:email]
	50	+ user = User.new(attrs.merge(:name => name))
	51	+
	52	+ begin
	53	+ user.signup!
53	54	user.generate_private_token! if user.activated?
54	55	present user, :with => Entities::UserLogin
55		- else
56		- user.destroy
57		- message = user.errors.as_json.merge(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
58	58	render_api_error!(message, 400)
59	59	end
60	60	end
...	...
1		-Subproject commit d3e59ff7da949cf01cf659d8d4e8aaae3060a121
	1	+Subproject commit 7fb05fecf22a0692a94c8fdd4c45545d21cb7999
...	...
...	...	@@ -26,6 +26,7 @@ class SessionTest < ActiveSupport::TestCase
26	26	post "/api/v1/register?#{params.to_query}"
27	27	assert_equal 201, last_response.status
28	28	json = JSON.parse(last_response.body)
	29	+ assert User['newuserapi'].activated?
29	30	assert json['activated']
30	31	assert json['private_token'].present?
31	32	end
...	...