Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Support X-Remote-User in web UI

Browse Source
This commit is contained in:
Max Berger
2026-03-22 15:56:04 +01:00
parent 8178b11e9e
commit 07685c292f
6 changed files with 261 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
radicale/web/internal_data/js/api/api.js
View File

@@ -22,7 +22,7 @@
import { COLOR_RE, ROOT_PATH, SERVER } from "../constants.js";
import { Collection, CollectionType } from "../models/collection.js";
import { escape_xml } from "../utils/misc.js";
import { to_error_message } from "./common.js";
import { create_request, to_error_message } from "./common.js";
/**
* Find the principal collection.
@@ -32,8 +32,7 @@ import { to_error_message } from "./common.js";
* @return {XMLHttpRequest}
*/
export function get_principal(user, password, callback) {
let request = new XMLHttpRequest();
request.open("PROPFIND", SERVER + ROOT_PATH, true, user, encodeURIComponent(password));
let request = create_request("PROPFIND", SERVER + ROOT_PATH, user, password);
request.onreadystatechange = function () {
if (request.readyState !== 4) {
return;
@@ -78,8 +77,7 @@ export function get_principal(user, password, callback) {
* @return {XMLHttpRequest}
*/
export function get_collections(user, password, collection, callback) {
let request = new XMLHttpRequest();
request.open("PROPFIND", SERVER + collection.href, true, user, encodeURIComponent(password));
let request = create_request("PROPFIND", SERVER + collection.href, user, password);
request.setRequestHeader("depth", "1");
request.onreadystatechange = function () {
if (request.readyState !== 4) {
@@ -201,8 +199,7 @@ export function get_collections(user, password, collection, callback) {
* @return {XMLHttpRequest}
*/
export function upload_collection(user, password, collection_href, file, callback) {
let request = new XMLHttpRequest();
request.open("PUT", SERVER + collection_href, true, user, encodeURIComponent(password));
let request = create_request("PUT", SERVER + collection_href, user, password);
request.onreadystatechange = function () {
if (request.readyState !== 4) {
return;
@@ -226,8 +223,7 @@ export function upload_collection(user, password, collection_href, file, callbac
* @return {XMLHttpRequest}
*/
export function delete_collection(user, password, collection, callback) {
let request = new XMLHttpRequest();
request.open("DELETE", SERVER + collection.href, true, user, encodeURIComponent(password));
let request = create_request("DELETE", SERVER + collection.href, user, password);
request.onreadystatechange = function () {
if (request.readyState !== 4) {
return;
@@ -251,8 +247,7 @@ export function delete_collection(user, password, collection, callback) {
* @return {XMLHttpRequest}
*/
function create_edit_collection(user, password, collection, create, callback) {
let request = new XMLHttpRequest();
request.open(create ? "MKCOL" : "PROPPATCH", SERVER + collection.href, true, user, encodeURIComponent(password));
let request = create_request(create ? "MKCOL" : "PROPPATCH", SERVER + collection.href, user, password);
request.onreadystatechange = function () {
if (request.readyState !== 4) {
return;

17
radicale/web/internal_data/js/api/common.js
View File

@@ -30,4 +30,21 @@ export function to_error_message(request) {
}
return request.status + " " + request.statusText;
}
/**
* @param {string} method
* @param {string} url
* @param {?string} user
* @param {?string} password
* @returns {XMLHttpRequest}
*/
export function create_request(method, url, user, password) {
let request = new XMLHttpRequest();
if (user !== null && password !== null) {
request.open(method, url, true, user, encodeURIComponent(password));
} else {
request.open(method, url, true);
}
return request;
}

8
radicale/web/internal_data/js/api/sharing.js
View File

@@ -18,7 +18,7 @@
import { ROOT_PATH, SERVER } from "../constants.js";
import { CollectionType } from "../models/collection.js";
import { to_error_message } from "./common.js";
import { create_request, to_error_message } from "./common.js";
/**
* @typedef {Object} SharingFeatures
@@ -56,13 +56,11 @@ function call_sharing_api(
on_not_found = null,
on_error = null,
) {
let request = new XMLHttpRequest();
request.open(
let request = create_request(
"POST",
SERVER + ROOT_PATH + ".sharing/v1/" + path,
true,
user,
encodeURIComponent(password),
password,
);
request.onreadystatechange = function () {
if (request.readyState !== 4) {