From dd3002d2c85302a8d75bb3f5c253dffc9ce98cad Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:17:53 +0000
Subject: [PATCH 1/4] Initial plan


From ba387b8e8bdf8f8732ae237397083072d280977e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:21:52 +0000
Subject: [PATCH 2/4] fix(ui): correct OAuth setup page links in integrations
 dashboard

The oauthLink() function in integrations_dashboard.html returned
/dropbox, /google-drive, /onedrive which are not valid routes
(404). The actual view routes are /dropbox-setup,
/google-drive-setup, /onedrive-setup.

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
---
 frontend/templates/integrations_dashboard.html |  6 +++---
 tests/test_views_integrations.py               | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/frontend/templates/integrations_dashboard.html b/frontend/templates/integrations_dashboard.html
index 434ba630..48a86a98 100644
--- a/frontend/templates/integrations_dashboard.html
+++ b/frontend/templates/integrations_dashboard.html
@@ -840,9 +840,9 @@ function integrationsDashboard() {
     hasFormFields(t) { return TYPES_WITH_FORM_FIELDS.has(t); },
 
     oauthLink(t) {
-      if (t === 'DROPBOX') return '/dropbox';
-      if (t === 'GOOGLE_DRIVE') return '/google-drive';
-      if (t === 'ONEDRIVE') return '/onedrive';
+      if (t === 'DROPBOX') return '/dropbox-setup';
+      if (t === 'GOOGLE_DRIVE') return '/google-drive-setup';
+      if (t === 'ONEDRIVE') return '/onedrive-setup';
       return '#';
     },
 
diff --git a/tests/test_views_integrations.py b/tests/test_views_integrations.py
index 1869ca1d..1bd71f17 100644
--- a/tests/test_views_integrations.py
+++ b/tests/test_views_integrations.py
@@ -63,6 +63,19 @@ class TestIntegrationsDashboardView:
         assert response.status_code == 200
         assert b"integrationsDashboard" in response.content
 
+    def test_integrations_page_oauth_links_point_to_setup_pages(self, client):
+        """oauthLink() must reference the correct -setup URLs, not bare paths."""
+        response = client.get("/integrations")
+        assert response.status_code == 200
+        body = response.text
+        assert "'/dropbox-setup'" in body or '"/dropbox-setup"' in body
+        assert "'/google-drive-setup'" in body or '"/google-drive-setup"' in body
+        assert "'/onedrive-setup'" in body or '"/onedrive-setup"' in body
+        # Ensure the old broken paths are gone
+        assert "return '/dropbox'" not in body.replace("/dropbox-setup", "")
+        assert "return '/google-drive'" not in body.replace("/google-drive-setup", "")
+        assert "return '/onedrive'" not in body.replace("/onedrive-setup", "")
+
     def test_integrations_page_contains_quota_indicators(self, client):
         """GET /integrations page includes quota labels."""
         response = client.get("/integrations")

From 73119e0cef6a50e23784267e8d68ec965a5bc70d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:40:25 +0000
Subject: [PATCH 3/4] feat(auth): save OAuth credentials per-user to
 UserIntegration records

- Add 'Authorize' button to integration cards for OAuth types without credentials
- Add isOAuthType() helper and update info box in create/edit modal
- Accept integration_id query param in Dropbox, Google Drive, OneDrive setup views
- Store integration_id in sessionStorage on setup pages
- Add per-user flow in OAuth callbacks: PUT credentials to /api/integrations/{id}
- Preserve existing global flow as fallback when no integration_id is present

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 app/views/dropbox.py                          |  5 +-
 app/views/google_drive.py                     |  5 +-
 app/views/onedrive.py                         |  5 +-
 frontend/templates/dropbox.html               |  6 +++
 frontend/templates/dropbox_callback.html      | 46 +++++++++++++++++-
 frontend/templates/google_drive.html          |  6 +++
 frontend/templates/google_drive_callback.html | 47 +++++++++++++++++-
 .../templates/integrations_dashboard.html     | 27 +++++++++--
 frontend/templates/onedrive.html              |  6 +++
 frontend/templates/onedrive_callback.html     | 48 ++++++++++++++++++-
 10 files changed, 189 insertions(+), 12 deletions(-)

diff --git a/app/views/dropbox.py b/app/views/dropbox.py
index 62a281ea..e6698f6f 100644
--- a/app/views/dropbox.py
+++ b/app/views/dropbox.py
@@ -2,7 +2,7 @@
 Dropbox integration views for setup and OAuth callback.
 """
 
-from fastapi import Request
+from fastapi import Query, Request
 
 from app.views.base import APIRouter, require_login, settings, templates
 
@@ -11,7 +11,7 @@ router = APIRouter()
 
 @router.get("/dropbox-setup")
 @require_login
-async def dropbox_setup_page(request: Request):
+async def dropbox_setup_page(request: Request, integration_id: int | None = Query(None)):
     """
     Setup page for the Dropbox integration.
     Shows configuration status and setup instructions.
@@ -28,6 +28,7 @@ async def dropbox_setup_page(request: Request):
             "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
+            "integration_id": integration_id,
         },
     )
 
