depository-deploy 1.0.17 → 1.0.20

package/install/install-unix.sh

@@ -248,6 +248,44 @@ apply_template "$TEMPLATE_DIR/appsettings-worker.json"   "$INSTALL_DIR/worker/ap
 apply_template "$TEMPLATE_DIR/appsettings-gatherer.json" "$INSTALL_DIR/gatherer/appsettings.json"
 apply_template "$TEMPLATE_DIR/appsettings-digestor.json" "$INSTALL_DIR/digestor/appsettings.json"
 
+# ---- Clean database (if requested) ----
+if [ "${CLEAN_DB:-false}" = "true" ]; then
+    warn "CLEAN_DB=true — database will be wiped on first service start."
+    if [ "$DB_PROVIDER" = "Oracle" ]; then
+        # Set OracleForceRecreate=true in api appsettings so the REST service drops all tables
+        if command -v python3 &>/dev/null; then
+            python3 -c "
+import json, sys
+p='$INSTALL_DIR/api/appsettings.json'
+with open(p) as f: d=json.load(f)
+d.setdefault('DatabaseConfiguration',{})['OracleForceRecreate']=True
+with open(p,'w') as f: json.dump(d,f,indent=2)
+print('  OracleForceRecreate set to true in api/appsettings.json')
+"
+        else
+            sed -i 's/"OracleForceRecreate": false/"OracleForceRecreate": true/' "$INSTALL_DIR/api/appsettings.json"
+            info "  OracleForceRecreate set to true in api/appsettings.json"
+        fi
+    elif [ "$DB_PROVIDER" = "SqlServer" ]; then
+        # Drop and recreate both SQL Server databases so EF migrations start fresh
+        info "  Dropping SQL Server databases: ${SQLSERVER_DATABASE}, DEPOSITORY_Users ..."
+        SQLCMD=""
+        if command -v sqlcmd &>/dev/null; then SQLCMD="sqlcmd"; fi
+        if [ -z "$SQLCMD" ] && [ -f /opt/mssql-tools18/bin/sqlcmd ]; then SQLCMD="/opt/mssql-tools18/bin/sqlcmd"; fi
+        if [ -z "$SQLCMD" ] && [ -f /opt/mssql-tools/bin/sqlcmd ]; then SQLCMD="/opt/mssql-tools/bin/sqlcmd"; fi
+        if [ -n "$SQLCMD" ]; then
+            for DBNAME in "$SQLSERVER_DATABASE" "DEPOSITORY_Users"; do
+                "$SQLCMD" -S "${SQLSERVER_HOST},${SQLSERVER_PORT}" -U "$SQLSERVER_USER" -P "$SQLSERVER_PASSWORD" \
+                    -C -Q "IF DB_ID('${DBNAME}') IS NOT NULL BEGIN ALTER DATABASE [${DBNAME}] SET SINGLE_USER WITH ROLLBACK IMMEDIATE; DROP DATABASE [${DBNAME}]; END" \
+                    2>/dev/null && info "  Dropped database: ${DBNAME}" || warn "  Could not drop ${DBNAME} (may not exist yet)"
+            done
+        else
+            warn "  sqlcmd not found — cannot drop SQL Server databases automatically."
+            warn "  The services will create fresh databases via EF migrations on first start."
+        fi
+    fi
+fi
+
 # ---- Install systemd services ----
 info "Installing systemd services..."
 for svc in api auth worker gatherer digestor; do

package/install/install-windows.ps1

@@ -231,6 +231,41 @@ Apply-Template "$TemplateDir\appsettings-worker.json"   "$INSTALL_DIR\worker\app
 Apply-Template "$TemplateDir\appsettings-gatherer.json" "$INSTALL_DIR\gatherer\appsettings.json"
 Apply-Template "$TemplateDir\appsettings-digestor.json" "$INSTALL_DIR\digestor\appsettings.json"
 
