Merge pull request #34 from solid/delete-email

Delete email record too, reject if not given

Author: kjetilk

src/user-store.js

@@ -204,8 +204,15 @@ class UserStore {
 
   deleteUser (user) {
     let userKey = UserStore.normalizeIdKey(user.id)
-
-    return this.backend.del('users', userKey)
+    var deletedEmail
+    if (user.email) {
+      let emailKey = UserStore.normalizeEmailKey(user.email)
+      deletedEmail = this.backend.del('users-by-email', emailKey)
+    } else {
+      deletedEmail = Promise.reject(new Error('No email given'))
+    }
+    let deletedUser = this.backend.del('users', userKey)
+    return Promise.all([deletedEmail, deletedUser])
   }
 
   /**

test/unit/user-store-test.js

@@ -4,6 +4,7 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 chai.use(dirtyChai)
 const expect = chai.expect
+const assert = chai.assert
 const sinon = require('sinon')
 const sinonChai = require('sinon-chai')
 chai.use(sinonChai)
@@ -220,13 +221,33 @@ describe('UserStore', () => {
       store = UserStore.from({ path: './db' })
     })
 
-    it('should call backend.del with normalized user id', () => {
+    it('should call backend.del with normalized user id and email', () => {
       let userId = 'alice.solidtest.space/profile/card#me'
+      let email = '[email protected]'
 
       store.backend.del = sinon.stub()
 
-      store.deleteUser({ id: userId })
-      expect(store.backend.del).to.have.been.calledWith('users', UserStore.normalizeIdKey(userId))
+      return store.deleteUser({ id: userId, email: email })
+        .then(() => {
+          expect(store.backend.del).to.have.been.calledWith('users', UserStore.normalizeIdKey(userId))
+          expect(store.backend.del).to.have.been.calledWith('users-by-email', UserStore.normalizeEmailKey(email))
+        })
+    })
+
+    it('should call backend.del with normalized user id but no email', () => {
+      let userId = 'alice.solidtest.space/profile/card#me'
+
+      store.backend.del = sinon.stub()
+
+      return store.deleteUser({ id: userId })
+        .then(() => {
+          expect(store.backend.del).to.have.been.calledWith('users', UserStore.normalizeIdKey(userId))
+          expect(store.backend.del).to.not.have.been.calledWith('users-by-email', UserStore.normalizeEmailKey())
+        })
+        .then(
+          () => Promise.reject(new Error('Expected method to reject.')),
+          err => assert.instanceOf(err, Error)
+        )
     })
   })
 })