update emailSender to use MailGun with wasp.sh domain

opensaas-sh/app_diff/.env.vault.diff

@@ -7,8 +7,8 @@
 +#/--------------------------------------------------/
 +
 +# development
-+DOTENV_VAULT_DEVELOPMENT="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"
-+DOTENV_VAULT_DEVELOPMENT_VERSION=13
++DOTENV_VAULT_DEVELOPMENT="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"
++DOTENV_VAULT_DEVELOPMENT_VERSION=14
 +
 +# ci
 +DOTENV_VAULT_CI="XGJ7HhbwC6C7beVXbifG+tkHOTHTPNHoECye25INPUQmK9vxQ9RObeQjfhLGd2Qkj1bsHDU3VGEjuReB7OxZ7YSFF1xaFoVPdm4x+Rwlr/vbVEy0t4JeUGYA54aNPQYaQBmCF0QVKSI0l7O+WWX7Th62nGyDYwwVOs4PIXwGf1Zr+mtmmJSOuJT8jPQdTfFTKVi/ntWrxl3CBsflW4xQIWsvnoHyDy161gg/HNmmnmdqDYK+roUBokBc1X2rBoSI+vmUUAg+M0rejg8HBs8ZKFDDBXPYOrcnQR306VYrVZjoS0HaA1pZNROXbUaUS2lxl74mP1vD3nV5oQ79coPc9FcwrIMBpv3V7gjdHSM/D/Scf3Wkq+nkk0YsysebRg3qBv/pOy5zb53+NF2AfHZ2drcW4X5QZng6haCqwaDuBDBetro9NECTuMTxuVR8Qfd+NlCXP9RVxhmVMETBYbABSzj2uXKPfCtc2QbtJULXtdO7BkW2ED7c40MGO2NDdEbv8NzqwPqPzpVjtw86YrzHH1y0pgfoEzGPXv6A9QQlt2Ns2EPHjPM87swrTuOGr/xHfpm/j6X8+kB4GwsJehes+BELT6UM9+maPExap/qh1c4WKCwrUYxLD82nixmzxARsqyqJYIoD57AzPeWeqwrxy2nNmKuN/xuau7u/mZqbXwpbE0RIs2zbREZazHDiD8GOL/kXAYhGOQABXrTpl6mFsNVU0OPWE6VkxA90YNxG0kTIBHYaOd2IbPDxPFYbtIGZNCYTn50+7JwPfl56fbVAM5mbvTGaQPo/74H92E3akWFBCA2Wa1yUn1jhfoYzGYrRj+CBCtJLpZI/JIfsVeKdVZ+3/osTb2UdN7humZlrpKzrFqcIKCsbYB2Y55R+LrbuQzbqKl7JUT/y0obboa6jBtO2VFzsF1cJDh3UCCQ2BdBXu5KYhk8BdM1SKWN/p+kteGSgdOuxs9dZW/z/p2Ycjd1cNZjDahN4Ye5HBtiNEXuej7o7SaF5BQC/fqQpSqvVKacxkNL+0X/UR+HUJE1t8d8jEwfT9WE0zxjnraDVxMbC6EHbPV44hUoYyclaKraSAgpaZuW0dkikWrTbyl8SMJPGsD5WZU5gps9i9SfY7y6R2Ruc7vxPRRYb25NTZap6L+hkWeXVM50tKDCIs6cWFHNF7oW9oF72WdZVziWm7kWX7Q0BjNT76od+CMD9tyHo48qSEmYed22cXCMV+dIsQtXwz8y0S8xuaBs1dHsHcEnF6sOGFsRlLaYbXbJiBOFqzqW2iKFdu/CMEJ8qmssxpKQfyy93mOSragacJ3D6iVbTvDaHZ+KbFtIdk+w368MaA/9xEvvdkDJX+u+wqA13SpXkOr2T0Czip1h8fiEw41Jc5cGmMLZyPo1d9dDnc9vyFtfDxGZxQ38BpEmDZcy21cM57TuhLmlZ0U15aiD122rZfdWGkKjtG2854MEJDoLVZRZHhxpSqdhEKRHCgFvhjHYU/FjjaBSGu0g5lOzbc3V/Un8U9Ix5KwMx+VAahGAF2pLaYRmNof3IXTzJC9xPwj+IsO7jTPtsBuJFjSjG"

