From f5fdcc41c6e4a47a0c6205b37136678a59b868d3 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Mon, 17 Dec 2012 15:24:01 +0100 Subject: [PATCH] fix token logic --- lib/travis/api/app/endpoint/authorization.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/travis/api/app/endpoint/authorization.rb b/lib/travis/api/app/endpoint/authorization.rb index c97886e7..42ff2bb4 100644 --- a/lib/travis/api/app/endpoint/authorization.rb +++ b/lib/travis/api/app/endpoint/authorization.rb @@ -141,10 +141,8 @@ class Travis::Api::App private def serialize_user(user) - rendered_user = Travis::Api.data(user, version: :v2) - travis_token = user.tokens.first - user['token'] = travis_token.token if travis_token - rendered_user + rendered = Travis::Api.data(user, version: :v2) + rendered['user'].merge('token' => user.tokens.first.try(:token).to_s) end def oauth_endpoint @@ -435,8 +433,8 @@ if(window.parent == window) { @@ post_payload - -
+ + ">