fix: verifyEmail to not delete guest contributors

Also, enforce profile completion for guests

Author: kewitz

server/controllers/users.ts

@@ -263,14 +263,19 @@ export async function signup(req: express.Request, res: express.Response) {
   }
 
   // Check if Users exists
-  let user = await models.User.findOne({ where: { email: sanitizedEmail } });
+  let user = await models.User.findOne({
+    where: { email: sanitizedEmail },
+    include: [{ model: models.Collective, as: 'collective' }],
+  });
   if (user) {
     if (user.confirmedAt) {
       res.status(403).send({
         error: { message: 'User already exists', type: 'USER_ALREADY_EXISTS' },
       });
       return;
     }
+    const newData = Object.assign({}, user.collective.data, { requiresProfileCompletion: true });
+    await user.collective.update({ data: newData });
   } else {
     user = await sequelize.transaction(async transaction => {
       const user = await models.User.create(
@@ -473,7 +478,11 @@ export async function verifyEmail(req: express.Request, res: express.Response) {
               const tries = otpSession.tries + 1;
               if (tries >= 3) {
                 await sessionCache.delete(otpSessionKey);
-                await user.safeDestroy();
+                const userHasTransactions = await user.collective.getTransactions({ limit: 1 });
+                // Covers edge-case where the user has previously contributed as guest
+                if (userHasTransactions.length === 0) {
+                  await user.safeDestroy();
+                }
               } else {
                 await sessionCache.set(otpSessionKey, { ...otpSession, tries }, 15 * 60);
               }

server/lib/guest-accounts.ts

@@ -77,7 +77,7 @@ export const getOrCreateGuestProfile = async (
           slug: `guest-${uuid().split('-')[0]}`,
           name: name || DEFAULT_GUEST_NAME,
           legalName,
-          data: { isGuest: true },
+          data: { isGuest: true, requiresProfileCompletion: true },
           CreatedByUserId: user.id,
           location,
           currency,