depository-deploy 1.5.6 → 1.5.15

package/install/install-unix.sh

@@ -437,6 +437,22 @@ echo "=============================================="
 echo "  INSTALLATION COMPLETE"
 echo "=============================================="
 echo ""
+# ---- Write version file (read by API to report installed version) ----
+PKG_VERSION=$(node -e "try{const p=require('$DEPLOY_DIR/package.json');process.stdout.write(p.version)}catch(e){}" 2>/dev/null || echo "")
+if [ -n "$PKG_VERSION" ]; then
+    echo "$PKG_VERSION" > "$INSTALL_DIR/version.txt"
+    info "Version file written: $PKG_VERSION"
+fi
+
+# ---- Allow depository user to run update commands without password ----
+SUDOERS_FILE="/etc/sudoers.d/depository-update"
+cat > "$SUDOERS_FILE" << SUDOERS_EOF
+# Allow depository service account to manage its own services and npm updates
+depository ALL=(ALL) NOPASSWD: /usr/bin/npm, /usr/local/bin/npm, /bin/systemctl stop depository-*, /bin/systemctl start depository-*, /usr/bin/systemctl stop depository-*, /usr/bin/systemctl start depository-*
+SUDOERS_EOF
+chmod 440 "$SUDOERS_FILE"
+info "sudo permissions configured for depository user"
+
 sleep 2
 ALL_OK=true
 for svc in depository-auth depository-gatherer depository-api depository-worker depository-digestor; do

package/install/install-windows.ps1

@@ -614,6 +614,16 @@ Write-Host "  INSTALLATION COMPLETE" -ForegroundColor Cyan
 Write-Host "==============================================" -ForegroundColor Cyan
 Write-Host ""
 Start-Sleep -Seconds 3
+# ---- Write version file (read by API to report installed version) ----
+try {
+    $pkgJson = Join-Path $DeployDir "package.json"
+    if (Test-Path $pkgJson) {
+        $installedVersion = (Get-Content $pkgJson -Raw | ConvertFrom-Json).version
+        Set-Content -Path "$INSTALL_DIR\version.txt" -Value $installedVersion -Encoding UTF8
+        Write-OK "Version file written: $installedVersion"
+    }
+} catch { Write-Warn "Could not write version.txt: $_" }
+
 $allOk = $true
 foreach ($def in $svcDefs) {
     $svc = Get-Service -Name $def.Name -ErrorAction SilentlyContinue

package/install/templates/appsettings-api.json

@@ -60,5 +60,8 @@
   "Upload": {
     "SftpHost": "sftp.example.local",
     "DefaultTtlMinutes": 60
+  },
+  "FileLogging": {
+    "Directory": "{{INSTALL_DIR}}/logs/api"
   }
 }

package/install/templates/appsettings-gatherer.json

@@ -19,5 +19,8 @@
   "DatabaseConfiguration": {
     "Provider": "{{DB_PROVIDER}}",
     "OracleConnectionString": "{{ORACLE_CONN_STRING}}"
+  },
+  "FileLogging": {
+    "Directory": "{{INSTALL_DIR}}/logs/gatherer"
   }
 }

package/install/templates/appsettings-worker.json

@@ -21,5 +21,8 @@
     "BatchWorkingRoot": "{{DATA_DIR}}",
     "AzureMainRoot": "main",
     "AzureStagingRoot": "staging"
+  },
+  "FileLogging": {
+    "Directory": "{{INSTALL_DIR}}/logs/worker"
   }
 }

package/install/templates/web.config

@@ -20,9 +20,6 @@
         <!-- 1. REST API  →  Kestrel on {{API_PORT}} -->
         <rule name="Depository API" stopProcessing="true">
           <match url="^api/(.*)" />
-          <conditions logicalGrouping="MatchAll">
-            <add input="{CACHE_URL}" pattern="^(.*)$" />
-          </conditions>
           <action type="Rewrite"
                   url="http://{{IIS_BACKEND_HOST}}:{{API_PORT}}/api/{R:1}"
                   appendQueryString="true" />

