Merge pull request #27 from dklimpel/increase_export

Increase export of users up to 10000

.dockerignore

@@ -1,4 +1,5 @@
 # Exclude a bunch of stuff which can make the build context a larger than it needs to be
+.git/
 tests/
 build/
 lib/

Dockerfile

@@ -1,5 +1,5 @@
 # Builder
-FROM node:current as builder
+FROM node:10-alpine as builder
 
 WORKDIR /src
 

README.md

@@ -4,7 +4,7 @@
 
 This project is built using [react-admin](https://marmelab.com/react-admin/).
 
-It needs at least Synapse v1.18.0 for all functions to work as expected!
+It needs at least Synapse v1.14.0 for all functions to work as expected!
 
 ## Step-By-Step install:
 
@@ -29,8 +29,3 @@ Steps for 2):
 ## Screenshots
 
 ![Screenshots](./screenshots.jpg)
-
-## Development
-
-- Use `yarn test` to run all style, lint and unit tests
-- Use `yarn fix` to fix the coding style

package.json

@@ -12,20 +12,19 @@
   "devDependencies": {
     "@testing-library/jest-dom": "^5.1.1",
     "@testing-library/react": "^10.0.2",
-    "@testing-library/user-event": "^12.0.11",
+    "@testing-library/user-event": "^10.0.1",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.2",
-    "jest-fetch-mock": "^3.0.3",
     "prettier": "^2.0.0"
   },
   "dependencies": {
     "prop-types": "^15.7.2",
     "ra-language-german": "^2.1.2",
     "react": "^16.13.1",
-    "react-admin": "^3.7.0",
+    "react-admin": "^3.4.0",
     "react-dom": "^16.13.1",
     "react-scripts": "^3.4.1"
   },

src/App.js

@@ -37,8 +37,6 @@ const App = () => (
     />
     <Resource name="rooms" list={RoomList} show={RoomShow} icon={RoomIcon} />
     <Resource name="connections" />
-    <Resource name="devices" />
-    <Resource name="room_members" />
     <Resource name="servernotices" />
   </Admin>
 );

src/components/devices.js

@@ -1,89 +0,0 @@
-import React, { Fragment, useState } from "react";
-import {
-  Button,
-  useMutation,
-  useNotify,
-  Confirm,
-  useRefresh,
-} from "react-admin";
-import ActionDelete from "@material-ui/icons/Delete";
-import { makeStyles } from "@material-ui/core/styles";
-import { fade } from "@material-ui/core/styles/colorManipulator";
-import classnames from "classnames";
-
-const useStyles = makeStyles(
-  theme => ({
-    deleteButton: {
-      color: theme.palette.error.main,
-      "&:hover": {
-        backgroundColor: fade(theme.palette.error.main, 0.12),
-        // Reset on mouse devices
-        "@media (hover: none)": {
-          backgroundColor: "transparent",
-        },
-      },
-    },
-  }),
-  { name: "RaDeleteDeviceButton" }
-);
-
-export const DeviceRemoveButton = props => {
-  const { record } = props;
-  const classes = useStyles(props);
-  const [open, setOpen] = useState(false);
-  const refresh = useRefresh();
-  const notify = useNotify();
-
-  const [removeDevice, { loading }] = useMutation();
-
-  if (!record) return null;
-
-  const handleClick = () => setOpen(true);
-  const handleDialogClose = () => setOpen(false);
-
-  const handleConfirm = () => {
-    removeDevice(
-      {
-        type: "delete",
-        resource: "devices",
-        payload: {
-          id: record.id,
-          user_id: record.user_id,
-        },
-      },
-      {
-        onSuccess: () => {
-          notify("resources.devices.action.erase.success");
-          refresh();
-        },
-        onFailure: () =>
-          notify("resources.devices.action.erase.failure", "error"),
-      }
-    );
-    setOpen(false);
-  };
-
-  return (
-    <Fragment>
-      <Button
-        label="ra.action.remove"
-        onClick={handleClick}
-        className={classnames("ra-delete-button", classes.deleteButton)}
-      >
-        <ActionDelete />
-      </Button>
-      <Confirm
-        isOpen={open}
-        loading={loading}
-        onConfirm={handleConfirm}
-        onClose={handleDialogClose}
-        title="resources.devices.action.erase.title"
-        content="resources.devices.action.erase.content"
-        translateOptions={{
-          id: record.id,
-          name: record.display_name ? record.display_name : record.id,
-        }}
-      />
-    </Fragment>
-  );
-};

src/components/rooms.js

