fix: reauthenticate an expired session after successful account fetch (…

…#149)
hoodiehq · Apr 11, 2017 · e339829 · e339829
1 parent 264be5c
commit e339829
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 0 deletions.
diff --git a/lib/get.js b/lib/get.js
@@ -40,6 +40,12 @@ function accountGet (state, path, options) {
         cachedProperties = result
       }
 
+      // reauthenticate an expired session
+      if (cachedProperties.session.invalid) {
+        delete cachedProperties.session.invalid
+        state.emitter.emit('reauthenticate')
+      }
+
       return state.cache.set(cachedProperties)
 
       .then(function () {

diff --git a/lib/profile-get.js b/lib/profile-get.js
@@ -38,6 +38,12 @@ function profileGet (state, path, options) {
         cachedProperties.profile = result
       }
 
+      // reauthenticate an expired session
+      if (cachedProperties.session.invalid) {
+        delete cachedProperties.session.invalid
+        state.emitter.emit('reauthenticate')
+      }
+
       return state.cache.set(cachedProperties)
 
       .then(function () {

diff --git a/test/unit/get-test.js b/test/unit/get-test.js
@@ -259,6 +259,53 @@ test('get(["id", "session.id"]) with session', function (t) {
   .catch(t.error)
 })
 
+test('get() and reauthenticate on invalid session', function (t) {
+  simple.mock(internals, 'fetchProperties').resolveWith({
+    foo: 'bar'
+  })
+  var state = {
+    setup: Promise.resolve(),
+    cache: {
+      get: function () {
+        return Promise.resolve({
+          session: {
+            id: 'session123',
+            invalid: true
+          }
+        })
+      },
+      set: simple.stub().resolveWith()
+    },
+    emitter: {
+      emit: simple.stub()
+    }
+  }
+
+  get(state)
+
+  .then(function (result) {
+    t.deepEqual(result, {
+      foo: 'bar',
+      session: {
+        id: 'session123'
+      }
+    })
+    t.deepEqual(state.cache.set.lastCall.arg, {
+      foo: 'bar',
+      session: {
+        id: 'session123'
+      }
+    })
+    t.is(state.emitter.emit.callCount, 1)
+    t.deepEqual(state.emitter.emit.lastCall.arg, 'reauthenticate')
+
+    simple.restore()
+    t.end()
+  })
+
+  .catch(t.error)
+})
+
 test('get() with session and server error', function (t) {
   simple.mock(internals, 'fetchProperties').rejectWith(new Error('oops'))
   var state = {

diff --git a/test/unit/profile-get-test.js b/test/unit/profile-get-test.js
@@ -63,6 +63,52 @@ test('profileGet() with session', function (t) {
   .catch(t.error)
 })
 
+test('profileGet() and reauthenticate on invalid session', function (t) {
+  simple.mock(internals, 'fetchProperties').resolveWith({
+    foo: 'bar'
+  })
+  var state = {
+    setup: Promise.resolve(),
+    cache: {
+      get: function () {
+        return Promise.resolve({
+          session: {
+            id: 'session123',
+            invalid: true
+          }
+        })
+      },
+      set: simple.stub().resolveWith()
+    },
+    emitter: {
+      emit: simple.stub()
+    }
+  }
+
+  profileGet(state)
+
+  .then(function (result) {
+    t.deepEqual(result, {
+      foo: 'bar'
+    })
+    t.deepEqual(state.cache.set.lastCall.arg, {
+      profile: {
+        foo: 'bar'
+      },
+      session: {
+        id: 'session123'
+      }
+    })
+    t.is(state.emitter.emit.callCount, 1)
+    t.deepEqual(state.emitter.emit.lastCall.arg, 'reauthenticate')
+
+    simple.restore()
+    t.end()
+  })
+
+  .catch(t.error)
+})
+
 test('profileGet() with session and server error', function (t) {
   simple.mock(internals, 'fetchProperties').rejectWith(new Error('oops'))
   var state = {