refactor of register

Evandro Junior
1 parent a8028635
Showing 1 changed file with 9 additions and 20 deletions Show diff stats
lib/noosfero/api/session.rb
@@ -43,27 +43,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
	@@ -43,27 +43,16 @@ module Noosfero		@@ -43,27 +43,16 @@ module Noosfero
43	# this return is just to improve the clarity of the execution path	43	# this return is just to improve the clarity of the execution path
44	return unless test_captcha(remote_ip, params, environment)	44	return unless test_captcha(remote_ip, params, environment)
45	user = User.new(attrs)	45	user = User.new(attrs)
46	- if params[:name].present?
47	- #adds user and person
48	- person = Person.new(name: params[:name], identifier: user.login)
49	- user.person = person
50	- if user.signup
51	- user.generate_private_token! if user.activated?
52	- present user, :with => Entities::UserLogin
53	- else
54	- user.destroy
55	- message = user.errors.as_json.merge(person.errors.as_json).to_json
56	- render_api_error!(message, 400)
57	- end	46	+ params[:name].present? ? name = params[:name] : name = attrs[:email]
		47	+ person = Person.new(name: name, identifier: user.login)
		48	+ user.person = person
		49	+ if user.signup
		50	+ user.generate_private_token! if user.activated?
		51	+ present user, :with => Entities::UserLogin
58	else	52	else
59	- #adds user only
60	- if user.save
61	- user.generate_private_token! if user.activated?
62	- present user, :with => Entities::UserLogin
63	- else
64	- message = user.errors.to_json
65	- render_api_error!(message, 400)
66	- end	53	+ user.destroy
		54	+ message = user.errors.as_json.merge(person.errors.as_json).to_json
		55	+ render_api_error!(message, 400)
67	end	56	end
68	end	57	end
69		58