Download as
Browse Code »

Commit 524373dba6e746bce012b57f7a0752ae09ebe451

Authored by Evandro Junior
1 parent cebdccf8
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Needs to be compatible with older versions

Showing 3 changed files with 14 additions and 4 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @524373d
... ... @@ -94,6 +94,12 @@ class User < ActiveRecord::Base
94 94 end
95 95 end
96 96  
  97 + def signup
  98 + User.transaction do
  99 + self.person.save if self.save
  100 + end
  101 + end
  102 +
97 103 has_one :person, :dependent => :destroy
98 104 belongs_to :environment
99 105  
... ...
lib/noosfero/api/entities.rb
  Diff comments   View file @524373d
... ... @@ -112,6 +112,7 @@ module Noosfero
112 112 root 'users', 'user'
113 113 expose :id
114 114 expose :login
  115 + expose :email
115 116 expose :person, :using => Profile
116 117 expose :activated?, as: :activated
117 118 expose :permissions do |user, options|
... ...
lib/noosfero/api/session.rb
  Diff comments   View file @524373d
... ... @@ -43,11 +43,14 @@ module Noosfero
43 43 # this return is just to improve the clarity of the execution path
44 44 return unless test_captcha(remote_ip, params, environment)
45 45 user = User.new(attrs)
46   - if user.save
47   - user.generate_private_token! if user.activated?
48   - present user, :with => Entities::UserLogin
  46 + person = Person.new(name: params[:name], identifier: user.login)
  47 + user.person = person
  48 + if user.signup
  49 + user.generate_private_token! if user.activated?
  50 + present user, :with => Entities::UserLogin
49 51 else
50   - message = user.errors.to_json
  52 + user.destroy
  53 + message = user.errors.as_json.merge(person.errors.as_json).to_json
51 54 render_api_error!(message, 400)
52 55 end
53 56 end
... ...