diff --git a/Gemfile.lock b/Gemfile.lock index adaf64e7..6dca86d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: d7095ea0305aedd918fc55faa0f1516c5ffcd349 + revision: d708b79e135d3e7d672bd66b0754524ff8eb7cbf branch: sf-use-services specs: travis-api (0.0.1) diff --git a/assets/javascripts/app/app.coffee b/assets/javascripts/app/app.coffee index e019972b..85d348ed 100644 --- a/assets/javascripts/app/app.coffee +++ b/assets/javascripts/app/app.coffee @@ -31,7 +31,14 @@ Travis.reopen @pusher = new Travis.Pusher() @tailing = new Travis.Tailing() - # @setCurrentUser(JSON.parse($.cookie('user'))) + @loadUser() + + loadUser: -> + user = sessionStorage?.getItem("travisUser") + if user + @setCurrentUser JSON.parse(user) + else if localStorage?.getItem("travisTrySignIn") + Travis.Auth.trySignIn() signIn: -> Travis.Auth.signIn() @@ -40,12 +47,15 @@ Travis.reopen signOut: -> Travis.config.access_token = null + localStorage?.clear() + sessionStorage?.clear() @setCurrentUser() setCurrentUser: (data) -> data = JSON.parse(data) if typeof data == 'string' - # $.cookie('user', JSON.stringify(data)) if data + localStorage?.setItem("travisTrySignIn", "true") + sessionStorage?.setItem("travisUser", JSON.stringify(data)) @store.load(Travis.User, data.user) @store.loadMany(Travis.Account, data.accounts) @set('currentUser', if data then Travis.User.find(data.user.id) else undefined) diff --git a/assets/javascripts/lib/travis/auth.coffee b/assets/javascripts/lib/travis/auth.coffee index d98cfd5a..8d215720 100644 --- a/assets/javascripts/lib/travis/auth.coffee +++ b/assets/javascripts/lib/travis/auth.coffee @@ -10,6 +10,9 @@ $.extend Travis.Auth, signIn: -> @instance.signIn() + trySignIn: -> + @instance.trySignIn() + $.extend Travis.Auth.prototype, iframe: $('