Release: Develop to Master

.action-plan-167-286.md

@@ -0,0 +1,183 @@
+# Action Plan: Task #167 → Issue #286
+
+## Current Status
+
+### ✅ Task #167 (Frontend Migration) - COMPLETE
+
+- All authentication screens migrated to React Hook Form + Zod
+- Old `.js` files removed
+- All unit tests passing (2,305 passing, 0 failing)
+- All E2E tests verified (34 Chromium tests passing)
+- Ready for commit and PR
+
+### ⏳ Issue #286 (Backend Password History) - PENDING
+
+- Backend bug: `PropertyValueException` when saving password history
+- Separate from frontend migration
+- Should be handled after frontend PR is merged
+
+---
+
+## Recommended Action Plan
+
+### Phase 1: Commit and Merge Frontend Work (Task #167) ✅
+
+**Rationale**:
+
+- Frontend migration is complete and tested
+- Backend issue is separate and can be fixed independently
+- Clean separation of concerns
+- Allows frontend work to be merged while backend fix is in progress
+
+**Steps**:
+
+1. **Review Changes**
+
+   ```bash
+   git status
+   git diff --stat
+   ```
+
+2. **Stage All Changes**
+
+   ```bash
+   git add .
+   ```
+
+3. **Commit with Descriptive Message**
+
+   ```bash
+   git commit -m "feat(frontend): migrate authentication screens to React Hook Form + Zod
+
+   - Migrate Login screen from Formik to React Hook Form + Zod
+   - Migrate Register screen from Formik to React Hook Form + Zod
+   - Migrate Reset Password screen from Formik to React Hook Form + Zod
+   - Migrate New Password screen from Formik to React Hook Form + Zod
+   - Remove old .js files (log_in, register, reset_password, new_password)
+   - Update unit tests for React Hook Form (all 2,305 tests passing)
+   - Verify E2E tests (34 Chromium tests passing)
+   - Maintain reactstrap components for design consistency
+   - Add fallback to window.location.search for test environments
+
+   Closes #167"
+   ```
+
+4. **Push to Remote**
+
+   ```bash
+   git push origin feature/migrate-auth-screens-167
+   ```
+
+5. **Create Pull Request**
+   - Title: `feat(frontend): migrate authentication screens to React Hook Form + Zod`
+   - Base: `develop`
+   - Description: Use `.pr-description-167.md`
+   - Link to issue: Closes #167
+   - Review checklist: See `.pending-items-167.md` checklist
+
+6. **After PR Approval & Merge**
+   - Merge PR to `develop`
+   - Delete feature branch (optional)
+
+---
+
+### Phase 2: Fix Backend Issue (Issue #286) 🔧
+
+**After frontend PR is merged**, create a new branch for the backend fix:
+
+1. **Create New Branch**
+
+   ```bash
+   git checkout develop
+   git pull origin develop
+   git checkout -b fix/backend-password-history-286
+   ```
+
+2. **Investigate Issue**
+   - Review `.github-issue-backend-password-history.md`
+   - Check `UserRestHelper.java` - `savePasswordHistory` method
+   - Check `PasswordHistory.java` entity
+   - Check `LoginRestController.java` - `resetPassword` method
+
+3. **Implement Fix**
+   - Based on attempted fixes documented in issue #286
+   - Consider using native SQL insert (already attempted but may need refinement)
+   - Or fix entity relationship/loading issue
+
+4. **Test Fix**
+   - Test password reset flow end-to-end
+   - Verify password history is saved
+   - Verify API returns HTTP 200
+   - Update E2E test expectations if needed
+
+5. **Commit and PR**
+
+   ```bash
+   git commit -m "fix(backend): resolve PropertyValueException when saving password history
+
+   - Fix password history saving during password reset
+   - Ensure User entity is properly loaded before saving PasswordHistory
+   - Return appropriate HTTP status codes
+   - Update error handling
+
+   Fixes #286"
+   ```
+
+---
+
+## Why This Order?
+
+1. **Clean Separation**: Frontend and backend are separate concerns
+2. **Independent Work**: Backend fix doesn't depend on frontend changes
+3. **Faster Integration**: Frontend work can be merged while backend fix is in progress
+4. **Easier Review**: Smaller, focused PRs are easier to review
+5. **Risk Management**: If backend fix takes time, frontend work is already merged
+
+---
+
+## Alternative Approach (If Needed)
+
+If you prefer to fix both in one PR:
+
+- Keep current branch
+- Add backend fix commits
+- Create single PR for both frontend migration and backend fix
+- **Note**: This makes the PR larger and harder to review
+
+---
+
+## Files Changed (Task #167)
+
+### Frontend
+
+- `apps/frontend/src/screens/log_in/screen.jsx` (migrated)
+- `apps/frontend/src/screens/register/screen.jsx` (migrated)
+- `apps/frontend/src/screens/reset_password/screen.jsx` (migrated)
+- `apps/frontend/src/screens/new_password/screen.jsx` (migrated)
+- `apps/frontend/src/screens/reset_password/__tests__/ResetPassword.test.js` (updated)
+- Removed: `apps/frontend/src/screens/log_in/screen.js`
+- Removed: `apps/frontend/src/screens/register/screen.js`
+- Removed: `apps/frontend/src/screens/reset_password/screen.js`
+- Removed: `apps/frontend/src/screens/new_password/screen.js`
+
+### Documentation
+
+- `.pr-description-167.md` (updated)
+- `.battle-plan-167.md` (updated)
+- `.pending-items-167.md` (updated)
+- `.github-issue-backend-password-history.md` (created)
+
+---
+
+## Next Steps
+
+1. ✅ Review current changes
+2. ✅ Commit frontend work
+3. ✅ Create PR for Task #167
+4. ⏳ After merge, create branch for Issue #286
+5. ⏳ Fix backend password history issue
+6. ⏳ Create PR for Issue #286
+
+---
+
+**Last Updated**: 2025-12-19

