summaryrefslogtreecommitdiff
path: root/users/app/models
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-22 16:22:49 +0100
committerAzul <azul@leap.se>2012-11-22 16:22:49 +0100
commitfb791b200ee4da1b6a2f4e3121cb26196e28c953 (patch)
treed71fa9065faec5f1bb584e18e45583b393bcd429 /users/app/models
parent13f53593551549d8e95e382fd42a92efc170943d (diff)
parentec87ccfa185a4c063386d385de7af15f993b77d8 (diff)
Merge branch 'feature/error-messages-on-login' into develop
Diffstat (limited to 'users/app/models')
-rw-r--r--users/app/models/session.rb34
-rw-r--r--users/app/models/user.rb2
2 files changed, 35 insertions, 1 deletions
diff --git a/users/app/models/session.rb b/users/app/models/session.rb
new file mode 100644
index 0000000..a9fdb1b
--- /dev/null
+++ b/users/app/models/session.rb
@@ -0,0 +1,34 @@
+class Session < SRP::Session
+ include ActiveModel::Validations
+
+ attr_accessor :login
+
+ validates :login,
+ :presence => true,
+ :format => { :with => /\A[A-Za-z\d_]+\z/,
+ :message => "Only letters, digits and _ allowed" }
+
+ def initialize(user = nil, aa = nil)
+ super(user, aa) if user
+ end
+
+ def persisted?
+ false
+ end
+
+ def new_record?
+ true
+ end
+
+ def to_model
+ self
+ end
+
+ def to_key
+ [object_id]
+ end
+
+ def to_param
+ nil
+ end
+end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 824c439..507eda5 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -36,7 +36,7 @@ class User < CouchRest::Model::Base
# valid set of attributes for testing
def valid_attributes_hash
{ :login => "me",
- :password_verifier => "1234ABC",
+ :password_verifier => "1234ABCD",
:password_salt => "4321AB" }
end