diff --git a/app/views/google_drive.py b/app/views/google_drive.py
index 4b67af5f..e6da1f65 100644
--- a/app/views/google_drive.py
+++ b/app/views/google_drive.py
@@ -4,7 +4,7 @@ Google Drive integration views for setup and OAuth callback.
 
 import urllib.parse
 
-from fastapi import Request
+from fastapi import Query, Request
 from fastapi.responses import RedirectResponse
 
 from app.views.base import APIRouter, require_login, settings, templates
@@ -14,7 +14,7 @@ router = APIRouter()
 
 @router.get("/google-drive-setup")
 @require_login
-async def google_drive_setup_page(request: Request):
+async def google_drive_setup_page(request: Request, integration_id: int | None = Query(None)):
     """
     Setup page for the Google Drive integration.
     Shows configuration status and setup instructions.
@@ -55,6 +55,7 @@ async def google_drive_setup_page(request: Request):
             "refresh_token_value": settings.google_drive_refresh_token or "",
             "folder_id": settings.google_drive_folder_id or "",
             "has_credentials_json": bool(settings.google_drive_credentials_json),
+            "integration_id": integration_id,
         },
     )
 
diff --git a/app/views/onedrive.py b/app/views/onedrive.py
index eb20f537..a721c376 100644
--- a/app/views/onedrive.py
+++ b/app/views/onedrive.py
@@ -2,7 +2,7 @@
 OneDrive integration views for setup and OAuth callback.
 """
 
-from fastapi import Request
+from fastapi import Query, Request
 
 from app.views.base import APIRouter, require_login, settings, templates
 
@@ -11,7 +11,7 @@ router = APIRouter()
 
 @router.get("/onedrive-setup")
 @require_login
