From 64cf85ef0afbefa61f22de2fa388284cf0051123 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 4 Aug 2015 19:56:24 +0200 Subject: Allow to use access_token in GitLab CI API --- lib/api/helpers.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index cff5920..8ea7f86 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -2,14 +2,17 @@ module API module Helpers PRIVATE_TOKEN_PARAM = :private_token PRIVATE_TOKEN_HEADER = "HTTP_PRIVATE_TOKEN" + ACCESS_TOKEN_PARAM = :access_token + ACCESS_TOKEN_HEADER = "HTTP_ACCESS_TOKEN" UPDATE_RUNNER_EVERY = 60 def current_user @current_user ||= begin options = { - private_token: (params[PRIVATE_TOKEN_PARAM] || env[PRIVATE_TOKEN_HEADER]) + access_token: (params[ACCESS_TOKEN_PARAM] || env[ACCESS_TOKEN_HEADER]), + private_token: (params[PRIVATE_TOKEN_PARAM] || env[PRIVATE_TOKEN_HEADER]), } - UserSession.new.authenticate(options) + UserSession.new.authenticate(options.compact) end end -- cgit v1.2.1