diff options
author | Azul <azul@leap.se> | 2014-05-13 09:51:36 +0200 |
---|---|---|
committer | Azul <azul@leap.se> | 2014-05-13 09:51:41 +0200 |
commit | 86eb9062f1e81302647bf18ce0f5fd981202b68a (patch) | |
tree | a1d63177b67c11e71f53c400cd9424588be1a7ec /app | |
parent | 726244f1c6bb72fb53a257c084dfbdf7b9c2b03c (diff) |
allow for usernames with dots
preparing for #5664 with some test improvements i ran into this issue
This commit includes a fix and the test improvements. In particular it
adds BrowserIntegrationTest#login - so there is no need to go through the signup procedure everytime you want a user to be logged in.
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/v1/sessions_controller.rb | 2 | ||||
-rw-r--r-- | app/models/identity.rb | 6 | ||||
-rw-r--r-- | app/models/token.rb | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/app/controllers/v1/sessions_controller.rb b/app/controllers/v1/sessions_controller.rb index eae3a1e..d88fcdc 100644 --- a/app/controllers/v1/sessions_controller.rb +++ b/app/controllers/v1/sessions_controller.rb @@ -38,7 +38,7 @@ module V1 def login_response handshake = session.delete(:handshake) || {} - handshake.to_hash.merge(:id => current_user.id, :token => @token.id) + handshake.to_hash.merge(:id => current_user.id, :token => @token.to_s) end end diff --git a/app/models/identity.rb b/app/models/identity.rb index 9b97b51..ad8c01e 100644 --- a/app/models/identity.rb +++ b/app/models/identity.rb @@ -70,6 +70,12 @@ class Identity < CouchRest::Model::Base end end + def self.destroy_all_for(user) + Identity.by_user_id.key(user.id).each do |identity| + identity.destroy + end + end + def self.destroy_all_disabled Identity.disabled.each do |identity| identity.destroy diff --git a/app/models/token.rb b/app/models/token.rb index 4856c31..e759ee3 100644 --- a/app/models/token.rb +++ b/app/models/token.rb @@ -30,6 +30,10 @@ class Token < CouchRest::Model::Base end end + def to_s + id + end + def authenticate if expired? destroy |