-async def onedrive_setup_page(request: Request):
+async def onedrive_setup_page(request: Request, integration_id: int | None = Query(None)):
     """
     Setup page for the OneDrive integration.
     Shows configuration status and setup instructions.
@@ -35,6 +35,7 @@ async def onedrive_setup_page(request: Request):
             "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
+            "integration_id": integration_id,
         },
     )
 
diff --git a/frontend/templates/dropbox.html b/frontend/templates/dropbox.html
index ae9165b8..6c59b9e9 100644
--- a/frontend/templates/dropbox.html
+++ b/frontend/templates/dropbox.html
@@ -216,6 +216,12 @@ DROPBOX_FOLDER={{ folder_path|default('/Documents/Uploads', true) }}</code></pre
 {% block scripts %}
 <script>
 document.addEventListener('DOMContentLoaded', function() {
+  // Store integration_id if provided (for per-user OAuth flow)
+  const integrationId = "{{ integration_id or '' }}";
+  if (integrationId) {
+    sessionStorage.setItem('oauth_integration_id', integrationId);
+  }
+
   // Elements
   const startAuthFlowBtn = document.getElementById('start-auth-flow');
   const testTokenBtn = document.getElementById('test-token');
diff --git a/frontend/templates/dropbox_callback.html b/frontend/templates/dropbox_callback.html
index 623a5d5b..5d253624 100644
--- a/frontend/templates/dropbox_callback.html
+++ b/frontend/templates/dropbox_callback.html
@@ -97,6 +97,7 @@ document.addEventListener('DOMContentLoaded', function() {
   const appKey = sessionStorage.getItem('dropbox_app_key') || "{{ app_key_value }}";
   const appSecret = sessionStorage.getItem('dropbox_app_secret') || "{{ app_secret_value }}";
   const folderPath = sessionStorage.getItem('dropbox_folder_path') || "{{ folder_path }}" || '/Documents/Uploads';
+  const integrationId = sessionStorage.getItem('oauth_integration_id');
 
   const redirectUri = window.location.origin + "/dropbox-callback";
 
@@ -137,7 +138,50 @@ document.addEventListener('DOMContentLoaded', function() {
     })
     .then(data => {
       if (data.refresh_token) {
-        // Update settings in memory
+        // Per-user flow: save to the user's integration record
+        if (integrationId) {
+          const creds = {
+            refresh_token: data.refresh_token,
+            app_key: appKey,
+            app_secret: appSecret,
+          };
+          const cfgUpdate = {};
+          if (folderPath) cfgUpdate.folder = folderPath;
+
+          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>';
+
+          return fetch(`/api/integrations/${integrationId}`, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(body),
+          }).then(response => {
+            if (!response.ok) {
+              return response.json().then(err => {
+                throw new Error('Failed to save credentials: ' + (err.detail || 'Unknown error'));
+              });
+            }
+            return response.json();
+          }).then(() => {
+            // Clean up
+            sessionStorage.removeItem('dropbox_app_key');
+            sessionStorage.removeItem('dropbox_app_secret');
+            sessionStorage.removeItem('dropbox_folder_path');
+            sessionStorage.removeItem('oauth_integration_id');
+
+            // Show brief success then redirect to integrations
+            document.getElementById('processing-message').innerHTML =
+              '<p class="text-green-600 font-semibold">✓ Dropbox authorized successfully!</p>' +
+              '<p class="text-sm text-gray-500 mt-2">Redirecting to Integrations...</p>';
+            document.querySelector('.animate-spin').parentNode.classList.add('hidden');
+            setTimeout(() => { window.location.href = '/integrations'; }, 2000);
+          });
+        }
+
+        // Global flow: update settings in memory
         const updateFormData = new FormData();
         updateFormData.append('refresh_token', data.refresh_token);
 
diff --git a/frontend/templates/google_drive.html b/frontend/templates/google_drive.html
index b65c482b..3a964b04 100644
--- a/frontend/templates/google_drive.html
+++ b/frontend/templates/google_drive.html
@@ -358,6 +358,12 @@ GOOGLE_DRIVE_FOLDER_ID={{ folder_id|default('YOUR_FOLDER_ID', true) }}
 {% block scripts %}
 <script>
 document.addEventListener('DOMContentLoaded', function() {
+  // 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');
diff --git a/frontend/templates/google_drive_callback.html b/frontend/templates/google_drive_callback.html
index 184c8771..cbe3841e 100644
--- a/frontend/templates/google_drive_callback.html
+++ b/frontend/templates/google_drive_callback.html
@@ -138,6 +138,7 @@ document.addEventListener('DOMContentLoaded', function() {
   const clientId = sessionStorage.getItem('google_drive_client_id');
   const clientSecret = sessionStorage.getItem('google_drive_client_secret');
   const folderId = sessionStorage.getItem('google_drive_folder_id');
+  const integrationId = sessionStorage.getItem('oauth_integration_id');
 
   const redirectUri = window.location.origin + "/google-drive-callback";
 
@@ -192,7 +193,51 @@ document.addEventListener('DOMContentLoaded', function() {
         refreshToken = data.refresh_token;
         accessToken = data.access_token;
 
-        // Update settings in memory first
+        // Per-user flow: save to the user's integration record
+        if (integrationId) {
+          const creds = {
+            client_id: clientId,
+            client_secret: clientSecret,
+            refresh_token: data.refresh_token,
+          };
+          const cfgUpdate = {};
+          if (folderId) cfgUpdate.folder_id = folderId;
+
+          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>';
+
+          return fetch(`/api/integrations/${integrationId}`, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(body),
+          }).then(response => {
+            if (!response.ok) {
+              return response.json().then(err => {
+                throw new Error('Failed to save credentials: ' + (err.detail || 'Unknown error'));
+              });
+            }
+            return response.json();
+          }).then(() => {
+            // Clean up
+            sessionStorage.removeItem('google_drive_client_id');
+            sessionStorage.removeItem('google_drive_client_secret');
+            sessionStorage.removeItem('google_drive_folder_id');
+            sessionStorage.removeItem('google_drive_use_oauth');
+            sessionStorage.removeItem('oauth_integration_id');
+
+            // Show brief success then redirect to integrations
+            document.getElementById('processing-message').innerHTML =
+              '<p class="text-green-600 font-semibold">✓ Google Drive authorized successfully!</p>' +
+              '<p class="text-sm text-gray-500 mt-2">Redirecting to Integrations...</p>';
+            document.querySelector('.animate-spin').parentNode.classList.add('hidden');
+            setTimeout(() => { window.location.href = '/integrations'; }, 2000);
+          });
+        }
+
+        // Global flow: update settings in memory first
         const updateFormData = new FormData();
         updateFormData.append('refresh_token', data.refresh_token);
 
diff --git a/frontend/templates/integrations_dashboard.html b/frontend/templates/integrations_dashboard.html
index 48a86a98..205e8a99 100644
--- a/frontend/templates/integrations_dashboard.html
+++ b/frontend/templates/integrations_dashboard.html
@@ -206,6 +206,16 @@
               </div>
               <!-- Actions -->
               <div class="flex items-center gap-2 shrink-0">
+                <template x-if="isOAuthType(intg.integration_type) && !intg.has_credentials">
+                  <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"
+                    style="min-height:36px;"
+                    :aria-label="`Authorize ${intg.name}`"
+                  >
+                    <i class="fas fa-key mr-1" aria-hidden="true"></i>Authorize
+                  </a>
+                </template>
                 <button
                   type="button"
                   @click="testSavedIntegration(intg)"
@@ -279,6 +289,16 @@
               </div>
               <!-- Actions -->
               <div class="flex items-center gap-2 shrink-0">
+                <template x-if="isOAuthType(intg.integration_type) && !intg.has_credentials">
+                  <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"
+                    style="min-height:36px;"
+                    :aria-label="`Authorize ${intg.name}`"
+                  >
+                    <i class="fas fa-key mr-1" aria-hidden="true"></i>Authorize
+                  </a>
+                </template>
                 <button
                   type="button"
                   @click="testSavedIntegration(intg)"
@@ -561,9 +581,8 @@
             </div>
             <div class="bg-blue-50 dark:bg-blue-900/30 rounded-md p-3 text-sm text-blue-700 dark:text-blue-300">
               <i class="fas fa-info-circle mr-1" aria-hidden="true"></i>
-              OAuth tokens can be configured via the dedicated
-              <a :href="oauthLink(form.integration_type)" class="underline hover:text-blue-900 dark:hover:text-blue-100" x-text="typeLabel(form.integration_type) + ' setup page'"></a>.
-              Once authorised, the token is stored automatically.
+              Save this integration first, then use the <strong>Authorize</strong> button to complete the OAuth flow.
+              Your credentials will be stored securely in your personal integration record.
             </div>
           </div>
         </template>
@@ -742,6 +761,7 @@ function integrationsDashboard() {
   const SOURCE_TYPES = ['IMAP', 'WATCH_FOLDER', 'WEBHOOK'];
   const DEST_TYPES = ['S3', 'DROPBOX', 'GOOGLE_DRIVE', 'ONEDRIVE', 'WEBDAV', 'NEXTCLOUD', 'FTP', 'SFTP', 'EMAIL', 'PAPERLESS', 'RCLONE'];
   const TYPES_WITH_FORM_FIELDS = new Set(['IMAP', 'S3', 'WEBDAV', 'NEXTCLOUD', 'FTP', 'SFTP', 'DROPBOX', 'GOOGLE_DRIVE', 'ONEDRIVE', 'EMAIL', 'WATCH_FOLDER', 'PAPERLESS']);
+  const OAUTH_TYPES = new Set(['DROPBOX', 'GOOGLE_DRIVE', 'ONEDRIVE']);
 
   const TYPE_LABELS = {
     IMAP: 'IMAP Email',
@@ -838,6 +858,7 @@ 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); },
 
     oauthLink(t) {
       if (t === 'DROPBOX') return '/dropbox-setup';
diff --git a/frontend/templates/onedrive.html b/frontend/templates/onedrive.html
index 78895ade..03a79afe 100644
--- a/frontend/templates/onedrive.html
+++ b/frontend/templates/onedrive.html
@@ -237,6 +237,12 @@ ONEDRIVE_FOLDER_PATH={{ folder_path|default('Documents/Uploads', true) }}</code>
 {% block scripts %}
 <script>
 document.addEventListener('DOMContentLoaded', function() {
+  // Store integration_id if provided (for per-user OAuth flow)
+  const integrationId = "{{ integration_id or '' }}";
+  if (integrationId) {
+    sessionStorage.setItem('oauth_integration_id', integrationId);
+  }
+
   // Elements
   const startAuthFlowBtn = document.getElementById('start-auth-flow');
   const testTokenBtn = document.getElementById('test-token');
diff --git a/frontend/templates/onedrive_callback.html b/frontend/templates/onedrive_callback.html
index d77ccb82..42ae7ca0 100644
--- a/frontend/templates/onedrive_callback.html
+++ b/frontend/templates/onedrive_callback.html
@@ -98,6 +98,7 @@ document.addEventListener('DOMContentLoaded', function() {
   const clientSecret = sessionStorage.getItem('onedrive_client_secret') || "{{ client_secret_value }}";
   const tenantId = sessionStorage.getItem('onedrive_tenant_id') || "{{ tenant_id }}" || "common";
   const folderPath = sessionStorage.getItem('onedrive_folder_path') || "";
+  const integrationId = sessionStorage.getItem('oauth_integration_id');
 
   const redirectUri = window.location.origin + "/onedrive-callback";
 
@@ -140,7 +141,52 @@ document.addEventListener('DOMContentLoaded', function() {
     })
     .then(data => {
       if (data.refresh_token) {
-        // Instead of saving to .env file, update settings in memory
+        // Per-user flow: save to the user's integration record
+        if (integrationId) {
+          const creds = {
+            client_id: clientId,
+            client_secret: clientSecret,
+            refresh_token: data.refresh_token,
+            tenant_id: tenantId,
+          };
+          const cfgUpdate = {};
+          if (folderPath) cfgUpdate.folder_path = folderPath;
+
+          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>';
+
+          return fetch(`/api/integrations/${integrationId}`, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(body),
+          }).then(response => {
+            if (!response.ok) {
+              return response.json().then(err => {
+                throw new Error('Failed to save credentials: ' + (err.detail || 'Unknown error'));
+              });
+            }
+            return response.json();
+          }).then(() => {
+            // Clean up
+            sessionStorage.removeItem('onedrive_client_id');
+            sessionStorage.removeItem('onedrive_client_secret');
+            sessionStorage.removeItem('onedrive_tenant_id');
+            sessionStorage.removeItem('onedrive_folder_path');
+            sessionStorage.removeItem('oauth_integration_id');
+
+            // Show brief success then redirect to integrations
+            document.getElementById('processing-message').innerHTML =
+              '<p class="text-green-600 font-semibold">✓ OneDrive authorized successfully!</p>' +
+              '<p class="text-sm text-gray-500 mt-2">Redirecting to Integrations...</p>';
+            document.querySelector('.animate-spin').parentNode.classList.add('hidden');
+            setTimeout(() => { window.location.href = '/integrations'; }, 2000);
+          });
+        }
+
+        // Global flow: update settings in memory
         const updateFormData = new FormData();
         updateFormData.append('refresh_token', data.refresh_token);
 

From cfc52fd355c54655a7a2619a97f01206b3c7820a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:48:11 +0000
Subject: [PATCH 4/4] feat(auth): make OAuth credentials user-specific via
 UserIntegration records

Setup pages now accept an integration_id query param to save OAuth
credentials to the user's personal UserIntegration record instead
of global settings. The integrations dashboard shows an "Authorize"
button for OAuth types (Dropbox, Google Drive, OneDrive) that need
credentials.

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
---
 tests/test_views_dropbox.py      | 18 ++++++++++++++++++
 tests/test_views_google_drive.py | 16 ++++++++++++++++
 tests/test_views_integrations.py | 27 +++++++++++++++++++++++++++
 tests/test_views_onedrive.py     | 16 ++++++++++++++++
 4 files changed, 77 insertions(+)

diff --git a/tests/test_views_dropbox.py b/tests/test_views_dropbox.py
index 02b21a19..a93d3065 100644
--- a/tests/test_views_dropbox.py
+++ b/tests/test_views_dropbox.py
@@ -26,3 +26,21 @@ class TestDropboxViews:
         """Test the Dropbox OAuth callback with auth code."""
         response = client.get("/dropbox-callback?code=test_code")
         assert response.status_code == 200
+
+    def test_dropbox_setup_page_with_integration_id(self, client):
+        """Test the Dropbox setup page accepts integration_id query param."""
+        response = client.get("/dropbox-setup?integration_id=42")
+        assert response.status_code == 200
+        # The template should store the integration_id for per-user OAuth flow
+        assert b"oauth_integration_id" in response.content
+        assert b"42" in response.content
+
+    def test_dropbox_setup_page_without_integration_id(self, client):
+        """Test the Dropbox setup page works without integration_id (global flow)."""
+        response = client.get("/dropbox-setup")
+        assert response.status_code == 200
+        # The template should not set integration_id when not provided
+        body = response.text
+        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
diff --git a/tests/test_views_google_drive.py b/tests/test_views_google_drive.py
index 045c92ce..397562d6 100644
--- a/tests/test_views_google_drive.py
+++ b/tests/test_views_google_drive.py
@@ -30,6 +30,22 @@ class TestGoogleDriveViews:
         response = client.get("/google-drive-callback?code=test_code")
         assert response.status_code == 200
 
+    def test_google_drive_setup_page_with_integration_id(self, client):
+        """Test the Google Drive setup page accepts integration_id query param."""
+        response = client.get("/google-drive-setup?integration_id=99")
+        assert response.status_code == 200
+        # The template should store the integration_id for per-user OAuth flow
+        assert b"oauth_integration_id" in response.content
+        assert b"99" in response.content
+
+    def test_google_drive_setup_page_without_integration_id(self, client):
+        """Test the Google Drive setup page works without integration_id (global flow)."""
+        response = client.get("/google-drive-setup")
+        assert response.status_code == 200
+        body = response.text
+        assert "oauth_integration_id" in body
+        assert 'const integrationId = ""' in body
+
     def test_google_drive_callback_with_code_and_state(self, client):
         """Test the Google Drive OAuth callback with code and state."""
         response = client.get("/google-drive-callback?code=test_code&state=test_state")
diff --git a/tests/test_views_integrations.py b/tests/test_views_integrations.py
index 1bd71f17..74150fa4 100644
--- a/tests/test_views_integrations.py
+++ b/tests/test_views_integrations.py
@@ -76,6 +76,33 @@ class TestIntegrationsDashboardView:
         assert "return '/google-drive'" not in body.replace("/google-drive-setup", "")
         assert "return '/onedrive'" not in body.replace("/onedrive-setup", "")
 
+    def test_integrations_page_contains_authorize_button(self, client):
+        """GET /integrations page includes per-user Authorize button for OAuth types."""
+        response = client.get("/integrations")
+        assert response.status_code == 200
+        body = response.text
+        assert "isOAuthType" in body
+        assert "Authorize" in body
+        assert "integration_id=" in body
+
+    def test_integrations_page_contains_oauth_types_constant(self, client):
+        """GET /integrations includes OAUTH_TYPES Set constant."""
+        response = client.get("/integrations")
+        assert response.status_code == 200
+        body = response.text
+        assert "OAUTH_TYPES" in body
+        assert "'DROPBOX'" in body
+        assert "'GOOGLE_DRIVE'" in body
+        assert "'ONEDRIVE'" in body
+
+    def test_integrations_page_modal_info_box_per_user(self, client):
+        """The create modal info box instructs to save first then authorize."""
+        response = client.get("/integrations")
+        assert response.status_code == 200
+        body = response.text
+        assert "Save this integration first" in body
+        assert "personal integration record" in body
+
     def test_integrations_page_contains_quota_indicators(self, client):
         """GET /integrations page includes quota labels."""
         response = client.get("/integrations")
diff --git a/tests/test_views_onedrive.py b/tests/test_views_onedrive.py
index 290cb175..aa9fe116 100644
--- a/tests/test_views_onedrive.py
+++ b/tests/test_views_onedrive.py
@@ -26,3 +26,19 @@ class TestOnedriveViews:
         """Test the OneDrive OAuth callback with auth code."""
         response = client.get("/onedrive-callback?code=test_code")
         assert response.status_code == 200
+
+    def test_onedrive_setup_page_with_integration_id(self, client):
+        """Test the OneDrive setup page accepts integration_id query param."""
+        response = client.get("/onedrive-setup?integration_id=77")
+        assert response.status_code == 200
+        # The template should store the integration_id for per-user OAuth flow
+        assert b"oauth_integration_id" in response.content
+        assert b"77" in response.content
+
+    def test_onedrive_setup_page_without_integration_id(self, client):
+        """Test the OneDrive setup page works without integration_id (global flow)."""
+        response = client.get("/onedrive-setup")
+        assert response.status_code == 200
+        body = response.text
+        assert "oauth_integration_id" in body
+        assert 'const integrationId = ""' in body