actually log in

This commit is contained in:
Konstantin Haase 2012-09-18 19:20:42 +02:00
parent a5e1c21d30
commit 8f57c67653
4 changed files with 7 additions and 6 deletions

View File

@ -22,7 +22,7 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-api.git
revision: 759ad4d1139eb05629ac0c4d1d3b353644ccb0c4
revision: 3a64c87a7f76021dfd8021c3e63c13dae0371cfd
branch: sf-use-services
specs:
travis-api (0.0.1)

View File

@ -35,7 +35,7 @@ Travis.reopen
@pusher = new Travis.Pusher()
@tailing = new Travis.Tailing()
@setCurrentUser(JSON.parse($.cookie('user')))
#@setCurrentUser(JSON.parse($.cookie('user')))
signIn: ->
user = Travis.Auth.signIn()
@ -48,7 +48,7 @@ Travis.reopen
setCurrentUser: (data) ->
data = JSON.parse(data) if typeof data == 'string'
$.cookie('user', JSON.stringify(data))
#$.cookie('user', JSON.stringify(data))
if data
@store.load(Travis.User, data.user)
@store.loadMany(Travis.Account, data.accounts)

View File

@ -23,8 +23,9 @@ $.extend Travis.Auth.prototype,
if event.origin != @expectedOrigin()
console.log("unexpected message #{event.origin}: #{event.data}")
else
Travis.config.access_token = event.data
alert Travis.config.access_token
Travis.config.access_token = event.data.token
Travis.app.setCurrentUser(event.data.user)
alert event.data.user.login
trySignIn: ->
@iframe.attr('src', "#{Travis.config.api_endpoint}/auth/post_message")

File diff suppressed because one or more lines are too long