feat(AccountModal): optional calendar home url field

SapphoSys · SapphoSys · commit 92baf9e03909 · 2026-04-07T16:25:36.000+05:00
diff --git a/src-tauri/src/migrations/mod.rs b/src-tauri/src/migrations/mod.rs
@@ -13,6 +13,7 @@ mod v012_tag_sort_config;
 mod v013_account_sort_order;
 mod v014_account_sort_config;
 mod v015_recurrence_fields;
+mod v016_account_calendar_home_url;
 
 use tauri_plugin_sql::Migration;
 
@@ -31,6 +32,7 @@ pub use v012_tag_sort_config::migration as migration_v012;
 pub use v013_account_sort_order::migration as migration_v013;
 pub use v014_account_sort_config::migration as migration_v014;
 pub use v015_recurrence_fields::migration as migration_v015;
+pub use v016_account_calendar_home_url::migration as migration_v016;
 
 /// Returns all database migrations for the application
 pub fn get_migrations() -> Vec<Migration> {
@@ -50,5 +52,6 @@ pub fn get_migrations() -> Vec<Migration> {
         migration_v013(),
         migration_v014(),
         migration_v015(),
+        migration_v016(),
     ]
 }
diff --git a/src-tauri/src/migrations/v016_account_calendar_home_url.rs b/src-tauri/src/migrations/v016_account_calendar_home_url.rs
@@ -0,0 +1,13 @@
+use tauri_plugin_sql::{Migration, MigrationKind};
+
+/// Adds optional calendar_home_url override to accounts
+pub fn migration() -> Migration {
+    Migration {
+        version: 16,
+        description: "add_account_calendar_home_url",
+        sql: r#"
+            ALTER TABLE accounts ADD COLUMN calendar_home_url TEXT;
+        "#,
+        kind: MigrationKind::Up,
+    }
+}
diff --git a/src/components/modals/AccountModal.tsx b/src/components/modals/AccountModal.tsx
@@ -1,5 +1,6 @@
 import { useQueryClient } from '@tanstack/react-query';
 import CheckCircle from 'lucide-react/icons/check-circle';
+import ChevronDown from 'lucide-react/icons/chevron-down';
 import Cloud from 'lucide-react/icons/cloud';
 import Info from 'lucide-react/icons/info';
 import Loader2 from 'lucide-react/icons/loader-2';
@@ -53,6 +54,8 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
   const [serverType, setServerType] = useState<ServerType>(
     () => preloadedConfig?.serverType || account?.serverType || 'generic',
   );
+  const [calendarHomeUrl, setCalendarHomeUrl] = useState(() => account?.calendarHomeUrl || '');
+  const [showAdvanced, setShowAdvanced] = useState(() => !!account?.calendarHomeUrl);
   const [isLoading, setIsLoading] = useState(false);
   const [isTesting, setIsTesting] = useState(false);
   const [testSuccess, setTestSuccess] = useState(false);
@@ -68,13 +71,19 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
   useModalEscapeKey(onClose);
 
   // Reset test state when credentials change
-  const [prevCredentials, setPrevCredentials] = useState({ serverUrl, username, password });
+  const [prevCredentials, setPrevCredentials] = useState({
+    serverUrl,
+    username,
+    password,
+    calendarHomeUrl,
+  });
   if (
     serverUrl !== prevCredentials.serverUrl ||
     username !== prevCredentials.username ||
-    password !== prevCredentials.password
+    password !== prevCredentials.password ||
+    calendarHomeUrl !== prevCredentials.calendarHomeUrl
   ) {
-    setPrevCredentials({ serverUrl, username, password });
+    setPrevCredentials({ serverUrl, username, password, calendarHomeUrl });
     if (testSuccess || testedConnectionId) {
       setTestSuccess(false);
       setTestedConnectionId(null);
@@ -178,6 +187,7 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
         username,
         effectivePassword,
         serverType,
+        calendarHomeUrl.trim() || undefined,
       );
 
       // Check if this is a Vikunja server and warn the user
@@ -231,6 +241,7 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
             username,
             effectivePassword,
             serverType,
+            calendarHomeUrl.trim() || undefined,
           );
         }
 
@@ -242,6 +253,7 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
             username,
             password: effectivePassword || account.password,
             serverType,
+            calendarHomeUrl: calendarHomeUrl.trim() || undefined,
           },
         });
       } else {
@@ -269,6 +281,7 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
             username,
             effectivePassword,
             serverType,
+            calendarHomeUrl.trim() || undefined,
           );
 
           // Check if this is a Vikunja server and warn the user
@@ -297,6 +310,7 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
             username,
             password: effectivePassword,
             serverType,
