summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--users/app/designs/user/by_email_alias.js2
-rw-r--r--users/app/designs/user/by_email_or_alias.js4
-rw-r--r--users/app/models/local_email.rb49
-rw-r--r--users/app/models/user.rb33
-rw-r--r--users/app/views/users/edit.html.haml4
-rw-r--r--users/test/factories.rb1
6 files changed, 49 insertions, 44 deletions
diff --git a/users/app/designs/user/by_email_alias.js b/users/app/designs/user/by_email_alias.js
index 508a002..dc8021a 100644
--- a/users/app/designs/user/by_email_alias.js
+++ b/users/app/designs/user/by_email_alias.js
@@ -3,6 +3,6 @@ function(doc) {
return;
}
doc.email_aliases.forEach(function(alias){
- emit(alias.email, 1);
+ emit(alias.username, 1);
});
}
diff --git a/users/app/designs/user/by_email_or_alias.js b/users/app/designs/user/by_email_or_alias.js
index 71fd0ea..2e5d0a8 100644
--- a/users/app/designs/user/by_email_or_alias.js
+++ b/users/app/designs/user/by_email_or_alias.js
@@ -3,9 +3,9 @@ function(doc) {
return;
}
if (doc.email) {
- emit(doc.email, 1);
+ emit(doc.login, 1);
}
doc.email_aliases.forEach(function(alias){
- emit(alias.email, 1);
+ emit(alias.username, 1);
});
}
diff --git a/users/app/models/local_email.rb b/users/app/models/local_email.rb
index d23df71..c3bb15c 100644
--- a/users/app/models/local_email.rb
+++ b/users/app/models/local_email.rb
@@ -1,15 +1,37 @@
-class LocalEmail < Email
+class LocalEmail
+
+ property :username, String
+
+ validates :username,
+ :format => { :with => /\A([^@\s]+)(@.*)?\Z/, :message => "needs to be a valid login or email address"}
validate :unique_on_server
validate :unique_alias_for_user
validate :differs_from_main_email
- before_validation :add_domain_if_needed
- validates :email,
+ before_validation :strip_domain_if_needed
+ validates :username,
:presence => true,
- :format => { :with => /@#{APP_CONFIG[:domain]}\Z/,
+ :format => { :with => /[^@]*(@#{APP_CONFIG[:domain]})?\Z/i,
:message => "needs to end in @#{APP_CONFIG[:domain]}"}
validates :casted_by, :presence => true
+ def initialize(attributes = nil, &block)
+ attributes = {:username => attributes} if attributes.is_a? String
+ super(attributes, &block)
+ end
+
+ def to_s
+ email
+ end
+
+ def ==(other)
+ other.is_a?(String) ? self.email == other : super
+ end
+
+ def to_param
+ email
+ end
+
def to_partial_path
"emails/email"
end
@@ -17,16 +39,16 @@ class LocalEmail < Email
protected
def unique_on_server
- has_email = User.find_by_email_or_alias(email)
+ has_email = User.find_by_login_or_alias(username)
if has_email && has_email != self.base_doc
- errors.add :email, "has already been taken"
+ errors.add :username, "has already been taken"
end
end
def unique_alias_for_user
aliases = self.casted_by.email_aliases
- if aliases.select{|a|a.email == self.email}.count > 1
- errors.add :email, "is already your alias"
+ if aliases.select{|a|a.username == self.username}.count > 1
+ errors.add :username, "is already your alias"
end
end
@@ -34,16 +56,13 @@ class LocalEmail < Email
# If this has not changed but the email let's mark the email invalid instead.
return if self.persisted?
user = self.casted_by
- if user.email == self.email
- errors.add :email, "may not be the same as your email address"
+ if user.login == self.username
+ errors.add :username, "may not be the same as your email address"
end
end
- def add_domain_if_needed
- if email.blank?
- errors.add :email, "may not be empty."
- end
- self.email += "@" + APP_CONFIG[:domain] unless self.email.include?("@")
+ def strip_domain_if_needed
+ self.username.gsub /@#{APP_CONFIG[:domain]}/i, ''
end
end
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
diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml
index 820b80e..d5dc3b5 100644
--- a/users/app/views/users/edit.html.haml
+++ b/users/app/views/users/edit.html.haml
@@ -5,7 +5,9 @@
= user_form_with 'password_fields', :legend => :change_password
= render 'cancel_account' if @user == current_user
- content_for :email do
- = user_form_with 'email_field', :legend => :set_email_address
+ %legend=t :email_address
+ Your email address is
+ =user.email_address
= user_form_with 'email_forward_field', :legend => :forward_email
= user_form_with 'email_aliases', :legend => :add_email_alias
= render 'tabs/tabs', :tabs => [:account, :email]
diff --git a/users/test/factories.rb b/users/test/factories.rb
index 4bf7e62..6b094bd 100644
--- a/users/test/factories.rb
+++ b/users/test/factories.rb
@@ -7,7 +7,6 @@ FactoryGirl.define do
factory :user_with_settings do
email_forward { Faker::Internet.email }
- email { Faker::Internet.user_name + '@' + APP_CONFIG[:domain] }
email_aliases_attributes do
{:a => Faker::Internet.user_name + '@' + APP_CONFIG[:domain]}
end