Skip secret/hash logic if logged in or hash exists

Author: jeobrien

lib/user-data.js

@@ -15,30 +15,24 @@ export default class UserData {
     this.settings = settings;
   }
   json() {
-    const verificationSecret = this.getVerificationSecret();
-    const identifier = this.getIdentifier();
-    if (this.settings.user_hash === undefined) {
-      this.setUserHash(verificationSecret, identifier);
-    }
+    this.setUserHash();
     return this.escapedSettings(this.settings);
   }
   getVerificationSecret() {
     const { verificationSecret } = this.settings;
     delete this.settings.verificationSecret;
     return verificationSecret;
   }
-  getIdentifier() {
-    if (this.settings.user_id) {
-      return this.settings.user_id.toString();
-    } else {
-      return this.settings.email;
-    }
-  }
-  setUserHash(verificationSecret, identifier) {
-    if (this.loggedOut) {
+  setUserHash() {
+    if (this.loggedOut || this.settings.user_hash !== undefined) {
       return;
     }
 
+    const { verificationSecret } = this.settings;
+    delete this.settings.verificationSecret;
+    const identifier = this.settings.user_id ? this.settings.user_id.toString() : this.settings.email;
+
+
     const userHash = IdentityVerification.userHash({
       secretKey: verificationSecret,
       identifier

test/user-data.js

@@ -1,4 +1,5 @@
 import UserData from '../lib/user-data';
+import { IdentityVerification } from '../lib/index';
 import assert from 'assert';
 import sinon from 'sinon';
 
@@ -21,7 +22,13 @@ describe('userData', () => {
       email: '[email protected]'
     };
     const userData = new UserData(settings);
-    assert.equal(userData.getIdentifier(), 1);
+    const userHash = sinon.spy(IdentityVerification, 'userHash');
+    userData.json();
+    userHash.restore();
+    sinon.assert.calledWith(userHash, {
+      secretKey: 'abc123',
+      identifier: '1'
+    });
   });
 
   it('should grab the email as the identifier if no user_id', () => {
@@ -31,7 +38,13 @@ describe('userData', () => {
       email: '[email protected]'
     };
     const userData = new UserData(settings);
-    assert.equal(userData.getIdentifier(), '[email protected]');
+    const userHash = sinon.spy(IdentityVerification, 'userHash');
+    userData.json();
+    userHash.restore();
+    sinon.assert.calledWith(userHash, {
+      secretKey: 'abc123',
+      identifier: '[email protected]'
+    });
   });
 
   it('should throw an error if there\'s no verification secret', () => {
@@ -118,11 +131,11 @@ describe('userData', () => {
       user_id: 1
     };
     const userData = new UserData(settings);
-    const setUserHash = sinon.spy(userData, 'setUserHash');
+    const userHash = sinon.spy(IdentityVerification, 'userHash');
     userData.json();
     userData.json();
-    setUserHash.restore();
-    sinon.assert.calledOnce(setUserHash);
+    userHash.restore();
+    sinon.assert.calledOnce(userHash);
   });
 
   it('should return the userData', () => {