diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee index 07687197..c86fe159 100644 --- a/assets/scripts/app/app.coffee +++ b/assets/scripts/app/app.coffee @@ -39,6 +39,9 @@ Travis.reopen signIn: -> @get('auth').signIn() + autoSignIn: -> + @get('auth').autoSignIn() + signOut: -> @get('auth').signOut() @get('router').send('afterSignOut') diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index ba7c2902..054e1c83 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -18,8 +18,8 @@ loadUser: -> if user = sessionStorage.getItem('travis.user') @setData(user: JSON.parse(user)) - else if localStorage.getItem('travis.auto_signin') - @trySignIn() + else + @autoSignIn() # try signing in, but check later in case we have a timeout signIn: -> @@ -27,6 +27,14 @@ @trySignIn() Ember.run.later(this, @checkSignIn.bind(this), @timeout) + autoSignIn: -> + @signIn() if localStorage.getItem('travis.auto_signin') + + signOut: -> + localStorage.clear() + sessionStorage.clear() + @setData() + trySignIn: -> @iframe.attr('src', "#{@endpoint}/auth/post_message?origin=#{@receivingEnd}") @@ -37,11 +45,6 @@ localStorage.setItem('travis.auto_signin', 'true') window.location = "#{@endpoint}/auth/handshake?redirect_uri=#{location}" - signOut: -> - localStorage?.clear() - sessionStorage?.clear() - @setData() - setData: (data) -> data = JSON.parse(data) if typeof data == 'string' @storeToken(data.token) if data?.token diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 9e4f75e0..9ba46e1e 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -148,24 +148,27 @@ Travis.Router = Ember.Router.extend path.indexOf('/profile') == 0 afterSignIn: -> - after_signin_path = sessionStorage.getItem('travis.after_signin_path') + path = sessionStorage.getItem('travis.after_signin_path') sessionStorage.removeItem('travis.after_signin_path') @transitionTo('root') - @route(after_signin_path || '/') + @route(path || '/') afterSignOut: -> - @transitionTo('loading') + @authorize('/') + + authorize: (path) -> + if !@signedIn() && @needsAuth(path) + sessionStorage.setItem('travis.after_signin_path', path) + @transitionTo('root.auth') + Travis.app.autoSignIn() + else + @transitionTo('root') + @route(path) loading: Ember.Route.extend routePath: (router, path) -> router.saveLineNumberHash(path) - if !router.signedIn() && router.needsAuth(path) - sessionStorage.setItem('travis.after_signin_path', path) - router.transitionTo('root.auth') - Travis.app.signIn() - else - router.transitionTo('root') - router.route(path) + router.authorize(path) root: Ember.Route.extend route: '/' diff --git a/public/scripts/app.js b/public/scripts/app.js index 793be3d4..615d8013 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -29619,4 +29619,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher_key);\n return this.tailing = new Travis.Tailing();\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('afterSignOut');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('