also store token

2012-09-25 19:01:46 +02:00 · 2012-09-25 19:01:46 +02:00 · 04ab459077
commit 04ab459077
parent 56afbd7840
4 changed files with 1495 additions and 1495 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -35,7 +35,7 @@ GIT

 GIT
  remote: git://github.com/travis-ci/travis-api.git
-  revision: e8d2604ec3e466856f64f20c42b03829d7cff996
+  revision: 97e06c556f038b5acfea7771ccb7328fac976629
  specs:
    travis-api (0.0.1)
      backports (~> 2.5)
--- a/assets/javascripts/app/auth.coffee
+++ b/assets/javascripts/app/auth.coffee
@ -45,9 +45,9 @@
    @set('user',  if user then user else undefined)

  storeUser: (data) ->
+    data.user.access_token ||= data.token # TODO why's the access_token not set on the user?
    localStorage?.setItem('travis.auto_signin', 'true')
    sessionStorage?.setItem('travis.user', JSON.stringify(data))
-    data.user.access_token = data.token # TODO why's the access_token not set on the user?
    @store.load(Travis.User, data.user)
    @store.loadMany(Travis.Account, data.accounts)
    Travis.User.find(data.user.id)
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css