diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee index c86fe159..214b3a9d 100644 --- a/assets/scripts/app/app.coffee +++ b/assets/scripts/app/app.coffee @@ -30,17 +30,22 @@ Travis.reopen @store = Travis.Store.create() @store.loadMany(Travis.Sponsor, Travis.SPONSORS) - @set('auth', Travis.Auth.create(app: this, endpoint: Travis.config.api_endpoint)) + # @set('auth', Travis.Auth.create(app: this, endpoint: Travis.config.api_endpoint)) @slider = new Travis.Slider() @pusher = new Travis.Pusher(Travis.config.pusher_key) @tailing = new Travis.Tailing() + initAuth: (router, path) -> + auth = Travis.Auth.create(app: this, router: router, endpoint: Travis.config.api_endpoint) + @set('auth', auth) + auth.loadUser(path) + signIn: -> @get('auth').signIn() - autoSignIn: -> - @get('auth').autoSignIn() + # autoSignIn: -> + # @get('auth').autoSignIn() signOut: -> @get('auth').signOut() diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index 6076b4a8..bb634571 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -7,7 +7,7 @@ init: -> @iframe.appendTo('body') window.addEventListener('message', (e) => @receiveMessage(e)) - @loadUser() + # @loadUser() accessToken: (-> sessionStorage.getItem('travis.token') @@ -15,20 +15,21 @@ # if the user is in the session storage, we're using it. if we have a flag # for auto signin then we're trying to sign in. - loadUser: -> + loadUser: (path)-> + @storeAfterSignInPath(path) if user = sessionStorage.getItem('travis.user') @setData(user: JSON.parse(user)) else @autoSignIn() # try signing in, but check later in case we have a timeout - signIn: -> + signIn: (path) -> @set('state', 'signing-in') @trySignIn() Ember.run.later(this, @checkSignIn.bind(this), @timeout) - autoSignIn: -> - @signIn() if localStorage.getItem('travis.auto_signin') + autoSignIn: (path) -> + @signIn(path) if localStorage.getItem('travis.auto_signin') signOut: -> localStorage.removeItem('travis.auto_signin') @@ -52,7 +53,10 @@ user = @storeUser(data.user) if data?.user @set('state', if user then 'signed-in' else 'signed-out') @set('user', if user then user else undefined) - router.send('afterSignIn') if router = Travis.app?.get('router') + @afterSignIn() + + afterSignIn: -> + @get('router').send('afterSignIn', @readAfterSignInPath()) storeToken: (token) -> sessionStorage.setItem('travis.token', token) @@ -66,6 +70,14 @@ user.get('permissions') user + storeAfterSignInPath: (path) -> + sessionStorage.setItem('travis.after_signin_path', path) + + readAfterSignInPath: -> + path = sessionStorage.getItem('travis.after_signin_path') + sessionStorage.removeItem('travis.after_signin_path') + path + receiveMessage: (event) -> if event.origin == @expectedOrigin() event.data.user.token = event.data.token if event.data.token diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 234da0d1..0e8fd731 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -151,19 +151,18 @@ Travis.Router = Ember.Router.extend afterSignOut: -> @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) router.authorize(path) + router.auth = Travis.app.initAuth(router, path) + + authorize: (path) -> + if !@signedIn() && @needsAuth(path) + @transitionTo('root.auth') + else + @transitionTo('root') + @route(path) root: Ember.Route.extend route: '/' @@ -178,9 +177,7 @@ Travis.Router = Ember.Router.extend router.get('authLayoutController').connectOutlet('top', 'top') router.get('authLayoutController').connectOutlet('main', 'signin') - afterSignIn: (router) -> - path = sessionStorage.getItem('travis.after_signin_path') - sessionStorage.removeItem('travis.after_signin_path') + afterSignIn: (router, path) -> router.route(path || '/') stats: Ember.Route.extend diff --git a/public/scripts/app.js b/public/scripts/app.js index 28792c5e..f7352694 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -30140,4 +30140,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 autoSignIn: function() {\n return this.get('auth').autoSignIn();\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: $('