add test and prevent duplicate creation of mauticId

src/server/storage/__tests__/storageAPI.js

@@ -3,6 +3,7 @@ import request from 'supertest'
 import makeServer from '../../server-test'
 import { getToken } from '../../__util__/'
 import type { UserRecord } from '../../../imports/types'
+import UserDBPrivate from '../../db/mongo/user-privat-provider'
 
 jest.setTimeout(30000)
 describe('storageAPI', () => {
@@ -31,6 +32,27 @@ describe('storageAPI', () => {
     expect(res).toMatchObject({ status: 200, body: { ok: 1 } })
   })
 
+  test('/user/add creds dont update mauticId', async () => {
+    const token = await getToken(server)
+    const mauticId = '111'
+    await UserDBPrivate.updateUser({ identifier: '0x7ac080f6607405705aed79675789701a48c76f55', mauticId: mauticId })
+    const user: UserRecord = {
+      identifier: '0x7ac080f6607405705aed79675789701a48c76f55',
+      email: 'useraddtest@gooddollar.org' // required for mautic create contact
+    }
+    let res = await request(server)
+      .post('/user/add')
+      .set('Authorization', `Bearer ${token}`)
+      .send({ user })
+    expect(res).toMatchObject({ status: 200, body: { ok: 1 } })
+
+    const mauticIdAfterAddUser = await UserDBPrivate.getUserField(
+      '0x7ac080f6607405705aed79675789701a48c76f55',
+      'mauticId'
+    )
+    expect(mauticIdAfterAddUser === mauticId).toBeTruthy()
+  })
+
   test('/user/add false creds', async () => {
     const token = await getToken(server)
     const user: UserRecord = { identifier: '0x7ac080f6607405705aed79675789701a48c76f56' }
@@ -40,19 +62,19 @@ describe('storageAPI', () => {
       .send({ user })
     expect(res).toMatchObject({ status: 400 })
   })
-  
+
   test('/user/delete with zoomId and bad signature', async () => {
     const token = await getToken(server)
     let res = await request(server)
       .post('/user/delete')
       .set('Authorization', `Bearer ${token}`)
       .send({
-        zoomId: "DEc4f150b719957a2dD434C48Dff9Bc57466e764",
-        zoomSignature: "Bad signature"
+        zoomId: 'DEc4f150b719957a2dD434C48Dff9Bc57466e764',
+        zoomSignature: 'Bad signature'
       })
     expect(res).toMatchObject({ status: 400 })
   })
-  
+
   test('/user/delete without zoomId ', async () => {
     const token = await getToken(server)
     let res = await request(server)
@@ -61,17 +83,17 @@ describe('storageAPI', () => {
       .send()
     expect(res).toMatchObject({ status: 200 })
   })
-  
+
   test('/user/delete with zoomId and good signature', async () => {
     const token = await getToken(server)
     let res = await request(server)
       .post('/user/delete')
       .set('Authorization', `Bearer ${token}`)
       .send({
-        zoomId: "DEc4f150b719957a2dD434C48Dff9Bc57466e764",
-        zoomSignature: "0xda0c23e71a589adfb4f29b021549371f44de105678284e4d9acecb8b670a35c63bd1e200ae9293dcca0064ae87438094df7e7db3268c47e638cdffdfe8c386a11c"
+        zoomId: 'DEc4f150b719957a2dD434C48Dff9Bc57466e764',
+        zoomSignature:
+          '0xda0c23e71a589adfb4f29b021549371f44de105678284e4d9acecb8b670a35c63bd1e200ae9293dcca0064ae87438094df7e7db3268c47e638cdffdfe8c386a11c'
       })
     expect(res).toMatchObject({ status: 200 })
   })
-
 })

src/server/storage/storageAPI.js

@@ -48,12 +48,16 @@ const setup = (app: Router, storage: StorageAPI) => {
         AdminWallet.whitelistUser(userRecord.gdAddress, userRecord.profilePublickey)
       }
 
-      const mauticRecordPromise =
-        process.env.NODE_ENV === 'development'
-          ? Promise.resolve({})
-          : Mautic.createContact(user).catch(e => {
-              log.error('Create Mautic Record Failed', e)
-            })
+      let mauticRecordPromise = Promise.resolve({})
+
+      if (!userRecord.mauticId) {
+        mauticRecordPromise =
+          process.env.NODE_ENV === 'development'
+            ? Promise.resolve({})
+            : Mautic.createContact(user).catch(e => {
+                log.error('Create Mautic Record Failed', e)
+              })
+      }
 
       const secureHash = md5(user.email + conf.secure_key)
 
@@ -81,7 +85,7 @@ const setup = (app: Router, storage: StorageAPI) => {
       log.debug('Web3 user record', web3Record)
 
       //mautic contact should already exists since it is first created during the email verification we update it here
-      const mauticId = get(mauticRecord, 'contact.fields.all.id', -1)
+      const mauticId = !userRecord.mauticId ? get(mauticRecord, 'contact.fields.all.id', -1) : userRecord.mauticId
       logger.debug('User mautic record', { mauticId, mauticRecord })
 
       const updateUserObj = {
@@ -131,21 +135,21 @@ const setup = (app: Router, storage: StorageAPI) => {
       const { user, log, body } = req
       const {zoomSignature, zoomId} = body
       log.info('delete user', { user })
-      
+
       if (zoomId && zoomSignature) {
-        
+
         const recovered = recoverPublickey(zoomSignature, zoomId, '').replace('0x', '')
-        
+
         if (recovered === body.zoomId.toLowerCase()) {
           await zoomHelper.delete(zoomId)
           log.info('zoom delete', { zoomId })
         } else {
           log.error('/user/delete', 'SigUtil unable to recover the message signer')
           throw new Error('Unable to verify credentials')
         }
-        
+
       }
-      
+
       const results = await Promise.all([
         (user.identifier ? storage.deleteUser(user) : Promise.reject())
           .then(r => ({ mongodb: 'ok' }))
@@ -154,7 +158,7 @@ const setup = (app: Router, storage: StorageAPI) => {
           .then(r => ({ mautic: 'ok' }))
           .catch(e => ({ mautic: 'failed' }))
       ])
-      
+
       log.info('delete user results', { results })
       res.json({ ok: 1, results })
     })