Merge branch 'master' of github.com:travis-ci/travis-api

This commit is contained in:
Sven Fuchs 2012-12-12 15:19:41 +01:00
commit 0e58055a0e

View File

@ -227,7 +227,9 @@ class Travis::Api::App
def get_token(endoint, values) def get_token(endoint, values)
response = Faraday.post(endoint, values) response = Faraday.post(endoint, values)
parameters = Addressable::URI.form_unencode(response.body) parameters = Addressable::URI.form_unencode(response.body)
parameters.assoc("access_token").last token_info = parameters.assoc("access_token")
halt 401, 'could not resolve github token' unless token_info
token_info.last
end end
def parse_scopes(data) def parse_scopes(data)
@ -434,6 +436,6 @@ if(window.parent == window) {
<form action="<%= uri %>" method='post'> <form action="<%= uri %>" method='post'>
<input type='hidden' name='token' value='<%= token %>'> <input type='hidden' name='token' value='<%= token %>'>
<input type='hidden' name='user' value="<%= user.to_json.gsub('"', '&quot;') %>"> <input type='hidden' name='user' value="<%= user.to_json.gsub('"', '&quot;') %>">
<input type='hidden' name='storage' value='sessionStorage'> <input type='hidden' name='storage' value='localStorage'>
</form> </form>
</body> </body>