summaryrefslogtreecommitdiff
path: root/users/app/controllers
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-17 10:35:49 +0100
committerAzul <azul@leap.se>2012-12-17 10:35:49 +0100
commitff9d29df260b29a1c20441e25e2fc3fdf9ee1fb3 (patch)
treea3884ac16f85314ef2ed04ae5faf4721be2ac3b2 /users/app/controllers
parentfa21fe9a5ba10f937cd21e83aa26a088f58e2e8a (diff)
parentf3f42086e9f325560444f42c6b54269546114167 (diff)
Merge branch 'feature/fixing-signup-and-login-issues'
Diffstat (limited to 'users/app/controllers')
-rw-r--r--users/app/controllers/sessions_controller.rb1
-rw-r--r--users/app/controllers/v1/sessions_controller.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
index bc910b5..0345fbd 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/users/app/controllers/sessions_controller.rb
@@ -11,6 +11,7 @@ class SessionsController < ApplicationController
end
def create
+ logout if logged_in?
authenticate!
end
diff --git a/users/app/controllers/v1/sessions_controller.rb b/users/app/controllers/v1/sessions_controller.rb
index 5b4a13b..27d10fb 100644
--- a/users/app/controllers/v1/sessions_controller.rb
+++ b/users/app/controllers/v1/sessions_controller.rb
@@ -12,6 +12,7 @@ module V1
end
def create
+ logout if logged_in?
authenticate!
end