Release Verification Emails and Admin Improvements

config/test.env

@@ -257,3 +257,4 @@ STELLAR_HORIZON_API_URL=https://horizon.stellar.org
 STELLAR_SCAN_API_URL=https://stellar.expert/explorer/public
 
 ENDAOMENT_ADMIN_WALLET_ADDRESS=0xfE3524e04E4e564F9935D34bB5e80c5CaB07F5b4
+SYNC_USER_MODEL_SCORE_CRONJOB_EXPRESSION=0 0 */3 * *

migration/1731071653657-addUserEmailVerificationColumns.ts

@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddUserEmailVerificationColumns1731071653657
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    queryRunner.query(`
+        ALTER TABLE "user"
+        ADD COLUMN IF NOT EXISTS "emailVerificationCode" VARCHAR,
+        ADD COLUMN IF NOT EXISTS "isEmailVerified" BOOLEAN DEFAULT false;
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    queryRunner.query(`
+        ALTER TABLE "user"
+        DROP COLUMN IF EXISTS "emailVerificationCode",
+        DROP COLUMN IF EXISTS "isEmailVerified";
+    `);
+  }
+}

src/adapters/notifications/MockNotificationAdapter.ts

@@ -35,6 +35,14 @@ export class MockNotificationAdapter implements NotificationAdapterInterface {
     return Promise.resolve(undefined);
   }
 
+  sendUserEmailConfirmationCodeFlow(params: { email: string }): Promise<void> {
+    logger.debug(
+      'MockNotificationAdapter sendUserEmailConfirmationCodeFlow',
+      params,
+    );
+    return Promise.resolve(undefined);
+  }
+
   userSuperTokensCritical(): Promise<void> {
     return Promise.resolve(undefined);
   }

src/adapters/notifications/NotificationAdapterInterface.ts

@@ -72,6 +72,11 @@ export interface NotificationAdapterInterface {
     networkName: string;
   }): Promise<void>;
 
+  sendUserEmailConfirmationCodeFlow(params: {
+    email: string;
+    user: User;
+  }): Promise<void>;
+
   projectVerified(params: { project: Project }): Promise<void>;
   projectBoosted(params: { projectId: number; userId: number }): Promise<void>;
   projectBoostedBatch(params: {

src/adapters/notifications/NotificationCenterAdapter.ts

@@ -94,6 +94,28 @@ export class NotificationCenterAdapter implements NotificationAdapterInterface {
     }
   }
 
+  async sendUserEmailConfirmationCodeFlow(params: {
+    email: string;
+    user: User;
+  }): Promise<void> {
+    const { email, user } = params;
+    try {
+      await callSendNotification({
+        eventName:
+          NOTIFICATIONS_EVENT_NAMES.SEND_USER_EMAIL_CONFIRMATION_CODE_FLOW,
+        segment: {
+          payload: {
+            email,
+            verificationCode: user.emailVerificationCode,
+            userId: user.id,
+          },
+        },
+      });
+    } catch (e) {
+      logger.error('sendUserEmailConfirmationCodeFlow >> error', e);
+    }
+  }
+
   async userSuperTokensCritical(params: {
     user: User;
     eventName: UserStreamBalanceWarning;

src/analytics/analytics.ts

@@ -49,4 +49,6 @@ export enum NOTIFICATIONS_EVENT_NAMES {
   SUBSCRIBE_ONBOARDING = 'Subscribe onboarding',
   CREATE_ORTTO_PROFILE = 'Create Ortto profile',
   SEND_EMAIL_CONFIRMATION = 'Send email confirmation',
+
+  SEND_USER_EMAIL_CONFIRMATION_CODE_FLOW = 'Send email confirmation code flow',
 }

src/entities/user.ts

@@ -34,6 +34,7 @@ export const publicSelectionFields = [
   'user.totalReceived',
   'user.passportScore',
   'user.passportStamps',
+  'user.isEmailVerified',
 ];
 
 export enum UserRole {
@@ -195,6 +196,13 @@ export class User extends BaseEntity {
   @Field(_type => Float, { nullable: true })
   activeQFMBDScore?: number;
 
+  @Field(_type => Boolean, { nullable: true })
+  @Column('bool', { default: false })
+  isEmailVerified: boolean;
+
+  @Column('varchar', { nullable: true, default: null })
+  emailVerificationCode?: string | null;
+
   @Field(_type => Int, { nullable: true })
   async donationsCount() {
     // Count for non-recurring donations

src/repositories/donationRepository.ts

@@ -661,12 +661,14 @@ export async function isVerifiedDonationExistsInQfRound(params: {
       `
       SELECT EXISTS (
         SELECT 1
-        FROM donation
+        FROM donation as d
+        INNER JOIN "qf_round" as qr on qr.id = $1
         WHERE 
-          status = 'verified' AND 
-          "qfRoundId" = $1 AND 
-          "projectId" = $2 AND 
-          "userId" = $3
+          d.status = 'verified' AND 
+          d."qfRoundId" = $1 AND 
+          d."projectId" = $2 AND 
+          d."userId" = $3 AND
+          d."createdAt" >= qr."beginDate" AND d."createdAt" <= qr."endDate"
       ) AS exists;
       `,
       [params.qfRoundId, params.projectId, params.userId],

src/repositories/projectVerificationRepository.ts

@@ -27,6 +27,10 @@ export const createProjectVerificationForm = async (params: {
   return ProjectVerificationForm.create({
     project,
     user,
+    // This has been added becasue we are now doing verification of the email on user profile and not on project verification form
+    email: user?.email ?? '',
+    emailConfirmed: true,
+    emailConfirmedAt: new Date(),
   } as ProjectVerificationForm).save();
 };
 

src/resolvers/donationResolver.test.ts

@@ -715,7 +715,7 @@ function doesDonatedToProjectInQfRoundTestCases() {
     await saveDonationDirectlyToDb(
       createDonationData({
         status: DONATION_STATUS.VERIFIED,
-        createdAt: moment().add(50, 'days').toDate(),
+        createdAt: moment().add(8, 'days').toDate(),
         valueUsd: 20,
         qfRoundId: qfRound.id,
       }),

src/resolvers/projectResolver.test.ts

@@ -5529,6 +5529,7 @@ function editProjectUpdateTestCases() {
       walletAddress: generateRandomEtheriumAddress(),
       loginType: 'wallet',
       firstName: 'testEditProjectUpdateFateme',
+      isEmailVerified: true,
     }).save();
     const accessToken = await generateTestAccessToken(user.id);
     const projectUpdateCount = await ProjectUpdate.count();
@@ -5644,6 +5645,7 @@ function deleteProjectUpdateTestCases() {
       walletAddress: generateRandomEtheriumAddress(),
       loginType: 'wallet',
       firstName: 'testDeleteProjectUpdateFateme',
+      isEmailVerified: true,
     }).save();
     const accessToken = await generateTestAccessToken(user.id);
     const projectUpdateCount = await ProjectUpdate.count();

src/resolvers/projectResolver.ts

@@ -1079,6 +1079,14 @@ export class ProjectResolver {
       throw new Error(
         i18n.__(translationErrorMessagesKeys.AUTHENTICATION_REQUIRED),
       );
+
+    const dbUser = await findUserById(user.userId);
+
+    // Check if user email is verified
+    if (!dbUser || !dbUser.isEmailVerified) {
+      throw new Error(i18n.__(translationErrorMessagesKeys.EMAIL_NOT_VERIFIED));
+    }
+
     const { image } = newProjectData;
 
     // const project = await Project.findOne({ id: projectId });
@@ -1362,6 +1370,13 @@ export class ProjectResolver {
     const user = await getLoggedInUser(ctx);
     const { image, description } = projectInput;
 
+    const dbUser = await findUserById(user.id);
+
+    // Check if user email is verified
+    if (!dbUser || !dbUser.isEmailVerified) {
+      throw new Error(i18n.__(translationErrorMessagesKeys.EMAIL_NOT_VERIFIED));
+    }
+
     const qualityScore = getQualityScore(description, Boolean(image), 0);
 
     if (!projectInput.categories) {
@@ -1561,6 +1576,11 @@ export class ProjectResolver {
     if (!owner)
       throw new Error(i18n.__(translationErrorMessagesKeys.USER_NOT_FOUND));
 
+    // Check if user email is verified
+    if (owner && !owner.isEmailVerified) {
+      throw new Error(i18n.__(translationErrorMessagesKeys.EMAIL_NOT_VERIFIED));
+    }
+
     const project = await findProjectById(projectId);
 
     if (!project)
@@ -1616,6 +1636,16 @@ export class ProjectResolver {
       );
     }
 
+    const owner = await findUserById(user.userId);
+
+    if (!owner)
+      throw new Error(i18n.__(translationErrorMessagesKeys.USER_NOT_FOUND));
+
+    // Check if user email is verified
+    if (owner && !owner.isEmailVerified) {
+      throw new Error(i18n.__(translationErrorMessagesKeys.EMAIL_NOT_VERIFIED));
+    }
+
     const update = await ProjectUpdate.findOne({ where: { id: updateId } });
     if (!update)
       throw new Error(
@@ -1648,6 +1678,16 @@ export class ProjectResolver {
         i18n.__(translationErrorMessagesKeys.AUTHENTICATION_REQUIRED),
       );
 
+    const owner = await findUserById(user.userId);
+
+    if (!owner)
+      throw new Error(i18n.__(translationErrorMessagesKeys.USER_NOT_FOUND));
+
+    // Check if user email is verified
+    if (owner && !owner.isEmailVerified) {
+      throw new Error(i18n.__(translationErrorMessagesKeys.EMAIL_NOT_VERIFIED));
+    }
+
     const update = await ProjectUpdate.findOne({ where: { id: updateId } });
     if (!update)
       throw new Error(