From 64fc6ce717a803ff90e4062e6c77d0c8a57fb43f Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 9 Oct 2012 13:08:57 +0200 Subject: [PATCH 1/3] Don't trigger state change on signin if already in authenticated state --- Gemfile.lock | 2 +- assets/scripts/app/auth.coffee | 4 +- assets/scripts/app/routes.coffee | 6 +- public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- public/styles/app.css | 3102 ++++++++++++++---------------- public/version | 2 +- 7 files changed, 1463 insertions(+), 1657 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5d87fdef..380310a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: 5d9c867142162b20d8471530f7447bd4af93c0e4 + revision: 1624742cfd4bb1704ef916684e8962bf25219de3 specs: travis-api (0.0.1) backports (~> 2.5) diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index 31aa96fe..aa384cfc 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -48,8 +48,8 @@ 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) - @app.get('router').transitionTo('authenticated') if @app.get('router') - # Travis.app.get('router').route(@get('returnTo')) + if Travis.app && (router = Travis.app.get('router')) + router.send('authenticate') storeToken: (token) -> sessionStorage.setItem('travis.token', token) diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 274b9d1b..4a1c120b 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -134,12 +134,14 @@ Travis.Router = Ember.Router.extend needsAuth: (path) -> path.indexOf('/profile') == 0 && !@signedIn() + authenticate: -> + @app.get('router').transitionTo('authenticated') + loading: Ember.Route.extend routePath: (router, path) -> if match = path.match(/#.*$/) router.set 'lineNumberHash', match[0] - sessionStorage.setItem('travis.path', path) if router.needsAuth(path) router.transitionTo('root.auth') @@ -148,6 +150,7 @@ Travis.Router = Ember.Router.extend router.transitionTo('authenticated') authenticated: Ember.Route.extend + authenticate: Ember.K connectOutlets: (router) -> path = sessionStorage.getItem('travis.path') sessionStorage.removeItem('travis.path') @@ -158,6 +161,7 @@ Travis.Router = Ember.Router.extend router.route('/') root: Ember.Route.extend + authenticate: Ember.K loading: Ember.State.extend() auth: Ember.Route.extend diff --git a/public/scripts/app.js b/public/scripts/app.js index fd1bcd26..0c81083a 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);\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('showRoot');\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: $('