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

fix token logic

Browse Source
This commit is contained in:
Konstantin Haase 2012-12-17 15:24:01 +01:00
parent 8c8f031259
commit f5fdcc41c6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,10 +141,8 @@ class Travis::Api::App
private private
def serialize_user(user) def serialize_user(user)
rendered_user = Travis::Api.data(user, version: :v2) rendered = Travis::Api.data(user, version: :v2)
travis_token = user.tokens.first rendered['user'].merge('token' => user.tokens.first.try(:token).to_s)
user['token'] = travis_token.token if travis_token
rendered_user
end end
def oauth_endpoint def oauth_endpoint
@ -435,8 +433,8 @@ if(window.parent == window) {
</script> </script>
@@ post_payload @@ post_payload
<body onload='document.forms[0].submit()'> <body onload=''>
<form action="<%= uri %>" method='post'> <form action="<%= document.forms[0].submit() %>" 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='localStorage'> <input type='hidden' name='storage' value='localStorage'>