summaryrefslogtreecommitdiff
path: root/app/controllers/v1
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-05-13 09:51:36 +0200
committerAzul <azul@leap.se>2014-05-13 09:51:41 +0200
commit86eb9062f1e81302647bf18ce0f5fd981202b68a (patch)
treea1d63177b67c11e71f53c400cd9424588be1a7ec /app/controllers/v1
parent726244f1c6bb72fb53a257c084dfbdf7b9c2b03c (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/controllers/v1')
-rw-r--r--app/controllers/v1/sessions_controller.rb2
1 files changed, 1 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