+            calendarHomeUrl: calendarHomeUrl.trim() || undefined,
           },
           {
             onSuccess: async (newAccount) => {
@@ -377,7 +391,11 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
               </button>
             </div>
 
-            <form onSubmit={handleSubmit} className="p-4 space-y-4">
+            <form
+              onSubmit={handleSubmit}
+              className="flex flex-col min-h-0 max-h-[calc(90vh-4rem)]"
+            >
+              <div className="p-4 space-y-4 overflow-y-auto flex-1 min-h-0">
               <div>
                 <label
                   htmlFor="account-name"
@@ -494,6 +512,43 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
                 />
               </div>
 
+              <div>
+                <button
+                  type="button"
+                  onClick={() => setShowAdvanced((v) => !v)}
+                  className="flex items-center gap-1 text-xs text-surface-500 dark:text-surface-400 hover:text-surface-700 dark:hover:text-surface-200 transition-colors outline-none focus-visible:ring-2 focus-visible:ring-primary-500 rounded"
+                >
+                  <ChevronDown
+                    className={`w-3.5 h-3.5 transition-transform ${showAdvanced ? '' : '-rotate-90'}`}
+                  />
+                  Advanced
+                </button>
+                {showAdvanced && (
+                  <div className="mt-3 space-y-3">
+                    <div>
+                      <label
+                        htmlFor="calendar-home-url"
+                        className="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1"
+                      >
+                        Calendar Home URL
+                      </label>
+                      <ComposedInput
+                        id="calendar-home-url"
+                        type="url"
+                        value={calendarHomeUrl}
+                        onChange={setCalendarHomeUrl}
+                        placeholder="https://caldav.example.com/calendars/user/"
+                        className="w-full px-3 py-2 text-sm text-surface-800 dark:text-surface-200 bg-surface-100 dark:bg-surface-700 border border-transparent rounded-lg focus:outline-none focus:border-primary-300 dark:focus:border-primary-400 focus:bg-white dark:focus:bg-primary-900/30 transition-colors"
+                      />
+                      <p className="mt-1.5 text-xs flex flex-row text-surface-500 dark:text-surface-400">
+                        <Info className="inline w-3.5 h-3.5 mr-1 shrink-0 text-surface-400" />
+                        Use this if auto-discovery is not possible.
+                      </p>
+                    </div>
+                  </div>
+                )}
+              </div>
+
               {error && (
                 <div className="p-3 text-sm text-red-600 dark:text-red-400 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-800 rounded-lg">
                   {error}
@@ -560,7 +615,9 @@ export const AccountModal = ({ account, onClose, preloadedConfig }: AccountModal
                 </div>
               )}
 
-              <div className="flex justify-between gap-3 pt-2">
+              </div>
+
+              <div className="flex justify-between gap-3 p-4 pt-3 border-t border-surface-200 dark:border-surface-700 shrink-0">
                 <button
                   type="button"
                   onClick={handleTestConnection}
diff --git a/src/lib/caldav/connection.ts b/src/lib/caldav/connection.ts
@@ -141,8 +141,9 @@ const discoverGenericUrls = async (
 
   // Try to extract principal from the response we already have before issuing
   // another PROPFIND
-  let discoveredPrincipal: string | null =
-    davRootBody ? (davRootBody.match(PRINCIPAL_RE)?.[1] ?? null) : null;
+  let discoveredPrincipal: string | null = davRootBody
+    ? (davRootBody.match(PRINCIPAL_RE)?.[1] ?? null)
+    : null;
 
   if (!discoveredPrincipal) {
     discoveredPrincipal = await discoverPrincipal(davRootUrl, credentials);
@@ -179,6 +180,7 @@ export const connect = async (
   username: string,
   password: string,
   serverType: ServerType = 'generic',
+  calendarHomeUrl?: string,
 ): Promise<{ principalUrl: string; displayName: string; calendarHome: string }> => {
   const credentials: CalDAVCredentials = { username, password };
 
@@ -196,26 +198,32 @@ export const connect = async (
   let principalUrl: string;
   let calendarHome: string;
 
-  switch (serverType) {
-    case 'rustical':
-    case 'radicale':
-    case 'baikal':
-    case 'nextcloud': {
-      const config = SERVER_CONFIGS[serverType];
-      principalUrl = `${baseUrl}${config.principalPath(username)}`;
-      calendarHome = config.calendarHomePath
-        ? `${baseUrl}${config.calendarHomePath(username)}`
-        : principalUrl;
-      break;
-    }
-    case 'fastmail':
-    case 'mailbox':
-    case 'generic': {
-      ({ principalUrl, calendarHome } = await discoverGenericUrls(baseUrl, credentials));
-      break;
+  // If a direct calendar home URL is provided, skip autodiscovery entirely
+  if (calendarHomeUrl) {
+    calendarHome = `${calendarHomeUrl.replace(/\/$/, '')}/`;
+    principalUrl = calendarHome;
+  } else {
+    switch (serverType) {
+      case 'rustical':
+      case 'radicale':
+      case 'baikal':
+      case 'nextcloud': {
+        const config = SERVER_CONFIGS[serverType];
+        principalUrl = `${baseUrl}${config.principalPath(username)}`;
+        calendarHome = config.calendarHomePath
+          ? `${baseUrl}${config.calendarHomePath(username)}`
+          : principalUrl;
+        break;
+      }
+      case 'fastmail':
+      case 'mailbox':
+      case 'generic': {
+        ({ principalUrl, calendarHome } = await discoverGenericUrls(baseUrl, credentials));
+        break;
+      }
+      default:
+        throw new Error(`Unknown server type: ${serverType}`);
     }
-    default:
-      throw new Error(`Unknown server type: ${serverType}`);
   }
 
   const propfindBody = `<?xml version="1.0" encoding="utf-8"?>
@@ -263,6 +271,7 @@ export const reconnect = async (account: Account): Promise<void> => {
     account.username,
     account.password,
     account.serverType ?? 'generic',
+    account.calendarHomeUrl,
   );
 };
 
diff --git a/src/lib/caldav/index.ts b/src/lib/caldav/index.ts
@@ -25,8 +25,9 @@ export class CalDAVClient {
     username: string,
     password: string,
     serverType: ServerType = 'generic',
+    calendarHomeUrl?: string,
   ): Promise<{ principalUrl: string; displayName: string; calendarHome: string }> {
-    return connectionOps.connect(accountId, serverUrl, username, password, serverType);
+    return connectionOps.connect(accountId, serverUrl, username, password, serverType, calendarHomeUrl);
   }
 
   static disconnect(accountId: string): void {
diff --git a/src/lib/database/accounts.ts b/src/lib/database/accounts.ts
@@ -34,21 +34,23 @@ export const createAccount = async (conn: DatabasePlugin, accountData: Partial<A
     username: accountData.username ?? '',
     password: accountData.password ?? '',
     serverType: accountData.serverType,
+    calendarHomeUrl: accountData.calendarHomeUrl,
     calendars: [],
     isActive: true,
     sortOrder: accountData.sortOrder || maxOrder + 100,
   };
 
   await conn.execute(
-    `INSERT INTO accounts (id, name, server_url, username, password, server_type, last_sync, is_active, sort_order)
-     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
+    `INSERT INTO accounts (id, name, server_url, username, password, server_type, calendar_home_url, last_sync, is_active, sort_order)
+     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)`,
     [
       account.id,
       account.name,
       account.serverUrl,
       account.username,
       account.password,
       account.serverType || null,
+      account.calendarHomeUrl || null,
       account.lastSync ? account.lastSync.toISOString() : null,
       account.isActive ? 1 : 0,
       account.sortOrder,
@@ -74,14 +76,15 @@ export const updateAccount = async (
   const updated: Account = { ...existing, ...updates };
 
   await conn.execute(
-    `UPDATE accounts SET name = $1, server_url = $2, username = $3, password = $4, server_type = $5, last_sync = $6, is_active = $7, sort_order = $8
-     WHERE id = $9`,
+    `UPDATE accounts SET name = $1, server_url = $2, username = $3, password = $4, server_type = $5, calendar_home_url = $6, last_sync = $7, is_active = $8, sort_order = $9
+     WHERE id = $10`,
     [
       updated.name,
       updated.serverUrl,
       updated.username,
       updated.password,
       updated.serverType || null,
+      updated.calendarHomeUrl || null,
       updated.lastSync ? updated.lastSync.toISOString() : null,
       updated.isActive ? 1 : 0,
       updated.sortOrder,
diff --git a/src/lib/database/converters.ts b/src/lib/database/converters.ts
@@ -65,6 +65,7 @@ export const rowToAccount = (row: AccountRow, calendars: Calendar[]): Account =>
   username: row.username,
   password: row.password,
   serverType: (row.server_type as ServerType) || undefined,
+  calendarHomeUrl: row.calendar_home_url || undefined,
   calendars: calendars.filter((c) => c.accountId === row.id),
   lastSync: row.last_sync ? new Date(row.last_sync) : undefined,
   isActive: row.is_active === 1,
diff --git a/src/types/database.ts b/src/types/database.ts
@@ -38,6 +38,7 @@ export interface AccountRow {
   username: string;
   password: string;
   server_type: string | null;
+  calendar_home_url: string | null;
   last_sync: string | null;
   is_active: number;
   sort_order: number | null;
diff --git a/src/types/index.ts b/src/types/index.ts
@@ -153,6 +153,7 @@ export interface Account {
   username: string;
   password: string;
   serverType?: ServerType;
+  calendarHomeUrl?: string;
   calendars: Calendar[];
   lastSync?: Date;
   isActive: boolean;
