@W-18685522 Password Reset and Passwordless Integration Test

.github/workflows/sync_extra_features_e2e.yml

@@ -0,0 +1,186 @@
+name: Sync More Logins E2E Branch with Develop
+
+on:
+  # Trigger when develop branch is updated
+  push:
+    branches:
+      - develop
+  # Run daily at 11 PM PST (7 AM UTC) to catch any missed syncs
+  schedule:
+    - cron: '0 7 * * *'
+  # Allow manual triggering with options
+  workflow_dispatch:
+    inputs:
+      force_sync:
+        description: 'Force sync even if conflicts exist (overwrites E2E branch)'
+        required: false
+        default: false
+        type: boolean
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: read
+
+jobs:
+  sync-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Configure git
+        run: |
+          git config --global user.name ${{ secrets.GIT_CONFIG_USERNAME }}
+          git config --global user.email ${{ secrets.GIT_CONFIG_EMAIL }}
+
+      - name: Sync extra-features-e2e-branch with develop
+        id: sync
+        continue-on-error: true
+        run: |
+          set -e
+
+          # Fetch all branches
+          git fetch origin
+
+          # Check if the target branch exists
+          if ! git show-ref --verify --quiet refs/remotes/origin/extra-features-e2e-branch; then
+            echo "Branch extra-features-e2e-branch does not exist. Creating it from develop..."
+            git checkout -b extra-features-e2e-branch origin/develop
+            git push origin extra-features-e2e-branch
+            echo "✅ Created extra-features-e2e-branch branch from develop"
+            echo "status=created" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # Switch to the target branch
+          git checkout extra-features-e2e-branch
+          git reset --hard origin/extra-features-e2e-branch
+
+          # Check if we're already up to date
+          if git merge-base --is-ancestor origin/develop HEAD; then
+            echo "✅ extra-features-e2e-branch is already up to date with develop"
+            echo "status=up-to-date" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          if [ "${{ github.event.inputs.force_sync }}" = "true" ]; then
+            echo "🔧 Force sync requested. Resetting to develop..."
+            git reset --hard origin/develop
+            git push --force origin extra-features-e2e-branch
+            echo "⚠️  Force synced extra-features-e2e-branch with develop (all conflicts overwritten)"
+            echo "status=force-synced" >> $GITHUB_OUTPUT
+          else
+            # Default merge strategy
+            if git merge origin/develop --no-edit; then
+              echo "✅ Successfully merged develop into extra-features-e2e-branch"
+              git push origin extra-features-e2e-branch
+              echo "status=merged" >> $GITHUB_OUTPUT
+            else
+              echo "❌ Merge conflicts detected!"
+              echo "📋 Files with conflicts:"
+              git diff --name-only --diff-filter=U || true
+              git merge --abort
+              echo "status=conflict" >> $GITHUB_OUTPUT
+              exit 1
+            fi
+          fi
+
+      - name: Create conflict resolution issue
+        if: steps.sync.outputs.status == 'conflict'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const conflictFiles = `${{ steps.sync.outputs.conflict_files || 'Unknown files' }}`;
+            const issueBody = `
+            ## 🚨 Automatic Sync Failed - Merge Conflicts Detected
+
+            Some features in PWA kit are defaulted to be off in \`develop\` branch (e.g. if they only work with private client). 
+            Hence there is another site that has these features enabled that E2E tests of these extra features are run against.
+            The \`extra-features-e2e-branch\` is used for this site.
+
+            A job is run nightly to sync \`develop\` to \`extra-features-e2e-branch\` branch, but today this automatic sync from \`develop\` to \`extra-features-e2e-branch\` failed due to merge conflicts.
+
+            ### Conflicting Files:
+            \`\`\`
+            ${conflictFiles}
+            \`\`\`
+
+
+            ### Manual Resolution:
+            \`\`\`bash
+            git checkout extra-features-e2e-branch
+            git pull origin extra-features-e2e-branch
+            git merge develop
+            # Resolve conflicts manually
+            git add .
+            git commit -m "Resolve merge conflicts from develop"
+            git push origin extra-features-e2e-branch
+            \`\`\`
+
+            ### After resolving the conflicts, close this issue
+            `;
+
+            // Check if issue already exists
+            const existingIssues = await github.rest.issues.listForRepo({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open',
+              labels: 'sync-conflict'
+            });
+
+            if (existingIssues.data.length === 0) {
+              await github.rest.issues.create({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: '🚨 Extra Features E2E Branch Sync Conflict - Manual Resolution Required',
+                body: issueBody,
+                labels: ['sync-conflict', 'automation']
+              });
+            }
+
+  deploy:
+    needs: sync-branch
+    if: needs.sync-branch.outputs.status != 'conflict' && needs.sync-branch.outputs.status != 'up-to-date'
+    runs-on: ubuntu-latest
+    environment: extra-features-e2e
+
+    steps:
+      - name: Checkout extra-features-e2e-branch branch
+        uses: actions/checkout@v4
+        with:
+          ref: extra-features-e2e-branch
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'npm'
+
+      - name: Install Monorepo Dependencies
+        run: |
+          # Install node dependencies
+          node ./scripts/gtime.js monorepo_install npm ci
+
+      - name: Build project
+        run: |
+          cd packages/template-retail-react-app
+          npm run build
+
+      - name: Create MRT credentials file
+        uses: "./.github/actions/create_mrt"
+        with:
+          mobify_user: ${{ secrets.MOBIFY_CLIENT_USER }}
+          mobify_api_key: ${{ secrets.MOBIFY_CLIENT_API_KEY }}
+
+      - name: Deploy to MRT
+        uses: "./.github/actions/push_to_mrt"
+        with:
+          CWD: "./packages/template-retail-react-app"
+          TARGET: extra-features-e2e
+          PROJECT: scaffold-pwa
+          MESSAGE: "Auto-sync from develop - build ${{ github.run_id }} (${{ github.sha }})"
+          FLAGS: --wait

