refactoring email sending to magic login and reset password

Author: joeltejeda

.github/workflows/test-email-shopowner-704.yml

@@ -29,15 +29,13 @@ jobs:
       - name: Run test shop owner email magic login received
         env:
           PLAYWRIGHT_HEADLESS: true
-          TEST_SHOP_OWNER_LOGIN_URL_ISSUE_704: ${{ secrets.SHOP_OWNER_LOGIN_URL_ISSUE_704 }}
-          TEST_SHOP_OWNER_EMAIL_ISSUE_704: ${{ secrets.SHOP_OWNER_EMAIL_ISSUE_704 }}
-          email_host: ${{ secrets.EMAIL_HOST_ISSUE_704 }}
-          email_user: ${{ secrets.EMAIL_USER_ISSUE_704 }}
-          email_password: ${{ secrets.EMAIL_PASSWORD_ISSUE_704 }}
-          email_search_api_host: ${{ secrets.EMAIL_SEARCH_API_HOST_ISSUE_704 }}
-          imap_search_subject: "Subscribie Magic Login"
-          imap_search_unseen: "1"
-          imap_search_since_date: "01-Sep-2021"
+          SHOP_OWNER_LOGIN_URL: ${{ secrets.SHOP_OWNER_LOGIN_URL }}
+          SHOP_OWNER_EMAIL_HOST: ${{ secrets.SHOP_OWNER_EMAIL_HOST }}
+          SHOP_OWNER_EMAIL_USER: ${{ secrets.SHOP_OWNER_EMAIL_USER }}
+          SHOP_OWNER_EMAIL_PASSWORD: ${{ secrets.SHOP_OWNER_EMAIL_PASSWORD }}
+          EMAIL_SEARCH_API_HOST: ${{ secrets.EMAIL_SEARCH_API_HOST_ISSUE_704 }}
+          SHOP_OWNER_MAGIC_LOGIN_IMAP_SEARCH_SUBJECT: "Subscribie Magic Login"
+          IMAP_SEARCH_SINCE_DATE: "01-Sep-2021"
         run: |
           set -x
           cd tests/browser-automated-tests-playwright; npx playwright test --grep @704

tests/browser-automated-tests-playwright/tests/704_shop_owner_magic_login_receives_email.js

@@ -1,12 +1,12 @@
 const { test, expect } = require('@playwright/test');
 const checkShopOwnerLogin = require('./checkShopOwnerLogin.js');
 
-const TEST_SHOP_OWNER_LOGIN_URL = process.env.TEST_SHOP_OWNER_LOGIN_URL_ISSUE_704
-const TEST_SHOP_OWNER_EMAIL = process.env.TEST_SHOP_OWNER_EMAIL_ISSUE_704
+const SHOP_OWNER_LOGIN_URL = process.env.SHOP_OWNER_LOGIN_URL
+const SHOP_OWNER_EMAIL = process.env.SHOP_OWNER_EMAIL_USER
 
 test('@704@shop_owner@magic login receives email', async ({ page }) => {
-  await page.goto(TEST_SHOP_OWNER_LOGIN_URL);
-  await page.fill('#email', TEST_SHOP_OWNER_EMAIL);
+  await page.goto(SHOP_OWNER_LOGIN_URL);
+  await page.fill('#email', SHOP_OWNER_EMAIL);
   await page.click('#login');
   await new Promise(r => setTimeout(r, 5000));
   checkShopOwnerLogin.checkShopOwnerLogin();

tests/browser-automated-tests-playwright/tests/checkShopOwnerLogin.js

@@ -1,27 +1,26 @@
 const https = require('https')
 
 function checkShopOwnerLogin() {
-  email_host = process.env.email_host
-  email_user = process.env.email_user
-  email_password = process.env.email_password
-  imap_search_subject = process.env.imap_search_subject
-  imap_search_unseen = process.env.imap_search_unseen
-  imap_search_since_date = process.env.imap_search_since_date
-
-  email_search_api_host = process.env.email_search_api_host
+  SHOP_OWNER_EMAIL_HOST = process.env.SHOP_OWNER_EMAIL_HOST
+  SHOP_OWNER_EMAIL_USER = process.env.SHOP_OWNER_EMAIL_USER
+  SHOP_OWNER_EMAIL_PASSWORD = process.env.SHOP_OWNER_EMAIL_PASSWORD
+  MAGIC_LOGIN_IMAP_SEARCH_SUBJECT = process.env.MAGIC_LOGIN_IMAP_SEARCH_SUBJECT
+  // global env
+  IMAP_SEARCH_SINCE_DATE = process.env.IMAP_SEARCH_SINCE_DATE
+  EMAIL_SEARCH_API_HOST = process.env.EMAIL_SEARCH_API_HOST
 
   const data = JSON.stringify({
-    email_host: email_host,
-    email_user: email_user,
-    email_password: email_password,
-    imap_search_subject: imap_search_subject,
-    imap_search_unseen: imap_search_unseen,
-    imap_search_since_date: imap_search_since_date
+    email_host: SHOP_OWNER_EMAIL_HOST,
+    email_user: SHOP_OWNER_EMAIL_USER,
+    email_password: SHOP_OWNER_EMAIL_PASSWORD,
+    imap_search_subject: MAGIC_LOGIN_IMAP_SEARCH_SUBJECT,
+    imap_search_unseen: 1,
+    imap_search_since_date: IMAP_SEARCH_SINCE_DATE
   })
 
 
   const options = {
-    hostname: email_search_api_host,
+    hostname: EMAIL_SEARCH_API_HOST,
     port: 443,
     path: '/search-email',
     method: 'POST',
@@ -46,6 +45,10 @@ function checkShopOwnerLogin() {
       }
       lastEmail = emails[emails.length -1]['email_body']
       if ( lastEmail.includes('/auth/login/') ) {
+        jsonToString = JSON.stringify(lastEmail);
+        const regex = /"(http.*)(?:\\")/gm;
+        magic_login_url = regex.exec(jsonToString)[1];
+        module.exports.magic_login_url = magic_login_url;
         return true
       } else {
         console.error("Could not find login text in email")

tests/browser-automated-tests-playwright/tests/checkSubscriberLogin.js

@@ -6,7 +6,7 @@ function checkSubscriberLogin() {
   SUBSCRIBER_EMAIL_USER = process.env.SUBSCRIBER_EMAIL_USER
   SUBSCRIBER_EMAIL_PASSWORD = process.env.SUBSCRIBER_EMAIL_PASSWORD
   RESET_PASSWORD_IMAP_SEARCH_SUBJECT = process.env.RESET_PASSWORD_IMAP_SEARCH_SUBJECT
-  IMAP_SEARCH_UNSEEN = process.env.IMAP_SEARCH_UNSEEN
+  //global env
   IMAP_SEARCH_SINCE_DATE = process.env.IMAP_SEARCH_SINCE_DATE
   EMAIL_SEARCH_API_HOST = process.env.EMAIL_SEARCH_API_HOST