feat(signin): remit reauthenticate instead of signin if user is the same

hoodiehq · Jan 17, 2016 · c69f2e1 · c69f2e1
1 parent bdc41af
commit c69f2e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/sign-in.js b/lib/sign-in.js
@@ -2,6 +2,7 @@ module.exports = signIn
 
 var Promise = require('lie')
 var clone = require('lodash/clone')
+var get = require('lodash/get')
 
 var internals = module.exports.internals = {}
 internals.deserialise = require('../utils/deserialise')
@@ -32,6 +33,12 @@ function signIn (state, options) {
       }
     }
 
+    // If the username hasn’t changed, emit 'reauthenticate' instead of 'signin'
+    var emitEvent = 'signin'
+    if (get(state, 'account.username') === options.username) {
+      emitEvent = 'reauthenticate'
+    }
+
     state.account = {
       username: data.account.username,
       session: {
@@ -48,7 +55,7 @@ function signIn (state, options) {
       account: state.account
     })
 
-    state.emitter.emit('signin', clone(state.account))
+    state.emitter.emit(emitEvent, clone(state.account))
 
     return clone(data.account)
   })

diff --git a/test/unit/sign-in-test.js b/test/unit/sign-in-test.js
@@ -109,7 +109,7 @@ test('signIn with request error', function (t) {
 
 // account.signIn() to emit `reauthenticate` event when unauthenticated
 
-test.only('signIn with same username', function (t) {
+test('signIn with same username', function (t) {
   t.plan(2)
 
   var state = {
@@ -131,11 +131,7 @@ test.only('signIn with same username', function (t) {
   })
   simple.mock(signIn.internals, 'serialise').returnWith('serialised')
   simple.mock(signIn.internals, 'deserialise').returnWith({
-    id: 'session123',
-    account: {
-      id: 'deserialise id',
-      username: 'deserialise username'
-    }
+    id: 'session123'
   })
   simple.mock(signIn.internals, 'saveAccount').callFn(function () {})