summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-06-17 01:57:15 -0700
committerelijah <elijah@riseup.net>2014-06-17 01:57:15 -0700
commit280a46b5c4958cb183427028a8e66059856d46aa (patch)
tree77afce7a62f1c40e594659e96abca712aa1f8768 /app
parent9fa52ed80d71ec56ed5acf18dfd63bd03b201cc5 (diff)
if identity fails to be created, destroy the user. also, pass through identity errors to user and add identity class hook.
Diffstat (limited to 'app')
-rw-r--r--app/models/account.rb15
-rw-r--r--app/models/identity.rb1
2 files changed, 13 insertions, 3 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index 32ed445..bee540e 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -18,9 +18,18 @@ class Account
def self.create(attrs)
@user = User.create(attrs)
if @user.persisted?
- identity = @user.identity
- identity.user_id = @user.id
- identity.save
+ @identity = @user.identity
+ @identity.user_id = @user.id
+ @identity.save
+ @identity.errors.each do |attr, msg|
+ @user.errors.add(attr, msg)
+ end
+ end
+ rescue StandardError => ex
+ @user.errors.add(:base, ex.to_s)
+ ensure
+ if @user.persisted? && (@identity.nil? || !@identity.persisted?)
+ @user.destroy
end
return @user
end
diff --git a/app/models/identity.rb b/app/models/identity.rb
index 2f6241c..e7b5785 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -163,4 +163,5 @@ class Identity < CouchRest::Model::Base
end
end
+ ActiveSupport.run_load_hooks(:identity, self)
end