.create-github-issue-pr.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+# Script to create GitHub issue and PR for Task #167
+# This script provides the content and URLs needed
+
+echo "=========================================="
+echo "GitHub Issue and PR Creation Guide"
+echo "=========================================="
+echo ""
+
+echo "1. CREATE GITHUB ISSUE"
+echo "======================"
+echo "URL: https://github.com/SimpleAccounts/SimpleAccounts-UAE/issues/new"
+echo ""
+echo "Title: Backend: PropertyValueException when saving PasswordHistory during password reset"
+echo ""
+echo "Labels: bug, backend, high-priority, authentication"
+echo ""
+echo "Body: (Copy from .github-issue-backend-password-history.md)"
+echo ""
+cat .github-issue-backend-password-history.md
+echo ""
+echo ""
+echo "=========================================="
+echo ""
+echo "2. CREATE PULL REQUEST"
+echo "======================"
+echo "URL: https://github.com/SimpleAccounts/SimpleAccounts-UAE/compare/develop...feature/auth-react-hook-form-167"
+echo ""
+echo "Title: feat(auth): migrate authentication screens to React Hook Form + Zod (#167)"
+echo ""
+echo "Body: (Copy from .pr-description-167.md)"
+echo ""
+cat .pr-description-167.md
+echo ""
+echo ""
+echo "=========================================="
+echo ""
+echo "3. AFTER CREATING ISSUE"
+echo "======================="
+echo "Once you have the issue number (e.g., #XXX), update the PR description:"
+echo "- Replace '#XXX' with the actual issue number"
+echo "- Link the issue in the PR description"
+echo ""
+

.devcontainer/Dockerfile

