unified devcontainer mobile app included

Author: haklyray

.devcontainer/Dockerfile

@@ -134,7 +134,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_MAJOR}.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /usr/local/share/npm-global \
-    && npm install -g rtlcss
+    && npm install -g rtlcss pnpm newman
 
 # =============================================================================
 # User: odoo (primary user for everything, UID 1000 to match host bind mounts)
@@ -173,9 +173,9 @@ RUN python -m venv /workspaces/venv \
 RUN git clone --depth 1 --single-branch --branch ${ODOO_VERSION} \
     https://github.com/${ODOO_SOURCE}.git /workspaces/odoo
 
-# Clone OpenSPP2
-RUN git clone --depth 1 --single-branch --branch v19.0.2.0.0 \
-    https://github.com/openspp/OpenSPP2.git /workspaces/openspp
+# Clone OpenSPP2 (track latest 19.0, matching OCA addon clone pattern below)
+RUN git clone --depth 1 --single-branch --branch 19.0 \
+    https://github.com/OpenSPP/OpenSPP2.git /workspaces/openspp
 
 # Install Python requirements (Odoo + OpenSPP manifest deps)
 COPY --chown=odoo:odoo requirements.in /tmp/project-requirements.txt

.devcontainer/config/keycloak/setup-keycloak.sh

@@ -2,7 +2,8 @@
 # =============================================================================
 # Keycloak Dev Setup for DSWD 4PS API
 #
-# Creates a "dswd4ps" realm with an "openspp-api" client for local development.
+# Creates a "dswd4ps" realm with "openspp-api" and "dswd-4ps-mobile" clients
+# for local development.
 # Intended to run once after Keycloak starts in the devcontainer.
 #
 # Usage: bash setup-keycloak.sh
@@ -122,6 +123,52 @@ else
   fi
 fi
 
+# --- Create Mobile Client ---
+MOBILE_CLIENT_ID="dswd-4ps-mobile"
+echo "==> Creating client '${MOBILE_CLIENT_ID}'..."
+EXISTING_MOBILE=$(curl -s -H "${AUTH}" "${KC_URL}/admin/realms/${REALM}/clients?clientId=${MOBILE_CLIENT_ID}")
+MOBILE_COUNT=$(echo "${EXISTING_MOBILE}" | python3 -c "import sys,json; print(len(json.load(sys.stdin)))")
+
+MOBILE_CLIENT_JSON="{
+  \"clientId\": \"${MOBILE_CLIENT_ID}\",
+  \"name\": \"DSWD 4PS Mobile\",
+  \"enabled\": true,
+  \"protocol\": \"openid-connect\",
+  \"publicClient\": true,
+  \"directAccessGrantsEnabled\": true,
+  \"standardFlowEnabled\": true,
+  \"implicitFlowEnabled\": false,
+  \"rootUrl\": \"http://localhost:5174\",
+  \"baseUrl\": \"/\",
+  \"redirectUris\": [\"http://localhost:5174/*\", \"http://localhost:11111/*\", \"com.newlogic.dswd4ps://auth/callback\"],
+  \"webOrigins\": [\"http://localhost:5174\", \"http://localhost:11111\", \"+\"],
+  \"attributes\": {
+    \"pkce.code.challenge.method\": \"S256\",
+    \"post.logout.redirect.uris\": \"http://localhost:5174/*##com.newlogic.dswd4ps://auth/callback\"
+  }
+}"
+
+if [ "${MOBILE_COUNT}" -gt "0" ]; then
+  echo "    Client '${MOBILE_CLIENT_ID}' already exists, updating..."
+  MOBILE_UUID=$(echo "${EXISTING_MOBILE}" | python3 -c "import sys,json; print(json.load(sys.stdin)[0]['id'])")
+  curl -s -o /dev/null -w "" -X PUT "${KC_URL}/admin/realms/${REALM}/clients/${MOBILE_UUID}" \
+    -H "${AUTH}" \
+    -H "Content-Type: application/json" \
+    -d "${MOBILE_CLIENT_JSON}"
+  echo "    Client '${MOBILE_CLIENT_ID}' updated."
+else
+  HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${KC_URL}/admin/realms/${REALM}/clients" \
+    -H "${AUTH}" \
+    -H "Content-Type: application/json" \
+    -d "${MOBILE_CLIENT_JSON}")
+  if [ "${HTTP_CODE}" = "201" ] || [ "${HTTP_CODE}" = "409" ]; then
+    echo "    Client '${MOBILE_CLIENT_ID}' created."
+  else
+    echo "ERROR: Failed to create mobile client (HTTP ${HTTP_CODE})"
+    exit 1
+  fi
+fi
+
 # --- Create Test User ---
 echo "==> Creating test user '${TEST_USER}'..."
 EXISTING_USERS=$(curl -s -H "${AUTH}" "${KC_URL}/admin/realms/${REALM}/users?username=${TEST_USER}&exact=true")