package/install/update-unix.sh

@@ -0,0 +1,224 @@
+#!/usr/bin/env bash
+# =============================================================
+#  DEPOSITORY - UNIX AUTO-UPDATE SCRIPT
+#  Triggered by the API when an admin approves an update.
+#  Run via nohup so it survives the API service restart.
+#
+#  Usage (called by UpdateService.cs):
+#    bash update-unix.sh <version> <install_root> <status_file> <log_file>
+#
+#  Arguments:
+#    $1  version       npm version tag, e.g. "1.5.7" or "latest"
+#    $2  install_root  INSTALL_DIR root, e.g. /opt/depository
+#    $3  status_file   JSON file path for progress state
+#    $4  log_file      Plain-text log file path
+# =============================================================
+set -euo pipefail
+
+VERSION="${1:-latest}"
+INSTALL_ROOT="${2:-/opt/depository}"
+STATUS_FILE="${3:-}"
+LOG_FILE="${4:-}"
+
+# ── Helpers ─────────────────────────────────────────────────────────────────
+
+log() {
+    local ts
+    ts=$(date '+%H:%M:%S')
+    local line="[$ts] $*"
+    if [ -n "$LOG_FILE" ]; then
+        echo "$line" >> "$LOG_FILE" 2>/dev/null || true
+    fi
+    echo "$line"
+}
+
+write_status() {
+    local STATUS="$1"
+    [ -z "$STATUS_FILE" ] && return
+    # Use python3 to safely update the JSON status file
+    python3 - <<PYEOF 2>/dev/null || true
+import json, os, sys
+path = "$STATUS_FILE"
+try:
+    with open(path) as f:
+        d = json.load(f)
+except Exception:
+    d = {}
+from datetime import datetime, timezone
+now = datetime.now(timezone.utc).isoformat()
+d["status"] = "$STATUS"
+d["updatedAt"] = now
+if "$STATUS" in ("complete", "failed"):
+    d["completedAt"] = now
+    d["success"] = "$STATUS" == "complete"
+with open(path, "w") as f:
+    json.dump(d, f, indent=2)
+PYEOF
+}
+
+# Detect OS platform
+OS_TYPE=$(uname -s)
+if [ "$OS_TYPE" = "Darwin" ]; then
+    PLAT="macos"
+else
+    PLAT="linux"
+fi
+
+# ── Main ─────────────────────────────────────────────────────────────────────
+
+log "============================================================"
+log "  DEPOSITORY AUTO-UPDATE"
+log "  Target version : $VERSION"
+log "  Install root   : $INSTALL_ROOT"
+log "  Platform       : $PLAT"
+log "============================================================"
+
+# ── Step 1: Download new package ─────────────────────────────────────────────
+write_status "installing_package"
+log ""
+log "STEP 1/4  Installing depository-deploy@$VERSION via npm..."
+
+# Use sudo if npm is owned by root (typical global install)
+NPM_CMD="npm"
+if [ -f "$(which npm 2>/dev/null)" ] && [ "$(stat -c '%U' "$(which npm)" 2>/dev/null || stat -f '%Su' "$(which npm)" 2>/dev/null)" = "root" ]; then
+    NPM_CMD="sudo npm"
+fi
+
+$NPM_CMD install -g "depository-deploy@$VERSION" >> "$LOG_FILE" 2>&1
+log "Package installed."
+
+# Locate release binaries
+NPM_ROOT=$(npm root -g 2>/dev/null || echo "")
+log "npm global root: $NPM_ROOT"
+
+RELEASE_DIR=""
+for candidate in \
+    "$NPM_ROOT/depository-deploy-$PLAT/release/$PLAT" \
+    "$NPM_ROOT/depository-deploy/release/$PLAT" \
+    "$NPM_ROOT/depository-deploy/release"
+do
+    if [ -d "$candidate" ]; then
+        RELEASE_DIR="$candidate"
+        break
+    fi
+done
+
+if [ -z "$RELEASE_DIR" ]; then
+    log "ERROR: Release directory not found under npm root: $NPM_ROOT"
+    write_status "failed"
+    exit 1
+fi
+log "Release directory: $RELEASE_DIR"
+
+# ── Step 2: Stop services ─────────────────────────────────────────────────────
+write_status "stopping_services"
+log ""
+log "STEP 2/4  Stopping Depository services..."
+
+for svc in depository-api depository-auth depository-worker depository-gatherer depository-digestor; do
+    if systemctl is-active --quiet "$svc" 2>/dev/null; then
+        sudo systemctl stop "$svc" 2>/dev/null || true
+        log "  Stopped: $svc"
+    fi
+done
+
+# Kill any remaining processes
+for proc_name in DEPOSITORY.API.REST DEPOSITORY.API.OATH DEPOSITORY.CORE.WORKER \
+                 DEPOSITORY.CORE.GATHERER DEPOSITORY.CORE.DIGESTOR; do
+    pids=$(pgrep -f "$proc_name" 2>/dev/null || true)
+    if [ -n "$pids" ]; then
+        echo "$pids" | while read -r pid; do
+            kill -9 "$pid" 2>/dev/null || true
+        done
+    fi
+done
+sleep 6
+
+# ── Step 3: Copy new binaries (preserve appsettings*.json) ───────────────────
+write_status "copying_binaries"
+log ""
+log "STEP 3/4  Copying new binaries..."
+
+for sub in api auth worker gatherer digestor pdfindexer setup; do
+    src="$RELEASE_DIR/$sub"
+    dst="$INSTALL_ROOT/$sub"
+    [ -d "$src" ] || continue
+    [ -d "$dst" ] || mkdir -p "$dst"
+    log "  $sub ..."
+    find "$src" -type f | while IFS= read -r srcfile; do
+        rel="${srcfile#$src/}"
+        name=$(basename "$srcfile")
+        destfile="$dst/$rel"
+        destdir=$(dirname "$destfile")
+        mkdir -p "$destdir"
+        # Preserve all appsettings files — they contain production config
+        if echo "$name" | grep -q '^appsettings'; then
+            log "    (preserved) $rel"
+        else
+            cp -f "$srcfile" "$destfile"
+        fi
+    done
+done
+
+# Update UI (static files — safe to overwrite)
+UI_SRC="$RELEASE_DIR/ui"
+[ -d "$UI_SRC" ] || UI_SRC="$(dirname "$RELEASE_DIR")/ui"
+UI_DST="$INSTALL_ROOT/ui"
+if [ -d "$UI_SRC" ] && [ -d "$UI_DST" ]; then
+    log "  ui ..."
+    cp -r "$UI_SRC/"* "$UI_DST/"
+    # Preserve the API base URL injected during original installation
+    UI_INDEX="$UI_DST/index.html"
+    if [ -f "$UI_INDEX" ]; then
+        SITE_URL=$(grep -oP "window\.__API_BASE__='\\K[^']*" "$UI_INDEX" 2>/dev/null || true)
+        if [ -n "$SITE_URL" ]; then
+            # Remove old injection then re-inject
+            sed -i.bak "s|<script>window\.__API_BASE__[^<]*</script>||g" "$UI_INDEX" 2>/dev/null || true
+            sed -i.bak "s|</head>|<script>window.__API_BASE__='${SITE_URL}';window.__CORE_API_BASE__='${SITE_URL}';</script></head>|" "$UI_INDEX"
+            rm -f "${UI_INDEX}.bak"
+        fi
+    fi
+fi
+
+# Fix permissions
+chown -R depository:depository "$INSTALL_ROOT" 2>/dev/null || true
+for bin in \
+    "$INSTALL_ROOT/api/DEPOSITORY.API.REST" \
+    "$INSTALL_ROOT/auth/DEPOSITORY.API.OATH" \
+    "$INSTALL_ROOT/worker/DEPOSITORY.CORE.WORKER" \
+    "$INSTALL_ROOT/gatherer/DEPOSITORY.CORE.GATHERER" \
+    "$INSTALL_ROOT/digestor/DEPOSITORY.CORE.DIGESTOR"; do
+    [ -f "$bin" ] && chmod +x "$bin"
+done
+
+# Update version.txt
+NEW_VERSION="$VERSION"
+if [ "$NEW_VERSION" = "latest" ]; then
+    NEW_VERSION=$(npm view depository-deploy version 2>/dev/null || echo "")
+fi
+if [ -n "$NEW_VERSION" ] && [ "$NEW_VERSION" != "latest" ]; then
+    echo "$NEW_VERSION" > "$INSTALL_ROOT/version.txt"
+    log "  version.txt → $NEW_VERSION"
+fi
+
+log "Binaries copied."
+
+# ── Step 4: Restart services ──────────────────────────────────────────────────
+write_status "starting_services"
+log ""
+log "STEP 4/4  Starting services..."
+
+# Start in dependency order
+for svc in depository-auth depository-api depository-gatherer \
+           depository-worker depository-digestor; do
+    log "  Starting $svc ..."
+    sudo systemctl start "$svc" 2>/dev/null || true
+    sleep 1
+done
+sleep 5
+
+write_status "complete"
+log ""
+log "============================================================"
+log "  UPDATE COMPLETE — Depository is now at version $NEW_VERSION"
+log "============================================================"

