For moment, have identity's address handle aliased from login so we can use LoginFormatValidation. However, this is not how we will want it eventually.

One issue is that the errors messages are set on login, rather than the appropriate field.

2 files changed, 11 insertions, 3 deletions

diff --git a/users/app/models/identity.rb b/users/app/models/identity.rb
index e197c9c..91345a0 100644
--- a/users/app/models/identity.rb
+++ b/users/app/models/identity.rb
@@ -1,4 +1,5 @@
 class Identity < CouchRest::Model::Base
+  include LoginFormatValidation
 
   use_database :identities
 
@@ -64,6 +65,11 @@ class Identity < CouchRest::Model::Base
     write_attribute('keys', keys.merge(type => value))
   end
 
+  # for LoginFormatValidation
+  def login
+    self.address.handle
+  end
+
   protected
 
   def unique_forward
diff --git a/users/app/models/login_format_validation.rb b/users/app/models/login_format_validation.rb
index 1d02bd1..c1fcf70 100644
--- a/users/app/models/login_format_validation.rb
+++ b/users/app/models/login_format_validation.rb
@@ -1,19 +1,21 @@
 module LoginFormatValidation
   extend ActiveSupport::Concern
 
+  #TODO: Probably will replace this. Playing with using it for aliases too, but won't want it connected to login field.
+
   included do
     # Have multiple regular expression validations so we can get specific error messages:
     validates :login,
       :format => { :with => /\A.{2,}\z/,
-        :message => "Login must have at least two characters"}
+        :message => "Must have at least two characters"}
     validates :login,
       :format => { :with => /\A[a-z\d_\.-]+\z/,
         :message => "Only lowercase letters, digits, . - and _ allowed."}
     validates :login,
       :format => { :with => /\A[a-z].*\z/,
-        :message => "Login must begin with a lowercase letter"}
+        :message => "Must begin with a lowercase letter"}
     validates :login,
       :format => { :with => /\A.*[a-z\d]\z/,
-        :message => "Login must end with a letter or digit"}
+        :message => "Must end with a letter or digit"}
   end
 end