1 files changed, 1 insertions, 27 deletions
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 5707f24..62fb7ec 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -6,9 +6,6 @@ class User < CouchRest::Model::Base
   property :password_verifier, String, :accessible => true
   property :password_salt, String, :accessible => true
 
-  property :email_forward, String, :accessible => true
-  property :email_aliases, [LocalEmail]
-
   property :public_key, :accessible => true
 
   property :enabled, TrueClass, :default => true
@@ -43,10 +40,6 @@ class User < CouchRest::Model::Base
     :confirmation => true,
     :format => { :with => /.{8}.*/, :message => "needs to be at least 8 characters long" }
 
-  validates :email_forward,
-    :allow_blank => true,
-    :format => { :with => /\A(([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}))?\Z/, :message => "needs to be a valid email address"}
-
   timestamps!
 
   design do
@@ -54,19 +47,6 @@ class User < CouchRest::Model::Base
     load_views(own_path.join('..', 'designs', 'user'))
     view :by_login
     view :by_created_at
-    view :pgp_key_by_handle,
-      map: <<-EOJS
-      function(doc) {
-        if (doc.type != 'User') {
-          return;
-        }
-        emit(doc.login, doc.public_key);
-        doc.email_aliases.forEach(function(alias){
-          emit(alias.username, doc.public_key);
-        });
-      }
-    EOJS
-
   end # end of design
 
   class << self
@@ -118,12 +98,6 @@ class User < CouchRest::Model::Base
     APP_CONFIG['admins'].include? self.login
   end
 
-  # this currently only adds the first email address submitted.
-  # All the ui needs for now.
-  def email_aliases_attributes=(attrs)
-    email_aliases.build(attrs.values.first) if attrs
-  end
-
   def most_recent_tickets(count=3)
     Ticket.for_user(self).limit(count).all #defaults to having most recent updated first
   end
@@ -136,7 +110,7 @@ class User < CouchRest::Model::Base
 
   def login_is_unique_alias
     alias_identity = Identity.find_by_address(self.email_address)
-    return if has_alias.nil?
+    return if alias_identity.blank?
     if alias_identity.user != self
       errors.add(:login, "has already been taken")
     end