package/install/update-windows.ps1

@@ -0,0 +1,214 @@
+#Requires -RunAsAdministrator
+# =============================================================
+#  DEPOSITORY - WINDOWS AUTO-UPDATE SCRIPT
+#  Triggered by the API when an admin approves an update.
+#  Runs as a detached process and survives the API service restart.
+#
+#  Parameters:
+#    -Version      npm version tag, e.g. "1.5.7" or "latest"
+#    -InstallRoot  INSTALL_DIR root, e.g. C:\Depository
+#    -StatusFile   JSON file path for progress state (read by API after restart)
+#    -LogFile      Plain-text log file path (tailed by SSE stream)
+# =============================================================
+param(
+    [string]$Version    = "latest",
+    [string]$InstallRoot = "",
+    [string]$StatusFile  = "",
+    [string]$LogFile     = ""
+)
+
+$ErrorActionPreference = "Continue"
+
+# ── Helpers ─────────────────────────────────────────────────────────────────
+
+function Write-Log {
+    param([string]$Msg)
+    $ts   = Get-Date -Format "HH:mm:ss"
+    $line = "[$ts] $Msg"
+    if ($LogFile) {
+        Add-Content -Path $LogFile -Value $line -Encoding UTF8 -ErrorAction SilentlyContinue
+    }
+    Write-Host $line
+}
+
+function Write-Status {
+    param([string]$Status)
+    if (-not $StatusFile) { return }
+    try {
+        $raw  = if (Test-Path $StatusFile) { Get-Content $StatusFile -Raw -Encoding UTF8 } else { "{}" }
+        $data = $raw | ConvertFrom-Json -ErrorAction Stop
+        $data.status    = $Status
+        $data.updatedAt = (Get-Date -Format "o")
+        if ($Status -in @("complete", "failed")) {
+            $data.completedAt = $data.updatedAt
+            $data.success     = ($Status -eq "complete")
+        }
+        $data | ConvertTo-Json -Depth 5 | Set-Content -Path $StatusFile -Encoding UTF8
+    } catch {
+        Write-Log "WARNING: Could not update status file — $_"
+    }
+}
+
+function Find-Npm {
+    foreach ($candidate in @("npm.cmd", "npm")) {
+        if (Get-Command $candidate -ErrorAction SilentlyContinue) { return $candidate }
+    }
+    # Try common Node.js install paths
+    foreach ($p in @("$env:ProgramFiles\nodejs\npm.cmd",
+                     "$env:LOCALAPPDATA\Programs\nodejs\npm.cmd")) {
+        if (Test-Path $p) { return $p }
+    }
+    throw "npm not found in PATH. Ensure Node.js is installed."
+}
+
+# ── Main ─────────────────────────────────────────────────────────────────────
+
+try {
+    Write-Log "============================================================"
+    Write-Log "  DEPOSITORY AUTO-UPDATE"
+    Write-Log "  Target version : $Version"
+    Write-Log "  Install root   : $InstallRoot"
+    Write-Log "============================================================"
+
+    $npm = Find-Npm
+
+    # ── Step 1: Download new package ─────────────────────────────────────────
+    Write-Status "installing_package"
+    Write-Log ""
+    Write-Log "STEP 1/4  Installing depository-deploy@$Version via npm..."
+    & $npm install -g "depository-deploy@$Version" 2>&1 | ForEach-Object {
+        if ($_ -and "$_".Trim()) { Write-Log "  $_" }
+    }
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        throw "npm install exited with code $LASTEXITCODE"
+    }
+    Write-Log "Package installed."
+
+    # Locate release binaries (npm global layout)
+    $npmRoot    = (& $npm root -g 2>$null).Trim()
+    if (-not $npmRoot) { $npmRoot = "$env:APPDATA\npm\node_modules" }
+    Write-Log "npm global root: $npmRoot"
+
+    $ReleaseDir = $null
+    foreach ($candidate in @(
+        "$npmRoot\depository-deploy-windows\release\windows",
+        "$npmRoot\depository-deploy\release\windows",
+        "$npmRoot\depository-deploy\release"
+    )) {
+        if (Test-Path $candidate) { $ReleaseDir = $candidate; break }
+    }
+    if (-not $ReleaseDir) {
+        throw "Release directory not found under npm root: $npmRoot"
+    }
+    Write-Log "Release directory: $ReleaseDir"
+
+    # ── Step 2: Stop services ─────────────────────────────────────────────────
+    Write-Status "stopping_services"
+    Write-Log ""
+    Write-Log "STEP 2/4  Stopping Depository services..."
+    $Services = @("depository-api", "depository-auth", "depository-worker",
+                  "depository-gatherer", "depository-digestor")
+    foreach ($svc in $Services) {
+        $info = sc.exe query $svc 2>$null | Out-String
+        if ($info -match "RUNNING") {
+            Write-Log "  Stopping $svc ..."
+            sc.exe stop $svc 2>&1 | Out-Null
+        }
+    }
+    Write-Log "Waiting for processes to exit..."
+    Start-Sleep -Seconds 8
+
+    # ── Step 3: Copy new binaries (preserve appsettings*.json) ───────────────
+    Write-Status "copying_binaries"
+    Write-Log ""
+    Write-Log "STEP 3/4  Copying new binaries..."
+
+    $SubDirs = @("api", "auth", "worker", "gatherer", "digestor", "pdfindexer", "setup")
+    foreach ($sub in $SubDirs) {
+        $src = Join-Path $ReleaseDir $sub
+        $dst = Join-Path $InstallRoot $sub
+        if (-not (Test-Path $src)) { continue }
+        if (-not (Test-Path $dst)) {
+            New-Item -ItemType Directory -Path $dst -Force | Out-Null
+        }
+        Write-Log "  $sub ..."
+        Get-ChildItem $src -Recurse | ForEach-Object {
+            $rel = $_.FullName.Substring($src.Length).TrimStart('\')
+            $target = Join-Path $dst $rel
+            if ($_.PSIsContainer) {
+                if (-not (Test-Path $target)) {
+                    New-Item -ItemType Directory -Path $target -Force | Out-Null
+                }
+            } else {
+                # Preserve all appsettings files — they contain production config
+                if ($_.Name -match '^appsettings') {
+                    Write-Log "    (preserved) $rel"
+                } else {
+                    Copy-Item $_.FullName -Destination $target -Force
+                }
+            }
+        }
+    }
+
+    # Update UI (static files — safe to overwrite, no secrets)
+    $uiSrc = Join-Path $ReleaseDir "ui"
+    if (-not (Test-Path $uiSrc)) {
+        $uiSrc = Join-Path (Split-Path -Parent $ReleaseDir) "ui"
+    }
+    $uiDst = Join-Path $InstallRoot "ui"
+    if ((Test-Path $uiSrc) -and (Test-Path $uiDst)) {
+        Write-Log "  ui ..."
+        Copy-Item "$uiSrc\*" $uiDst -Recurse -Force
+        # Re-inject the API base URL that was set during the original installation
+        $uiIndex = Join-Path $uiDst "index.html"
+        if (Test-Path $uiIndex) {
+            $html    = Get-Content $uiIndex -Raw -Encoding UTF8
+            # Find the existing __API_BASE__ injection and preserve it
+            if ($html -match "window.__API_BASE__='([^']*)'") {
+                $siteUrl = $Matches[1]
+                $inject  = "<script>window.__API_BASE__='$siteUrl';window.__CORE_API_BASE__='$siteUrl';</script>"
+                $html    = $html -replace '<script>window\.__API_BASE__.*?</script>', ""
+                $html    = $html -replace '</head>', "$inject</head>"
+                Set-Content $uiIndex -Value $html -Encoding UTF8
+            }
+        }
+    }
+
+    # Update version.txt
+    $newVersion = $Version
+    if ($newVersion -eq "latest") {
+        try { $newVersion = (& $npm view "depository-deploy" version 2>$null).Trim() } catch {}
+    }
+    if ($newVersion -and $newVersion -ne "latest") {
+        Set-Content -Path (Join-Path $InstallRoot "version.txt") -Value $newVersion -Encoding UTF8
+        Write-Log "  version.txt → $newVersion"
+    }
+
+    Write-Log "Binaries copied."
+
+    # ── Step 4: Restart services ──────────────────────────────────────────────
+    Write-Status "starting_services"
+    Write-Log ""
+    Write-Log "STEP 4/4  Starting services..."
+    # Start in dependency order: auth first, then api, then workers
+    foreach ($svc in @("depository-auth", "depository-api", "depository-gatherer",
+                        "depository-worker", "depository-digestor")) {
+        Write-Log "  Starting $svc ..."
+        sc.exe start $svc 2>&1 | Out-Null
+        Start-Sleep -Seconds 1
+    }
+    Start-Sleep -Seconds 5
+
+    Write-Status "complete"
+    Write-Log ""
+    Write-Log "============================================================"
+    Write-Log "  UPDATE COMPLETE — Depository is now at version $newVersion"
+    Write-Log "============================================================"
+
+} catch {
+    Write-Log ""
+    Write-Log "ERROR: $_"
+    Write-Log $_.ScriptStackTrace
+    Write-Status "failed"
+    exit 1
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "depository-deploy",
-  "version": "1.5.6",
+  "version": "1.5.15",
   "description": "Depository document management system – deployment wizard and installers",
   "license": "UNLICENSED",
   "publishConfig": {
@@ -25,9 +25,9 @@
     "scripts/publish.mjs"
   ],
   "optionalDependencies": {
-    "depository-deploy-linux": "1.5.6",
-    "depository-deploy-macos": "1.5.6",
-    "depository-deploy-windows": "1.5.6"
+    "depository-deploy-linux": "1.5.15",
+    "depository-deploy-macos": "1.5.15",
+    "depository-deploy-windows": "1.5.15"
   },
   "scripts": {
     "start": "node wizard-server.mjs"

package/wizard.html

@@ -1155,6 +1155,7 @@ const T = {
     admin_org_lbl:"Organization",
     admin_note:"This admin account will be created automatically after installation completes.",
     err_admin_email:"Admin email is required.",
+    err_admin_email_invalid:"Please enter a valid email address.",
     err_admin_pass:"Password is required.",
     err_admin_pass2:"Passwords do not match.",
     err_admin_name:"Full name is required.",
@@ -1276,6 +1277,7 @@ const T = {
     admin_org_lbl:"Organizasyon",
     admin_note:"Bu yönetici hesabı, kurulum tamamlandıktan sonra otomatik olarak oluşturulacaktır.",
     err_admin_email:"Yönetici e-postası zorunludur.",
+    err_admin_email_invalid:"Lütfen geçerli bir e-posta adresi girin.",
     err_admin_pass:"Şifre zorunludur.",
     err_admin_pass2:"Şifreler eşleşmiyor.",
     err_admin_name:"Tam ad zorunludur.",
@@ -1397,6 +1399,7 @@ const T = {
     admin_org_lbl:"Organisation",
     admin_note:"Ce compte administrateur sera créé automatiquement à la fin de l'installation.",
     err_admin_email:"L'e-mail administrateur est obligatoire.",
+    err_admin_email_invalid:"Veuillez saisir une adresse e-mail valide.",
     err_admin_pass:"Le mot de passe est obligatoire.",
     err_admin_pass2:"Les mots de passe ne correspondent pas.",
     err_admin_name:"Le nom complet est obligatoire.",
@@ -1518,6 +1521,7 @@ const T = {
     admin_org_lbl:"Organisation",
     admin_note:"Dieses Admin-Konto wird automatisch nach Abschluss der Installation erstellt.",
     err_admin_email:"Admin-E-Mail ist erforderlich.",
+    err_admin_email_invalid:"Bitte geben Sie eine gültige E-Mail-Adresse ein.",
     err_admin_pass:"Passwort ist erforderlich.",
     err_admin_pass2:"Passwörter stimmen nicht überein.",
     err_admin_name:"Vollständiger Name ist erforderlich.",
@@ -1639,6 +1643,7 @@ const T = {
     admin_org_lbl:"Organización",
     admin_note:"Esta cuenta de administrador se creará automáticamente al finalizar la instalación.",
     err_admin_email:"El correo del administrador es obligatorio.",
+    err_admin_email_invalid:"Por favor, introduce una dirección de correo electrónico válida.",
     err_admin_pass:"La contraseña es obligatoria.",
     err_admin_pass2:"Las contraseñas no coinciden.",
     err_admin_name:"El nombre completo es obligatorio.",
@@ -1760,6 +1765,7 @@ const T = {
     admin_org_lbl:"المؤسسة",
     admin_note:"سيتم إنشاء حساب المسؤول تلقائيًا بعد اكتمال التثبيت.",
     err_admin_email:"البريد الإلكتروني للمسؤول مطلوب.",
+    err_admin_email_invalid:"يرجى إدخال عنوان بريد إلكتروني صالح.",
     err_admin_pass:"كلمة المرور مطلوبة.",
     err_admin_pass2:"كلمتا المرور غير متطابقتين.",
     err_admin_name:"الاسم الكامل مطلوب.",
@@ -1924,12 +1930,15 @@ function validateStep(s) {
         return {msg:t('err_overwrite'), field:'overwriteOk'};
       }
       break;
-    case 6:
-      if (!val('admin_email')) return {msg:t('err_admin_email'), field:'admin_email'};
+    case 6: {
+      const emailVal = val('admin_email');
+      if (!emailVal) return {msg:t('err_admin_email'), field:'admin_email'};
+      if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(emailVal)) return {msg:t('err_admin_email_invalid'), field:'admin_email'};
       if (!val('admin_name'))  return {msg:t('err_admin_name'),  field:'admin_name'};
       if (!val('admin_pass'))  return {msg:t('err_admin_pass'),  field:'admin_pass'};
       if (val('admin_pass') !== val('admin_pass2')) return {msg:t('err_admin_pass2'), field:'admin_pass2'};
       break;
+    }
   }
   return null;
 }