mt77/synapse-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct API to suspend/unsuspend user (#607)

Browse Source 
* Use correct API to suspend/unsuspend user

* bring back suspend toggle

* make linter happy
This commit is contained in:
Borislav Pantaleev 2025-06-06 23:49:47 +03:00 committed by GitHub
parent 5165625cd0
commit ab247891dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/UserAccountData.tsx
View File

@ -40,7 +40,7 @@ const UserAccountData = () => {
<>
<Stack direction="column" spacing={2} width="100%">
<Typography variant="h6">{translate("resources.users.account_data.title")}</Typography>
<Typography variant="body1">
<Typography variant="body1" component="div">
<Box>
<Accordion>
<AccordionSummary expandIcon={<ArrowDownwardIcon />}>

1
src/components/UserRateLimits.tsx
View File

@ -33,7 +33,6 @@ const RateLimitRow = ({
}}
>
<TextField
id="outlined-number"
type="number"
value={value}
onChange={handleChange}

34
src/pages/LoginPage.tsx
View File

@ -185,7 +185,6 @@ const LoginPage = () => {
}
};
const UserData = ({ formData }) => {
const form = useFormContext();
@ -197,17 +196,17 @@ const LoginPage = () => {
const domain = splitMxid(formData.username)?.domain;
if (domain) {
const url = await getWellKnownUrl(domain);
if (allowAnyBaseUrl || (allowMultipleBaseUrls && restrictBaseUrl.includes(url))) {
form.setValue("base_url", url, {
shouldValidate: true,
shouldDirty: true,
});
if (allowAnyBaseUrl || (allowMultipleBaseUrls && restrictBaseUrl.includes(url))) {
form.setValue("base_url", url, {
shouldValidate: true,
shouldDirty: true,
});
checkServerInfo(url);
}
}
};
const handleBaseUrlBlurOrChange = (event) => {
const handleBaseUrlBlurOrChange = event => {
// Get the value either from the event (onChange) or from formData (onBlur)
const value = event?.target?.value || formData.base_url;
@ -318,16 +317,17 @@ const LoginPage = () => {
choices={baseUrlChoices}
/>
)}
{!allowMultipleBaseUrls && (<TextInput
source="base_url"
label="synapseadmin.auth.base_url"
autoComplete="url"
{...(loading ? { disabled: true } : {})}
readOnly={allowSingleBaseUrl}
resettable={allowAnyBaseUrl}
validate={[required(), validateBaseUrl]}
onBlur={handleBaseUrlBlurOrChange}
/>
{!allowMultipleBaseUrls && (
<TextInput
source="base_url"
label="synapseadmin.auth.base_url"
autoComplete="url"
{...(loading ? { disabled: true } : {})}
readOnly={allowSingleBaseUrl}
resettable={allowAnyBaseUrl}
validate={[required(), validateBaseUrl]}
onBlur={handleBaseUrlBlurOrChange}
/>
)}
</Box>
<Typography className="serverVersion">{serverVersion}</Typography>

4
src/resources/users.tsx
View File

@ -115,7 +115,8 @@ const userFilters = [
<BooleanInput source="guests" alwaysOn />,
<BooleanInput label="resources.users.fields.show_deactivated" source="deactivated" alwaysOn />,
<BooleanInput label="resources.users.fields.show_locked" source="locked" alwaysOn />,
<BooleanInput label="resources.users.fields.show_suspended" source="suspended" alwaysOn />,
// waiting for https://github.com/element-hq/synapse/issues/18016
// <BooleanInput label="resources.users.fields.show_suspended" source="suspended" alwaysOn />,
];
const UserPreventSelfDelete: React.FC<{
@ -208,7 +209,6 @@ export const UserList = (props: ListProps) => (
<BooleanField source="admin" label="resources.users.fields.admin" />
<BooleanField source="deactivated" label="resources.users.fields.deactivated" />
<BooleanField source="locked" label="resources.users.fields.locked" />
<BooleanField source="suspended" label="resources.users.fields.suspended" />
<BooleanField source="erased" sortable={false} label="resources.users.fields.erased" />
<DateField source="creation_ts" label="resources.users.fields.creation_ts_ms" showTime options={DATE_FORMAT} />
</DatagridConfigurable>

27
src/synapse/dataProvider.ts
View File

@ -348,6 +348,10 @@ export interface SynapseDataProvider extends DataProvider {
getAccountData: (id: Identifier) => Promise<AccountDataModel>;
checkUsernameAvailability: (username: string) => Promise<UsernameAvailabilityResult>;
makeRoomAdmin: (room_id: string, user_id: string) => Promise<{ success: boolean; error?: string; errcode?: string }>;
suspendUser: (
id: Identifier,
suspendValue: boolean
) => Promise<{ success: boolean; error?: string; errcode?: string }>;
getServerRunningProcess: (etkeAdminUrl: string) => Promise<ServerProcessResponse>;
getServerStatus: (etkeAdminUrl: string) => Promise<ServerStatusResponse>;
getServerNotifications: (etkeAdminUrl: string) => Promise<ServerNotificationsResponse>;
@ -782,6 +786,7 @@ const baseDataProvider: SynapseDataProvider = {
const res = resourceMap[resource];
const endpoint_url = homeserver + res.path;
const { json } = await jsonClient(`${endpoint_url}/${encodeURIComponent(params.id)}`, {
method: "PUT",
body: JSON.stringify(params.data, filterNullValues),
@ -1026,6 +1031,22 @@ const baseDataProvider: SynapseDataProvider = {
throw error;
}
},
suspendUser: async (id: Identifier, suspendValue: boolean) => {
const base_url = localStorage.getItem("base_url");
const endpoint_url = `${base_url}/_synapse/admin/v1/suspend/${encodeURIComponent(returnMXID(id))}`;
try {
const { json } = await jsonClient(endpoint_url, {
method: "PUT",
body: JSON.stringify({ suspend: suspendValue }),
});
return { success: true };
} catch (error) {
if (error instanceof HttpError) {
return { success: false, error: error.body.error, errcode: error.body.errcode };
}
throw error;
}
},
getServerRunningProcess: async (etkeAdminUrl: string, burstCache = false): Promise<ServerProcessResponse> => {
const locked_at = "";
const command = "";
@ -1427,12 +1448,18 @@ const dataProvider = withLifecycleCallbacks(baseDataProvider, [
const avatarFile = params.data.avatar_file?.rawFile;
const avatarErase = params.data.avatar_erase;
const rates = params.data.rates;
const suspended = params.data.suspended;
if (rates) {
await dataProvider.setRateLimits(params.id, rates);
delete params.data.rates;
}
if (suspended !== undefined) {
await (dataProvider as SynapseDataProvider).suspendUser(params.id, suspended);
delete params.data.suspended;
}
if (avatarErase) {
params.data.avatar_url = "";
return params;