e2e/config.js

@@ -162,5 +162,5 @@ module.exports = {
   },
   PWA_E2E_USER_EMAIL: process.env.PWA_E2E_USER_EMAIL,
   PWA_E2E_USER_PASSWORD: process.env.PWA_E2E_USER_PASSWORD,
-  SOCIAL_LOGIN_RETAIL_APP_HOME: "https://wasatch-mrt-feature-public.mrt-storefront-staging.com"
+  EXTRA_FEATURES_E2E_RETAIL_APP_HOME: "https://scaffold-pwa-extra-features-e2e.mobify-storefront.com"
 };

e2e/scripts/pageHelpers.js

@@ -164,7 +164,7 @@ export const navigateToPDPDesktopSocial = async ({
     productColor,
     productPrice
 }) => {
-    await page.goto(config.SOCIAL_LOGIN_RETAIL_APP_HOME)
+    await page.goto(config.EXTRA_FEATURES_E2E_RETAIL_APP_HOME)
     await answerConsentTrackingForm(page)
 
     await page.getByRole('link', {name: 'Womens'}).hover()
@@ -373,7 +373,7 @@ export const loginShopper = async ({page, userCredentials}) => {
  */
 export const socialLoginShopper = async ({page}) => {
     try {
-        await page.goto(config.SOCIAL_LOGIN_RETAIL_APP_HOME + '/login')
+        await page.goto(config.EXTRA_FEATURES_E2E_RETAIL_APP_HOME + '/login')
 
         await page.getByText(/Google/i).click()
         await expect(page.getByText(/Sign in with Google/i)).toBeVisible({timeout: 10000})

e2e/tests/desktop/login.spec.js

@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2025, Salesforce, Inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+const {test, expect} = require('@playwright/test')
+const config = require('../../config')
+const {generateUserCredentials} = require('../../scripts/utils.js')
+const {answerConsentTrackingForm} = require('../../scripts/pageHelpers.js')
+
+const GUEST_USER_CREDENTIALS = generateUserCredentials()
+/**
+ * Test that a user can login with passwordless login on mobile. There is no programmatic way to check the email,
+ * so we will check that the necessary API call is being made and expected UI is shown
+ */
+test('Verify passwordless login request', async ({page}) => {
+    let interceptedRequest = null
+
+    await page.route('**/mobify/slas/private/shopper/auth/v1/organizations/*/oauth2/passwordless/login', (route) => {
+        interceptedRequest = route.request()
+        route.continue()
+    })
+
+    await page.goto(config.EXTRA_FEATURES_E2E_RETAIL_APP_HOME + '/login')
+    await answerConsentTrackingForm(page)
+
+    await page.locator('#email').scrollIntoViewIfNeeded()
+    await page.fill('#email', config.PWA_E2E_USER_EMAIL)
+
+    await page.getByRole('button', {name: 'Continue Securely'}).click()
+
+    await page.waitForResponse('**/mobify/slas/private/shopper/auth/v1/organizations/*/oauth2/passwordless/login')
+
+    expect(interceptedRequest).toBeTruthy()
+    expect(interceptedRequest.method()).toBe('POST')
+
+    const postData = interceptedRequest.postData()
+    expect(postData).toBeTruthy()
+
+    const params = new URLSearchParams(postData)
+
+    expect(params.get('user_id')).toBe(config.PWA_E2E_USER_EMAIL)
+    expect(params.get('mode')).toBe('callback')
+    expect(params.get('channel_id')).toBe('RefArchGlobal')
+    expect(params.get('callback_uri')).toMatch(/.*\/passwordless-login-callback$/)
+})
+
+test('Verify password reset callback request', async ({page}) => {
+    let interceptedRequest = null
+
+    await page.route('**/mobify/slas/private/shopper/auth/v1/organizations/*/oauth2/password/reset', (route) => {
+        interceptedRequest = route.request()
+        route.continue()
+    })
+
+    await page.goto(config.EXTRA_FEATURES_E2E_RETAIL_APP_HOME + '/login')
+    await answerConsentTrackingForm(page)
+
+    await page.locator('#email').scrollIntoViewIfNeeded()
+    await page.fill('#email', config.PWA_E2E_USER_EMAIL)
+
+    await page.getByRole('button', {name: 'Password'}).click()
+    await page.getByRole('button', {name: 'Forgot password?'}).click()
+
+    await page.fill('#email', config.PWA_E2E_USER_EMAIL)
+    await page.getByRole('button', {name: 'Reset Password'}).click()
+
+    await page.waitForResponse('**/mobify/slas/private/shopper/auth/v1/organizations/*/oauth2/password/reset')
+
+    expect(interceptedRequest).toBeTruthy()
+    expect(interceptedRequest.method()).toBe('POST')
+
+    const postData = interceptedRequest.postData()
+    expect(postData).toBeTruthy()
+
+    const params = new URLSearchParams(postData)
+
+    expect(params.get('user_id')).toBe(config.PWA_E2E_USER_EMAIL)
+    expect(params.get('mode')).toBe('callback')
+    expect(params.get('channel_id')).toBe('RefArchGlobal')
+    expect(params.get('callback_uri')).toMatch(/.*\/reset-password-callback$/)
+    expect(params.get('hint')).toBe('cross_device')
+})
+
+test('Verify password reset request', async ({page}) => {
+    let interceptedRequest = null
+    await page.route('**/mobify/slas/private/shopper/auth/v1/organizations/*/oauth2/password/action', (route) => {
+        interceptedRequest = route.request()
+        route.continue()
+    })
+
+    await page.goto(config.EXTRA_FEATURES_E2E_RETAIL_APP_HOME + `/reset-password-landing?token=1234567&email=${GUEST_USER_CREDENTIALS.email}`)
+    await answerConsentTrackingForm(page)
+
+    await page.fill('#password', GUEST_USER_CREDENTIALS.password)
+    await page.fill('#confirmPassword', GUEST_USER_CREDENTIALS.password)
+
+    expect(await page.inputValue('#password')).toBe(GUEST_USER_CREDENTIALS.password)
+    expect(await page.inputValue('#confirmPassword')).toBe(GUEST_USER_CREDENTIALS.password)
+    await page.getByRole('button', {name: 'Reset Password'}).click()
+
+    await page.waitForResponse('**/mobify/slas/private/shopper/auth/v1/organizations/*/oauth2/password/action')
+
+    expect(interceptedRequest).toBeTruthy()
+})