@@ -170,8 +217,9 @@ echo "   Username:        ${KC_ADMIN}"
 echo "   Password:        ${KC_ADMIN_PASS}"
 echo ""
 echo " Realm:             ${REALM}"
-echo " Client ID:         ${CLIENT_ID}"
+echo " Client ID (API):   ${CLIENT_ID}"
 echo " Client Secret:     ${CLIENT_SECRET}"
+echo " Client ID (Mobile): ${MOBILE_CLIENT_ID}  (public, PKCE)"
 echo ""
 echo " Test User:         ${TEST_USER} / ${TEST_USER_PASS}"
 echo " Test User Email:   ${TEST_USER_EMAIL}"

.devcontainer/devcontainer.json

@@ -13,7 +13,13 @@
       "extensions": [
         "anthropic.claude-code",
         "ms-python.python",
-        "eamodio.gitlens"
+        "eamodio.gitlens",
+        "Vue.volar",
+        "vitest.explorer",
+        "ms-playwright.playwright",
+        "dbaeumer.vscode-eslint",
+        "EditorConfig.EditorConfig",
+        "esbenp.prettier-vscode"
       ],
       "settings": {
         "terminal.integrated.defaultProfile.linux": "zsh"
@@ -29,6 +35,7 @@
   "mounts": [
     "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
     "source=${localEnv:HOME}/.claude,target=/home/odoo/.claude,type=bind",
+    "source=${localEnv:HOME}/.claude.json,target=/home/odoo/.claude.json,type=bind",
     "source=${localEnv:HOME}/.gitconfig,target=/home/odoo/.gitconfig-host,type=bind,readonly",
     "source=${localEnv:HOME}/.config/gh,target=/home/odoo/.config/gh,type=bind",
     "source=${localEnv:HOME}/.ssh,target=/home/odoo/.ssh-host,type=bind,readonly",
@@ -39,20 +46,24 @@
   "workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/dswd-4ps-dp-openspp,type=bind",
   "workspaceFolder": "/workspaces/dswd-4ps-dp-openspp",
 
-  "forwardPorts": [11111, 8069, 5432, 8081, 8025, 9001],
+  "forwardPorts": [11111, 8069, 5432, 8081, 8025, 9001, 5174, 3000, 3001, 3456],
   "portsAttributes": {
     "11111": { "label": "OpenSPP (nginx)", "onAutoForward": "notify" },
     "8069": { "label": "Odoo (direct)", "onAutoForward": "silent" },
     "5432": { "label": "PostgreSQL", "onAutoForward": "silent" },
     "8081": { "label": "pgweb", "onAutoForward": "notify" },
     "8025": { "label": "Mailpit", "onAutoForward": "notify" },
-    "9001": { "label": "Supervisor", "onAutoForward": "silent" }
+    "9001": { "label": "Supervisor", "onAutoForward": "silent" },
+    "5174": { "label": "Mobile (Vue/Vite)", "onAutoForward": "notify" },
+    "3000": { "label": "Datacollect Backend", "onAutoForward": "silent" },
+    "3001": { "label": "Datacollect Admin", "onAutoForward": "silent" },
+    "3456": { "label": "Mobile SQLite dev", "onAutoForward": "silent" }
   },
   "otherPortsAttributes": {
     "onAutoForward": "ignore"
   },
 
-  "postCreateCommand": "sudo chown -R odoo:odoo /workspaces/dswd-4ps-dp-openspp /home/odoo/.claude /home/odoo/.config 2>/dev/null; cp /home/odoo/.gitconfig-host /home/odoo/.gitconfig 2>/dev/null || true; mkdir -p /home/odoo/.ssh && cp -a /home/odoo/.ssh-host/. /home/odoo/.ssh/ 2>/dev/null || true; chmod 700 /home/odoo/.ssh && chmod 600 /home/odoo/.ssh/* 2>/dev/null; chmod 644 /home/odoo/.ssh/*.pub /home/odoo/.ssh/config /home/odoo/.ssh/known_hosts 2>/dev/null || true; cd /workspaces/dswd-4ps-dp-openspp/DSWD/dswd-4ps-dp-openspp-v2-module && pre-commit install --install-hooks 2>/dev/null || true",
+  "postCreateCommand": "sudo chown -R odoo:odoo /workspaces/dswd-4ps-dp-openspp /home/odoo/.claude /home/odoo/.config 2>/dev/null; cp /home/odoo/.gitconfig-host /home/odoo/.gitconfig 2>/dev/null || true; mkdir -p /home/odoo/.ssh && cp -a /home/odoo/.ssh-host/. /home/odoo/.ssh/ 2>/dev/null || true; chmod 700 /home/odoo/.ssh && chmod 600 /home/odoo/.ssh/* 2>/dev/null; chmod 644 /home/odoo/.ssh/*.pub /home/odoo/.ssh/config /home/odoo/.ssh/known_hosts 2>/dev/null || true; cd /workspaces/dswd-4ps-dp-openspp/DSWD/dswd-4ps-dp-openspp-v2-module && pre-commit install --install-hooks 2>/dev/null || true; [ -f /workspaces/dswd-4ps-dp-openspp/mobile/package.json ] && (cd /workspaces/dswd-4ps-dp-openspp/mobile && git submodule update --init --recursive 2>/dev/null; pnpm install --frozen-lockfile 2>/dev/null || pnpm install) || true",
   "postStartCommand": "cp /home/odoo/.gitconfig-host /home/odoo/.gitconfig 2>/dev/null || true; cp -a /home/odoo/.ssh-host/. /home/odoo/.ssh/ 2>/dev/null || true; chmod 700 /home/odoo/.ssh && chmod 600 /home/odoo/.ssh/* 2>/dev/null; chmod 644 /home/odoo/.ssh/*.pub /home/odoo/.ssh/config /home/odoo/.ssh/known_hosts 2>/dev/null || true; nohup sudo /usr/bin/supervisord -c /etc/supervisor/supervisord.conf > /tmp/supervisord.log 2>&1 & sleep 2 && sudo chmod 666 /var/run/docker.sock 2>/dev/null || true",
   "postAttachCommand": "PUB_KEY=$(ssh-add -L 2>/dev/null | grep -E '^ssh-' | head -1); [ -n \"$PUB_KEY\" ] && git config --global user.signingkey \"key::$PUB_KEY\" && echo 'Git signing key set from SSH agent' || echo 'WARNING: SSH agent not available or no keys loaded, signing key not updated'"
 }

.devcontainer/initialize-host.sh

@@ -50,6 +50,7 @@ link_or_create() {
 }
 
 link_or_create ".claude" d
+link_or_create ".claude.json" f
 link_or_create ".gitconfig" f
 link_or_create ".ssh" d
 # SSH requires strict permissions on key files
@@ -62,11 +63,21 @@ fi
 mkdir -p "$HOME/.config"
 link_or_create ".config/gh" d
 
-# Ensure submodules are checked out (skip if already populated, don't fail the build)
+# Subscription auth files: always mirror from Windows so re-logins propagate.
+# (link_or_create uses --ignore-existing, which would otherwise leave stale auth.)
+if [ -n "$win_home" ]; then
+  for f in ".claude.json" ".claude/.credentials.json"; do
+    if [ -f "$win_home/$f" ]; then
+      cp -f "$win_home/$f" "$HOME/$f" 2>/dev/null || true
+    fi
+  done
+fi
+
+# Ensure submodules are checked out — only when something is uninitialized
+# (a leading '-' in `submodule status` means the submodule has no working tree).
 REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-echo "==> Checking git submodules..."
-git -C "$REPO_ROOT" submodule update --init --recursive 2>/dev/null || {
-  echo "    WARNING: submodule update failed — skipping."
-  echo "    If DSWD/dswd-4ps-dp-openspp-v2-module is empty, clone it manually."
-}
-echo "    Submodules done."
+if git -C "$REPO_ROOT" submodule status --recursive 2>/dev/null | grep -q '^-'; then
+  echo "==> Initializing missing git submodules..."
+  git -C "$REPO_ROOT" submodule update --init --recursive 2>/dev/null || \
+    echo "    WARNING: submodule update failed — initialize manually if needed."
+fi

.devcontainer/supervisord.conf

@@ -20,7 +20,7 @@ stopsignal=INT
 autostart=true
 
 [program:createuser]
-command=/bin/sh -c "until pg_isready -q; do sleep 1; done && (createuser --superuser --echo odoo || true) && (echo \"ALTER USER odoo WITH PASSWORD 'odoo';\" | psql) && (createdb -O odoo odoo || true)"
+command=/bin/sh -c "until pg_isready -q; do sleep 1; done && (createuser --superuser --echo odoo || true) && (echo \"ALTER USER odoo WITH PASSWORD 'odoo';\" | psql) && (createdb -O odoo odoo || true) && (createuser --echo dswd4ps || true) && (echo \"ALTER USER dswd4ps WITH PASSWORD 'dswd4ps';\" | psql) && (createdb -O dswd4ps datacollect || true)"
 user=postgres
 environment=PGUSER="",PGPASSWORD="",PGDATABASE=""
 startsecs=0

.gitignore

@@ -188,3 +188,9 @@ mailpit.sh
 # Claude Code plugin directories (Windows paths accidentally created as Linux dirs in WSL)
 C:*
 scripts/restore_dev_config.sh
+
+# Node / pnpm (mobile submodule may create these at outer root)
+node_modules/
+.pnpm-store/
+pnpm-debug.log*
+npm-debug.log*

.gitmodules

@@ -6,3 +6,7 @@
 	path = keycloak/dswd-4ps-dp-keycloak-login-theme
 	url = https://github.com/newlogic/dswd-4ps-dp-keycloak-login-theme.git
 	branch = main
+[submodule "mobile"]
+	path = mobile
+	url = git@github.com:newlogic/dswd-4ps-dp-mobile.git
+	branch = develop

.vscode/launch.json

@@ -1,5 +1,15 @@
 {
   "version": "0.2.0",
+  "compounds": [
+    {
+      "name": "Mobile: Run All",
+      "configurations": [
+        "Datacollect Backend: Dev",
+        "Datacollect Admin: Dev",
+        "DSWD Mobile: Dev"
+      ]
+    }
+  ],
   "configurations": [
     {
       "name": "Odoo: Server (Hot Reload)",
@@ -129,6 +139,45 @@
       "env": { "TZ": "UTC" },
       "console": "integratedTerminal",
       "justMyCode": false
+    },
+    {
+      "name": "DSWD Mobile: Dev",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "pnpm dev",
+      "cwd": "${workspaceFolder:mobile}"
+    },
+    {
+      "name": "Datacollect Backend: Dev",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "pnpm dev",
+      "env": {
+        "POSTGRES": "postgresql://dswd4ps:dswd4ps@localhost:5432/datacollect",
+        "ADMIN_EMAIL": "admin@datacollect.lan",
+        "ADMIN_PASSWORD": "correct horse battery staple 42!",
+        "JWT_SECRET": "Council of Elrond",
+        "NODE_ENV": "development"
+      },
+      "cwd": "${workspaceFolder:mobile}/idpass-data-collect/packages/backend"
+    },
+    {
+      "name": "Datacollect Admin: Dev",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "pnpm dev --port 3001",
+      "env": {
+        "VITE_API_URL": "http://localhost:3000"
+      },
+      "cwd": "${workspaceFolder:mobile}/idpass-data-collect/packages/admin"
+    },
+    {
+      "name": "Mobile: Debug in Chrome",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:5174",
+      "webRoot": "${workspaceFolder:mobile}/src",
+      "sourceMaps": true
     }
   ],
   "inputs": [