@@ -6,8 +6,6 @@ import {
   Filter,
   List,
   Pagination,
-  ReferenceField,
-  ReferenceManyField,
   SelectField,
   Show,
   Tab,
@@ -20,7 +18,6 @@ import { Tooltip, Typography, Chip } from "@material-ui/core";
 import HttpsIcon from "@material-ui/icons/Https";
 import NoEncryptionIcon from "@material-ui/icons/NoEncryption";
 import PageviewIcon from "@material-ui/icons/Pageview";
-import UserIcon from "@material-ui/icons/Group";
 import ViewListIcon from "@material-ui/icons/ViewList";
 import VisibilityIcon from "@material-ui/icons/Visibility";
 
@@ -95,34 +92,6 @@ export const RoomShow = props => {
           />
         </Tab>
 
-        <Tab label="synapseadmin.rooms.tabs.members" icon={<UserIcon />}>
-          <ReferenceManyField
-            reference="room_members"
-            target="room_id"
-            addLabel={false}
-          >
-            <Datagrid
-              style={{ width: "100%" }}
-              rowClick={(id, basePath, record) => "/users/" + id}
-            >
-              <TextField
-                source="id"
-                sortable={false}
-                label="resources.users.fields.id"
-              />
-              <ReferenceField
-                label="resources.users.fields.displayname"
-                source="id"
-                reference="users"
-                sortable={false}
-                link=""
-              >
-                <TextField source="displayname" sortable={false} />
-              </ReferenceField>
-            </Datagrid>
-          </ReferenceManyField>
-        </Tab>
-
         <Tab
           label="synapseadmin.rooms.tabs.permission"
           icon={<VisibilityIcon />}

src/components/users.js

@@ -2,7 +2,6 @@ import React, { cloneElement, Fragment } from "react";
 import Avatar from "@material-ui/core/Avatar";
 import PersonPinIcon from "@material-ui/icons/PersonPin";
 import ContactMailIcon from "@material-ui/icons/ContactMail";
-import DevicesIcon from "@material-ui/icons/Devices";
 import SettingsInputComponentIcon from "@material-ui/icons/SettingsInputComponent";
 import {
   ArrayInput,
@@ -24,7 +23,6 @@ import {
   TextField,
   TextInput,
   ReferenceField,
-  ReferenceManyField,
   SelectInput,
   BulkDeleteButton,
   DeleteButton,
@@ -38,7 +36,6 @@ import {
   sanitizeListRestProps,
 } from "react-admin";
 import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
-import { DeviceRemoveButton } from "./devices";
 import { makeStyles } from "@material-ui/core/styles";
 
 const useStyles = makeStyles({
@@ -53,7 +50,7 @@ const useStyles = makeStyles({
   },
 });
 
-const UserListActions = ({
+const ListActions = ({
   currentSort,
   className,
   resource,
@@ -132,7 +129,7 @@ export const UserList = props => {
       {...props}
       filters={<UserFilter />}
       filterDefaultValues={{ guests: true, deactivated: false }}
-      actions={<UserListActions maxResults={10000} />}
+      actions={<ListActions maxResults={10000} />}
       bulkActionButtons={<UserBulkActionButtons />}
       pagination={<UserPagination />}
     >
@@ -208,14 +205,10 @@ const UserTitle = ({ record }) => {
 };
 export const UserEdit = props => {
   const classes = useStyles();
-  const translate = useTranslate();
   return (
     <Edit {...props} title={<UserTitle />}>
       <TabbedForm toolbar={<UserEditToolbar />}>
-        <FormTab
+        <FormTab label="resources.users.name" icon={<PersonPinIcon />}>
-          label={translate("resources.users.name", { smart_count: 1 })}
-          icon={<PersonPinIcon />}
-        >
           <AvatarField
             source="avatar_src"
             sortable={false}
@@ -261,37 +254,6 @@ export const UserEdit = props => {
             </SimpleFormIterator>
           </ArrayInput>
         </FormTab>
-        <FormTab
-          label={translate("resources.devices.name", { smart_count: 2 })}
-          icon={<DevicesIcon />}
-          path="devices"
-        >
-          <ReferenceManyField
-            reference="devices"
-            target="user_id"
-            addLabel={false}
-          >
-            <Datagrid style={{ width: "100%" }}>
-              <TextField source="device_id" sortable={false} />
-              <TextField source="display_name" sortable={false} />
-              <TextField source="last_seen_ip" sortable={false} />
-              <DateField
-                source="last_seen_ts"
-                showTime
-                options={{
-                  year: "numeric",
-                  month: "2-digit",
-                  day: "2-digit",
-                  hour: "2-digit",
-                  minute: "2-digit",
-                  second: "2-digit",
-                }}
-                sortable={false}
-              />
-              <DeviceRemoveButton />
-            </Datagrid>
-          </ReferenceManyField>
-        </FormTab>
         <FormTab
           label="resources.connections.name"
           icon={<SettingsInputComponentIcon />}

src/i18n/de.js

@@ -37,7 +37,7 @@ export default {
         id: "Benutzer-ID",
         name: "Name",
         is_guest: "Gast",
-        admin: "Server Administrator",
+        admin: "Admin",
         deactivated: "Deaktiviert",
         guests: "Zeige Gäste",
         show_deactivated: "Zeige deaktivierte Benutzer",
@@ -51,11 +51,6 @@ export default {
         address: "Adresse",
         creation_ts_ms: "Zeitpunkt der Erstellung",
         consent_version: "Zugestimmte Geschäftsbedingungen",
-        // Devices:
-        device_id: "Geräte-ID",
-        display_name: "Gerätename",
-        last_seen_ts: "Zeitstempel",
-        last_seen_ip: "IP-Adresse",
       },
       helper: {
         deactivate: "Deaktivierte Nutzer können nicht wieder aktiviert werden.",
@@ -112,17 +107,6 @@ export default {
         user_agent: "User Agent",
       },
     },
-    devices: {
-      name: "Gerät |||| Geräte",
-      action: {
-        erase: {
-          title: "Entferne %{id}",
-          content: 'Möchten Sie das Gerät "%{name}" wirklich entfernen?',
-          success: "Gerät erfolgreich entfernt.",
-          failure: "Beim Entfernen ist ein Fehler aufgetreten.",
-        },
-      },
-    },
     servernotices: {
       name: "Serverbenachrichtigungen",
       send: "Servernachricht versenden",

src/i18n/en.js

@@ -35,7 +35,7 @@ export default {
         id: "User-ID",
         name: "Name",
         is_guest: "Guest",
-        admin: "Server Administrator",
+        admin: "Admin",
         deactivated: "Deactivated",
         guests: "Show guests",
         show_deactivated: "Show deactivated users",
@@ -49,11 +49,6 @@ export default {
         address: "Address",
         creation_ts_ms: "Creation timestamp",
         consent_version: "Consent version",
-        // Devices:
-        device_id: "Device-ID",
-        display_name: "Device name",
-        last_seen_ts: "Timestamp",
-        last_seen_ip: "IP address",
       },
       helper: {
         deactivate: "Deactivated users cannot be reactivated",
@@ -110,17 +105,6 @@ export default {
         user_agent: "User agent",
       },
     },
-    devices: {
-      name: "Device |||| Devices",
-      action: {
-        erase: {
-          title: "Removing %{id}",
-          content: 'Are you sure you want to remove the device "%{name}"?',
-          success: "Device successfully removed.",
-          failure: "An error has occurred.",
-        },
-      },
-    },
     servernotices: {
       name: "Server Notices",
       send: "Send server notices",

src/setupTests.js

@@ -1,6 +1,4 @@
 import { configure } from "enzyme";
 import Adapter from "enzyme-adapter-react-16";
-import fetchMock from "jest-fetch-mock";
 
 configure({ adapter: new Adapter() });
-fetchMock.enableMocks();

src/synapse/dataProvider.js

@@ -45,8 +45,8 @@ const resourceMap = {
       body: data,
       method: "PUT",
     }),
-    delete: params => ({
+    delete: id => ({
-      endpoint: `/_synapse/admin/v1/deactivate/${params.id}`,
+      endpoint: `/_synapse/admin/v1/deactivate/${id}`,
       body: { erase: true },
       method: "POST",
     }),
@@ -67,19 +67,6 @@ const resourceMap = {
       return json.total_rooms;
     },
   },
-  devices: {
-    map: d => ({
-      ...d,
-      id: d.device_id,
-    }),
-    data: "devices",
-    reference: id => ({
-      endpoint: `/_synapse/admin/v2/users/${id}/devices`,
-    }),
-    delete: params => ({
-      endpoint: `/_synapse/admin/v2/users/${params.user_id}/devices/${params.id}`,
-    }),
-  },
   connections: {
     path: "/_synapse/admin/v1/whois",
     map: c => ({
@@ -88,15 +75,6 @@ const resourceMap = {
     }),
     data: "connections",
   },
-  room_members: {
-    map: m => ({
-      id: m,
-    }),
-    reference: id => ({
-      endpoint: `/_synapse/admin/v1/rooms/${id}/members`,
-    }),
-    data: "members",
-  },
   servernotices: {
     map: n => ({ id: n.event_id }),
     create: data => ({
@@ -188,18 +166,30 @@ const dataProvider = {
   },
 
   getManyReference: (resource, params) => {
+    // FIXME
     console.log("getManyReference " + resource);
+    const { page, perPage } = params.pagination;
+    const { field, order } = params.sort;
+    const query = {
+      sort: JSON.stringify([field, order]),
+      range: JSON.stringify([(page - 1) * perPage, page * perPage - 1]),
+      filter: JSON.stringify({
+        ...params.filter,
+        [params.target]: params.id,
+      }),
+    };
 
     const homeserver = localStorage.getItem("base_url");
     if (!homeserver || !(resource in resourceMap)) return Promise.reject();
 
     const res = resourceMap[resource];
 
-    const ref = res["reference"](params.id);
+    const endpoint_url = homeserver + res.path;
-    const endpoint_url = homeserver + ref.endpoint;
+    const url = `${endpoint_url}?${stringify(query)}`;
 
-    return jsonClient(endpoint_url).then(({ headers, json }) => ({
+    return jsonClient(url).then(({ headers, json }) => ({
-      data: json[res.data].map(res.map),
+      data: json,
+      total: parseInt(headers.get("content-range").split("/").pop(), 10),
     }));
   },
 
@@ -286,11 +276,11 @@ const dataProvider = {
     const res = resourceMap[resource];
 
     if ("delete" in res) {
-      const del = res["delete"](params);
+      const del = res["delete"](params.id);
       const endpoint_url = homeserver + del.endpoint;
       return jsonClient(endpoint_url, {
-        method: "method" in del ? del.method : "DELETE",
+        method: del.method,
-        body: "body" in del ? JSON.stringify(del.body) : null,
+        body: JSON.stringify(del.body),
       }).then(({ json }) => ({
         data: json,
       }));
@@ -315,11 +305,11 @@ const dataProvider = {
     if ("delete" in res) {
       return Promise.all(
         params.ids.map(id => {
-          const del = res["delete"]({ ...params, id: id });
+          const del = res["delete"](id);
           const endpoint_url = homeserver + del.endpoint;
           return jsonClient(endpoint_url, {
-            method: "method" in del ? del.method : "DELETE",
+            method: del.method,
-            body: "body" in del ? JSON.stringify(del.body) : null,
+            body: JSON.stringify(del.body),
           });
         })
       ).then(responses => ({

src/synapse/dataProvider.test.js

@@ -1,78 +0,0 @@
-import dataProvider from "./dataProvider";
-
-beforeEach(() => {
-  fetch.resetMocks();
-});
-
-describe("dataProvider", () => {
-  localStorage.setItem("base_url", "http://localhost");
-  localStorage.setItem("access_token", "access_token");
-
-  it("fetches all users", async () => {
-    fetch.mockResponseOnce(
-      JSON.stringify({
-        users: [
-          {
-            name: "user_id1",
-            password_hash: "password_hash1",
-            is_guest: 0,
-            admin: 0,
-            user_type: null,
-            deactivated: 0,
-            displayname: "User One",
-          },
-          {
-            name: "user_id2",
-            password_hash: "password_hash2",
-            is_guest: 0,
-            admin: 1,
-            user_type: null,
-            deactivated: 0,
-            displayname: "User Two",
-          },
-        ],
-        next_token: "100",
-        total: 200,
-      })
-    );
-
-    const users = await dataProvider.getList("users", {
-      pagination: { page: 1, perPage: 5 },
-      sort: { field: "title", order: "ASC" },
-      filter: { author_id: 12 },
-    });
-
-    expect(users["data"][0]["id"]).toEqual("user_id1");
-    expect(users["total"]).toEqual(200);
-    expect(fetch).toHaveBeenCalledTimes(1);
-  });
-
-  it("fetches one user", async () => {
-    fetch.mockResponseOnce(
-      JSON.stringify({
-        name: "user_id1",
-        password: "user_password",
-        displayname: "User",
-        threepids: [
-          {
-            medium: "email",
-            address: "user@mail_1.com",
-          },
-          {
-            medium: "email",
-            address: "user@mail_2.com",
-          },
-        ],
-        avatar_url: "mxc://localhost/user1",
-        admin: false,
-        deactivated: false,
-      })
-    );
-
-    const user = await dataProvider.getOne("users", { id: "user_id1" });
-
-    expect(user["data"]["id"]).toEqual("user_id1");
-    expect(user["data"]["displayname"]).toEqual("User");
-    expect(fetch).toHaveBeenCalledTimes(1);
-  });
-});