opensaas-sh/app_diff/main.wasp.diff

@@ -54,7 +54,7 @@
          fromField: {
            name: "Open SaaS App",
 -          email: "[email protected]"
-+          email: "vince@wasp-lang.dev"
++          email: "noreply@mg.wasp.sh"
          },
          emailVerification: {
            clientRoute: EmailVerificationRoute,
@@ -97,12 +97,12 @@
      //   Make sure to check the server logs for the email confirmation url (it will not be sent to an address)!
      //   Once you are ready for production, switch to e.g. "SendGrid" or "Mailgun" providers. Check out https://docs.opensaas.sh/guides/email-sending/ .
 -    provider: Dummy,
-+    provider: SendGrid,
++    provider: Mailgun,
      defaultFrom: {
        name: "Open SaaS App",
        // When using a real provider, e.g. SendGrid, you must use the same email address that you configured your account to send out emails with!
 -      email: "[email protected]"
-+      email: "vince@wasp-lang.dev"
++      email: "noreply@mg.wasp.sh"
      },
    },
  }

opensaas-sh/app_diff/src/auth/email-and-pass/emails.ts.diff

@@ -0,0 +1,30 @@
+--- template/app/src/auth/email-and-pass/emails.ts
++++ opensaas-sh/app/src/auth/email-and-pass/emails.ts
+@@ -6,10 +6,10 @@
+ export const getVerificationEmailContent: GetVerificationEmailContentFn = ({
+   verificationLink,
+ }) => ({
+-  subject: "Verify your email",
+-  text: `Click the link below to verify your email: ${verificationLink}`,
++  subject: "Open SaaS - Verify your email",
++  text: `Open SaaS - Click the link to verify your email: ${verificationLink}`,
+   html: `
+-        <p>Click the link below to verify your email</p>
++        <p>Open SaaS - Click the link to verify your email:</p>
+         <a href="${verificationLink}">Verify email</a>
+     `,
+ });
+@@ -17,10 +17,10 @@
+ export const getPasswordResetEmailContent: GetPasswordResetEmailContentFn = ({
+   passwordResetLink,
+ }) => ({
+-  subject: "Password reset",
+-  text: `Click the link below to reset your password: ${passwordResetLink}`,
++  subject: "Open SaaS - Password reset",
++  text: `Open SaaS - Click the link to reset your password: ${passwordResetLink}`,
+   html: `
+-        <p>Click the link below to reset your password</p>
++        <p>Open SaaS - Click the link to reset your password:</p>
+         <a href="${passwordResetLink}">Reset password</a>
+     `,
+ });

template/e2e-tests/tests/utils.ts

@@ -79,6 +79,11 @@ export const createRandomUser = () => {
   return { email, password: DEFAULT_PASSWORD } as User;
 };
 
+const getNextYearLastTwoDigits = () => {
+  const nextYear = new Date().getFullYear() + 1;
+  return nextYear.toString().slice(-2);
+};
+
 export const makeStripePayment = async ({
   test,
   page,
@@ -103,7 +108,7 @@ export const makeStripePayment = async ({
     waitUntil: "domcontentloaded",
   });
   await page.fill('input[name="cardNumber"]', "4242424242424242");
-  await page.getByPlaceholder("MM / YY").fill("1225");
+  await page.getByPlaceholder("MM / YY").fill(`12${getNextYearLastTwoDigits()}`);
   await page.getByPlaceholder("CVC").fill("123");
   await page.getByPlaceholder("Full name on card").fill("Test User");
   const countrySelect = page.getByLabel("Country or region");