@@ -0,0 +1,52 @@
+# SimpleAccounts-UAE Development Container
+# Base image with Node 20 and Java 21 for full-stack development
+
+FROM mcr.microsoft.com/devcontainers/java:21-bookworm
+
+# Install Node.js 20
+ARG NODE_VERSION="20"
+RUN su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"
+
+# Install additional system dependencies
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends \
+        postgresql-client \
+        redis-tools \
+        chromium \
+        chromium-driver \
+        fonts-liberation \
+        libasound2 \
+        libatk-bridge2.0-0 \
+        libatk1.0-0 \
+        libcups2 \
+        libdbus-1-3 \
+        libdrm2 \
+        libgbm1 \
+        libgtk-3-0 \
+        libnspr4 \
+        libnss3 \
+        libx11-xcb1 \
+        libxcomposite1 \
+        libxdamage1 \
+        libxfixes3 \
+        libxrandr2 \
+        xdg-utils \
+    && apt-get clean -y && rm -rf /var/lib/apt/lists/*
+
+# Set Playwright to use system Chromium
+ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+ENV PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH=/usr/bin/chromium
+
+# Install global npm packages
+RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g npm@latest" 2>&1
+
+# Pre-cache Maven dependencies (optional - speeds up first build)
+# Uncomment if you want to pre-download Maven dependencies
+# COPY apps/backend/pom.xml /tmp/pom.xml
+# RUN cd /tmp && mvn dependency:go-offline -B
+
+# Set working directory
+WORKDIR /workspaces/SimpleAccounts-UAE
+
+# Default command
+CMD ["sleep", "infinity"]

.devcontainer/devcontainer.json

@@ -0,0 +1,96 @@
+{
+  "name": "SimpleAccounts-UAE",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "devcontainer",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+
+  // Features to add to the dev container
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
+      "moby": true,
+      "installDockerBuildx": true
+    },
+    "ghcr.io/devcontainers/features/git:1": {
+      "ppa": true,
+      "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/github-cli:1": {}
+  },
+
+  // Configure tool-specific properties
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        // Java Development
+        "vscjava.vscode-java-pack",
+        "vmware.vscode-spring-boot",
+        "vscjava.vscode-spring-initializr",
+        "vscjava.vscode-spring-boot-dashboard",
+
+        // Frontend Development
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "bradlc.vscode-tailwindcss",
+        "ms-vscode.vscode-typescript-next",
+
+        // Testing
+        "ms-playwright.playwright",
+
+        // Database
+        "cweijan.vscode-postgresql-client2",
+
+        // Git & Collaboration
+        "eamodio.gitlens",
+        "github.copilot",
+
+        // General
+        "editorconfig.editorconfig",
+        "usernamehw.errorlens",
+        "christian-kohler.path-intellisense"
+      ],
+      "settings": {
+        // Java settings
+        "java.server.launchMode": "Standard",
+        "java.configuration.updateBuildConfiguration": "automatic",
+        "java.compile.nullAnalysis.mode": "automatic",
+
+        // Editor settings
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "[java]": {
+          "editor.defaultFormatter": "redhat.java"
+        },
+
+        // Terminal settings
+        "terminal.integrated.defaultProfile.linux": "bash",
+
+        // File associations
+        "files.associations": {
+          "*.env*": "dotenv"
+        }
+      }
+    }
+  },
+
+  // Port forwarding
+  "forwardPorts": [3000, 8080, 5432, 6379],
+  "portsAttributes": {
+    "3000": { "label": "Frontend (Vite)", "onAutoForward": "notify" },
+    "8080": { "label": "Backend (Spring Boot)", "onAutoForward": "notify" },
+    "5432": { "label": "PostgreSQL", "onAutoForward": "silent" },
+    "6379": { "label": "Redis", "onAutoForward": "silent" }
+  },
+
+  // Lifecycle scripts
+  "postCreateCommand": "bash .devcontainer/post-create.sh",
+  "postStartCommand": "bash .devcontainer/post-start.sh",
+
+  // Environment variables
+  "containerEnv": {
+    "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD": "1",
+    "PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH": "/usr/bin/chromium"
+  },
+
+  // Run as non-root user
+  "remoteUser": "vscode"
+}