+# ---- Clean database (if requested) ----
+if ($conf.CLEAN_DB -eq "true") {
+    Write-Warn "CLEAN_DB=true -- database will be wiped."
+    if ($conf.DB_PROVIDER -eq "Oracle") {
+        # Set OracleForceRecreate=true in api appsettings
+        $apiSettings = Join-Path $INSTALL_DIR "api\appsettings.json"
+        $json = Get-Content $apiSettings -Raw | ConvertFrom-Json
+        $json.DatabaseConfiguration.OracleForceRecreate = $true
+        $json | ConvertTo-Json -Depth 10 | Set-Content $apiSettings -Encoding UTF8
+        Write-Info "  OracleForceRecreate set to true in api/appsettings.json"
+    }
+    elseif ($conf.DB_PROVIDER -eq "SqlServer") {
+        # Drop and recreate SQL Server databases
+        Write-Info "  Dropping SQL Server databases..."
+        $sqlHost = "$($conf.SQLSERVER_HOST),$($conf.SQLSERVER_PORT)"
+        $sqlUser = $conf.SQLSERVER_USER
+        $sqlPass = $conf.SQLSERVER_PASSWORD
+        foreach ($dbName in @($conf.SQLSERVER_DATABASE, "DEPOSITORY_Users")) {
+            $dropSql = "IF DB_ID('$dbName') IS NOT NULL BEGIN ALTER DATABASE [$dbName] SET SINGLE_USER WITH ROLLBACK IMMEDIATE; DROP DATABASE [$dbName]; END"
+            try {
+                $connStr = "Server=$sqlHost;User ID=$sqlUser;Password=$sqlPass;TrustServerCertificate=true;"
+                $conn = New-Object System.Data.SqlClient.SqlConnection($connStr)
+                $conn.Open()
+                $cmd = $conn.CreateCommand()
+                $cmd.CommandText = $dropSql
+                $cmd.ExecuteNonQuery() | Out-Null
+                $conn.Close()
+                Write-Info "  Dropped database: $dbName"
+            } catch {
+                Write-Warn "  Could not drop ${dbName}: $($_.Exception.Message)"
+            }
+        }
+    }
+}
+
 # ---- Register Windows Services ----
 Write-Info "Registering Windows Services..."
 $svcDefs = @(

package/package.json

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

package/wizard.html

@@ -635,6 +635,27 @@ input.err { border-color: var(--err) !important; box-shadow: 0 0 0 3px rgba(220,
             <span class="test-badge" id="testBadge-ora"></span>
           </div>
         </div>
+
+        <!-- Clean Database toggle -->
+        <div style="margin-top:18px;padding:14px 16px;border:1px solid #fca5a5;border-radius:8px;background:#fef2f2">
+          <div class="toggle-row" style="margin-bottom:0">
+            <label class="toggle">
+              <input type="checkbox" id="clean_db" onchange="toggleCleanDb()">
+              <div class="toggle-slider" style="background:#e5e7eb"></div>
+            </label>
+            <div class="toggle-text">
+              <div class="toggle-label" data-i18n="clean_db_toggle" onclick="document.getElementById('clean_db').click()" style="color:#991b1b;font-weight:600">Clean Database (Drop All Tables)</div>
+              <div class="toggle-sub" data-i18n="clean_db_sub" style="color:#b91c1c">Removes ALL existing data before installation. Use only for a fresh start.</div>
+            </div>
+          </div>
+          <div id="cleanDbConfirm" style="display:none;margin-top:10px;padding:10px 12px;background:#fee2e2;border-radius:6px;border:1px solid #fca5a5">
+            <div style="font-size:12px;color:#991b1b;font-weight:600;margin-bottom:6px" data-i18n="clean_db_warn">&#9888; WARNING: This will permanently delete all documents, users, batches, and configuration from the database. This action cannot be undone.</div>
+            <label style="display:flex;align-items:center;gap:8px;cursor:pointer;font-size:13px;color:#991b1b">
+              <input type="checkbox" id="clean_db_confirm" onchange="validateCleanDb()">
+              <span data-i18n="clean_db_confirm">I understand that ALL data will be permanently deleted</span>
+            </label>
+          </div>
+        </div>
       </div>
 
       <!-- Step 2: Auth DB -->
@@ -960,6 +981,12 @@ const T = {
     prev_install_warn:"A previous Depository installation was detected at this path.",
     prev_install_confirm:"I understand — overwrite the existing installation",
     err_overwrite:"Please confirm that you want to overwrite the existing installation.",
+    clean_db_toggle:"Clean Database (Drop All Tables)",
+    clean_db_sub:"Removes ALL existing data before installation. Use only for a fresh start.",
+    clean_db_warn:"\u26A0 WARNING: This will permanently delete all documents, users, batches, and configuration from the database. This action cannot be undone.",
+    clean_db_confirm:"I understand that ALL data will be permanently deleted",
+    err_clean_db:"Please confirm that you want to delete all database data.",
+    review_clean_db:"Clean Database",
     update_available:"A newer version is available:",
     update_btn:"Update Now",
     update_updating:"Updating…",
@@ -1052,6 +1079,12 @@ const T = {
     prev_install_warn:"Bu yolda önceki bir Depository kurulumu algılandı.",
     prev_install_confirm:"Anlıyorum — mevcut kurulumun üzerine yaz",
     err_overwrite:"Lütfen mevcut kurulumun üzerine yazmak istediğinizi onaylayın.",
+    clean_db_toggle:"Veritabanını Temizle (Tüm Tabloları Sil)",
+    clean_db_sub:"Kurulum öncesinde TÜM mevcut verileri siler. Yalnızca temiz başlangıç için kullanın.",
+    clean_db_warn:"\u26A0 UYARI: Bu işlem veritabanındaki tüm belgeleri, kullanıcıları, iş gruplarını ve yapılandırmayı kalıcı olarak silecektir. Bu işlem geri alınamaz.",
+    clean_db_confirm:"TÜM verilerin kalıcı olarak silineceğini anlıyorum",
+    err_clean_db:"Lütfen tüm veritabanı verilerini silmek istediğinizi onaylayın.",
+    review_clean_db:"Veritabanı Temizliği",
     update_available:"Daha yeni bir sürüm mevcut:",
     update_btn:"Şimdi Güncelle",
     update_updating:"Güncelleniyor…",
@@ -1144,6 +1177,12 @@ const T = {
     prev_install_warn:"Une installation précédente de Depository a été détectée à cet emplacement.",
     prev_install_confirm:"Je comprends — écraser l'installation existante",
     err_overwrite:"Veuillez confirmer que vous souhaitez écraser l'installation existante.",
+    clean_db_toggle:"Nettoyer la base de données (Supprimer toutes les tables)",
+    clean_db_sub:"Supprime TOUTES les données existantes avant l'installation. À utiliser uniquement pour un nouveau départ.",
+    clean_db_warn:"\u26A0 ATTENTION : Cette action supprimera définitivement tous les documents, utilisateurs, lots et configurations de la base de données. Cette action est irréversible.",
+    clean_db_confirm:"Je comprends que TOUTES les données seront définitivement supprimées",
+    err_clean_db:"Veuillez confirmer la suppression de toutes les données.",
+    review_clean_db:"Nettoyage de la base",
     update_available:"Une version plus récente est disponible :",
     update_btn:"Mettre à jour",
     update_updating:"Mise à jour…",
@@ -1236,6 +1275,12 @@ const T = {
     prev_install_warn:"An diesem Pfad wurde eine vorherige Depository-Installation erkannt.",
     prev_install_confirm:"Verstanden — vorhandene Installation überschreiben",
     err_overwrite:"Bitte bestätigen Sie, dass Sie die vorhandene Installation überschreiben möchten.",
+    clean_db_toggle:"Datenbank bereinigen (Alle Tabellen löschen)",
+    clean_db_sub:"Entfernt ALLE vorhandenen Daten vor der Installation. Nur für einen Neustart verwenden.",
+    clean_db_warn:"\u26A0 WARNUNG: Alle Dokumente, Benutzer, Stapel und Konfigurationen in der Datenbank werden unwiderruflich gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.",
+    clean_db_confirm:"Ich verstehe, dass ALLE Daten unwiderruflich gelöscht werden",
+    err_clean_db:"Bitte bestätigen Sie die Löschung aller Datenbankdaten.",
+    review_clean_db:"Datenbank bereinigen",
     update_available:"Eine neuere Version ist verfügbar:",
     update_btn:"Jetzt aktualisieren",
     update_updating:"Aktualisierung…",
@@ -1328,6 +1373,12 @@ const T = {
     prev_install_warn:"Se detectó una instalación previa de Depository en esta ruta.",
     prev_install_confirm:"Entiendo — sobrescribir la instalación existente",
     err_overwrite:"Por favor confirme que desea sobrescribir la instalación existente.",
+    clean_db_toggle:"Limpiar base de datos (Eliminar todas las tablas)",
+    clean_db_sub:"Elimina TODOS los datos existentes antes de la instalación. Usar solo para un inicio limpio.",
+    clean_db_warn:"\u26A0 ADVERTENCIA: Esto eliminará permanentemente todos los documentos, usuarios, lotes y configuraciones de la base de datos. Esta acción no se puede deshacer.",
+    clean_db_confirm:"Entiendo que TODOS los datos serán eliminados permanentemente",
+    err_clean_db:"Por favor confirme que desea eliminar todos los datos de la base de datos.",
+    review_clean_db:"Limpiar base de datos",
     update_available:"Hay una versión más reciente disponible:",
     update_btn:"Actualizar ahora",
     update_updating:"Actualizando…",
@@ -1420,6 +1471,12 @@ const T = {
     prev_install_warn:"تم اكتشاف تثبيت سابق لـ Depository في هذا المسار.",
     prev_install_confirm:"أفهم ذلك — الكتابة فوق التثبيت الحالي",
     err_overwrite:"يرجى تأكيد رغبتك في الكتابة فوق التثبيت الحالي.",
+    clean_db_toggle:"تنظيف قاعدة البيانات (حذف جميع الجداول)",
+    clean_db_sub:"يحذف جميع البيانات الموجودة قبل التثبيت. استخدمه فقط للبدء من جديد.",
+    clean_db_warn:"\u26A0 تحذير: سيؤدي هذا إلى حذف جميع المستندات والمستخدمين والدفعات والتكوينات من قاعدة البيانات نهائيًا. لا يمكن التراجع عن هذا الإجراء.",
+    clean_db_confirm:"أفهم أنه سيتم حذف جميع البيانات نهائيًا",
+    err_clean_db:"يرجى تأكيد رغبتك في حذف جميع بيانات قاعدة البيانات.",
+    review_clean_db:"تنظيف قاعدة البيانات",
     update_available:"يتوفر إصدار أحدث:",
     update_btn:"تحديث الآن",
     update_updating:"جارٍ التحديث…",
@@ -1557,6 +1614,10 @@ function validateStep(s) {
         if (!val('ora_svc'))  return {msg:t('err_ora_svc'),  field:'ora_svc'};
         if (!val('ora_user')) return {msg:t('err_ora_user'), field:'ora_user'};
       }
+      if (document.getElementById('clean_db').checked && !document.getElementById('clean_db_confirm').checked) {
+        document.getElementById('cleanDbConfirm').scrollIntoView({behavior:'smooth',block:'center'});
+        return {msg:t('err_clean_db'), field:'clean_db_confirm'};
+      }
       break;
     case 2:
       if (dbType() === 'SqlServer') {
@@ -1635,6 +1696,16 @@ function toggleAd() {
   document.getElementById('adFields').classList.toggle('off', !on);
 }
 
+function toggleCleanDb() {
+  const on = document.getElementById('clean_db').checked;
+  document.getElementById('cleanDbConfirm').style.display = on ? 'block' : 'none';
+  if (!on) document.getElementById('clean_db_confirm').checked = false;
+}
+function validateCleanDb() {
+  // If clean_db is on but confirm is not checked, disable Next until confirmed.
+  // This is checked in validateStep() below.
+}
+
 // ── JWT generator ─────────────────────────────────────────────
 function generateJwt() {
   const chars = 'ABCDEFGHJKMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789!@#%^&*';
@@ -1665,6 +1736,7 @@ function buildConf() {
     AD_GROUP_ADMIN:       val('ad_admin'),   AD_GROUP_ORG_ADMIN: val('ad_orgadmin'),
     AD_GROUP_USER:        val('ad_user'),    AD_GROUP_READONLY:  val('ad_readonly'),
     OPENAI_API_KEY:       '',
+    CLEAN_DB:             document.getElementById('clean_db').checked?'true':'false',
   };
 }
 
@@ -1686,6 +1758,7 @@ function populateReview() {
     [t('review_ports'),     `UI=${c.UI_PORT}  API=${c.API_PORT}  Auth=${c.AUTH_PORT}  Gatherer=${c.GATHERER_PORT}`],
     [t('review_jwt'),       c.JWT_SECRET.substring(0,12)+'…  ('+c.JWT_SECRET.length+' chars)', true],
     [t('review_ad'),        c.WINDOWS_AUTH_ENABLED==='true'?`✓ ${c.AD_EMAIL_DOMAIN}`:'✗'],
+    [t('review_clean_db'),  c.CLEAN_DB==='true'?'<span style="color:#dc2626;font-weight:700">\u26A0 YES — All data will be deleted</span>':'No'],
   ];
   document.getElementById('reviewGrid').innerHTML = rows.map(([k,v,mono]) =>
     `<div class="review-row"><div class="review-key">${k}</div><div class="review-val${mono?' mono':''}">${v}</div></div>`
@@ -1741,6 +1814,8 @@ function downloadConf() {
     'WINDOWS_AUTH_ENABLED=' + c.WINDOWS_AUTH_ENABLED, 'AD_EMAIL_DOMAIN='  + c.AD_EMAIL_DOMAIN,
     'AD_GROUP_ADMIN='     + c.AD_GROUP_ADMIN,       'AD_GROUP_ORG_ADMIN=' + c.AD_GROUP_ORG_ADMIN,
     'AD_GROUP_USER='      + c.AD_GROUP_USER,        'AD_GROUP_READONLY='  + c.AD_GROUP_READONLY,
+    '', '# Clean database (drop all tables before install)',
+    'CLEAN_DB=' + c.CLEAN_DB,
     '', '# OpenAI (optional)',
     'OPENAI_API_KEY=',
   ];