suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

create use if missing

Browse Source
This commit is contained in:
Konstantin Haase 2012-09-18 23:33:35 +02:00
parent 01e19e2888
commit a67b8bf1de
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/travis/api/app/endpoint/authorization.rb
View File

@ -139,10 +139,18 @@ class Travis::Api::App
generate_token options.merge(user: user_for_github_token(token)) generate_token options.merge(user: user_for_github_token(token))
end end
def user_info(data, misc = {})
info = data.to_hash.slice('name', 'login', 'github_oauth_token', 'gravatar_id')
info.merge! misc
info['github_id'] ||= data['id']
info
end
def user_for_github_token(token) def user_for_github_token(token)
data = GH.with(token: token.to_s) { GH['user'] } data = GH.with(token: token.to_s) { GH['user'] }
scopes = parse_scopes data.headers['x-oauth-scopes'] scopes = parse_scopes data.headers['x-oauth-scopes']
user = User.find_by_github_id(data['id']) user = User.find_by_github_id(data['id'])
user ||= User.create! user_info(data, github_oauth_token: token)
halt 403, 'not a Travis user' if user.nil? halt 403, 'not a Travis user' if user.nil?
halt 403, 'insufficient access' unless acceptable? scopes halt 403, 'insufficient access' unless acceptable? scopes