From 80b1b01beb1d5c161a6cfc0454800bb3715fa627 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 9 Mar 2026 17:58:17 +0000
Subject: [PATCH 1/5] Initial plan


From c71f33a214272badb5c719f7a91d46a352caa2d0 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 9 Mar 2026 18:24:07 +0000
Subject: [PATCH 2/5] feat(integrations): add per-user OAuth wizard with
 user-mode for Dropbox, OneDrive, Google Drive

- Add user_mode to dropbox/onedrive/google_drive setup views that loads integration config
- Show user-friendly auth wizard when integration_id is provided (user mode)
- In user mode: show integration name, current folder, back-to-integrations link
- In callback templates: only save credentials (not config) for user integrations
- In integrations dashboard: show Authorize/Re-Authorize button for all OAuth types
- Add WATCH_FOLDER OAuth support: detect source_type in config for auth button
- isOAuthType() and oauthLink() now accept full integration object

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
---
 app/views/dropbox.py                          |  61 +++++-
 app/views/google_drive.py                     |  67 +++++--
 app/views/onedrive.py                         |  66 ++++++-
 frontend/templates/dropbox.html               |  85 +++++++--
 frontend/templates/dropbox_callback.html      |   5 +-
 frontend/templates/google_drive.html          | 174 ++++++++++++------
 frontend/templates/google_drive_callback.html |   5 +-
 .../templates/integrations_dashboard.html     |  48 +++--
 frontend/templates/onedrive.html              |  88 +++++++--
 frontend/templates/onedrive_callback.html     |   5 +-
 10 files changed, 473 insertions(+), 131 deletions(-)

diff --git a/app/views/dropbox.py b/app/views/dropbox.py
index e6698f6f..f623a7c6 100644
--- a/app/views/dropbox.py
+++ b/app/views/dropbox.py
@@ -2,33 +2,82 @@
 Dropbox integration views for setup and OAuth callback.
 """
 
-from fastapi import Query, Request
+import json
 
-from app.views.base import APIRouter, require_login, settings, templates
+from fastapi import Query, Request
+from sqlalchemy.orm import Session
+
+from app.models import UserIntegration
+from app.utils.user_scope import get_current_owner_id
+from app.views.base import APIRouter, Depends, get_db, require_login, settings, templates
 
 router = APIRouter()
 
 
 @router.get("/dropbox-setup")
 @require_login
-async def dropbox_setup_page(request: Request, integration_id: int | None = Query(None)):
+async def dropbox_setup_page(
+    request: Request,
+    integration_id: int | None = Query(None),
+    db: Session = Depends(get_db),
+):
     """
     Setup page for the Dropbox integration.
-    Shows configuration status and setup instructions.
+
+    When ``integration_id`` is provided the page operates in **user mode**:
+    the OAuth wizard saves credentials to the named per-user integration
+    record rather than to the global application settings.  Only the folder
+    path from the integration's existing config is pre-populated; global
+    admin credentials are never exposed in this mode.
     """
-    # Check Dropbox configuration
+    if integration_id is not None:
+        owner_id = get_current_owner_id(request)
+        integration = (
+            db.query(UserIntegration)
+            .filter(UserIntegration.id == integration_id, UserIntegration.owner_id == owner_id)
+            .first()
+        )
+        if integration:
+            cfg: dict = {}
+            if integration.config:
+                try:
+                    cfg = json.loads(integration.config)
+                except (json.JSONDecodeError, TypeError):
+                    cfg = {}
+            # Support both "folder" (DROPBOX destination) and "folder_path" (WATCH_FOLDER source)
+            folder_path = cfg.get("folder", cfg.get("folder_path", ""))
+            return templates.TemplateResponse(
+                "dropbox.html",
+                {
+                    "request": request,
+                    "user_mode": True,
+                    "is_configured": bool(integration.credentials),
+                    "integration_id": integration_id,
+                    "integration_name": integration.name,
+                    "integration_type": integration.integration_type,
+                    "folder_path": folder_path,
+                    "app_key_value": "",
+                    "app_secret_value": "",
+                    "refresh_token_value": "",
+                },
+            )
+
+    # ── Admin / global mode ──────────────────────────────────────────────────
     is_configured = bool(settings.dropbox_app_key and settings.dropbox_app_secret and settings.dropbox_refresh_token)
 
     return templates.TemplateResponse(
         "dropbox.html",
         {
             "request": request,
+            "user_mode": False,
             "is_configured": is_configured,
             "app_key_value": settings.dropbox_app_key or "",
             "app_secret_value": settings.dropbox_app_secret if settings.dropbox_app_secret else "",
             "refresh_token_value": settings.dropbox_refresh_token if settings.dropbox_refresh_token else "",
-            "folder_path": settings.dropbox_folder or "/Documents/Uploads",  # Default folder path
+            "folder_path": settings.dropbox_folder or "/Documents/Uploads",
             "integration_id": integration_id,
+            "integration_name": None,
+            "integration_type": None,
         },
     )
 
diff --git a/app/views/google_drive.py b/app/views/google_drive.py
index e6da1f65..f6bde9c0 100644
--- a/app/views/google_drive.py
+++ b/app/views/google_drive.py
@@ -2,47 +2,90 @@
 Google Drive integration views for setup and OAuth callback.
 """
 
+import json
 import urllib.parse
 
 from fastapi import Query, Request
 from fastapi.responses import RedirectResponse
+from sqlalchemy.orm import Session
 
-from app.views.base import APIRouter, require_login, settings, templates
+from app.models import UserIntegration
+from app.utils.user_scope import get_current_owner_id
+from app.views.base import APIRouter, Depends, get_db, require_login, settings, templates
 
 router = APIRouter()
 
 
 @router.get("/google-drive-setup")
 @require_login
-async def google_drive_setup_page(request: Request, integration_id: int | None = Query(None)):
+async def google_drive_setup_page(
+    request: Request,
+    integration_id: int | None = Query(None),
+    db: Session = Depends(get_db),
+):
     """
     Setup page for the Google Drive integration.
-    Shows configuration status and setup instructions.
+
+    When ``integration_id`` is provided the page operates in **user mode**:
+    the OAuth wizard saves credentials to the named per-user integration
+    record rather than to the global application settings.
     """
-    # Check if using OAuth
+    if integration_id is not None:
+        owner_id = get_current_owner_id(request)
+        integration = (
+            db.query(UserIntegration)
+            .filter(UserIntegration.id == integration_id, UserIntegration.owner_id == owner_id)
+            .first()
+        )
+        if integration:
+            cfg: dict = {}
+            if integration.config:
+                try:
+                    cfg = json.loads(integration.config)
+                except (json.JSONDecodeError, TypeError):
+                    cfg = {}
+            folder_id = cfg.get("folder_id", "")
+            return templates.TemplateResponse(
+                "google_drive.html",
+                {
+                    "request": request,
+                    "user_mode": True,
+                    "is_configured": bool(integration.credentials),
+                    "integration_id": integration_id,
+                    "integration_name": integration.name,
+                    "integration_type": integration.integration_type,
+                    "folder_id": folder_id,
+                    "use_oauth": True,
+                    "oauth_configured": bool(integration.credentials),
+                    "sa_configured": False,
+                    "client_id": False,
+                    "client_id_value": "",
+                    "client_secret": False,
+                    "client_secret_value": "",
+                    "refresh_token": False,
+                    "refresh_token_value": "",
+                    "has_credentials_json": False,
+                },
+            )
+
+    # ── Admin / global mode ──────────────────────────────────────────────────
     use_oauth = getattr(settings, "google_drive_use_oauth", False)
 
-    # Check Google Drive OAuth configuration
     oauth_configured = bool(
         settings.google_drive_client_id and settings.google_drive_client_secret and settings.google_drive_refresh_token
     )
-
-    # Check Google Drive service account configuration
     sa_configured = bool(settings.google_drive_credentials_json)
-
-    # Overall configuration status
     is_configured = (use_oauth and oauth_configured) or (not use_oauth and sa_configured)
-
     if settings.google_drive_folder_id:
         is_configured = is_configured and True
     else:
         is_configured = False
 
