Adds safety nets in case settings update fails

hull · May 27, 2014 · 5da3e0b · 5da3e0b
1 parent a3680f0
commit 5da3e0b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/api/auth.coffee b/src/api/auth.coffee
@@ -10,11 +10,21 @@ define ['underscore', '../utils/promises', '../utils/version'], (_, promises, ve
     _popupInterval = null
 
     loginComplete = (me)->
-      emitter.once 'hull.settings.update', ->
+      dfd = promises.deferred()
+      promise = dfd.promise
+      promise.then ->
         emitter.emit('hull.auth.login', me)
         unless me?.stats?.sign_in_count?
           emitter.emit('hull.auth.create', me)
-      me
+      , (err)->
+        emitter.emit('hull.auth.fail', err)
+      emitter.once 'hull.settings.update', ->
+        # user has been set, settings have been update. Yay!
+        dfd.resolve me
+      # Setup a delay to launch rejection
+      rejectable = _.bind(dfd.reject, dfd)
+      _.delay rejectable, 30000, new Error('Timeout for login')
+      promise
 
     loginFailed = (err)->
       emitter.emit('hull.auth.fail', err)

diff --git a/src/api/current-user.coffee b/src/api/current-user.coffee
@@ -6,10 +6,7 @@ define ()->
     emitter.on 'hull.auth.login', (me)->
       _currentUser = me
     emitter.on 'hull.auth.update', (me)->
-      unless _currentUser?.id
-        if me.id
-          emitter.emit 'hull.auth.login', me
-      else
+      if _currentUser?.id
         if _currentUser.id == me.id
           _currentUser = me
         else unless me?.id