actually log in
This commit is contained in:
parent
a5e1c21d30
commit
8f57c67653
|
@ -22,7 +22,7 @@ GIT
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/travis-ci/travis-api.git
|
remote: git://github.com/travis-ci/travis-api.git
|
||||||
revision: 759ad4d1139eb05629ac0c4d1d3b353644ccb0c4
|
revision: 3a64c87a7f76021dfd8021c3e63c13dae0371cfd
|
||||||
branch: sf-use-services
|
branch: sf-use-services
|
||||||
specs:
|
specs:
|
||||||
travis-api (0.0.1)
|
travis-api (0.0.1)
|
||||||
|
|
|
@ -35,7 +35,7 @@ Travis.reopen
|
||||||
@pusher = new Travis.Pusher()
|
@pusher = new Travis.Pusher()
|
||||||
@tailing = new Travis.Tailing()
|
@tailing = new Travis.Tailing()
|
||||||
|
|
||||||
@setCurrentUser(JSON.parse($.cookie('user')))
|
#@setCurrentUser(JSON.parse($.cookie('user')))
|
||||||
|
|
||||||
signIn: ->
|
signIn: ->
|
||||||
user = Travis.Auth.signIn()
|
user = Travis.Auth.signIn()
|
||||||
|
@ -48,7 +48,7 @@ Travis.reopen
|
||||||
|
|
||||||
setCurrentUser: (data) ->
|
setCurrentUser: (data) ->
|
||||||
data = JSON.parse(data) if typeof data == 'string'
|
data = JSON.parse(data) if typeof data == 'string'
|
||||||
$.cookie('user', JSON.stringify(data))
|
#$.cookie('user', JSON.stringify(data))
|
||||||
if data
|
if data
|
||||||
@store.load(Travis.User, data.user)
|
@store.load(Travis.User, data.user)
|
||||||
@store.loadMany(Travis.Account, data.accounts)
|
@store.loadMany(Travis.Account, data.accounts)
|
||||||
|
|
|
@ -23,8 +23,9 @@ $.extend Travis.Auth.prototype,
|
||||||
if event.origin != @expectedOrigin()
|
if event.origin != @expectedOrigin()
|
||||||
console.log("unexpected message #{event.origin}: #{event.data}")
|
console.log("unexpected message #{event.origin}: #{event.data}")
|
||||||
else
|
else
|
||||||
Travis.config.access_token = event.data
|
Travis.config.access_token = event.data.token
|
||||||
alert Travis.config.access_token
|
Travis.app.setCurrentUser(event.data.user)
|
||||||
|
alert event.data.user.login
|
||||||
|
|
||||||
trySignIn: ->
|
trySignIn: ->
|
||||||
@iframe.attr('src', "#{Travis.config.api_endpoint}/auth/post_message")
|
@iframe.attr('src', "#{Travis.config.api_endpoint}/auth/post_message")
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user