From 1e3fce1a82ee3583f2e209f48c30b964e32a637c Mon Sep 17 00:00:00 2001
From: Marin Jankovski <marin@gitlab.com>
Date: Thu, 10 Jul 2014 13:10:37 +0200
Subject: [PATCH] Check for the correct param for token.
---
app/controllers/application_controller.rb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6128f6e48ed..9700447f78d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -30,8 +30,13 @@ class ApplicationController < ActionController::Base
protected
# From https://github.com/plataformatec/devise/wiki/How-To:-Simple-Token-Authentication-Example
+ # https://gist.github.com/josevalim/fb706b1e933ef01e4fb6
def authenticate_user_from_token!
- user_token = params[:user_token].presence
+ user_token = if params[:authenticity_token].presence
+ params[:authenticity_token].presence
+ elsif params[:private_token].presence
+ params[:private_token].presence
+ end
user = user_token && User.find_by_authentication_token(user_token.to_s)
if user
--
GitLab