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

fix sign in payload, user loading etc

Browse Source
This commit is contained in:
Sven Fuchs 2012-09-18 21:03:52 +02:00
parent b3c310d51d
commit effd6360a7
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/javascripts/app/app.coffee
View File

@ -31,7 +31,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: ->
Travis.Auth.signIn() Travis.Auth.signIn()
@ -44,11 +44,10 @@ 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)
# TODO: this throws an error @store.loadMany(Travis.Account, data.accounts)
#@store.loadMany(Travis.Account, data.accounts)
@set('currentUser', if data then Travis.User.find(data.user.id) else undefined) @set('currentUser', if data then Travis.User.find(data.user.id) else undefined)
render: (name, action, params) -> render: (name, action, params) ->

18
assets/javascripts/app/models/user.coffee
View File

@ -1,15 +1,15 @@
require 'travis/model' require 'travis/model'
@Travis.User = Travis.Model.extend @Travis.User = Travis.Model.extend
name: DS.attr('string') name: DS.attr('string')
email: DS.attr('string') email: DS.attr('string')
login: DS.attr('string') login: DS.attr('string')
token: DS.attr('string') token: DS.attr('string')
locale: DS.attr('string') locale: DS.attr('string')
gravatar: DS.attr('string') gravatarId: DS.attr('string')
isSyncing: DS.attr('boolean') isSyncing: DS.attr('boolean')
syncedAt: DS.attr('string') syncedAt: DS.attr('string')
repoCount: DS.attr('number') repoCount: DS.attr('number')
init: -> init: ->
@poll() if @get('isSyncing') @poll() if @get('isSyncing')

4
assets/javascripts/app/views/profile.coffee
View File

@ -65,8 +65,8 @@
userBinding: 'controller.user' userBinding: 'controller.user'
gravatarUrl: (-> gravatarUrl: (->
"http://www.gravatar.com/avatar/#{@get('user.gravatar')}?s=48&d=mm" "http://www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=48&d=mm"
).property('user.gravatar') ).property('user.gravatarId')
locales: (-> locales: (->
[ [

4
assets/javascripts/app/views/top.coffee
View File

@ -8,8 +8,8 @@ require 'travis/auth'
userBinding: 'controller.user' userBinding: 'controller.user'
gravatarUrl: (-> gravatarUrl: (->
"https://www.gravatar.com/avatar/#{@get('user.gravatar')}?s=24&d=mm" "https://www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=24&d=mm"
).property('user.gravatar') ).property('user.gravatarId')
# hrm. how to parametrize bindAttr? # hrm. how to parametrize bindAttr?
classHome: (-> classHome: (->

6
assets/javascripts/lib/travis/auth.coffee
View File

@ -15,7 +15,7 @@ $.extend Travis.Auth.prototype,
expectedOrigin: -> expectedOrigin: ->
if Travis.config.api_endpoint[0] == '/' if Travis.config.api_endpoint[0] == '/'
window.location.protocol + "://" + window.location.host window.location.protocol + "//" + window.location.host
else else
Travis.config.api_endpoint Travis.config.api_endpoint
@ -24,8 +24,8 @@ $.extend Travis.Auth.prototype,
console.log("unexpected message #{event.origin}: #{event.data}") console.log("unexpected message #{event.origin}: #{event.data}")
else else
Travis.config.access_token = event.data.token Travis.config.access_token = event.data.token
Travis.app.setCurrentUser(event.data.user) Travis.app.setCurrentUser(event.data)
console.log('sign in!') console.log("signed in as #{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")