From e2a4051cc3f4192849d7571bf83b0d9a7b2cbd4e Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Fri, 15 Apr 2016 19:55:38 +0530
Subject: [PATCH] Allow personal access tokens to be specified in a header.

- In addition to a param.
---
 lib/api/helpers/authentication.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/api/helpers/authentication.rb b/lib/api/helpers/authentication.rb
index f11c9725f3..e1d7ac83ff 100644
--- a/lib/api/helpers/authentication.rb
+++ b/lib/api/helpers/authentication.rb
@@ -6,6 +6,7 @@ module API
       SUDO_HEADER ="HTTP_SUDO"
       SUDO_PARAM = :sudo
       PERSONAL_ACCESS_TOKEN_PARAM = :personal_access_token
+      PERSONAL_ACCESS_TOKEN_HEADER = "HTTP_PERSONAL_ACCESS_TOKEN"
 
       def find_user_by_private_token
         private_token = (params[PRIVATE_TOKEN_PARAM] || env[PRIVATE_TOKEN_HEADER]).to_s
@@ -13,10 +14,9 @@ module API
       end
 
       def find_user_by_personal_access_token
-        personal_access_token = PersonalAccessToken.find_by_token(params[PERSONAL_ACCESS_TOKEN_PARAM])
-        if personal_access_token
-          personal_access_token.user
-        end
+        personal_access_token_string = (params[PERSONAL_ACCESS_TOKEN_PARAM] || env[PERSONAL_ACCESS_TOKEN_HEADER]).to_s
+        personal_access_token = PersonalAccessToken.find_by_token(personal_access_token_string)
+        personal_access_token.user if personal_access_token
       end
 
       def current_user