From 42f8d5df41cf7e24e2a3aead51b1cc7e18362705 Mon Sep 17 00:00:00 2001
From: Max Berger <max@berger.name>
Date: Sun, 26 Apr 2026 20:45:47 +0200
Subject: [PATCH] UI: Fix: Load username from principal component

Co-authored-by: Copilot <copilot@github.com>
---
 .../web/internal_data/js/scenes/LoginScene.js | 18 ++++++---------
 .../js/utils/collection_utils.js              | 22 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/radicale/web/internal_data/js/scenes/LoginScene.js b/radicale/web/internal_data/js/scenes/LoginScene.js
index 36deebac..2b9dab14 100644
--- a/radicale/web/internal_data/js/scenes/LoginScene.js
+++ b/radicale/web/internal_data/js/scenes/LoginScene.js
@@ -22,13 +22,14 @@
 import { get_principal } from "../api/api.js";
 import { ROOT_PATH, SERVER } from "../constants.js";
 import { Collection } from "../models/collection.js";
+import { extract_title, extractUsernameFromPrincipalCollection } from "../utils/collection_utils.js";
 import { collectionsCache } from "../utils/collections_cache.js";
 import { ErrorHandler } from "../utils/error.js";
 import { FormValidator, validate_non_empty } from "../utils/form_validator.js";
 import { get_element, get_element_by_id } from "../utils/misc.js";
 import { CollectionsScene } from "./CollectionsScene.js";
 import { LoadingScene } from "./LoadingScene.js";
-import { Scene, is_current_scene, pop_scene, pop_to_root, push_scene, replace_scene } from "./scene_manager.js";
+import { is_current_scene, pop_scene, pop_to_root, push_scene, replace_scene, Scene } from "./scene_manager.js";
 
 /**
  * @implements {Scene}
@@ -77,7 +78,6 @@ export class LoginScene {
         }
         this._logout_btn.onclick = () => this._onlogout();
         this._refresh_btn.onclick = () => this._refresh();
-        this._logout_user_form.textContent = this._user + "'s Collections";
         // Fetch principal
         let loading_scene = new LoadingScene();
         push_scene(loading_scene);
@@ -90,13 +90,16 @@ export class LoginScene {
                 this._errorHandler.setError(error1);
                 pop_scene();
             } else if (principal_collection) {
+                this._logout_user_form.textContent = extract_title(principal_collection) + "'s Collections";
+
                 // clear error on successful login
                 this._errorHandler.clearError();
                 // show collections
                 let saved_user = this._user;
+                let username_from_principal = extractUsernameFromPrincipalCollection(principal_collection);
                 this._user = "";
                 let collections_scene = new CollectionsScene(
-                    saved_user, p_password, principal_collection, (/** @type {?string} */ error1) => {
+                    username_from_principal, p_password, principal_collection, (/** @type {?string} */ error1) => {
                         this._errorHandler.setError(error1);
                         this._user = saved_user;
                     });
@@ -164,14 +167,7 @@ export class LoginScene {
                 // Authenticated! Now it's safe to call get_principal
                 get_principal(null, null, (/** @type {?Collection} */ principal_collection, error) => {
                     if (!error && principal_collection) {
-                        let authenticated_user = principal_collection.displayname;
-                        if (!authenticated_user) {
-                            let href = principal_collection.href.replace(/\/+$/, "");
-                            if (href && href !== ROOT_PATH.replace(/\/+$/, "")) {
-                                authenticated_user = href.substring(href.lastIndexOf("/") + 1);
-                            }
-                        }
-                        this._perform_login(authenticated_user, null);
+                        this._perform_login(extractUsernameFromPrincipalCollection(principal_collection), null);
                     }
                 });
             }
diff --git a/radicale/web/internal_data/js/utils/collection_utils.js b/radicale/web/internal_data/js/utils/collection_utils.js
index 6da4e9f5..4e6d8695 100644
--- a/radicale/web/internal_data/js/utils/collection_utils.js
+++ b/radicale/web/internal_data/js/utils/collection_utils.js
@@ -19,6 +19,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { CollectionType } from "../models/collection.js";
+
+
+/**
+ * Extracts the username from the principal collection
+ * 
+ * @param {import("../models/collection.js").Collection} principal_collection
+ * @returns str
+ */
+export function extractUsernameFromPrincipalCollection(principal_collection) {
+    // href is usually /username/
+    let href = decodeURIComponent(principal_collection.href);
+    if (href.endsWith("/")) {
+        href = href.substring(0, href.length - 1);
+    }
+    return href.substring(href.lastIndexOf("/") + 1);
+}
+
 /**
  * @param {import("../models/collection.js").Collection} collection
  * @returns str
@@ -26,8 +44,10 @@
 export function extract_title(collection) {
     if (collection.displayname && collection.displayname.length > 0) {
         return collection.displayname;
+    } else if (collection.type = CollectionType.PRINCIPAL) {
+        return extractUsernameFromPrincipalCollection(collection)
     } else
-        return collection.href;
+        return decodeURIComponent(collection.href);
 }
 
 /**