4 files changed, 31 insertions, 18 deletions
diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb
index f380c19..b271152 100644
--- a/users/app/controllers/v1/users_controller.rb
+++ b/users/app/controllers/v1/users_controller.rb
@@ -18,23 +18,20 @@ module V1
     end
 
     def create
-      @user = signup_service.register(params[:user])
+      @user = Account.create(params[:user])
       respond_with @user # return ID instead?
     end
 
     def update
-      account_settings.update params[:user]
+      account.update params[:user]
       respond_with @user
     end
 
     protected
 
-    def account_settings
-      AccountSettings.new(@user)
+    def account
+      Account.new(@user)
     end
 
-    def signup_service
-      SignupService.new
-    end
   end
 end
diff --git a/users/app/models/account_settings.rb b/users/app/models/account.rb
index 27fa227..5368a1b 100644
--- a/users/app/models/account_settings.rb
+++ b/users/app/models/account.rb
@@ -1,9 +1,21 @@
-class AccountSettings
+#
+# A Composition of a User record and it's identity records.
+#
+class Account
 
-  def initialize(user)
+  attr_reader :user
+
+  def initialize(user = nil)
     @user = user
   end
 
+  # Returns the user record so it can be used in views.
+  def self.create(attrs)
+    @user = User.create(attrs).tap do |user|
+      Identity.create_for user
+    end
+  end
+
   def update(attrs)
     if attrs[:password_verifier].present?
       update_login(attrs[:login])
@@ -12,6 +24,15 @@ class AccountSettings
     # TODO: move into identity controller
     update_pgp_key(attrs[:public_key]) if attrs.has_key? :public_key
     @user.save && save_identities
+    @user.refresh_identity
+  end
+
+  def destroy
+    return unless @user
+    Identity.by_user_id.key(@user.id).each do |identity|
+      identity.destroy
+    end
+    @user.destroy
   end
 
   protected
diff --git a/users/app/models/signup_service.rb b/users/app/models/signup_service.rb
deleted file mode 100644
index f316ca9..0000000
--- a/users/app/models/signup_service.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class SignupService
-
-  def register(attrs)
-    User.create(attrs).tap do |user|
-      Identity.create_for user
-    end
-  end
-
-end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 8874966..310eecd 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -86,6 +86,10 @@ class User < CouchRest::Model::Base
     @identity ||= Identity.for(self)
   end
 
+  def refresh_identity
+    @identity = Identity.for(self)
+  end
+
   protected
 
   ##