incomplete initial changes to make email address just login@domain.tld

This involves a number of other changes like making sure the comparison between aliases and emails still works.

Will do that by removing the @domain.tld from aliases as well.

1 files changed, 9 insertions, 24 deletions

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index f20c6ac..40e285a 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -6,7 +6,6 @@ class User < CouchRest::Model::Base
   property :password_verifier, String, :accessible => true
   property :password_salt, String, :accessible => true
 
-  property :email, String, :accessible => true
   property :email_forward, String, :accessible => true
   property :email_aliases, [LocalEmail]
 
@@ -21,6 +20,8 @@ class User < CouchRest::Model::Base
     :format => { :with => /\A[A-Za-z\d_\.]+\z/,
       :message => "Only letters, digits, . and _ allowed" }
 
+  validate :login_differs_from_email_aliases
+
   validates :password_salt, :password_verifier,
     :format => { :with => /\A[\dA-Fa-f]+\z/, :message => "Only hex numbers allowed" }
 
@@ -28,21 +29,9 @@ class User < CouchRest::Model::Base
     :confirmation => true,
     :format => { :with => /.{8}.*/, :message => "needs to be at least 8 characters long" }
 
-  # TODO: write a proper email validator to be used in the different places
-  validates :email,
-    :format => { :with => /\A(([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}))?\Z/, :message => "needs to be a valid email address"}
-
-  validates :email,
-    :format => { :with => /\A(.+@#{APP_CONFIG[:domain]})?\Z/,
-      :message => "needs to end in @#{APP_CONFIG[:domain]}"}
-
-  validate :email_unique_on_server
-
   validates :email_forward,
     :format => { :with => /\A(([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}))?\Z/, :message => "needs to be a valid email address"}
 
-  validate :email_differs_from_email_aliases
-
   timestamps!
 
   design do
@@ -83,6 +72,10 @@ class User < CouchRest::Model::Base
     login
   end
 
+  def email_address
+    login + '@' + APP_CONFIG[:domain]
+  end
+
   # Since we are storing admins by login, we cannot allow admins to change their login.
   def is_admin?
     APP_CONFIG['admins'].include? self.login
@@ -100,19 +93,11 @@ class User < CouchRest::Model::Base
   #  Validation Functions
   ##
 
-  def email_differs_from_email_aliases
+  def login_differs_from_email_aliases
     # If this has not changed but the email aliases let's not mark this invalid.
     return if email_aliases.any? and email_aliases.last.errors.any?
-    if email_aliases.map(&:email).include?(email)
-      errors.add(:email, "may not be the same as an alias")
-    end
-  end
-
-  def email_unique_on_server
-    return unless email
-    has_email = User.find_by_email_or_alias(email)
-    if has_email && has_email != self.base_doc
-      errors.add :email, "has already been taken"
+    if email_aliases.map(&:email).include?(email_address)
+      errors.add(:login, "may not be the same as an alias")
     end
   end