fix: remove old email on validation of new one (#619)

* fix: remove old email on validation of new one

* fix: remove old email on validation of new one

* fix: remove old email on validation of new one

Author: o-v-t

src/utils/contacts.js

@@ -3,7 +3,7 @@ const { HttpStatusError } = require('@microfleet/validation');
 const challengeAct = require('./challenges/challenge');
 const redisKey = require('./key');
 const handlePipeline = require('./pipeline-error');
-const { getUserId } = require('./userData');
+const { getInternalData, getUserId } = require('./userData');
 const {
   USERS_CONTACTS,
   USERS_DEFAULT_CONTACT,
@@ -64,8 +64,11 @@ async function removeAllEmailContactsOfUser(redisPipe, userId, exceptEmail) {
   }
 }
 
-async function setUserName(redisPipe, userId, verifiedEmail) {
+async function replaceUserName(redisPipe, userId, verifiedEmail) {
   const { config: { jwt: { defaultAudience } } } = this;
+  const internalData = await getInternalData.call(this, userId);
+  const username = internalData[USERS_USERNAME_FIELD];
+  redisPipe.hdel(USERS_USERNAME_TO_ID, username);
   redisPipe.hset(USERS_USERNAME_TO_ID, verifiedEmail, userId);
   redisPipe.hset(redisKey(userId, USERS_DATA), USERS_USERNAME_FIELD, verifiedEmail);
   redisPipe.hset(redisKey(userId, USERS_METADATA, defaultAudience), USERS_USERNAME_FIELD, JSON.stringify(verifiedEmail));
@@ -173,7 +176,7 @@ async function verifyEmail({ secret }) {
       await removeAllEmailContactsOfUser.call(this, pipe, userId, contact.value);
     }
     if (this.config.contacts.updateUsername) {
-      await setUserName.call(this, pipe, userId, contact.value);
+      await replaceUserName.call(this, pipe, userId, contact.value);
     }
     pipe.hset(key, 'verified', 'true');
     metadata.contact.verified = true;

test/suites/actions/contacts.js

@@ -280,9 +280,9 @@ describe('#user contacts', function registerSuite() {
       .dispatch('contacts.verify-email', { params: { secret } });
 
     // get meta of user by updated email
-    const { [audience]: { username: updatedUserName } } = await this.users
+    const { [audience]: { username: updatedUserName, id } } = await this.users
       .dispatch('getMetadata', { params: { username: params.contact.value, audience } });
-
+    this.testUser.id = id;
     assert.equal(updatedUserName, params.contact.value);
     assert.equal(value, params.contact.value);
     assert.strictEqual(verified, true);
@@ -292,7 +292,7 @@ describe('#user contacts', function registerSuite() {
 
   it('should remove username to userid mapping on contact removal', async function test() {
     const params = {
-      username: this.testUser.username,
+      username: this.testUser.id,
       contact: {
         value: 'email@mail.org',
         type: 'email',