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

Pass also travis token in /auth/post_message

Browse Source
This commit is contained in:
Piotr Sarnacki 2012-11-10 15:39:48 +01:00
parent 2f21def4a1
commit 662697953e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,9 @@ class Travis::Api::App
handshake do |user, token, target_origin| handshake do |user, token, target_origin|
halt 403, invalid_target(target_origin) unless target_ok? target_origin halt 403, invalid_target(target_origin) unless target_ok? target_origin
rendered_user = Travis::Api.data(user, version: :v2) rendered_user = Travis::Api.data(user, version: :v2)
post_message(token: token, user: rendered_user, target_origin: target_origin) travis_token = user.tokens.first
post_message(token: token, user: rendered_user, target_origin: target_origin,
travis_token: travis_token ? travis_token.token : nil)
end end
end end
@ -216,6 +218,7 @@ class Travis::Api::App
def post_message(payload) def post_message(payload)
content_type :html content_type :html
p [:payload, payload]
erb(:post_message, locals: payload) erb(:post_message, locals: payload)
end end
@ -242,5 +245,6 @@ alert('refusing to send a token to <%= target_origin.inspect %>, not whitelisted
<script> <script>
var payload = <%= user.to_json %>; var payload = <%= user.to_json %>;
payload.token = <%= token.inspect %>; payload.token = <%= token.inspect %>;
payload.travis_token = <%= travis_token ? travis_token.inspect : null %>;
window.parent.postMessage(payload, <%= target_origin.inspect %>); window.parent.postMessage(payload, <%= target_origin.inspect %>);
</script> </script>