-    # Get configuration values to display status (hide sensitive values)
     return templates.TemplateResponse(
         "google_drive.html",
         {
             "request": request,
+            "user_mode": False,
             "is_configured": is_configured,
             "use_oauth": use_oauth,
             "oauth_configured": oauth_configured,
@@ -56,6 +99,8 @@ async def google_drive_setup_page(request: Request, integration_id: int | None =
             "folder_id": settings.google_drive_folder_id or "",
             "has_credentials_json": bool(settings.google_drive_credentials_json),
             "integration_id": integration_id,
+            "integration_name": None,
+            "integration_type": None,
         },
     )
 
diff --git a/app/views/onedrive.py b/app/views/onedrive.py
index a721c376..4b8b3763 100644
--- a/app/views/onedrive.py
+++ b/app/views/onedrive.py
@@ -2,40 +2,90 @@
 OneDrive integration views for setup and OAuth callback.
 """
 
-from fastapi import Query, Request
+import json
 
-from app.views.base import APIRouter, require_login, settings, templates
+from fastapi import Query, Request
+from sqlalchemy.orm import Session
+
+from app.models import UserIntegration
+from app.utils.user_scope import get_current_owner_id
+from app.views.base import APIRouter, Depends, get_db, require_login, settings, templates
 
 router = APIRouter()
 
 
 @router.get("/onedrive-setup")
 @require_login
-async def onedrive_setup_page(request: Request, integration_id: int | None = Query(None)):
+async def onedrive_setup_page(
+    request: Request,
+    integration_id: int | None = Query(None),
+    db: Session = Depends(get_db),
+):
     """
     Setup page for the OneDrive integration.
-    Shows configuration status and setup instructions.
+
+    When ``integration_id`` is provided the page operates in **user mode**:
+    the OAuth wizard saves credentials to the named per-user integration
+    record rather than to the global application settings.
     """
-    # Check OneDrive configuration
+    if integration_id is not None:
+        owner_id = get_current_owner_id(request)
+        integration = (
+            db.query(UserIntegration)
+            .filter(UserIntegration.id == integration_id, UserIntegration.owner_id == owner_id)
+            .first()
+        )
+        if integration:
+            cfg: dict = {}
+            if integration.config:
+                try:
+                    cfg = json.loads(integration.config)
+                except (json.JSONDecodeError, TypeError):
+                    cfg = {}
+            # Support both "folder_path" (WATCH_FOLDER / ONEDRIVE destination)
+            folder_path = cfg.get("folder_path", cfg.get("folder", ""))
+            return templates.TemplateResponse(
+                "onedrive.html",
+                {
+                    "request": request,
+                    "user_mode": True,
+                    "is_configured": bool(integration.credentials),
+                    "integration_id": integration_id,
+                    "integration_name": integration.name,
+                    "integration_type": integration.integration_type,
+                    "folder_path": folder_path,
+                    "client_id": False,
+                    "client_id_value": "",
+                    "client_secret": False,
+                    "client_secret_value": "",
+                    "tenant_id": "common",
+                    "refresh_token": False,
+                    "refresh_token_value": "",
+                },
+            )
+
+    # ── Admin / global mode ──────────────────────────────────────────────────
     is_configured = bool(
         settings.onedrive_client_id and settings.onedrive_client_secret and settings.onedrive_refresh_token
     )
 
-    # Get configuration values to display status (hide sensitive values)
     return templates.TemplateResponse(
         "onedrive.html",
         {
             "request": request,
+            "user_mode": False,
             "is_configured": is_configured,
             "client_id": bool(settings.onedrive_client_id),
-            "client_id_value": settings.onedrive_client_id or "",  # Pass the actual value for the form
+            "client_id_value": settings.onedrive_client_id or "",
             "client_secret": bool(settings.onedrive_client_secret),
             "client_secret_value": settings.onedrive_client_secret if settings.onedrive_client_secret else "",
             "tenant_id": settings.onedrive_tenant_id,
             "refresh_token": bool(settings.onedrive_refresh_token),
             "refresh_token_value": settings.onedrive_refresh_token if settings.onedrive_refresh_token else "",
-            "folder_path": settings.onedrive_folder_path or "Documents/Uploads",  # Default folder path
+            "folder_path": settings.onedrive_folder_path or "Documents/Uploads",
             "integration_id": integration_id,
+            "integration_name": None,
+            "integration_type": None,
         },
     )
 
diff --git a/frontend/templates/dropbox.html b/frontend/templates/dropbox.html
index 6c59b9e9..fb8fb469 100644
--- a/frontend/templates/dropbox.html
+++ b/frontend/templates/dropbox.html
@@ -4,6 +4,37 @@
 {% block content %}
 <div class="container mx-auto px-4 py-8">
   <div class="mb-8">
+    {% if user_mode %}
+    <!-- ── User-mode header ──────────────────────────────────────────── -->
+    <div class="mb-4">
+      <a href="/integrations" class="inline-flex items-center text-sm text-indigo-600 hover:text-indigo-800">
+        <i class="fas fa-arrow-left mr-1" aria-hidden="true"></i> Back to Integrations
+      </a>
+    </div>
+    <h1 class="text-3xl font-bold mb-2">
+      Connect Dropbox
+      {% if integration_name %}<span class="text-gray-500 text-2xl font-normal">— {{ integration_name }}</span>{% endif %}
+    </h1>
+    <p class="text-gray-600 mb-4">
+      Authorize DocuElevate to access your Dropbox account. Your credentials are stored securely in your personal integration record.
+    </p>
+    {% if is_configured %}
+    <div class="bg-green-50 border-l-4 border-green-500 text-green-700 p-4 my-4" role="alert">
+      <p class="font-semibold">✓ Already authorized</p>
+      <p class="text-sm mt-1">This integration already has credentials. You can re-authorize below to refresh or update them.
+      {% if folder_path %}<br><strong>Folder:</strong> {{ folder_path }}{% endif %}
+      </p>
+    </div>
+    {% else %}
+    <div class="bg-blue-50 border-l-4 border-blue-500 text-blue-700 p-4 my-4" role="alert">
+      <p class="font-semibold">Authorization required</p>
+      <p class="text-sm mt-1">Complete the wizard below to grant access to your Dropbox account.
+      {% if folder_path %}<br><strong>Target folder:</strong> {{ folder_path }}{% endif %}
+      </p>
+    </div>
+    {% endif %}
+    {% else %}
+    <!-- ── Admin-mode header ─────────────────────────────────────────── -->
     <h1 class="text-3xl font-bold mb-2">Dropbox Integration Setup</h1>
     <p class="text-gray-600 mb-4">
       Configure the Dropbox integration for DocuElevate using our setup wizard.
@@ -37,6 +68,7 @@
         </div>
       </div>
     </div>
+    {% endif %}
   </div>
 
   <div class="bg-white shadow-md rounded-lg p-6 mb-8">
@@ -79,24 +111,35 @@
   </div>
 
   <div class="bg-white shadow-md rounded-lg p-6 mb-8">
-    <h2 class="text-2xl font-semibold mb-4">Complete Setup with Wizard</h2>
+    <h2 class="text-2xl font-semibold mb-4">
+      {% if user_mode %}OAuth Wizard{% else %}Complete Setup with Wizard{% endif %}
+    </h2>
 
     <div class="space-y-4">
       <div>
-        <label for="app-key" class="block text-sm font-medium text-gray-700">App Key</label>
+        <label for="app-key" class="block text-sm font-medium text-gray-700">App Key <span class="text-red-500" aria-hidden="true">*</span></label>
         <input type="text" id="app-key" class="mt-1 block w-full border border-gray-300 rounded-md shadow-sm py-2 px-3 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" placeholder="Enter your Dropbox app key" value="{{ app_key_value }}">
       </div>
 
       <div>
-        <label for="app-secret" class="block text-sm font-medium text-gray-700">App Secret</label>
+        <label for="app-secret" class="block text-sm font-medium text-gray-700">App Secret <span class="text-red-500" aria-hidden="true">*</span></label>
         <input type="password" id="app-secret" class="mt-1 block w-full border border-gray-300 rounded-md shadow-sm py-2 px-3 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" placeholder="Enter your Dropbox app secret" value="{{ app_secret_value }}">
       </div>
 
+      {% if not user_mode %}
       <div>
         <label for="folder-path" class="block text-sm font-medium text-gray-700">Folder Path (Optional)</label>
         <input type="text" id="folder-path" class="mt-1 block w-full border border-gray-300 rounded-md shadow-sm py-2 px-3 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" placeholder="/Documents/Uploads" value="{{ folder_path }}">
         <p class="text-xs text-gray-500 mt-1">Enter the folder path where files should be uploaded (e.g., /Documents/Uploads)</p>
       </div>
+      {% else %}
+      {% if folder_path %}
+      <div class="bg-gray-50 border border-gray-200 rounded-md px-3 py-2">
+        <p class="text-xs text-gray-500">Target folder (from integration settings)</p>
+        <p class="text-sm font-mono text-gray-700">{{ folder_path }}</p>
+      </div>
+      {% endif %}
+      {% endif %}
 
       <div>
         <button id="start-auth-flow" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
@@ -104,7 +147,8 @@
         </button>
       </div>
 
-      <!-- Token validation and status -->
+      <!-- Token validation and status (admin mode only) -->
+      {% if not user_mode %}
       <div id="token-status" class="mt-6 {{ 'hidden' if not is_configured else '' }}">
         <div class="rounded-md {{ 'bg-green-50' if is_configured else 'bg-yellow-50' }} p-4">
           <div class="flex">
@@ -140,7 +184,7 @@
           </button>
         </div>
 
-        <!-- Configuration for Worker Nodes section -->
+        <!-- Configuration for Worker Nodes section (admin only) -->
         <div class="mt-6 p-4 bg-gray-100 rounded-md">
           <h3 class="font-medium text-lg mb-2">Configuration for Worker Nodes</h3>
           <p class="text-sm text-gray-600 mb-3">
@@ -163,6 +207,7 @@ DROPBOX_FOLDER={{ folder_path|default('/Documents/Uploads', true) }}</code></pre
           </p>
         </div>
       </div>
+      {% endif %}
     </div>
   </div>
 
@@ -184,9 +229,15 @@ DROPBOX_FOLDER={{ folder_path|default('/Documents/Uploads', true) }}</code></pre
   </div>
 
   <div class="mt-8">
+    {% if user_mode %}
+    <a href="/integrations" class="inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md shadow-sm text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+      <i class="fas fa-arrow-left mr-2" aria-hidden="true"></i> Back to Integrations
+    </a>
+    {% else %}
     <a href="/status" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
       Back to Status
     </a>
+    {% endif %}
   </div>
 
   <!-- Result Modal -->
@@ -216,6 +267,8 @@ DROPBOX_FOLDER={{ folder_path|default('/Documents/Uploads', true) }}</code></pre
 {% block scripts %}
 <script>
 document.addEventListener('DOMContentLoaded', function() {
+  const userMode = {{ 'true' if user_mode else 'false' }};
+
   // Store integration_id if provided (for per-user OAuth flow)
   const integrationId = "{{ integration_id or '' }}";
   if (integrationId) {
@@ -279,7 +332,6 @@ document.addEventListener('DOMContentLoaded', function() {
   startAuthFlowBtn.addEventListener('click', function() {
     const appKey = document.getElementById('app-key').value.trim();
     const appSecret = appSecretInput.value.trim();
-    const folderPath = document.getElementById('folder-path').value.trim();
     const redirectUri = window.location.origin + "/dropbox-callback";
 
     if (!appKey) {
@@ -292,11 +344,16 @@ document.addEventListener('DOMContentLoaded', function() {
       return;
     }
 
-    // Save app key, app secret and folder path to session storage temporarily
+    // Save app key and app secret to session storage temporarily
     sessionStorage.setItem('dropbox_app_key', appKey);
     sessionStorage.setItem('dropbox_app_secret', appSecret);
-    if (folderPath) {
-      sessionStorage.setItem('dropbox_folder_path', folderPath);
+
+    // In admin mode also store folder path; in user mode the config is already set
+    if (!userMode) {
+      const folderPathEl = document.getElementById('folder-path');
+      if (folderPathEl && folderPathEl.value.trim()) {
+        sessionStorage.setItem('dropbox_folder_path', folderPathEl.value.trim());
+      }
     }
 
     // Generate the authorization URL
@@ -306,7 +363,7 @@ document.addEventListener('DOMContentLoaded', function() {
     window.location.href = authUrl;
   });
 
-  // Test Token button click
+  // Test Token button click (admin mode only)
   if (testTokenBtn) {
     testTokenBtn.addEventListener('click', function() {
       testTokenBtn.innerHTML = '<span class="animate-spin inline-block mr-2">⟳</span> Testing...';
@@ -343,7 +400,7 @@ document.addEventListener('DOMContentLoaded', function() {
     });
   }
 
-  // Refresh Token button click
+  // Refresh Token button click (admin mode only)
   if (refreshTokenBtn) {
     refreshTokenBtn.addEventListener('click', function() {
       showModal('info', 'Confirm', 'This will start a new authentication flow to obtain a fresh token from Dropbox. Continue?');
@@ -374,7 +431,7 @@ document.addEventListener('DOMContentLoaded', function() {
     });
   }
 
-  // Copy Environment Variables Button
+  // Copy Environment Variables Button (admin mode only)
   const copyEnvVarsBtn = document.getElementById('copy-env-vars');
   if (copyEnvVarsBtn) {
     copyEnvVarsBtn.addEventListener('click', function() {
@@ -403,8 +460,8 @@ document.addEventListener('DOMContentLoaded', function() {
     sessionStorage.removeItem('dropbox_app_secret');
   }
 
-  // If token is not configured but we have an app key, show the token status section
-  if (document.getElementById('app-key').value && !tokenStatus.classList.contains('hidden')) {
+  // If token is not configured but we have an app key, show the token status section (admin mode)
+  if (tokenStatus && document.getElementById('app-key').value && !tokenStatus.classList.contains('hidden')) {
     tokenStatus.classList.remove('hidden');
   }
 });
diff --git a/frontend/templates/dropbox_callback.html b/frontend/templates/dropbox_callback.html
index 5d253624..7d9f0e1e 100644
--- a/frontend/templates/dropbox_callback.html
+++ b/frontend/templates/dropbox_callback.html
@@ -145,11 +145,10 @@ document.addEventListener('DOMContentLoaded', function() {
             app_key: appKey,
             app_secret: appSecret,
           };
-          const cfgUpdate = {};
-          if (folderPath) cfgUpdate.folder = folderPath;
 
+          // Only send credentials — the integration's config (folder, source_type, etc.)
+          // is already set and must not be overwritten here.
           const body = { credentials: creds };
-          if (Object.keys(cfgUpdate).length > 0) body.config = cfgUpdate;
 
           document.getElementById('processing-message').innerHTML =
             '<p>Saving credentials to your integration...</p>';
diff --git a/frontend/templates/google_drive.html b/frontend/templates/google_drive.html
index 3a964b04..ff0fc18e 100644
--- a/frontend/templates/google_drive.html
+++ b/frontend/templates/google_drive.html
@@ -4,6 +4,37 @@
 {% block content %}
 <div class="container mx-auto px-4 py-8">
   <div class="mb-8">
+    {% if user_mode %}
+    <!-- ── User-mode header ──────────────────────────────────────────── -->
+    <div class="mb-4">
+      <a href="/integrations" class="inline-flex items-center text-sm text-indigo-600 hover:text-indigo-800">
+        <i class="fas fa-arrow-left mr-1" aria-hidden="true"></i> Back to Integrations
+      </a>
+    </div>
+    <h1 class="text-3xl font-bold mb-2">
+      Connect Google Drive
+      {% if integration_name %}<span class="text-gray-500 text-2xl font-normal">— {{ integration_name }}</span>{% endif %}
+    </h1>
+    <p class="text-gray-600 mb-4">
+      Authorize DocuElevate to access your Google Drive account. Your credentials are stored securely in your personal integration record.
+    </p>
+    {% if is_configured %}
+    <div class="bg-green-50 border-l-4 border-green-500 text-green-700 p-4 my-4" role="alert">
+      <p class="font-semibold">✓ Already authorized</p>
+      <p class="text-sm mt-1">This integration already has credentials. You can re-authorize below to refresh or update them.
+      {% if folder_id %}<br><strong>Folder ID:</strong> {{ folder_id }}{% endif %}
+      </p>
+    </div>
+    {% else %}
+    <div class="bg-blue-50 border-l-4 border-blue-500 text-blue-700 p-4 my-4" role="alert">
+      <p class="font-semibold">Authorization required</p>
+      <p class="text-sm mt-1">Complete the wizard below to grant access to your Google Drive account.
+      {% if folder_id %}<br><strong>Target folder ID:</strong> {{ folder_id }}{% endif %}
+      </p>
+    </div>
+    {% endif %}
+    {% else %}
+    <!-- ── Admin-mode header ─────────────────────────────────────────── -->
     <h1 class="text-3xl font-bold mb-2">Google Drive Integration Setup</h1>
     <p class="text-gray-600 mb-4">
       Configure the Google Drive integration for DocuElevate using our setup wizard.
@@ -42,8 +73,10 @@
         </div>
       </div>
     </div>
+    {% endif %}
   </div>
 
+  {% if not user_mode %}
   <div class="bg-white shadow-md rounded-lg p-6 mb-8">
     <div class="flex justify-between items-start mb-4">
       <h2 class="text-2xl font-semibold">Authentication Method</h2>
@@ -224,7 +257,39 @@
     </div>
   </div>
 
-  <!-- Token validation and status -->
+  </div>
+  {% endif %}{# end if not user_mode for admin auth-method block #}
+
+  <!-- ── User-mode OAuth wizard ────────────────────────────────────────── -->
+  {% if user_mode %}
+  <div class="bg-white shadow-md rounded-lg p-6 mb-8">
+    <h2 class="text-2xl font-semibold mb-4">OAuth Wizard</h2>
+    <div class="space-y-4">
+      <div>
+        <label for="client-id" class="block text-sm font-medium text-gray-700">Client ID <span class="text-red-500" aria-hidden="true">*</span></label>
+        <input type="text" id="client-id" class="mt-1 block w-full border border-gray-300 rounded-md shadow-sm py-2 px-3 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" placeholder="Enter your OAuth Client ID" value="{{ client_id_value }}">
+      </div>
+      <div>
+        <label for="client-secret" class="block text-sm font-medium text-gray-700">Client Secret <span class="text-red-500" aria-hidden="true">*</span></label>
+        <input type="password" id="client-secret" class="mt-1 block w-full border border-gray-300 rounded-md shadow-sm py-2 px-3 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" placeholder="Enter your OAuth Client Secret" value="{{ client_secret_value }}">
+      </div>
+      {% if folder_id %}
+      <div class="bg-gray-50 border border-gray-200 rounded-md px-3 py-2">
+        <p class="text-xs text-gray-500">Target folder ID (from integration settings)</p>
+        <p class="text-sm font-mono text-gray-700">{{ folder_id }}</p>
+      </div>
+      {% endif %}
+      <div>
+        <button id="start-oauth-flow" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+          Start Authentication Flow
+        </button>
+      </div>
+    </div>
+  </div>
+  {% endif %}
+
+  <!-- Token validation and status (admin mode only) -->
+  {% if not user_mode %}
   <div id="token-status" class="mt-6 bg-white shadow-md rounded-lg p-6 {{ 'hidden' if not is_configured else '' }}">
     <h2 class="text-xl font-semibold mb-4">Connection Status</h2>
 
@@ -262,7 +327,7 @@
       </button>
     </div>
 
-    <!-- Configuration for Worker Nodes section -->
+    <!-- Configuration for Worker Nodes section (admin only) -->
     <div id="oauth-env-section" class="mt-6 p-4 bg-gray-100 rounded-md {{ 'hidden' if not use_oauth else '' }}">
       <h3 class="font-medium text-lg mb-2">OAuth Configuration for Worker Nodes</h3>
       <p class="text-sm text-gray-600 mb-3">
@@ -307,6 +372,7 @@ GOOGLE_DRIVE_FOLDER_ID={{ folder_id|default('YOUR_FOLDER_ID', true) }}
       </p>
     </div>
   </div>
+  {% endif %}
 
   <div class="bg-white shadow-md rounded-lg p-6 mt-8 mb-8">
     <div class="flex items-start">
@@ -326,9 +392,15 @@ GOOGLE_DRIVE_FOLDER_ID={{ folder_id|default('YOUR_FOLDER_ID', true) }}
   </div>
 
   <div class="mt-8">
+    {% if user_mode %}
+    <a href="/integrations" class="inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md shadow-sm text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+      <i class="fas fa-arrow-left mr-2" aria-hidden="true"></i> Back to Integrations
+    </a>
+    {% else %}
     <a href="/status" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
       Back to Status
     </a>
+    {% endif %}
   </div>
 
   <!-- Result Modal -->
@@ -358,18 +430,14 @@ GOOGLE_DRIVE_FOLDER_ID={{ folder_id|default('YOUR_FOLDER_ID', true) }}
 {% block scripts %}
 <script>
 document.addEventListener('DOMContentLoaded', function() {
+  const userMode = {{ 'true' if user_mode else 'false' }};
+
   // Store integration_id if provided (for per-user OAuth flow)
   const integrationId = "{{ integration_id or '' }}";
   if (integrationId) {
     sessionStorage.setItem('oauth_integration_id', integrationId);
   }
 
-  // Tab elements
-  const oauthTabBtn = document.getElementById('oauth-tab-btn');
-  const saTabBtn = document.getElementById('sa-tab-btn');
-  const oauthTab = document.getElementById('oauth-tab');
-  const saTab = document.getElementById('sa-tab');
-
   // Form elements
   const clientIdInput = document.getElementById('client-id');
   const clientSecretInput = document.getElementById('client-secret');
@@ -379,12 +447,14 @@ document.addEventListener('DOMContentLoaded', function() {
   const saveSaSettingsBtn = document.getElementById('save-sa-settings');
   const selectFolderBtn = document.getElementById('select-folder-btn');
 
-  // Status and test elements
+  // Admin-mode elements (may be null in user mode)
+  const oauthTabBtn = document.getElementById('oauth-tab-btn');
+  const saTabBtn = document.getElementById('sa-tab-btn');
+  const oauthTab = document.getElementById('oauth-tab');
+  const saTab = document.getElementById('sa-tab');
   const tokenStatus = document.getElementById('token-status');
   const testConnectionBtn = document.getElementById('test-connection');
   const refreshTokenBtn = document.getElementById('refresh-token-btn');
-
-  // Environment sections
   const oauthEnvSection = document.getElementById('oauth-env-section');
   const saEnvSection = document.getElementById('sa-env-section');
 
@@ -485,7 +555,7 @@ document.addEventListener('DOMContentLoaded', function() {
       const folderName = folder[google.picker.Document.NAME];
 
       // Update the folder ID input
-      folderIdInput.value = folderId;
+      if (folderIdInput) folderIdInput.value = folderId;
       if (saFolderIdInput) {
         saFolderIdInput.value = folderId;
       }
@@ -501,7 +571,7 @@ document.addEventListener('DOMContentLoaded', function() {
   // New function to save folder ID after picker selection
   function saveFolderId(folderId) {
     // Check which tab is active to determine if we're using OAuth or Service Account
-    const isOauthActive = !oauthTab.classList.contains('hidden');
+    const isOauthActive = !oauthTab || !oauthTab.classList.contains('hidden');
 
     // Prepare form data
     const formData = new FormData();
@@ -509,9 +579,9 @@ document.addEventListener('DOMContentLoaded', function() {
     formData.append('use_oauth', isOauthActive ? 'true' : 'false');
 
     // If using OAuth, also include client credentials if available
-    if (isOauthActive) {
+    if (isOauthActive && clientIdInput) {
       const clientId = clientIdInput.value.trim();
-      const clientSecret = clientSecretInput.value.trim();
+      const clientSecret = clientSecretInput ? clientSecretInput.value.trim() : '';
 
       if (clientId) formData.append('client_id', clientId);
       if (clientSecret) formData.append('client_secret', clientSecret);
@@ -535,8 +605,8 @@ document.addEventListener('DOMContentLoaded', function() {
         console.error('Error saving folder ID:', data.message);
       } else {
         console.log('Folder ID saved successfully');
-        // Make the token status visible if it was hidden
-        tokenStatus.classList.remove('hidden');
+        // Make the token status visible if it was hidden (admin mode)
+        if (tokenStatus) tokenStatus.classList.remove('hidden');
 
         // Update environment variables display if they exist
         updateEnvVarsDisplay();
@@ -549,13 +619,13 @@ document.addEventListener('DOMContentLoaded', function() {
 
   // Function to update environment variables display
   function updateEnvVarsDisplay() {
-    const folderId = folderIdInput.value || saFolderIdInput.value || 'YOUR_FOLDER_ID';
+    const folderId = (folderIdInput && folderIdInput.value) || (saFolderIdInput && saFolderIdInput.value) || 'YOUR_FOLDER_ID';
 
     // Update OAuth env vars if the element exists
     const oauthEnvVarsCode = document.querySelector('#oauth-env-vars code');
     if (oauthEnvVarsCode) {
-      const clientId = clientIdInput.value || 'YOUR_CLIENT_ID';
-      const clientSecret = clientSecretInput.value ? 'YOUR_CLIENT_SECRET' : 'YOUR_CLIENT_SECRET';
+      const clientId = (clientIdInput && clientIdInput.value) || 'YOUR_CLIENT_ID';
+      const clientSecret = 'YOUR_CLIENT_SECRET';
 
       oauthEnvVarsCode.textContent = `GOOGLE_DRIVE_USE_OAUTH=true
 GOOGLE_DRIVE_CLIENT_ID=${clientId}
@@ -615,33 +685,33 @@ GOOGLE_DRIVE_FOLDER_ID=${folderId}
     selectFolderBtn.addEventListener('click', createPicker);
   }
 
-  // Tab switching
-  oauthTabBtn.addEventListener('click', function() {
-    oauthTabBtn.className = 'px-4 py-2 rounded-md text-white bg-blue-600';
-    saTabBtn.className = 'px-4 py-2 rounded-md text-gray-700 bg-gray-200';
-    oauthTab.classList.remove('hidden');
-    saTab.classList.add('hidden');
-    oauthEnvSection.classList.remove('hidden');
-    saEnvSection.classList.add('hidden');
-  });
+  // Tab switching (admin mode only)
+  if (oauthTabBtn && saTabBtn && oauthTab && saTab) {
+    oauthTabBtn.addEventListener('click', function() {
+      oauthTabBtn.className = 'px-4 py-2 rounded-md text-white bg-blue-600';
+      saTabBtn.className = 'px-4 py-2 rounded-md text-gray-700 bg-gray-200';
+      oauthTab.classList.remove('hidden');
+      saTab.classList.add('hidden');
+      if (oauthEnvSection) oauthEnvSection.classList.remove('hidden');
+      if (saEnvSection) saEnvSection.classList.add('hidden');
+    });
 
-  saTabBtn.addEventListener('click', function() {
-    saTabBtn.className = 'px-4 py-2 rounded-md text-white bg-blue-600';
-    oauthTabBtn.className = 'px-4 py-2 rounded-md text-gray-700 bg-gray-200';
-    saTab.classList.remove('hidden');
-    oauthTab.classList.add('hidden');
-    saEnvSection.classList.remove('hidden');
-    oauthEnvSection.classList.add('hidden');
-  });
+    saTabBtn.addEventListener('click', function() {
+      saTabBtn.className = 'px-4 py-2 rounded-md text-white bg-blue-600';
+      oauthTabBtn.className = 'px-4 py-2 rounded-md text-gray-700 bg-gray-200';
+      saTab.classList.remove('hidden');
+      oauthTab.classList.add('hidden');
+      if (saEnvSection) saEnvSection.classList.remove('hidden');
+      if (oauthEnvSection) oauthEnvSection.classList.add('hidden');
+    });
+  }
 
-  // Sync folder IDs between tabs
-  folderIdInput.addEventListener('input', function() {
-    if (saFolderIdInput) {
+  // Sync folder IDs between tabs (admin mode only)
+  if (folderIdInput && saFolderIdInput) {
+    folderIdInput.addEventListener('input', function() {
       saFolderIdInput.value = folderIdInput.value;
-    }
-  });
+    });
 
-  if (saFolderIdInput) {
     saFolderIdInput.addEventListener('input', function() {
       folderIdInput.value = saFolderIdInput.value;
     });
@@ -652,7 +722,7 @@ GOOGLE_DRIVE_FOLDER_ID=${folderId}
     startOauthFlowBtn.addEventListener('click', function() {
       const clientId = clientIdInput.value.trim();
       const clientSecret = clientSecretInput.value.trim();
-      const folderId = folderIdInput.value.trim();
+      const folderId = folderIdInput ? folderIdInput.value.trim() : '';
 
       if (!clientId) {
         showModal('error', 'Validation Error', 'Please enter your Client ID');
@@ -664,12 +734,12 @@ GOOGLE_DRIVE_FOLDER_ID=${folderId}
         return;
       }
 
-      // Don't require folder ID, make it optional
-
       // Save values to session storage for use after redirect
       sessionStorage.setItem('google_drive_client_id', clientId);
       sessionStorage.setItem('google_drive_client_secret', clientSecret);
-      if (folderId) {
+
+      // In admin mode store folder_id; in user mode the config is already set
+      if (!userMode && folderId) {
         sessionStorage.setItem('google_drive_folder_id', folderId);
       }
       sessionStorage.setItem('google_drive_use_oauth', 'true');
@@ -682,7 +752,7 @@ GOOGLE_DRIVE_FOLDER_ID=${folderId}
     });
   }
 
-  // Save service account settings button
+  // Save service account settings button (admin mode only)
   if (saveSaSettingsBtn) {
     saveSaSettingsBtn.addEventListener('click', function() {
       const folderId = saFolderIdInput.value.trim();
@@ -717,7 +787,7 @@ GOOGLE_DRIVE_FOLDER_ID=${folderId}
       .then(data => {
         if (data.status === 'success') {
           showModal('success', 'Settings Saved', 'Google Drive service account settings have been saved');
-          tokenStatus.classList.remove('hidden');
+          if (tokenStatus) tokenStatus.classList.remove('hidden');
 
           // Update environment variables display
           const saEnvVarsCode = document.querySelector('#sa-env-vars code');
@@ -740,7 +810,7 @@ GOOGLE_DRIVE_FOLDER_ID=${folderId}
     });
   }
 
-  // Test connection button
+  // Test connection button (admin mode only)
   if (testConnectionBtn) {
     testConnectionBtn.addEventListener('click', function() {
       const originalText = testConnectionBtn.textContent;
@@ -770,7 +840,7 @@ GOOGLE_DRIVE_FOLDER_ID=${folderId}
     });
   }
 
-  // Refresh token button
+  // Refresh token button (admin mode only)
   if (refreshTokenBtn) {
     refreshTokenBtn.addEventListener('click', function() {
       showModal('info', 'Confirm', 'This will start a new OAuth flow to obtain a fresh token. Continue?');
@@ -808,7 +878,7 @@ GOOGLE_DRIVE_FOLDER_ID=${folderId}
     });
   }
 
-  // Copy environment variables buttons
+  // Copy environment variables buttons (admin mode only)
   const copyOAuthEnvVarsBtn = document.getElementById('copy-oauth-env-vars');
   const copySAEnvVarsBtn = document.getElementById('copy-sa-env-vars');
 
diff --git a/frontend/templates/google_drive_callback.html b/frontend/templates/google_drive_callback.html
index cbe3841e..9f92db7b 100644
--- a/frontend/templates/google_drive_callback.html
+++ b/frontend/templates/google_drive_callback.html
@@ -200,11 +200,10 @@ document.addEventListener('DOMContentLoaded', function() {
             client_secret: clientSecret,
             refresh_token: data.refresh_token,
           };
-          const cfgUpdate = {};
-          if (folderId) cfgUpdate.folder_id = folderId;
 
+          // Only send credentials — the integration's config (folder_id, etc.)
+          // is already set and must not be overwritten here.
           const body = { credentials: creds };
-          if (Object.keys(cfgUpdate).length > 0) body.config = cfgUpdate;
 
           document.getElementById('processing-message').innerHTML =
             '<p>Saving credentials to your integration...</p>';
diff --git a/frontend/templates/integrations_dashboard.html b/frontend/templates/integrations_dashboard.html
index ea530404..eb1c2a16 100644
--- a/frontend/templates/integrations_dashboard.html
+++ b/frontend/templates/integrations_dashboard.html
@@ -206,14 +206,17 @@
               </div>
               <!-- Actions -->
               <div class="flex items-center gap-2 shrink-0">
-                <template x-if="isOAuthType(intg.integration_type) && !intg.has_credentials">
+                <template x-if="isOAuthType(intg)">
                   <a
-                    :href="oauthLink(intg.integration_type) + '?integration_id=' + intg.id"
-                    class="inline-flex items-center px-3 py-1.5 text-xs font-medium rounded border border-yellow-400 text-yellow-700 bg-yellow-50 hover:bg-yellow-100 focus:outline-none focus:ring-2 focus:ring-yellow-500"
+                    :href="oauthLink(intg) + '?integration_id=' + intg.id"
+                    :class="intg.has_credentials
+                      ? 'inline-flex items-center px-3 py-1.5 text-xs font-medium rounded border border-blue-300 text-blue-700 bg-blue-50 hover:bg-blue-100 focus:outline-none focus:ring-2 focus:ring-blue-500'
+                      : 'inline-flex items-center px-3 py-1.5 text-xs font-medium rounded border border-yellow-400 text-yellow-700 bg-yellow-50 hover:bg-yellow-100 focus:outline-none focus:ring-2 focus:ring-yellow-500'"
                     style="min-height:36px;"
-                    :aria-label="`Authorize ${intg.name}`"
+                    :aria-label="`${intg.has_credentials ? 'Re-authorize' : 'Authorize'} ${intg.name}`"
                   >
-                    <i class="fas fa-key mr-1" aria-hidden="true"></i>Authorize
+                    <i class="fas fa-key mr-1" aria-hidden="true"></i>
+                    <span x-text="intg.has_credentials ? 'Re-Authorize' : 'Authorize'"></span>
                   </a>
                 </template>
                 <button
@@ -289,14 +292,17 @@
               </div>
               <!-- Actions -->
               <div class="flex items-center gap-2 shrink-0">
-                <template x-if="isOAuthType(intg.integration_type) && !intg.has_credentials">
+                <template x-if="isOAuthType(intg)">
                   <a
-                    :href="oauthLink(intg.integration_type) + '?integration_id=' + intg.id"
-                    class="inline-flex items-center px-3 py-1.5 text-xs font-medium rounded border border-yellow-400 text-yellow-700 bg-yellow-50 hover:bg-yellow-100 focus:outline-none focus:ring-2 focus:ring-yellow-500"
+                    :href="oauthLink(intg) + '?integration_id=' + intg.id"
+                    :class="intg.has_credentials
+                      ? 'inline-flex items-center px-3 py-1.5 text-xs font-medium rounded border border-blue-300 text-blue-700 bg-blue-50 hover:bg-blue-100 focus:outline-none focus:ring-2 focus:ring-blue-500'
+                      : 'inline-flex items-center px-3 py-1.5 text-xs font-medium rounded border border-yellow-400 text-yellow-700 bg-yellow-50 hover:bg-yellow-100 focus:outline-none focus:ring-2 focus:ring-yellow-500'"
                     style="min-height:36px;"
-                    :aria-label="`Authorize ${intg.name}`"
+                    :aria-label="`${intg.has_credentials ? 'Re-authorize' : 'Authorize'} ${intg.name}`"
                   >
-                    <i class="fas fa-key mr-1" aria-hidden="true"></i>Authorize
+                    <i class="fas fa-key mr-1" aria-hidden="true"></i>
+                    <span x-text="intg.has_credentials ? 'Re-Authorize' : 'Authorize'"></span>
                   </a>
                 </template>
                 <button
@@ -1133,12 +1139,30 @@ function integrationsDashboard() {
     typeLabel(t) { return TYPE_LABELS[t] || t; },
     typeIcon(t) { return TYPE_ICONS[t] || 'fa-plug text-gray-400'; },
     hasFormFields(t) { return TYPES_WITH_FORM_FIELDS.has(t); },
-    isOAuthType(t) { return OAUTH_TYPES.has(t); },
+    isOAuthType(intg) {
+      // Direct OAuth types: DROPBOX, GOOGLE_DRIVE, ONEDRIVE
+      if (OAUTH_TYPES.has(intg.integration_type)) return true;
+      // WATCH_FOLDER with an OAuth-backed source type (dropbox, onedrive, google_drive)
+      if (intg.integration_type === 'WATCH_FOLDER') {
+        const cfg = intg.config || {};
+        const src = (cfg.source_type || '').toLowerCase();
+        return src === 'dropbox' || src === 'onedrive' || src === 'google_drive';
+      }
+      return false;
+    },
 
-    oauthLink(t) {
+    oauthLink(intg) {
+      const t = intg.integration_type;
       if (t === 'DROPBOX') return '/dropbox-setup';
       if (t === 'GOOGLE_DRIVE') return '/google-drive-setup';
       if (t === 'ONEDRIVE') return '/onedrive-setup';
+      if (t === 'WATCH_FOLDER') {
+        const cfg = intg.config || {};
+        const src = (cfg.source_type || '').toLowerCase();
+        if (src === 'dropbox') return '/dropbox-setup';
+        if (src === 'onedrive') return '/onedrive-setup';
+        if (src === 'google_drive') return '/google-drive-setup';
+      }
       return '#';
     },
 
diff --git a/frontend/templates/onedrive.html b/frontend/templates/onedrive.html
index 03a79afe..b088b972 100644
--- a/frontend/templates/onedrive.html
+++ b/frontend/templates/onedrive.html
@@ -4,6 +4,37 @@
 {% block content %}
 <div class="container mx-auto px-4 py-8">
   <div class="mb-8">
+    {% if user_mode %}
+    <!-- ── User-mode header ──────────────────────────────────────────── -->
+    <div class="mb-4">
+      <a href="/integrations" class="inline-flex items-center text-sm text-indigo-600 hover:text-indigo-800">
+        <i class="fas fa-arrow-left mr-1" aria-hidden="true"></i> Back to Integrations
+      </a>
+    </div>
+    <h1 class="text-3xl font-bold mb-2">
+      Connect OneDrive
+      {% if integration_name %}<span class="text-gray-500 text-2xl font-normal">— {{ integration_name }}</span>{% endif %}
+    </h1>
+    <p class="text-gray-600 mb-4">
+      Authorize DocuElevate to access your OneDrive account. Your credentials are stored securely in your personal integration record.
+    </p>
+    {% if is_configured %}
+    <div class="bg-green-50 border-l-4 border-green-500 text-green-700 p-4 my-4" role="alert">
+      <p class="font-semibold">✓ Already authorized</p>
+      <p class="text-sm mt-1">This integration already has credentials. You can re-authorize below to refresh or update them.
+      {% if folder_path %}<br><strong>Folder:</strong> {{ folder_path }}{% endif %}
+      </p>
+    </div>
+    {% else %}
+    <div class="bg-blue-50 border-l-4 border-blue-500 text-blue-700 p-4 my-4" role="alert">
+      <p class="font-semibold">Authorization required</p>
+      <p class="text-sm mt-1">Complete the wizard below to grant access to your OneDrive account.
+      {% if folder_path %}<br><strong>Target folder:</strong> {{ folder_path }}{% endif %}
+      </p>
+    </div>
+    {% endif %}
+    {% else %}
+    <!-- ── Admin-mode header ─────────────────────────────────────────── -->
     <h1 class="text-3xl font-bold mb-2">OneDrive Integration Setup</h1>
     <p class="text-gray-600 mb-4">
       Configure the Microsoft OneDrive integration for DocuElevate using our setup wizard.
@@ -37,6 +68,7 @@
         </div>
       </div>
     </div>
+    {% endif %}
   </div>
 
   <div class="bg-white shadow-md rounded-lg p-6 mb-8">
@@ -93,16 +125,18 @@
   </div>
 
   <div class="bg-white shadow-md rounded-lg p-6 mb-8">
-    <h2 class="text-2xl font-semibold mb-4">Complete Setup with Wizard</h2>
+    <h2 class="text-2xl font-semibold mb-4">
+      {% if user_mode %}OAuth Wizard{% else %}Complete Setup with Wizard{% endif %}
+    </h2>
 
     <div class="space-y-4">
       <div>
-        <label for="client-id" class="block text-sm font-medium text-gray-700">Client ID</label>
+        <label for="client-id" class="block text-sm font-medium text-gray-700">Client ID <span class="text-red-500" aria-hidden="true">*</span></label>
         <input type="text" id="client-id" class="mt-1 block w-full border border-gray-300 rounded-md shadow-sm py-2 px-3 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" placeholder="Enter your Azure AD application client ID" value="{{ client_id_value }}">
       </div>
 
       <div>
-        <label for="client-secret" class="block text-sm font-medium text-gray-700">Client Secret</label>
+        <label for="client-secret" class="block text-sm font-medium text-gray-700">Client Secret <span class="text-red-500" aria-hidden="true">*</span></label>
         <input type="password" id="client-secret" class="mt-1 block w-full border border-gray-300 rounded-md shadow-sm py-2 px-3 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" placeholder="Enter your Azure AD application client secret" value="{{ client_secret_value }}">
       </div>
 
@@ -112,11 +146,20 @@
         <p class="text-xs text-gray-500 mt-1">Use "common" for personal accounts or your organization's Tenant ID for corporate accounts</p>
       </div>
 
+      {% if not user_mode %}
       <div>
         <label for="folder-path" class="block text-sm font-medium text-gray-700">Folder Path (Optional)</label>
         <input type="text" id="folder-path" class="mt-1 block w-full border border-gray-300 rounded-md shadow-sm py-2 px-3 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" placeholder="Documents/Uploads" value="{{ folder_path }}">
         <p class="text-xs text-gray-500 mt-1">Enter the folder path where files should be uploaded (e.g., Documents/Uploads)</p>
       </div>
+      {% else %}
+      {% if folder_path %}
+      <div class="bg-gray-50 border border-gray-200 rounded-md px-3 py-2">
+        <p class="text-xs text-gray-500">Target folder (from integration settings)</p>
+        <p class="text-sm font-mono text-gray-700">{{ folder_path }}</p>
+      </div>
+      {% endif %}
+      {% endif %}
 
       <div>
         <button id="start-auth-flow" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
@@ -124,7 +167,8 @@
         </button>
       </div>
 
-      <!-- Token validation and status -->
+      <!-- Token validation and status (admin mode only) -->
+      {% if not user_mode %}
       <div id="token-status" class="mt-6 {{ 'hidden' if not is_configured else '' }}">
         <div class="rounded-md {{ 'bg-green-50' if is_configured else 'bg-yellow-50' }} p-4">
           <div class="flex">
@@ -160,7 +204,7 @@
           </button>
         </div>
 
-        <!-- Configuration for Worker Nodes section -->
+        <!-- Configuration for Worker Nodes section (admin only) -->
         <div class="mt-6 p-4 bg-gray-100 rounded-md">
           <h3 class="font-medium text-lg mb-2">Configuration for Worker Nodes</h3>
           <p class="text-sm text-gray-600 mb-3">
@@ -184,6 +228,7 @@ ONEDRIVE_FOLDER_PATH={{ folder_path|default('Documents/Uploads', true) }}</code>
           </p>
         </div>
       </div>
+      {% endif %}
     </div>
   </div>
 
@@ -205,9 +250,15 @@ ONEDRIVE_FOLDER_PATH={{ folder_path|default('Documents/Uploads', true) }}</code>
   </div>
 
   <div class="mt-8">
+    {% if user_mode %}
+    <a href="/integrations" class="inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md shadow-sm text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+      <i class="fas fa-arrow-left mr-2" aria-hidden="true"></i> Back to Integrations
+    </a>
+    {% else %}
     <a href="/status" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
       Back to Status
     </a>
+    {% endif %}
   </div>
 
   <!-- Result Modal -->
@@ -237,6 +288,8 @@ ONEDRIVE_FOLDER_PATH={{ folder_path|default('Documents/Uploads', true) }}</code>
 {% block scripts %}
 <script>
 document.addEventListener('DOMContentLoaded', function() {
+  const userMode = {{ 'true' if user_mode else 'false' }};
+
   // Store integration_id if provided (for per-user OAuth flow)
   const integrationId = "{{ integration_id or '' }}";
   if (integrationId) {
@@ -302,7 +355,6 @@ document.addEventListener('DOMContentLoaded', function() {
     const clientSecret = clientSecretInput.value.trim();
     const redirectUri = window.location.origin + "/onedrive-callback";
     const tenantId = document.getElementById('tenant-id').value.trim() || 'common';
-    const folderPath = document.getElementById('folder-path') ? document.getElementById('folder-path').value.trim() : '';
 
     if (!clientId) {
       showModal('error', 'Validation Error', 'Please enter your Client ID');
@@ -319,8 +371,12 @@ document.addEventListener('DOMContentLoaded', function() {
     sessionStorage.setItem('onedrive_client_secret', clientSecret);
     sessionStorage.setItem('onedrive_tenant_id', tenantId);
 
-    if (folderPath) {
-      sessionStorage.setItem('onedrive_folder_path', folderPath);
+    // In admin mode also store folder path; in user mode the config is already set
+    if (!userMode) {
+      const folderPathEl = document.getElementById('folder-path');
+      if (folderPathEl && folderPathEl.value.trim()) {
+        sessionStorage.setItem('onedrive_folder_path', folderPathEl.value.trim());
+      }
     }
 
     // Generate the authorization URL with .default scope
@@ -330,7 +386,7 @@ document.addEventListener('DOMContentLoaded', function() {
     window.location.href = authUrl;
   });
 
-  // Test Token button click
+  // Test Token button click (admin mode only)
   if (testTokenBtn) {
     testTokenBtn.addEventListener('click', function() {
       testTokenBtn.innerHTML = '<span class="animate-spin inline-block mr-2">⟳</span> Testing...';
@@ -367,7 +423,7 @@ document.addEventListener('DOMContentLoaded', function() {
     });
   }
 
-  // Refresh Token button click
+  // Refresh Token button click (admin mode only)
   if (refreshTokenBtn) {
     refreshTokenBtn.addEventListener('click', function() {
       showModal('info', 'Confirm', 'This will start a new authentication flow to obtain a fresh token from Microsoft. Continue?');
@@ -398,7 +454,7 @@ document.addEventListener('DOMContentLoaded', function() {
     });
   }
 
-  // Copy Environment Variables Button
+  // Copy Environment Variables Button (admin mode only)
   const copyEnvVarsBtn = document.getElementById('copy-env-vars');
   if (copyEnvVarsBtn) {
     copyEnvVarsBtn.addEventListener('click', function() {
@@ -437,14 +493,8 @@ document.addEventListener('DOMContentLoaded', function() {
     tenantIdInput.value = sessionStorage.getItem('onedrive_tenant_id');
   }
 
-  // Check for folder path in session storage
-  const folderPathInput = document.getElementById('folder-path');
-  if (folderPathInput && !folderPathInput.value && sessionStorage.getItem('onedrive_folder_path')) {
-    folderPathInput.value = sessionStorage.getItem('onedrive_folder_path');
-  }
-
-  // If token is not configured but we have a client ID, show the token status section
-  if (document.getElementById('client-id').value && !tokenStatus.classList.contains('hidden')) {
+  // If token is configured and we have a client ID, show the token status section (admin mode)
+  if (tokenStatus && document.getElementById('client-id').value && !tokenStatus.classList.contains('hidden')) {
     tokenStatus.classList.remove('hidden');
   }
 });
diff --git a/frontend/templates/onedrive_callback.html b/frontend/templates/onedrive_callback.html
index 42ae7ca0..bad44a57 100644
--- a/frontend/templates/onedrive_callback.html
+++ b/frontend/templates/onedrive_callback.html
@@ -149,11 +149,10 @@ document.addEventListener('DOMContentLoaded', function() {
             refresh_token: data.refresh_token,
             tenant_id: tenantId,
           };
-          const cfgUpdate = {};
-          if (folderPath) cfgUpdate.folder_path = folderPath;
 
+          // Only send credentials — the integration's config (folder_path, source_type, etc.)
+          // is already set and must not be overwritten here.
           const body = { credentials: creds };
-          if (Object.keys(cfgUpdate).length > 0) body.config = cfgUpdate;
 
           document.getElementById('processing-message').innerHTML =
             '<p>Saving credentials to your integration...</p>';

From 2d01e71afd1a5f86ca47bc326216bc73d94095fb Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 9 Mar 2026 18:32:04 +0000
Subject: [PATCH 3/5] test(views): add user-mode coverage tests and fix
 dashboard helper duplication

- Add tests for user-mode with invalid JSON config (covers exception handling path)
- Add tests for user-mode with valid config (verifies folder path pre-population)
- Extract _watchFolderOAuthSource() helper to reduce isOAuthType/oauthLink duplication

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
---
 .../templates/integrations_dashboard.html     | 27 +++++-----
 tests/test_views_dropbox.py                   | 49 +++++++++++++++++++
 tests/test_views_google_drive.py              | 47 ++++++++++++++++++
 tests/test_views_onedrive.py                  | 49 +++++++++++++++++++
 4 files changed, 158 insertions(+), 14 deletions(-)

diff --git a/frontend/templates/integrations_dashboard.html b/frontend/templates/integrations_dashboard.html
index eb1c2a16..a710b98c 100644
--- a/frontend/templates/integrations_dashboard.html
+++ b/frontend/templates/integrations_dashboard.html
@@ -1139,16 +1139,18 @@ function integrationsDashboard() {
     typeLabel(t) { return TYPE_LABELS[t] || t; },
     typeIcon(t) { return TYPE_ICONS[t] || 'fa-plug text-gray-400'; },
     hasFormFields(t) { return TYPES_WITH_FORM_FIELDS.has(t); },
+    _watchFolderOAuthSource(intg) {
+      if (intg.integration_type !== 'WATCH_FOLDER') return null;
+      const src = ((intg.config || {}).source_type || '').toLowerCase();
+      if (src === 'dropbox' || src === 'onedrive' || src === 'google_drive') return src;
+      return null;
+    },
+
     isOAuthType(intg) {
       // Direct OAuth types: DROPBOX, GOOGLE_DRIVE, ONEDRIVE
       if (OAUTH_TYPES.has(intg.integration_type)) return true;
-      // WATCH_FOLDER with an OAuth-backed source type (dropbox, onedrive, google_drive)
-      if (intg.integration_type === 'WATCH_FOLDER') {
-        const cfg = intg.config || {};
-        const src = (cfg.source_type || '').toLowerCase();
-        return src === 'dropbox' || src === 'onedrive' || src === 'google_drive';
-      }
-      return false;
+      // WATCH_FOLDER with an OAuth-backed source type
+      return this._watchFolderOAuthSource(intg) !== null;
     },
 
     oauthLink(intg) {
@@ -1156,13 +1158,10 @@ function integrationsDashboard() {
       if (t === 'DROPBOX') return '/dropbox-setup';
       if (t === 'GOOGLE_DRIVE') return '/google-drive-setup';
       if (t === 'ONEDRIVE') return '/onedrive-setup';
-      if (t === 'WATCH_FOLDER') {
-        const cfg = intg.config || {};
-        const src = (cfg.source_type || '').toLowerCase();
-        if (src === 'dropbox') return '/dropbox-setup';
-        if (src === 'onedrive') return '/onedrive-setup';
-        if (src === 'google_drive') return '/google-drive-setup';
-      }
+      const src = this._watchFolderOAuthSource(intg);
+      if (src === 'dropbox') return '/dropbox-setup';
+      if (src === 'onedrive') return '/onedrive-setup';
+      if (src === 'google_drive') return '/google-drive-setup';
       return '#';
     },
 
diff --git a/tests/test_views_dropbox.py b/tests/test_views_dropbox.py
index a93d3065..8f089cda 100644
--- a/tests/test_views_dropbox.py
+++ b/tests/test_views_dropbox.py
@@ -1,7 +1,12 @@
 """Tests for app/views/dropbox.py module."""
 
+import json
+from unittest.mock import patch
+
 import pytest
 
+from app.models import UserIntegration
+
 
 @pytest.mark.integration
 class TestDropboxViews:
@@ -44,3 +49,47 @@ class TestDropboxViews:
         assert "oauth_integration_id" in body  # The JS code is always present
         # But integration_id template var should be empty
         assert 'const integrationId = ""' in body
+
+    def test_dropbox_setup_user_mode_invalid_json_config(self, client, db_session):
+        """Test user-mode renders correctly when integration.config is invalid JSON."""
+        owner_id = "user_invalid_json@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="DESTINATION",
+            integration_type="DROPBOX",
+            name="My Dropbox (bad cfg)",
+            config="{INVALID JSON}",
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.dropbox.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/dropbox-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        # Should render user mode without errors despite the bad config
+        assert b"user_mode" not in response.content or b"Back to Integrations" in response.content
+
+    def test_dropbox_setup_user_mode_valid_config(self, client, db_session):
+        """Test user-mode correctly loads folder path from integration config."""
+        owner_id = "user_valid_cfg@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="DESTINATION",
+            integration_type="DROPBOX",
+            name="My Dropbox",
+            config=json.dumps({"folder": "/Documents/Uploads"}),
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.dropbox.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/dropbox-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        assert b"/Documents/Uploads" in response.content
+        assert b"Back to Integrations" in response.content
diff --git a/tests/test_views_google_drive.py b/tests/test_views_google_drive.py
index 397562d6..78c76321 100644
--- a/tests/test_views_google_drive.py
+++ b/tests/test_views_google_drive.py
@@ -1,10 +1,13 @@
 """Tests for app/views/google_drive.py module."""
 
+import json
 import urllib.parse
 from unittest.mock import patch
 
 import pytest
 
+from app.models import UserIntegration
+
 
 @pytest.mark.integration
 class TestGoogleDriveViews:
@@ -156,3 +159,47 @@ class TestGoogleDriveViews:
 
         response = client.get("/google-drive-setup")
         assert response.status_code == 200
+
+    def test_google_drive_setup_user_mode_invalid_json_config(self, client, db_session):
+        """Test user-mode renders correctly when integration.config is invalid JSON."""
+        owner_id = "user_gd_invalid_json@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="DESTINATION",
+            integration_type="GOOGLE_DRIVE",
+            name="My GDrive (bad cfg)",
+            config="{INVALID JSON}",
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.google_drive.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/google-drive-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        # Should render user mode without errors despite the bad config
+        assert b"Back to Integrations" in response.content
+
+    def test_google_drive_setup_user_mode_valid_config(self, client, db_session):
+        """Test user-mode correctly loads folder ID from integration config."""
+        owner_id = "user_gd_valid_cfg@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="DESTINATION",
+            integration_type="GOOGLE_DRIVE",
+            name="My Google Drive",
+            config=json.dumps({"folder_id": "1abc2def3ghi"}),
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.google_drive.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/google-drive-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        assert b"1abc2def3ghi" in response.content
+        assert b"Back to Integrations" in response.content
diff --git a/tests/test_views_onedrive.py b/tests/test_views_onedrive.py
index aa9fe116..3b8d4502 100644
--- a/tests/test_views_onedrive.py
+++ b/tests/test_views_onedrive.py
@@ -1,7 +1,12 @@
 """Tests for app/views/onedrive.py module."""
 
+import json
+from unittest.mock import patch
+
 import pytest
 
+from app.models import UserIntegration
+
 
 @pytest.mark.integration
 class TestOnedriveViews:
@@ -42,3 +47,47 @@ class TestOnedriveViews:
         body = response.text
         assert "oauth_integration_id" in body
         assert 'const integrationId = ""' in body
+
+    def test_onedrive_setup_user_mode_invalid_json_config(self, client, db_session):
+        """Test user-mode renders correctly when integration.config is invalid JSON."""
+        owner_id = "user_od_invalid_json@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="DESTINATION",
+            integration_type="ONEDRIVE",
+            name="My OneDrive (bad cfg)",
+            config="{INVALID JSON}",
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.onedrive.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/onedrive-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        # Should render user mode without errors despite the bad config
+        assert b"Back to Integrations" in response.content
+
+    def test_onedrive_setup_user_mode_valid_config(self, client, db_session):
+        """Test user-mode correctly loads folder path from integration config."""
+        owner_id = "user_od_valid_cfg@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="DESTINATION",
+            integration_type="ONEDRIVE",
+            name="My OneDrive",
+            config=json.dumps({"folder_path": "Documents/Archive"}),
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.onedrive.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/onedrive-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        assert b"Documents/Archive" in response.content
+        assert b"Back to Integrations" in response.content

From 0529ae53ff9367dc5390c1137896b2eea33ceb64 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 9 Mar 2026 20:19:19 +0000
Subject: [PATCH 4/5] fix: 100% coverage, WCAG accessibility fixes, and
 documentation updates for per-user OAuth wizards

Test coverage:
- Add config=None branch test for dropbox, onedrive, google_drive views (100% coverage)
- Add WATCH_FOLDER source-type test (folder_path vs folder key)
- Add integration-not-found fallback-to-admin-mode test

WCAG 2.1 AA fixes:
- Add aria-labelledby="modalTitle" to role="dialog" modals in setup templates
- Add aria-hidden="true" to decorative SVGs in callback templates
- Add role="status" aria-label="Loading" to spinner divs
- Add aria-live="polite" to processing-message and success/folder-selection regions
- Add role="alert" aria-live="assertive" to error containers
- Update "Return to Setup" link to preserve integration_id in user mode

Docs: update DropboxSetup.md, GoogleDriveSetup.md, OneDriveSetup.md with per-user OAuth flow section

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
---
 docs/DropboxSetup.md                          | 40 +++++++++-----
 docs/GoogleDriveSetup.md                      | 18 ++++++-
 docs/OneDriveSetup.md                         | 38 ++++++++-----
 frontend/templates/dropbox.html               |  2 +-
 frontend/templates/dropbox_callback.html      | 24 ++++++---
 frontend/templates/google_drive.html          |  2 +-
 frontend/templates/google_drive_callback.html | 30 +++++++----
 frontend/templates/onedrive.html              |  2 +-
 frontend/templates/onedrive_callback.html     | 24 ++++++---
 tests/test_views_dropbox.py                   | 53 ++++++++++++++++++-
 tests/test_views_google_drive.py              | 31 +++++++++++
 tests/test_views_onedrive.py                  | 53 +++++++++++++++++++
 12 files changed, 259 insertions(+), 58 deletions(-)

diff --git a/docs/DropboxSetup.md b/docs/DropboxSetup.md
index 37de4701..8923a595 100644
--- a/docs/DropboxSetup.md
+++ b/docs/DropboxSetup.md
@@ -15,23 +15,37 @@ For a complete list of configuration options, see the [Configuration Guide](Conf
 
 ## Setup Methods
 
-You can set up Dropbox integration in two ways:
+DocuElevate supports two distinct Dropbox OAuth flows:
 
-1. **Using the Built-in Setup Wizard (Recommended)**: An interactive setup experience available at `/dropbox-setup` in the web interface
-2. **Manual Setup**: Following the step-by-step instructions in this document
+1. **Per-User Integration Wizard (Recommended for end users)**: Triggered from the Integrations dashboard (`/integrations`) by clicking **Authorize** on a Dropbox destination or Dropbox-backed Watch Folder. Credentials are saved securely to your personal integration record — global settings are never exposed.
+2. **System-Level Setup Wizard**: Available at `/dropbox-setup` for administrators configuring the global system-wide Dropbox connection. Generates environment variables for all worker nodes.
+3. **Manual Setup**: Following the step-by-step instructions in this document.
 
-## Using the Setup Wizard
+## Per-User OAuth Flow (Integrations Dashboard)
 
-The easiest way to set up Dropbox integration is to use the built-in setup wizard:
+End users authorize their own Dropbox integration from the **Integrations** dashboard:
 
-1. Navigate to the `/dropbox-setup` page in your DocuElevate instance
-2. Follow the on-screen instructions to create a Dropbox app
-3. Enter your App Key and App Secret in the wizard
-4. Optionally specify a custom folder path for uploads
-5. Click "Start Authentication Flow" to begin the authorization process
-6. Complete the Dropbox authentication process
-7. The system will automatically exchange the authorization code for a refresh token
-8. Copy the generated environment variables for your worker nodes
+1. Navigate to `/integrations` and click **+ Add Destination** (or **+ Add Source** for Watch Folder).
+2. Create a Dropbox destination integration (or a Watch Folder with `source_type = dropbox`).
+3. Click the **Authorize** button next to the integration — it links directly to the OAuth wizard pre-loaded with your integration's configuration.
+4. Enter your Dropbox App Key and App Secret in the wizard (or use the global admin credentials if pre-configured).
+5. Click **Start Authentication Flow**, authorize access in Dropbox, and the refresh token is automatically saved to your personal integration record.
+6. The page redirects back to `/integrations` on success. Re-authorization is available at any time via the **Re-Authorize** button.
+
+> **Note:** Your credentials are stored encrypted per-integration and are never mixed with other users' data. Each user can have multiple Dropbox integrations with independent tokens.
+
+## Using the System-Level Setup Wizard (Admin)
+
+The easiest way to configure the global Dropbox integration is to use the built-in setup wizard:
+
+1. Navigate to the `/dropbox-setup` page in your DocuElevate instance.
+2. Follow the on-screen instructions to create a Dropbox app.
+3. Enter your App Key and App Secret in the wizard.
+4. Optionally specify a custom folder path for uploads.
+5. Click **Start Authentication Flow** to begin the authorization process.
+6. Complete the Dropbox authentication process.
+7. The system will automatically exchange the authorization code for a refresh token.
+8. Copy the generated environment variables for your worker nodes.
 
 The wizard handles all the token exchange steps and provides you with the exact configuration needed for your environment.
 
diff --git a/docs/GoogleDriveSetup.md b/docs/GoogleDriveSetup.md
index 73107077..e85addcc 100644
--- a/docs/GoogleDriveSetup.md
+++ b/docs/GoogleDriveSetup.md
@@ -16,14 +16,28 @@ This guide explains how to set up the Google Drive integration for DocuElevate.
 
 For a complete list of configuration options, see the [Configuration Guide](ConfigurationGuide.md).
 
-## Authentication Methods
+## Authentication Methods and Setup Flows
 
 DocuElevate supports two authentication methods for Google Drive:
 
 1. **OAuth Authentication (Recommended)** - User-based authentication that provides better security and control. Recommended for most deployments.
 2. **Service Account Authentication** - Server-to-server authentication that doesn't require user interaction. Useful for specific enterprise deployments.
 
-## Method 1: OAuth Authentication Setup (Recommended)
+### Per-User OAuth Flow (Integrations Dashboard)
+
+End users can authorize their own Google Drive integration directly from the **Integrations** dashboard — no admin involvement required:
+
+1. Navigate to `/integrations` and click **+ Add Destination** (or **+ Add Source** for Watch Folder).
+2. Create a Google Drive destination integration (or a Watch Folder with `source_type = google_drive`).
+3. Click the **Authorize** button — it opens the OAuth wizard pre-loaded with your integration's configuration.
+4. Enter your Google OAuth Client ID and Client Secret in the wizard.
+5. Click **Start Authentication Flow** and authorize access in Google.
+6. Credentials are saved automatically to your personal integration record; the page redirects back to `/integrations`.
+7. Re-authorization is available at any time via the **Re-Authorize** button.
+
+> **Note:** Credentials are stored encrypted per-integration. Each user can hold multiple Google Drive integrations with independent tokens targeting different folders or accounts.
+
+## Method 1: OAuth Authentication Setup (System-Level)
 
 The OAuth method is preferred as it:
 - Provides better security with token expiration and refresh
diff --git a/docs/OneDriveSetup.md b/docs/OneDriveSetup.md
index 035fb61e..e9a555f4 100644
--- a/docs/OneDriveSetup.md
+++ b/docs/OneDriveSetup.md
@@ -16,22 +16,36 @@ For a complete list of configuration options, see the [Configuration Guide](Conf
 
 ## Setup Methods
 
-You can set up OneDrive integration in two ways:
+DocuElevate supports two distinct OneDrive OAuth flows:
 
-1. **Using the Auth Wizard (Recommended)**: An interactive setup experience available at `/onedrive-setup` in the web interface
-2. **Manual Setup**: Following the step-by-step instructions in this document
+1. **Per-User Integration Wizard (Recommended for end users)**: Triggered from the Integrations dashboard (`/integrations`) by clicking **Authorize** on a OneDrive destination or OneDrive-backed Watch Folder. Credentials are saved securely to your personal integration record.
+2. **System-Level Setup Wizard**: Available at `/onedrive-setup` for administrators configuring the global system-wide OneDrive connection.
+3. **Manual Setup**: Following the step-by-step instructions in this document.
 
-## Using the Auth Wizard
+## Per-User OAuth Flow (Integrations Dashboard)
 
-The easiest way to set up OneDrive integration is to use the built-in auth wizard:
+End users authorize their own OneDrive integration from the **Integrations** dashboard:
 
-1. Register an application in Azure AD (see steps below)
-2. Navigate to the OneDrive Setup page at `/onedrive-setup`
-3. Enter your Client ID and other required information
-4. Click "Start Authentication Flow"
-5. Complete the Microsoft authentication process
-6. The system will automatically exchange the authorization code for a refresh token
-7. Copy the generated environment variables for your worker nodes
+1. Navigate to `/integrations` and click **+ Add Destination** (or **+ Add Source** for Watch Folder).
+2. Create a OneDrive destination integration (or a Watch Folder with `source_type = onedrive`).
+3. Click the **Authorize** button next to the integration — it links directly to the OAuth wizard pre-loaded with your integration's configuration.
+4. Enter your Azure AD Client ID and Client Secret in the wizard.
+5. Click **Start Authentication Flow**, authorize access via Microsoft, and the refresh token is automatically saved to your personal integration record.
+6. The page redirects back to `/integrations` on success. Re-authorization is available at any time via the **Re-Authorize** button.
+
+> **Note:** Your credentials are stored encrypted per-integration and are never mixed with other users' data. Each user can have multiple OneDrive integrations with independent tokens.
+
+## Using the System-Level Auth Wizard (Admin)
+
+The easiest way to configure the global OneDrive integration is to use the built-in auth wizard:
+
+1. Register an application in Azure AD (see steps below).
+2. Navigate to the OneDrive Setup page at `/onedrive-setup`.
+3. Enter your Client ID and other required information.
+4. Click **Start Authentication Flow**.
+5. Complete the Microsoft authentication process.
+6. The system will automatically exchange the authorization code for a refresh token.
+7. Copy the generated environment variables for your worker nodes.
 
 The auth wizard handles all the token exchange steps and provides you with the exact configuration needed for your environment.
 
diff --git a/frontend/templates/dropbox.html b/frontend/templates/dropbox.html
index fb8fb469..a94a5b96 100644
--- a/frontend/templates/dropbox.html
+++ b/frontend/templates/dropbox.html
@@ -241,7 +241,7 @@ DROPBOX_FOLDER={{ folder_path|default('/Documents/Uploads', true) }}</code></pre
   </div>
 
   <!-- Result Modal -->
-  <div id="resultModal" class="fixed inset-0 bg-gray-600 bg-opacity-50 hidden overflow-y-auto h-full w-full z-50" aria-modal="true" role="dialog">
+  <div id="resultModal" class="fixed inset-0 bg-gray-600 bg-opacity-50 hidden overflow-y-auto h-full w-full z-50" aria-modal="true" role="dialog" aria-labelledby="modalTitle">
     <div class="relative top-20 mx-auto p-5 border w-11/12 md:w-1/2 lg:w-1/3 shadow-lg rounded-md bg-white">
       <div class="mt-3 text-center">
         <div id="modalIcon" class="mx-auto flex items-center justify-center h-12 w-12 rounded-full bg-green-100 mb-4">
diff --git a/frontend/templates/dropbox_callback.html b/frontend/templates/dropbox_callback.html
index 7d9f0e1e..fd7b0f31 100644
--- a/frontend/templates/dropbox_callback.html
+++ b/frontend/templates/dropbox_callback.html
@@ -5,7 +5,7 @@
 <div class="container mx-auto px-4 py-8">
   <div class="bg-white shadow-md rounded-lg p-6">
     <div class="text-center mb-6">
-      <svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-blue-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+      <svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-blue-500" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
       </svg>
       <h2 class="text-2xl font-bold mt-4">Processing Authorization</h2>
@@ -13,18 +13,18 @@
     </div>
 
     <div class="flex justify-center my-6">
-      <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500"></div>
+      <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500" role="status" aria-label="Loading"></div>
     </div>
 
-    <div id="processing-message" class="text-center text-gray-700">
+    <div id="processing-message" class="text-center text-gray-700" aria-live="polite">
       <p>Exchanging authorization code for refresh token...</p>
     </div>
 
-    <div id="error-container" class="hidden mt-6">
+    <div id="error-container" class="hidden mt-6" role="alert" aria-live="assertive">
       <div class="bg-red-50 border-l-4 border-red-400 p-4">
         <div class="flex">
           <div class="flex-shrink-0">
-            <svg class="h-5 w-5 text-red-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="h-5 w-5 text-red-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
               <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" />
             </svg>
           </div>
@@ -37,17 +37,17 @@
         </div>
       </div>
       <div class="mt-4">
-        <a href="/dropbox-setup" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+        <a id="return-to-setup-link" href="/dropbox-setup" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
           Return to Setup
         </a>
       </div>
     </div>
 
-    <div id="success-container" class="hidden mt-6">
+    <div id="success-container" class="hidden mt-6" aria-live="polite">
       <div class="rounded-md bg-green-50 p-4">
         <div class="flex">
           <div class="flex-shrink-0">
-            <svg class="h-5 w-5 text-green-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="h-5 w-5 text-green-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
               <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
             </svg>
           </div>
@@ -99,6 +99,14 @@ document.addEventListener('DOMContentLoaded', function() {
   const folderPath = sessionStorage.getItem('dropbox_folder_path') || "{{ folder_path }}" || '/Documents/Uploads';
   const integrationId = sessionStorage.getItem('oauth_integration_id');
 
+  // In user mode, point the "Return to Setup" link back to the wizard with integration_id
+  if (integrationId) {
+    const returnLink = document.getElementById('return-to-setup-link');
+    if (returnLink) {
+      returnLink.href = `/dropbox-setup?integration_id=${encodeURIComponent(integrationId)}`;
+    }
+  }
+
   const redirectUri = window.location.origin + "/dropbox-callback";
 
   // Automatically exchange the code for a refresh token
diff --git a/frontend/templates/google_drive.html b/frontend/templates/google_drive.html
index ff0fc18e..7c8d5c9d 100644
--- a/frontend/templates/google_drive.html
+++ b/frontend/templates/google_drive.html
@@ -404,7 +404,7 @@ GOOGLE_DRIVE_FOLDER_ID={{ folder_id|default('YOUR_FOLDER_ID', true) }}
   </div>
 
   <!-- Result Modal -->
-  <div id="resultModal" class="fixed inset-0 bg-gray-600 bg-opacity-50 hidden overflow-y-auto h-full w-full z-50" aria-modal="true" role="dialog">
+  <div id="resultModal" class="fixed inset-0 bg-gray-600 bg-opacity-50 hidden overflow-y-auto h-full w-full z-50" aria-modal="true" role="dialog" aria-labelledby="modalTitle">
     <div class="relative top-20 mx-auto p-5 border w-11/12 md:w-1/2 lg:w-1/3 shadow-lg rounded-md bg-white">
       <div class="mt-3 text-center">
         <div id="modalIcon" class="mx-auto flex items-center justify-center h-12 w-12 rounded-full bg-green-100 mb-4">
diff --git a/frontend/templates/google_drive_callback.html b/frontend/templates/google_drive_callback.html
index 9f92db7b..95e4ec97 100644
--- a/frontend/templates/google_drive_callback.html
+++ b/frontend/templates/google_drive_callback.html
@@ -5,7 +5,7 @@
 <div class="container mx-auto px-4 py-8">
   <div class="bg-white shadow-md rounded-lg p-6">
     <div class="text-center mb-6">
-      <svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-blue-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+      <svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-blue-500" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
       </svg>
       <h2 class="text-2xl font-bold mt-4">Processing Authorization</h2>
@@ -13,18 +13,18 @@
     </div>
 
     <div class="flex justify-center my-6">
-      <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500"></div>
+      <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500" role="status" aria-label="Loading"></div>
     </div>
 
-    <div id="processing-message" class="text-center text-gray-700">
+    <div id="processing-message" class="text-center text-gray-700" aria-live="polite">
       <p>Exchanging authorization code for refresh token...</p>
     </div>
 
-    <div id="error-container" class="hidden mt-6">
+    <div id="error-container" class="hidden mt-6" role="alert" aria-live="assertive">
       <div class="bg-red-50 border-l-4 border-red-400 p-4">
         <div class="flex">
           <div class="flex-shrink-0">
-            <svg class="h-5 w-5 text-red-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="h-5 w-5 text-red-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
               <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" />
             </svg>
           </div>
@@ -37,17 +37,17 @@
         </div>
       </div>
       <div class="mt-4">
-        <a href="/google-drive-setup" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+        <a id="return-to-setup-link" href="/google-drive-setup" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
           Return to Setup
         </a>
       </div>
     </div>
 
-    <div id="folder-selection-container" class="hidden mt-6">
+    <div id="folder-selection-container" class="hidden mt-6" aria-live="polite">
       <div class="rounded-md bg-blue-50 p-4 mb-6">
         <div class="flex">
           <div class="flex-shrink-0">
-            <svg class="h-5 w-5 text-blue-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="h-5 w-5 text-blue-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
               <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd" />
             </svg>
           </div>
@@ -65,7 +65,7 @@
           <div class="mt-1 flex rounded-md shadow-sm">
             <input type="text" id="folder-id-input" class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-md sm:text-sm border-gray-300" placeholder="Enter Google Drive folder ID">
             <button id="folder-select-picker-btn" type="button" class="ml-3 inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
-              <svg class="h-4 w-4 mr-1 text-white-100" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+              <svg class="h-4 w-4 mr-1 text-white-100" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
                 <path fill-rule="evenodd" d="M2 6a2 2 0 012-2h4l2 2h4a2 2 0 012 2v1H8a3 3 0 00-3 3v1.5a1.5 1.5 0 01-3 0V6z" clip-rule="evenodd" />
               </svg>
               Select Folder
@@ -84,11 +84,11 @@
       </div>
     </div>
 
-    <div id="success-container" class="hidden mt-6">
+    <div id="success-container" class="hidden mt-6" aria-live="polite">
       <div class="rounded-md bg-green-50 p-4">
         <div class="flex">
           <div class="flex-shrink-0">
-            <svg class="h-5 w-5 text-green-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="h-5 w-5 text-green-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
               <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
             </svg>
           </div>
@@ -140,6 +140,14 @@ document.addEventListener('DOMContentLoaded', function() {
   const folderId = sessionStorage.getItem('google_drive_folder_id');
   const integrationId = sessionStorage.getItem('oauth_integration_id');
 
+  // In user mode, point the "Return to Setup" link back to the wizard with integration_id
+  if (integrationId) {
+    const returnLink = document.getElementById('return-to-setup-link');
+    if (returnLink) {
+      returnLink.href = `/google-drive-setup?integration_id=${encodeURIComponent(integrationId)}`;
+    }
+  }
+
   const redirectUri = window.location.origin + "/google-drive-callback";
 
   let accessToken = null;
diff --git a/frontend/templates/onedrive.html b/frontend/templates/onedrive.html
index b088b972..b12ae1ec 100644
--- a/frontend/templates/onedrive.html
+++ b/frontend/templates/onedrive.html
@@ -262,7 +262,7 @@ ONEDRIVE_FOLDER_PATH={{ folder_path|default('Documents/Uploads', true) }}</code>
   </div>
 
   <!-- Result Modal -->
-  <div id="resultModal" class="fixed inset-0 bg-gray-600 bg-opacity-50 hidden overflow-y-auto h-full w-full z-50" aria-modal="true" role="dialog">
+  <div id="resultModal" class="fixed inset-0 bg-gray-600 bg-opacity-50 hidden overflow-y-auto h-full w-full z-50" aria-modal="true" role="dialog" aria-labelledby="modalTitle">
     <div class="relative top-20 mx-auto p-5 border w-11/12 md:w-1/2 lg:w-1/3 shadow-lg rounded-md bg-white">
       <div class="mt-3 text-center">
         <div id="modalIcon" class="mx-auto flex items-center justify-center h-12 w-12 rounded-full bg-green-100 mb-4">
diff --git a/frontend/templates/onedrive_callback.html b/frontend/templates/onedrive_callback.html
index bad44a57..3eece4e9 100644
--- a/frontend/templates/onedrive_callback.html
+++ b/frontend/templates/onedrive_callback.html
@@ -5,7 +5,7 @@
 <div class="container mx-auto px-4 py-8">
   <div class="bg-white shadow-md rounded-lg p-6">
     <div class="text-center mb-6">
-      <svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-blue-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+      <svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-blue-500" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
       </svg>
       <h2 class="text-2xl font-bold mt-4">Processing Authorization</h2>
@@ -13,18 +13,18 @@
     </div>
 
     <div class="flex justify-center my-6">
-      <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500"></div>
+      <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500" role="status" aria-label="Loading"></div>
     </div>
 
-    <div id="processing-message" class="text-center text-gray-700">
+    <div id="processing-message" class="text-center text-gray-700" aria-live="polite">
       <p>Exchanging authorization code for refresh token...</p>
     </div>
 
-    <div id="error-container" class="hidden mt-6">
+    <div id="error-container" class="hidden mt-6" role="alert" aria-live="assertive">
       <div class="bg-red-50 border-l-4 border-red-400 p-4">
         <div class="flex">
           <div class="flex-shrink-0">
-            <svg class="h-5 w-5 text-red-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="h-5 w-5 text-red-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
               <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" />
             </svg>
           </div>
@@ -37,17 +37,17 @@
         </div>
       </div>
       <div class="mt-4">
-        <a href="/onedrive-setup" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+        <a id="return-to-setup-link" href="/onedrive-setup" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
           Return to Setup
         </a>
       </div>
     </div>
 
-    <div id="success-container" class="hidden mt-6">
+    <div id="success-container" class="hidden mt-6" aria-live="polite">
       <div class="rounded-md bg-green-50 p-4">
         <div class="flex">
           <div class="flex-shrink-0">
-            <svg class="h-5 w-5 text-green-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="h-5 w-5 text-green-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
               <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
             </svg>
           </div>
@@ -100,6 +100,14 @@ document.addEventListener('DOMContentLoaded', function() {
   const folderPath = sessionStorage.getItem('onedrive_folder_path') || "";
   const integrationId = sessionStorage.getItem('oauth_integration_id');
 
+  // In user mode, point the "Return to Setup" link back to the wizard with integration_id
+  if (integrationId) {
+    const returnLink = document.getElementById('return-to-setup-link');
+    if (returnLink) {
+      returnLink.href = `/onedrive-setup?integration_id=${encodeURIComponent(integrationId)}`;
+    }
+  }
+
   const redirectUri = window.location.origin + "/onedrive-callback";
 
   // Automatically exchange the code for a refresh token
diff --git a/tests/test_views_dropbox.py b/tests/test_views_dropbox.py
index 8f089cda..d42b9304 100644
--- a/tests/test_views_dropbox.py
+++ b/tests/test_views_dropbox.py
@@ -72,7 +72,58 @@ class TestDropboxViews:
         # Should render user mode without errors despite the bad config
         assert b"user_mode" not in response.content or b"Back to Integrations" in response.content
 
-    def test_dropbox_setup_user_mode_valid_config(self, client, db_session):
+    def test_dropbox_setup_user_mode_none_config(self, client, db_session):
+        """Test user-mode renders correctly when integration.config is None (no folder path)."""
+        owner_id = "user_none_cfg@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="DESTINATION",
+            integration_type="DROPBOX",
+            name="My Dropbox (no cfg)",
+            config=None,
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.dropbox.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/dropbox-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        # Should render user mode without errors, with empty folder_path
+        assert b"Back to Integrations" in response.content
+
+    def test_dropbox_setup_user_mode_watchfolder_config(self, client, db_session):
+        """Test user-mode correctly loads folder_path from WATCH_FOLDER source config."""
+        owner_id = "user_wf_cfg@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="SOURCE",
+            integration_type="WATCH_FOLDER",
+            name="My Dropbox Watch",
+            config=json.dumps({"source_type": "dropbox", "folder_path": "/Inbox"}),
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.dropbox.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/dropbox-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        assert b"/Inbox" in response.content
+        assert b"Back to Integrations" in response.content
+
+    def test_dropbox_setup_user_mode_integration_not_found(self, client, db_session):
+        """Test user-mode falls back to admin mode when integration not owned by user."""
+        with patch("app.views.dropbox.get_current_owner_id", return_value="other_user@example.com"):
+            response = client.get("/dropbox-setup?integration_id=999999")
+
+        assert response.status_code == 200
+        # Falls back to admin mode (no "Back to Integrations" link)
+        assert b"Dropbox Integration Setup" in response.content
         """Test user-mode correctly loads folder path from integration config."""
         owner_id = "user_valid_cfg@example.com"
         integration = UserIntegration(
diff --git a/tests/test_views_google_drive.py b/tests/test_views_google_drive.py
index 78c76321..2e3759d7 100644
--- a/tests/test_views_google_drive.py
+++ b/tests/test_views_google_drive.py
@@ -182,6 +182,37 @@ class TestGoogleDriveViews:
         # Should render user mode without errors despite the bad config
         assert b"Back to Integrations" in response.content
 
+    def test_google_drive_setup_user_mode_none_config(self, client, db_session):
+        """Test user-mode renders correctly when integration.config is None (no folder ID)."""
+        owner_id = "user_gd_none_cfg@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="DESTINATION",
+            integration_type="GOOGLE_DRIVE",
+            name="My GDrive (no cfg)",
+            config=None,
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.google_drive.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/google-drive-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        # Should render user mode without errors, with empty folder_id
+        assert b"Back to Integrations" in response.content
+
+    def test_google_drive_setup_user_mode_integration_not_found(self, client, db_session):
+        """Test user-mode falls back to admin mode when integration not owned by user."""
+        with patch("app.views.google_drive.get_current_owner_id", return_value="other_user@example.com"):
+            response = client.get("/google-drive-setup?integration_id=999999")
+
+        assert response.status_code == 200
+        # Falls back to admin mode (no "Back to Integrations" link)
+        assert b"Google Drive Integration Setup" in response.content
+
     def test_google_drive_setup_user_mode_valid_config(self, client, db_session):
         """Test user-mode correctly loads folder ID from integration config."""
         owner_id = "user_gd_valid_cfg@example.com"
diff --git a/tests/test_views_onedrive.py b/tests/test_views_onedrive.py
index 3b8d4502..fb08c6eb 100644
--- a/tests/test_views_onedrive.py
+++ b/tests/test_views_onedrive.py
@@ -70,6 +70,59 @@ class TestOnedriveViews:
         # Should render user mode without errors despite the bad config
         assert b"Back to Integrations" in response.content
 
+    def test_onedrive_setup_user_mode_none_config(self, client, db_session):
+        """Test user-mode renders correctly when integration.config is None (no folder path)."""
+        owner_id = "user_od_none_cfg@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="DESTINATION",
+            integration_type="ONEDRIVE",
+            name="My OneDrive (no cfg)",
+            config=None,
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.onedrive.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/onedrive-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        # Should render user mode without errors, with empty folder_path
+        assert b"Back to Integrations" in response.content
+
+    def test_onedrive_setup_user_mode_watchfolder_config(self, client, db_session):
+        """Test user-mode correctly loads folder_path from WATCH_FOLDER source config."""
+        owner_id = "user_od_wf_cfg@example.com"
+        integration = UserIntegration(
+            owner_id=owner_id,
+            direction="SOURCE",
+            integration_type="WATCH_FOLDER",
+            name="My OneDrive Watch",
+            config=json.dumps({"source_type": "onedrive", "folder_path": "Work/Inbox"}),
+            is_active=True,
+        )
+        db_session.add(integration)
+        db_session.commit()
+        db_session.refresh(integration)
+
+        with patch("app.views.onedrive.get_current_owner_id", return_value=owner_id):
+            response = client.get(f"/onedrive-setup?integration_id={integration.id}")
+
+        assert response.status_code == 200
+        assert b"Work/Inbox" in response.content
+        assert b"Back to Integrations" in response.content
+
+    def test_onedrive_setup_user_mode_integration_not_found(self, client, db_session):
+        """Test user-mode falls back to admin mode when integration not owned by user."""
+        with patch("app.views.onedrive.get_current_owner_id", return_value="other_user@example.com"):
+            response = client.get("/onedrive-setup?integration_id=999999")
+
+        assert response.status_code == 200
+        # Falls back to admin mode (no "Back to Integrations" link)
+        assert b"OneDrive Integration Setup" in response.content
+
     def test_onedrive_setup_user_mode_valid_config(self, client, db_session):
         """Test user-mode correctly loads folder path from integration config."""
         owner_id = "user_od_valid_cfg@example.com"

From 256d9cb674429bd7beebacd320d4701dafec6831 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 9 Mar 2026 21:46:38 +0000
Subject: [PATCH 5/5] fix(templates): remove orphan </div> in google_drive.html
 causing HTML accessibility lint failure

The extra </div> at line 260 (before the {% endif %} closing the admin
auth-method block) was introduced when the per-user OAuth wizard PR
restructured the admin section. Removing it balances the div tree so
that the outer container div is properly closed by line 427.

djlint frontend/templates/ --lint now reports 0 errors across 58 files.

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
---
 frontend/templates/google_drive.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/templates/google_drive.html b/frontend/templates/google_drive.html
index 7c8d5c9d..10a9aca9 100644
--- a/frontend/templates/google_drive.html
+++ b/frontend/templates/google_drive.html
@@ -257,7 +257,6 @@
     </div>
   </div>
 
-  </div>
   {% endif %}{# end if not user_mode for admin auth-method block #}
 
   <!-- ── User-mode OAuth wizard ────────────────────────────────────────── -->