feat(config): support disabling rooms and sync auth tokens

- Add support for `disabled_rooms` to remove rooms from active configuration
- Sync auth tokens from server to client to prevent state drift
- Enable `allow_local_address` for Talk API requests
- Update settings page to fetch configured rooms instead of available ones
This commit is contained in:
kyle
2026-06-12 11:47:16 -07:00
parent 5b521afec1
commit 4d0bb40120
4 changed files with 37 additions and 9 deletions
+20 -5
View File
@@ -26,6 +26,7 @@ document.addEventListener('DOMContentLoaded', function () {
let configuredRoomsState = configuredRooms; let configuredRoomsState = configuredRooms;
let authTokensState = authTokens; let authTokensState = authTokens;
let serverAuthTokens = authTokens; // canonical server state, re-synced after save
function showStatus(msg, type) { function showStatus(msg, type) {
statusMsg.textContent = msg; statusMsg.textContent = msg;
@@ -88,7 +89,7 @@ document.addEventListener('DOMContentLoaded', function () {
tokenDiv.className = 'nc-room-tokens'; tokenDiv.className = 'nc-room-tokens';
tokenDiv.id = 'tokens-' + room.token; tokenDiv.id = 'tokens-' + room.token;
tokenDiv.style.display = 'none'; tokenDiv.style.display = 'none';
if (room.configured || (authTokensState[room.token] && authTokensState[room.token].length > 0)) { if (room.configured || (serverAuthTokens[room.token] && serverAuthTokens[room.token].length > 0)) {
tokenDiv.style.display = 'block'; tokenDiv.style.display = 'block';
renderTokens(room.token, tokenDiv); renderTokens(room.token, tokenDiv);
} }
@@ -230,22 +231,24 @@ document.addEventListener('DOMContentLoaded', function () {
saveBtn.disabled = true; saveBtn.disabled = true;
saveBtn.textContent = 'Saving...'; saveBtn.textContent = 'Saving...';
// Collect configured rooms // Collect configured rooms from checked checkboxes
const rooms = {}; const rooms = {};
document.querySelectorAll('#nc-rooms-list input[type="checkbox"]:checked').forEach(function (cb) { document.querySelectorAll('#nc-rooms-list input[type="checkbox"]:checked').forEach(function (cb) {
const token = cb.value; const token = cb.value;
rooms[token] = ''; // name will be filled from existing config rooms[token] = configuredRoomsState[token] || ''; // preserve name from existing config
}); });
// Restore names from existing config for newly checked rooms // Remove rooms that were previously configured but are now unchecked
const disabledRooms = [];
Object.keys(configuredRoomsState).forEach(function (token) { Object.keys(configuredRoomsState).forEach(function (token) {
if (rooms[token] === undefined) { if (rooms[token] === undefined) {
rooms[token] = configuredRoomsState[token]; disabledRooms.push(token);
} }
}); });
const payload = { const payload = {
rooms: rooms, rooms: rooms,
disabled_rooms: disabledRooms,
auth_tokens: authTokensState, auth_tokens: authTokensState,
retention_days: parseInt(retentionInput.value) || 90, retention_days: parseInt(retentionInput.value) || 90,
sender_name: senderNameInput.value || 'Webhook Bot', sender_name: senderNameInput.value || 'Webhook Bot',
@@ -265,6 +268,18 @@ document.addEventListener('DOMContentLoaded', function () {
if (data.status === 'ok') { if (data.status === 'ok') {
configuredRoomsState = rooms; configuredRoomsState = rooms;
// Sync auth tokens from server to fix state drift
if (data.auth_tokens) {
serverAuthTokens = data.auth_tokens;
authTokensState = Object.assign({}, serverAuthTokens);
// Re-render token divs for re-enabled rooms
document.querySelectorAll('#nc-rooms-list input[type="checkbox"]:checked').forEach(function (cb) {
const tokenDiv = document.getElementById('tokens-' + cb.value);
if (tokenDiv && tokenDiv.style.display !== 'none') {
renderTokens(cb.value, tokenDiv);
}
});
}
showStatus('Configuration saved', 'success'); showStatus('Configuration saved', 'success');
botPasswordInput.value = ''; botPasswordInput.value = '';
} else { } else {
+4 -1
View File
@@ -191,7 +191,10 @@ class WebhookController extends Controller {
$this->talkService->saveConfig($config); $this->talkService->saveConfig($config);
return new DataResponse(['status' => 'ok']); return new DataResponse([
'status' => 'ok',
'auth_tokens' => $this->talkService->getAuthTokens(),
]);
} }
/** /**
+12 -2
View File
@@ -543,7 +543,7 @@ class TalkService {
$response = $client->get($url, [ $response = $client->get($url, [
'timeout' => 15, 'timeout' => 15,
'nextcloud' => [ 'nextcloud' => [
'allow_local_address' => false, 'allow_local_address' => true,
], ],
]); ]);
@@ -710,7 +710,7 @@ class TalkService {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
], ],
'nextcloud' => [ 'nextcloud' => [
'allow_local_address' => false, 'allow_local_address' => true,
], ],
]); ]);
@@ -804,6 +804,7 @@ class TalkService {
* bot_password?: string, * bot_password?: string,
* retention_days?: int, * retention_days?: int,
* rooms?: array<string, string>, * rooms?: array<string, string>,
* disabled_rooms?: array<string>,
* auth_tokens?: array<string, string[]>, * auth_tokens?: array<string, string[]>,
* sender_name?: string * sender_name?: string
* } * }
@@ -821,6 +822,15 @@ class TalkService {
$this->setRooms($config['rooms']); $this->setRooms($config['rooms']);
} }
// Remove explicitly disabled rooms from config
if (isset($config['disabled_rooms']) && is_array($config['disabled_rooms'])) {
$rooms = $this->getRooms();
foreach ($config['disabled_rooms'] as $token) {
unset($rooms[$token]);
}
$this->setRooms($rooms);
}
if (isset($config['auth_tokens'])) { if (isset($config['auth_tokens'])) {
$this->setAuthTokens($config['auth_tokens']); $this->setAuthTokens($config['auth_tokens']);
} }
+1 -1
View File
@@ -23,7 +23,7 @@ class Admin implements ISettings {
$params = [ $params = [
'hasBotPassword' => $this->talkService->hasBotPassword(), 'hasBotPassword' => $this->talkService->hasBotPassword(),
'retentionDays' => $this->talkService->getRetentionDays(), 'retentionDays' => $this->talkService->getRetentionDays(),
'rooms' => $this->talkService->getAvailableTalkRooms(), 'rooms' => $this->talkService->getRooms(),
'authTokens' => $this->talkService->getAuthTokens(), 'authTokens' => $this->talkService->getAuthTokens(),
'configuredRooms' => $this->talkService->getRooms(), 'configuredRooms' => $this->talkService->getRooms(),
'serverUrl' => $this->talkService->getBaseUrl(), 'serverUrl' => $this->talkService->getBaseUrl(),