Increment version

Change-Id: I149896f55be7840b240d92fed5880e3f5624b857
Update en.js (#144 )
2021-05-25 15:03:15 +02:00 · 2021-05-25 15:01:13 +02:00 · 2021-05-18 12:39:53 +02:00 · 2021-05-08 19:10:51 +02:00 · 2021-05-05 20:24:15 +02:00 · 2021-05-05 19:36:47 +02:00
26 changed files with 3362 additions and 3814 deletions
--- a/.env
+++ b/.env
@@ -0,0 +1,5 @@
+# This setting allows to fix the homeserver.
+# If you set this setting, the user will not be able to select
+# the server and have to use synapse-admin with this server.
+
+#REACT_APP_SERVER=https://yourmatrixserver.example.com
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - 13
+  - lts/*

 cache: yarn
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 This project is built using [react-admin](https://marmelab.com/react-admin/).

-It needs at least Synapse v1.27.0 for all functions to work as expected!
+It needs at least Synapse v1.32.0 for all functions to work as expected!

 You get your server version with the request `/_synapse/admin/v1/server_version`.
 See also [Synapse version API](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/version_api.rst).
@@ -33,6 +33,11 @@ Steps for 1):
 - download dependencies: `yarn install`
 - start web server: `yarn start`

+You can fix the homeserver, so that the user can no longer define it himself.
+Either you define it at startup (e.g. `REACT_APP_SERVER=https://yourmatrixserver.example.com yarn start`)
+or by editing it in the [.env](.env) file. See also the
+[documentation](https://create-react-app.dev/docs/adding-custom-environment-variables/).
+
 Steps for 2):

 - run the Docker container from the public docker registry: `docker run -p 8080:80 awesometechnologies/synapse-admin` or use the (docker-compose.yml)[docker-compose.yml]: `docker-compose up -d`
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "synapse-admin",
-  "version": "AMP/2021.05",
+  "version": "0.8.1",
  "description": "Admin GUI for the Matrix.org server Synapse",
  "author": "Awesome Technologies Innovationslabor GmbH",
  "license": "Apache-2.0",
@@ -11,30 +11,24 @@
  },
  "devDependencies": {
    "@testing-library/jest-dom": "^5.1.1",
-    "@testing-library/react": "^10.0.2",
-    "@testing-library/user-event": "^12.0.11",
-    "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.2",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
+    "@testing-library/react": "^11.2.6",
+    "@testing-library/user-event": "^13.1.8",
+    "eslint": "^7.25.0",
+    "eslint-config-prettier": "^8.3.0",
    "eslint-plugin-prettier": "^3.1.2",
    "jest-fetch-mock": "^3.0.3",
-    "prettier": "^2.0.0",
-    "ra-test": "^3.14.0"
+    "prettier": "^2.2.0",
+    "ra-test": "^3.15.0"
  },
  "dependencies": {
-    "@progress/kendo-drawing": "^1.6.0",
-    "@progress/kendo-react-pdf": "^3.10.1",
-    "babel-preset-jest": "^24.9.0",
    "papaparse": "^5.2.0",
    "prop-types": "^15.7.2",
-    "qrcode.react": "^1.0.0",
    "ra-language-chinese": "^2.0.10",
-    "ra-language-german": "^2.1.2",
+    "ra-language-german": "^3.13.4",
    "react": "^17.0.0",
-    "react-admin": "^3.14.0",
-    "react-dom": "^16.14.0",
-    "react-scripts": "^3.4.4"
+    "react-admin": "^3.15.0",
+    "react-dom": "^17.0.2",
+    "react-scripts": "^4.0.0"
  },
  "scripts": {
    "start": "REACT_APP_VERSION=$(git describe --tags) react-scripts start",
--- a/public/fonts/DejaVu/DejaVuSans-Bold.ttf
+++ b/public/fonts/DejaVu/DejaVuSans-Bold.ttf
--- a/public/fonts/DejaVu/DejaVuSans-Mono.ttf
+++ b/public/fonts/DejaVu/DejaVuSans-Mono.ttf
--- a/public/fonts/DejaVu/DejaVuSans-Oblique.ttf
+++ b/public/fonts/DejaVu/DejaVuSans-Oblique.ttf
--- a/public/fonts/DejaVu/DejaVuSans.ttf
+++ b/public/fonts/DejaVu/DejaVuSans.ttf
--- a/public/images/logo.png
+++ b/public/images/logo.png
--- a/public/index.html
+++ b/public/index.html
@@ -9,32 +9,6 @@
      name="description"
      content="Synapse-Admin"
    />
-    <style>
-      @font-face {
-        font-family: "DejaVu Sans";
-        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans.ttf") format("truetype");
-      }
-      @font-face {
-        font-family: "DejaVu Sans";
-        font-weight: bold;
-        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans-Bold.ttf") format("truetype");
-      }
-      @font-face {
-        font-family: "DejaVu Sans";
-        font-style: italic;
-        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans-Oblique.ttf") format("truetype");
-      }
-      @font-face {
-        font-family: "DejaVu Sans";
-        font-weight: bold;
-        font-style: italic;
-        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans-Oblique.ttf") format("truetype");
-      }
-      @font-face {
-        font-family: "DejaVu Sans Mono";
-        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans-Mono.ttf") format("truetype");
-      }
-    </style>
    <!--
      manifest.json provides metadata used when your web app is installed on a
      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -72,4 +46,4 @@
      </a>
    </footer>
  </body>
-</html>
+</html>
--- a/src/App.js
+++ b/src/App.js
@@ -4,7 +4,7 @@ import polyglotI18nProvider from "ra-i18n-polyglot";
 import authProvider from "./synapse/authProvider";
 import dataProvider from "./synapse/dataProvider";
 import { UserList, UserCreate, UserEdit } from "./components/users";
-import { RoomList, RoomCreate, RoomShow, RoomEdit } from "./components/rooms";
+import { RoomList, RoomShow } from "./components/rooms";
 import { ReportList, ReportShow } from "./components/EventReports";
 import LoginPage from "./components/LoginPage";
 import UserIcon from "@material-ui/icons/Group";
@@ -19,7 +19,6 @@ import { Route } from "react-router-dom";
 import germanMessages from "./i18n/de";
 import englishMessages from "./i18n/en";
 import chineseMessages from "./i18n/zh";
-import ShowUserPdf from "./components/ShowUserPdf";

 // TODO: Can we use lazy loading together with browser locale?
 const messages = {
@@ -40,7 +39,7 @@ const App = () => (
    dataProvider={dataProvider}
    i18nProvider={i18nProvider}
    customRoutes={[
-      <Route key="showpdf" path="/showpdf" component={ShowUserPdf} />,
+      <Route key="userImport" path="/import_users" component={ImportFeature} />,
    ]}
  >
    <Resource
@@ -50,14 +49,7 @@ const App = () => (
      edit={UserEdit}
      icon={UserIcon}
    />
-    <Resource
-      name="rooms"
-      list={RoomList}
-      create={RoomCreate}
-      show={RoomShow}
-      edit={RoomEdit}
-      icon={RoomIcon}
-    />
+    <Resource name="rooms" list={RoomList} show={RoomShow} icon={RoomIcon} />
    <Resource
      name="user_media_statistics"
      list={UserMediaStatsList}
@@ -81,6 +73,7 @@ const App = () => (
    <Resource name="joined_rooms" />
    <Resource name="pushers" />
    <Resource name="servernotices" />
+    <Resource name="forward_extremities" />
    <Resource name="room_state" />
  </Admin>
 );
--- a/src/App.test.js
+++ b/src/App.test.js
@@ -1,14 +1,9 @@
 import React from "react";
-import { TestContext } from "ra-test";
-import { shallow } from "enzyme";
+import { render } from "@testing-library/react";
 import App from "./App";

 describe("App", () => {
  it("renders", () => {
-    shallow(
-      <TestContext>
-        <App />
-      </TestContext>
-    );
+    render(<App />);
  });
 });
--- a/src/components/LoginPage.js
+++ b/src/components/LoginPage.js
@@ -82,6 +82,7 @@ const LoginPage = ({ theme }) => {
  const setLocale = useSetLocale();
  const translate = useTranslate();
  const base_url = localStorage.getItem("base_url");
+  const cfg_base_url = process.env.REACT_APP_SERVER;

  const renderInput = ({
    meta: { touched, error } = {},
@@ -111,7 +112,9 @@ const LoginPage = ({ theme }) => {
      if (!values.base_url.match(/^(http|https):\/\//)) {
        errors.base_url = translate("synapseadmin.auth.protocol_error");
      } else if (
-        !values.base_url.match(/^(http|https):\/\/[a-zA-Z0-9\-.]+(:\d{1,5})?$/)
+        !values.base_url.match(
+          /^(http|https):\/\/[a-zA-Z0-9\-.]+(:\d{1,5})?[^?&\s]*$/
+        )
      ) {
        errors.base_url = translate("synapseadmin.auth.url_error");
      }
@@ -147,7 +150,7 @@ const LoginPage = ({ theme }) => {
    const [serverVersion, setServerVersion] = useState("");

    const handleUsernameChange = _ => {
-      if (formData.base_url) return;
+      if (formData.base_url || cfg_base_url) return;
      // check if username is a full qualified userId then set base_url accordially
      const home_server = extractHomeServer(formData.username);
      const wellKnownUrl = `https://${home_server}/.well-known/matrix/client`;
@@ -199,6 +202,7 @@ const LoginPage = ({ theme }) => {
            label={translate("ra.auth.username")}
            disabled={loading}
            onBlur={handleUsernameChange}
+            resettable
            fullWidth
          />
        </div>
@@ -209,6 +213,7 @@ const LoginPage = ({ theme }) => {
            label={translate("ra.auth.password")}
            type="password"
            disabled={loading}
+            resettable
            fullWidth
          />
        </div>
@@ -217,7 +222,8 @@ const LoginPage = ({ theme }) => {
            name="base_url"
            component={renderInput}
            label={translate("synapseadmin.auth.base_url")}
-            disabled={loading}
+            disabled={cfg_base_url || loading}
+            resettable
            fullWidth
          />
        </div>
@@ -228,7 +234,7 @@ const LoginPage = ({ theme }) => {

  return (
    <Form
-      initialValues={{ base_url: base_url }}
+      initialValues={{ base_url: cfg_base_url || base_url }}
      onSubmit={handleSubmit}
      validate={validate}
      render={({ handleSubmit }) => (
--- a/src/components/LoginPage.test.js
+++ b/src/components/LoginPage.test.js
@@ -1,11 +1,11 @@
 import React from "react";
+import { render } from "@testing-library/react";
 import { TestContext } from "ra-test";
-import { shallow } from "enzyme";
 import LoginPage from "./LoginPage";

 describe("LoginForm", () => {
  it("renders", () => {
-    shallow(
+    render(
      <TestContext>
        <LoginPage />
      </TestContext>
--- a/src/components/RoomDirectory.js
+++ b/src/components/RoomDirectory.js
@@ -171,7 +171,7 @@ const RoomDirectoryFilter = ({ ...props }) => {
  );
 };

-export const FilterableRoomDirectoryList = ({ ...props }) => {
+export const FilterableRoomDirectoryList = ({ dispatch, ...props }) => {
  const classes = useStyles();
  const translate = useTranslate();
  const filter = props.roomDirectoryFilters;
@@ -242,7 +242,7 @@ export const FilterableRoomDirectoryList = ({ ...props }) => {

 function mapStateToProps(state) {
  return {
-    roomDirectoryFilters:
+    roomdirectoryfilters:
      state.admin.resources.room_directory.list.params.displayedFilters,
  };
 }
--- a/src/components/SaveQrButton.js
+++ b/src/components/SaveQrButton.js
@@ -1,35 +0,0 @@
-import React, { useCallback } from "react";
-import { SaveButton, useCreate, useRedirect, useNotify } from "react-admin";
-
-const SaveQrButton = props => {
-  const [create] = useCreate("users");
-  const redirectTo = useRedirect();
-  const notify = useNotify();
-  const { basePath } = props;
-
-  const handleSave = useCallback(
-    (values, redirect) => {
-      create(
-        {
-          payload: { data: { ...values } },
-        },
-        {
-          onSuccess: ({ data: newRecord }) => {
-            notify("ra.notification.created", "info", {
-              smart_count: 1,
-            });
-            redirectTo(redirect, basePath, newRecord.id, {
-              password: values.password,
-              ...newRecord,
-            });
-          },
-        }
-      );
-    },
-    [create, notify, redirectTo, basePath]
-  );
-
-  return <SaveButton {...props} onSave={handleSave} />;
-};
-
-export default SaveQrButton;
--- a/src/components/ShowUserPdf.js
+++ b/src/components/ShowUserPdf.js
@@ -1,210 +0,0 @@
-import React from "react";
-import { Title, Button } from "react-admin";
-import { makeStyles } from "@material-ui/core/styles";
-import { PDFExport } from "@progress/kendo-react-pdf";
-import QRCode from "qrcode.react";
-
-function xor(a, b) {
-  var res = "";
-  for (var i = 0; i < a.length; i++) {
-    res += String.fromCharCode(a.charCodeAt(i) ^ b.charCodeAt(i % b.length));
-  }
-  return res;
-}
-
-function calculateQrString(serverUrl, username, password) {
-  const magicString = "wo9k5tep252qxsa5yde7366kugy6c01w7oeeya9hrmpf0t7ii7";
-  var urlString = "user=" + username + "&password=" + password;
-
-  urlString = xor(urlString, magicString); // xor with magic string
-  urlString = btoa(urlString); // to base64
-
-  return serverUrl + "/#" + urlString;
-}
-
-const ShowUserPdf = props => {
-  const useStyles = makeStyles(theme => ({
-    page: {
-      height: 800,
-      width: 566,
-      padding: "none",
-      backgroundColor: "white",
-      boxShadow: "5px 5px 5px black",
-      margin: "auto",
-      overflowX: "hidden",
-      overflowY: "hidden",
-      fontFamily: "DejaVu Sans, Sans-Serif",
-      fontSize: 15,
-    },
-    header: {
-      height: 144,
-      width: 534,
-      marginLeft: 32,
-      marginTop: 15,
-    },
-    name: {
-      width: 240,
-      fontSize: 35,
-      float: "left",
-      marginTop: 100,
-    },
-    logo: {
-      width: 90,
-      marginTop: 50,
-      marginRight: 70,
-      float: "right",
-    },
-    body: {
-      clear: "both",
-    },
-    table_cell: {
-      verticalAlign: "top",
-    },
-    code_note: {
-      marginLeft: 32,
-      marginTop: 86,
-    },
-    qr: {
-      marginTop: 15,
-      marginLeft: 32,
-    },
-    credentials_note: {
-      marginTop: 86,
-      marginLeft: 10,
-    },
-    credentials_text: {
-      marginLeft: 10,
-      fontSize: 12,
-    },
-    credentials: {
-      fontFamily: "DejaVu Sans Mono, monospace",
-    },
-    note: {
-      fontSize: 18,
-      marginTop: 100,
-      marginLeft: 32,
-      marginRight: 32,
-    },
-  }));
-
-  const classes = useStyles();
-
-  var resume;
-
-  const exportPDF = () => {
-    resume.save();
-  };
-
-  var qrCode = "";
-  var displayname = "";
-  var id = "";
-  var password = "";
-  var username = "";
-  var serverUrl = "";
-
-  if (
-    props.location.state &&
-    props.location.state.id &&
-    props.location.state.password
-  ) {
-    id = props.location.state.id;
-    password = props.location.state.password;
-
-    username = id.substring(1, id.indexOf(":"));
-    serverUrl = "https://" + id.substring(id.indexOf(":") + 1);
-
-    const qrString = calculateQrString(serverUrl, username, password);
-
-    qrCode = <QRCode value={qrString} size={128} />;
-    displayname = props.location.state.displayname;
-  }
-
-  return (
-    <div>
-      <Title title="PDF" />
-      <Button label="synapseadmin.action.download_pdf" onClick={exportPDF} />
-
-      <PDFExport
-        paperSize={"A4"}
-        fileName="User.pdf"
-        title=""
-        subject=""
-        keywords=""
-        ref={r => (resume = r)}
-      >
-        <div className={classes.page}>
-          <div className={classes.header}>
-            <div className={classes.name}>{displayname}</div>
-            <img className={classes.logo} alt="Logo" src="images/logo.png" />
-          </div>
-          <div className={classes.body}>
-            <table>
-              <tbody>
-                <tr>
-                  <td width="200px">
-                    <div className={classes.code_note}>
-                      Ihr persönlicher Anmeldecode:
-                    </div>
-                  </td>
-                  <td className={classes.table_cell}>
-                    <div className={classes.credentials_note}>
-                      Ihre persönlichen Zugangsdaten:
-                    </div>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <div className={classes.qr}>{qrCode}</div>
-                  </td>
-                  <td className={classes.table_cell}>
-                    <div className={classes.credentials_text}>
-                      <br />
-                      <table>
-                        <tbody>
-                          <tr>
-                            <td>Heimserver:</td>
-                            <td>
-                              <span className={classes.credentials}>
-                                {serverUrl}
-                              </span>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td>Benutzername:</td>
-                            <td>
-                              <span className={classes.credentials}>
-                                {username}
-                              </span>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td>Passwort:</td>
-                            <td>
-                              <span className={classes.credentials}>
-                                {password}
-                              </span>
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-            <div className={classes.note}>
-              Hier können Sie Ihre selbst gewählte
-              Schlüsselsicherungs-Passphrase notieren:
-              <br />
-              <br />
-              <br />
-              <hr />
-            </div>
-          </div>
-        </div>
-      </PDFExport>
-    </div>
-  );
-};
-
-export default ShowUserPdf;
--- a/src/components/rooms.js
+++ b/src/components/rooms.js
@@ -1,59 +1,38 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
-import { Route, Link } from "react-router-dom";
 import {
-  AutocompleteArrayInput,
-  AutocompleteInput,
-  BooleanInput,
  BooleanField,
  BulkDeleteButton,
-  Button,
-  Create,
-  Edit,
-  Datagrid,
  DateField,
+  Datagrid,
  DeleteButton,
  Filter,
-  FormTab,
  List,
+  NumberField,
  Pagination,
-  ReferenceArrayInput,
  ReferenceField,
-  ReferenceInput,
  ReferenceManyField,
  SearchInput,
  SelectField,
  Show,
-  SimpleForm,
  Tab,
-  TabbedForm,
  TabbedShowLayout,
  TextField,
-  TextInput,
-  Toolbar,
  TopToolbar,
-  useDataProvider,
-  useRefresh,
+  useRecordContext,
  useTranslate,
 } from "react-admin";
 import get from "lodash/get";
-import {
-  Tooltip,
-  Typography,
-  Chip,
-  Drawer,
-  styled,
-  withStyles,
-  Select,
-  MenuItem,
-} from "@material-ui/core";
+import PropTypes from "prop-types";
+import { makeStyles } from "@material-ui/core/styles";
+import { Tooltip, Typography, Chip } from "@material-ui/core";
+import FastForwardIcon from "@material-ui/icons/FastForward";
 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";
-import ContentSave from "@material-ui/icons/Save";
 import EventIcon from "@material-ui/icons/Event";
 import {
  RoomDirectoryBulkDeleteButton,
@@ -62,6 +41,13 @@ import {
  RoomDirectorySaveButton,
 } from "./RoomDirectory";

+const useStyles = makeStyles(theme => ({
+  helper_forward_extremities: {
+    fontFamily: "Roboto, Helvetica, Arial, sans-serif",
+    margin: "0.5em",
+  },
+}));
+
 const RoomPagination = props => (
  <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
 );
@@ -92,368 +78,20 @@ const EncryptionField = ({ source, record = {}, emptyText }) => {
  );
 };

-const validateDisplayName = fieldval => {
-  return fieldval == null
-    ? "synapseadmin.rooms.room_name_required"
-    : fieldval.length === 0
-    ? "synapseadmin.rooms.room_name_required"
-    : undefined;
-};
-
-function approximateAliasLength(alias, homeserver) {
-  /* TODO maybe handle punycode in homeserver name */
-
-  var te;
-
-  // Support for TextEncoder is quite widespread, but the polyfill is
-  // pretty large; We will only underestimate the size with the regular
-  // length attribute of String, so we never prevent the user from using
-  // an alias that is short enough for the server, but too long for our
-  // heuristic.
-  try {
-    te = new TextEncoder();
-  } catch (err) {
-    if (err instanceof ReferenceError) {
-      te = undefined;
-    }
-  }
-
-  const aliasLength = te === undefined ? alias.length : te.encode(alias).length;
-
-  return "#".length + aliasLength + ":".length + homeserver.length;
-}
-
-const validateAlias = fieldval => {
-  if (fieldval === undefined) {
-    return undefined;
-  }
-  const homeserver = localStorage.getItem("home_server");
-
-  if (approximateAliasLength(fieldval, homeserver) > 255) {
-    return "synapseadmin.rooms.alias_too_long";
-  }
-};
-
-const removeLeadingWhitespace = fieldVal =>
-  fieldVal === undefined ? undefined : fieldVal.trimStart();
-const replaceAllWhitespace = fieldVal =>
-  fieldVal === undefined ? undefined : fieldVal.replace(/\s/, "_");
-const removeLeadingSigil = fieldVal =>
-  fieldVal === undefined
-    ? undefined
-    : fieldVal.startsWith("#")
-    ? fieldVal.substr(1)
-    : fieldVal;
-
-const validateHasAliasIfPublic = formdata => {
-  let errors = {};
-  if (formdata.public) {
-    if (
-      formdata.canonical_alias === undefined ||
-      formdata.canonical_alias.trim().length === 0
-    ) {
-      errors.canonical_alias = "synapseadmin.rooms.alias_required_if_public";
-    }
-  }
-  return errors;
-};
-
-export const RoomCreate = props => (
-  <Create {...props}>
-    <TabbedForm validate={validateHasAliasIfPublic}>
-      <FormTab label="synapseadmin.rooms.details" icon={<ViewListIcon />}>
-        <TextInput
-          source="name"
-          parse={removeLeadingWhitespace}
-          validate={validateDisplayName}
-        />
-        <TextInput
-          source="canonical_alias"
-          parse={fv => replaceAllWhitespace(removeLeadingSigil(fv))}
-          validate={validateAlias}
-          placeholder="#"
-        />
-        <ReferenceInput
-          reference="users"
-          source="owner"
-          filterToQuery={searchText => ({ user_id: searchText })}
-        >
-          <AutocompleteInput
-            optionText="displayname"
-            suggestionText="displayname"
-          />
-        </ReferenceInput>
-        <BooleanInput source="public" label="synapseadmin.rooms.make_public" />
-        <BooleanInput
-          source="encrypt"
-          initialValue={true}
-          label="synapseadmin.rooms.encrypt"
-        />
-      </FormTab>
-      <FormTab
-        label="resources.rooms.fields.invite_members"
-        icon={<UserIcon />}
-      >
-        <ReferenceArrayInput
-          reference="users"
-          source="invitees"
-          filterToQuery={searchText => ({ user_id: searchText })}
-        >
-          <AutocompleteArrayInput
-            optionText="displayname"
-            suggestionText="displayname"
-          />
-        </ReferenceArrayInput>
-      </FormTab>
-    </TabbedForm>
-  </Create>
-);
-
 const RoomTitle = ({ record }) => {
  const translate = useTranslate();
+  var name = "";
+  if (record) {
+    name = record.name !== "" ? record.name : record.id;
+  }
+
  return (
    <span>
-      {translate("resources.rooms.name", 1)} {record ? `"${record.name}"` : ""}
+      {translate("resources.rooms.name", 1)} {name}
    </span>
  );
 };

-// Explicitely passing "to" prop
-// Toolbar adds all kinds of unsupported props to its children :(
-const StyledLink = styles => {
-  const Styled = styled(Link)(styles);
-  return ({ to, children }) => <Styled to={to}>{children}</Styled>;
-};
-
-const RoomMemberEditToolbar = ({ backLink, translate, onSave, ...props }) => {
-  const SaveLink = StyledLink({
-    textDecoration: "none",
-  });
-  const CancelLink = StyledLink({
-    textDecoration: "none",
-    marginLeft: "1em",
-  });
-  const SaveIcon = styled(ContentSave)({
-    width: "1rem",
-    marginRight: "0.25em",
-  });
-
-  return (
-    <Toolbar {...props}>
-      <SaveLink to={backLink}>
-        <Button onClick={onSave} variant="contained">
-          <React.Fragment>
-            <SaveIcon />
-            {translate("ra.action.save")}
-          </React.Fragment>
-        </Button>
-      </SaveLink>
-      <CancelLink to={backLink}>
-        <Button>
-          <React.Fragment>{translate("ra.action.cancel")}</React.Fragment>
-        </Button>
-      </CancelLink>
-    </Toolbar>
-  );
-};
-
-const RoomMemberIdField = ({ memberId, data = {} }) => {
-  const value = get(data[memberId], "id");
-
-  return (
-    <Typography component="span" variant="body2">
-      {value}
-    </Typography>
-  );
-};
-
-const RoomMemberRoleInput = ({ memberId, data = {}, translate, onChange }) => {
-  const roleValue = get(data[memberId], "role");
-  const [role, setRole] = React.useState(roleValue);
-
-  React.useEffect(() => {
-    onChange(roleValue);
-  }, [onChange, roleValue]);
-
-  return (
-    <React.Fragment>
-      <Select
-        labelId="demo-simple-select-label"
-        id="demo-simple-select"
-        value={role}
-        onChange={event => {
-          setRole(event.target.value);
-          onChange(event.target.value);
-        }}
-      >
-        <MenuItem value={"user"}>
-          {translate("resources.users.roles.user")}
-        </MenuItem>
-        <MenuItem value={"mod"}>
-          {translate("resources.users.roles.mod")}
-        </MenuItem>
-        <MenuItem value={"admin"}>
-          {translate("resources.users.roles.admin")}
-        </MenuItem>
-      </Select>
-    </React.Fragment>
-  );
-};
-
-const RoomMemberEdit = ({ backLink, memberId, ...props }) => {
-  const translate = useTranslate();
-  const refresh = useRefresh();
-  const dataProvider = useDataProvider();
-
-  const [role, setRole] = React.useState();
-
-  const { id } = props;
-
-  return (
-    <Edit title=" " {...props}>
-      <SimpleForm
-        toolbar={
-          <RoomMemberEditToolbar
-            backLink={backLink}
-            translate={translate}
-            onSave={() => {
-              dataProvider
-                .update("rooms", {
-                  data: {
-                    id,
-                    member_roles: [{ member_id: memberId, role }],
-                  },
-                })
-                .then(() => {
-                  refresh();
-                });
-            }}
-          />
-        }
-      >
-        <ReferenceManyField
-          reference="room_members"
-          target="room_id"
-          label="resources.users.fields.id"
-        >
-          <RoomMemberIdField memberId={memberId} />
-        </ReferenceManyField>
-        <ReferenceManyField
-          reference="room_members"
-          target="room_id"
-          label="resources.users.fields.role"
-        >
-          <RoomMemberRoleInput
-            memberId={memberId}
-            translate={translate}
-            onChange={setRole}
-          />
-        </ReferenceManyField>
-      </SimpleForm>
-    </Edit>
-  );
-};
-
-const drawerStyles = {
-  paper: {
-    width: 300,
-  },
-};
-const StyledDrawer = withStyles(drawerStyles)(({ classes, ...props }) => (
-  <Drawer {...props} classes={classes} />
-));
-
-export const RoomEdit = props => {
-  const translate = useTranslate();
-
-  return (
-    <React.Fragment>
-      <Edit {...props} title={<RoomTitle />}>
-        <TabbedForm>
-          <FormTab label="synapseadmin.rooms.tabs.members" icon={<UserIcon />}>
-            <ReferenceArrayInput
-              reference="users"
-              source="invitees"
-              filterToQuery={searchText => ({ user_id: searchText })}
-            >
-              <AutocompleteArrayInput
-                optionText="displayname"
-                suggestionText="displayname"
-              />
-            </ReferenceArrayInput>
-
-            <ReferenceManyField
-              reference="room_members"
-              target="room_id"
-              addLabel={false}
-            >
-              <Datagrid
-                style={{ width: "100%" }}
-                rowClick={(id, basePath, record) =>
-                  `/rooms/${encodeURIComponent(
-                    record.parentId
-                  )}/${encodeURIComponent(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>
-                <SelectField
-                  source="role"
-                  label="resources.users.fields.role"
-                  choices={[
-                    {
-                      id: "user",
-                      name: translate("resources.users.roles.user"),
-                    },
-                    { id: "mod", name: translate("resources.users.roles.mod") },
-                    {
-                      id: "admin",
-                      name: translate("resources.users.roles.admin"),
-                    },
-                  ]}
-                />
-              </Datagrid>
-            </ReferenceManyField>
-          </FormTab>
-        </TabbedForm>
-      </Edit>
-      <Route path="/rooms/:roomId/:memberId">
-        {({ match }) => {
-          const isMatch = !!match && !!match.params;
-
-          return (
-            <StyledDrawer open={isMatch} anchor="right">
-              {isMatch ? (
-                <RoomMemberEdit
-                  {...props}
-                  memberId={
-                    isMatch ? decodeURIComponent(match.params.memberId) : null
-                  }
-                  backLink={`/rooms/${match.params.roomId}`}
-                />
-              ) : (
-                <div />
-              )}
-            </StyledDrawer>
-          );
-        }}
-      </Route>
-    </React.Fragment>
-  );
-};
-
 const RoomShowActions = ({ basePath, data, resource }) => {
  var roomDirectoryStatus = "";
  if (data) {
@@ -481,6 +119,7 @@ const RoomShowActions = ({ basePath, data, resource }) => {
 };

 export const RoomShow = props => {
+  const classes = useStyles({ props });
  const translate = useTranslate();
  return (
    <Show {...props} actions={<RoomShowActions />} title={<RoomTitle />}>
@@ -592,6 +231,7 @@ export const RoomShow = props => {
            ]}
          />
        </Tab>
+
        <Tab
          label={translate("resources.room_state.name", { smart_count: 2 })}
          icon={<EventIcon />}
@@ -628,6 +268,40 @@ export const RoomShow = props => {
            </Datagrid>
          </ReferenceManyField>
        </Tab>
+
+        <Tab
+          label="resources.forward_extremities.name"
+          icon={<FastForwardIcon />}
+          path="forward_extremities"
+        >
+          <div className={classes.helper_forward_extremities}>
+            {translate("resources.rooms.helper.forward_extremities")}
+          </div>
+          <ReferenceManyField
+            reference="forward_extremities"
+            target="room_id"
+            addLabel={false}
+          >
+            <Datagrid style={{ width: "100%" }}>
+              <TextField source="id" sortable={false} />
+              <DateField
+                source="received_ts"
+                showTime
+                options={{
+                  year: "numeric",
+                  month: "2-digit",
+                  day: "2-digit",
+                  hour: "2-digit",
+                  minute: "2-digit",
+                  second: "2-digit",
+                }}
+                sortable={false}
+              />
+              <NumberField source="depth" sortable={false} />
+              <TextField source="state_group" sortable={false} />
+            </Datagrid>
+          </ReferenceManyField>
+        </Tab>
      </TabbedShowLayout>
    </Show>
  );
@@ -679,8 +353,22 @@ const RoomFilter = ({ ...props }) => {
  );
 };

-const FilterableRoomList = ({ ...props }) => {
-  const filter = props.roomFilters;
+const RoomNameField = props => {
+  const { source } = props;
+  const record = useRecordContext(props);
+  return (
+    <span>{record[source] || record["canonical_alias"] || record["id"]}</span>
+  );
+};
+
+RoomNameField.propTypes = {
+  label: PropTypes.string,
+  record: PropTypes.object,
+  source: PropTypes.string.isRequired,
+};
+
+const FilterableRoomList = ({ roomFilters, dispatch, ...props }) => {
+  const filter = roomFilters;
  const localMembersFilter =
    filter && filter.joined_local_members ? true : false;
  const stateEventsFilter = filter && filter.state_events ? true : false;
@@ -701,7 +389,7 @@ const FilterableRoomList = ({ ...props }) => {
          sortBy="encryption"
          label={<HttpsIcon />}
        />
-        <TextField source="name" />
+        <RoomNameField source="name" />
        <TextField source="joined_members" />
        {localMembersFilter && <TextField source="joined_local_members" />}
        {stateEventsFilter && <TextField source="state_events" />}
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -28,10 +28,9 @@ import {
  PasswordInput,
  TextField,
  TextInput,
-  SearchInput,
  ReferenceField,
  ReferenceManyField,
-  SelectField,
+  SearchInput,
  SelectInput,
  BulkDeleteButton,
  DeleteButton,
@@ -46,11 +45,16 @@ import {
  sanitizeListRestProps,
  NumberField,
 } from "react-admin";
-import SaveQrButton from "./SaveQrButton";
 import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
 import { DeviceRemoveButton } from "./devices";
 import { makeStyles } from "@material-ui/core/styles";

+const redirect = (basePath, id, data) => {
+  return {
+    pathname: "/import_users",
+  };
+};
+
 const useStyles = makeStyles({
  small: {
    height: "40px",
@@ -101,6 +105,15 @@ const UserListActions = ({
        exporter={exporter}
        maxResults={maxResults}
      />
+      {/* Add your custom actions */}
+      <Button
+        onClick={() => {
+          redirectTo(redirect);
+        }}
+        label="CSV Import"
+      >
+        <GetAppIcon style={{ transform: "rotate(180deg)", fontSize: "20" }} />
+      </Button>
    </TopToolbar>
  );
 };
@@ -149,6 +162,7 @@ export const UserList = props => {
      {...props}
      filters={<UserFilter />}
      filterDefaultValues={{ guests: true, deactivated: false }}
+      sort={{ field: "name", order: "ASC" }}
      actions={<UserListActions maxResults={10000} />}
      bulkActionButtons={<UserBulkActionButtons />}
      pagination={<UserPagination />}
@@ -156,55 +170,19 @@ export const UserList = props => {
      <Datagrid rowClick="edit">
        <AvatarField
          source="avatar_src"
-          sortable={false}
          className={classes.small}
+          sortBy="avatar_url"
        />
-        <TextField source="id" sortable={false} />
+        <TextField source="id" sortBy="name" />
        <TextField source="displayname" />
-        <BooleanField source="is_guest" sortable={false} />
-        <BooleanField source="admin" sortable={false} />
-        <SelectField
-          source="user_type"
-          choices={[
-            { id: null, name: "resources.users.type.default" },
-            { id: "free", name: "resources.users.type.free" },
-            { id: "limited", name: "resources.users.type.limited" },
-          ]}
-        />
-        <BooleanField source="deactivated" sortable={false} />
+        <BooleanField source="is_guest" />
+        <BooleanField source="admin" />
+        <BooleanField source="deactivated" />
      </Datagrid>
    </List>
  );
 };

-// redirect to the related Author show page
-const redirect = (basePath, id, data) => {
-  return {
-    pathname: "/showpdf",
-    state: {
-      id: data.id,
-      displayname: data.displayname,
-      password: data.password,
-    },
-  };
-};
-
-const UserCreateToolbar = props => (
-  <Toolbar {...props}>
-    <SaveQrButton
-      label="synapseadmin.action.save_and_show"
-      redirect={redirect}
-      submitOnEnter={true}
-    />
-    <SaveButton
-      label="synapseadmin.action.save_only"
-      redirect="list"
-      submitOnEnter={false}
-      variant="text"
-    />
-  </Toolbar>
-);
-
 // https://matrix.org/docs/spec/appendices#user-identifiers
 const validateUser = regex(
  /^@[a-z0-9._=\-/]+:.*/,
@@ -256,17 +234,7 @@ const UserEditToolbar = props => {
  const translate = useTranslate();
  return (
    <Toolbar {...props}>
-      <SaveQrButton
-        label="synapseadmin.action.save_and_show"
-        redirect={redirect}
-        submitOnEnter={true}
-      />
-      <SaveButton
-        label="synapseadmin.action.save_only"
-        redirect="list"
-        submitOnEnter={false}
-        variant="text"
-      />
+      <SaveButton submitOnEnter={true} />
      <DeleteButton
        label="resources.users.action.erase"
        confirmTitle={translate("resources.users.helper.erase", {
@@ -280,20 +248,12 @@ const UserEditToolbar = props => {
 };

 export const UserCreate = props => (
-  <Create record={generateRandomUser()} {...props}>
-    <SimpleForm toolbar={<UserCreateToolbar />}>
+  <Create {...props}>
+    <SimpleForm>
      <TextInput source="id" autoComplete="off" validate={validateUser} />
      <TextInput source="displayname" />
      <PasswordInput source="password" autoComplete="new-password" />
      <BooleanInput source="admin" />
-      <SelectInput
-        source="user_type"
-        choices={[
-          { id: null, name: "resources.users.type.default" },
-          { id: "free", name: "resources.users.type.free" },
-          { id: "limited", name: "resources.users.type.limited" },
-        ]}
-      />
      <ArrayInput source="threepids">
        <SimpleFormIterator>
          <SelectInput
@@ -321,7 +281,6 @@ const UserTitle = ({ record }) => {
    </span>
  );
 };
-
 export const UserEdit = props => {
  const classes = useStyles();
  const translate = useTranslate();
@@ -340,15 +299,6 @@ export const UserEdit = props => {
          <TextInput source="id" disabled />
          <TextInput source="displayname" />
          <PasswordInput source="password" autoComplete="new-password" />
-          <SelectInput
-            source="user_type"
-            choices={[
-              { id: null, name: "resources.users.type.default" },
-              { id: "free", name: "resources.users.type.free" },
-              { id: "limited", name: "resources.users.type.limited" },
-            ]}
-            emptyText="resources.users.type.default"
-          />
          <BooleanInput source="admin" />
          <BooleanInput
            source="deactivated"
@@ -471,6 +421,7 @@ export const UserEdit = props => {
            addLabel={false}
            pagination={<UserPagination />}
            perPage={50}
+            sort={{ field: "created_ts", order: "DESC" }}
          >
            <Datagrid style={{ width: "100%" }}>
              <DateField
@@ -484,7 +435,6 @@ export const UserEdit = props => {
                  minute: "2-digit",
                  second: "2-digit",
                }}
-                sortable={false}
              />
              <DateField
                source="last_access_ts"
@@ -497,14 +447,13 @@ export const UserEdit = props => {
                  minute: "2-digit",
                  second: "2-digit",
                }}
-                sortable={false}
              />
-              <TextField source="media_id" sortable={false} />
-              <NumberField source="media_length" sortable={false} />
-              <TextField source="media_type" sortable={false} />
-              <TextField source="upload_name" sortable={false} />
-              <TextField source="quarantined_by" sortable={false} />
-              <BooleanField source="safe_from_quarantine" sortable={false} />
+              <TextField source="media_id" />
+              <NumberField source="media_length" />
+              <TextField source="media_type" />
+              <TextField source="upload_name" />
+              <TextField source="quarantined_by" />
+              <BooleanField source="safe_from_quarantine" />
              <DeleteButton mutationMode="pessimistic" redirect={false} />
            </Datagrid>
          </ReferenceManyField>
--- a/src/i18n/de.js
+++ b/src/i18n/de.js
@@ -1,6 +1,6 @@
 import germanMessages from "ra-language-german";

-export default {
+const de = {
  ...germanMessages,
  synapseadmin: {
    auth: {
@@ -11,25 +11,12 @@ export default {
      protocol_error: "Die URL muss mit 'http://' oder 'https://' beginnen",
      url_error: "Keine gültige Matrix Server URL",
    },
-    action: {
-      save_and_show: "Speichern und QR Code erzeugen",
-      save_only: "Nur speichern",
-      download_pdf: "PDF speichern",
-    },
    users: {
      invalid_user_id:
        "Muss eine vollständige Matrix Benutzer-ID sein, z.B. @benutzer_id:homeserver",
    },
    rooms: {
      details: "Raumdetails",
-      room_name: "Raumname",
-      make_public: "Öffentlicher Raum",
-      encrypt: "Verschlüsselter Raum",
-      room_name_required: "Muss angegeben werden",
-      alias_required_if_public: "Muss für öffentliche Räume angegeben werden.",
-      alias: "Alias",
-      alias_too_long:
-        "Darf zusammen mit der Domain des Homeservers 255 bytes nicht überschreiten",
      tabs: {
        basic: "Allgemein",
        members: "Mitglieder",
@@ -133,18 +120,6 @@ export default {
        address: "Adresse",
        creation_ts_ms: "Zeitpunkt der Erstellung",
        consent_version: "Zugestimmte Geschäftsbedingungen",
-        user_type: "Kontotyp",
-        // Devices:
-        device_id: "Geräte-ID",
-        display_name: "Gerätename",
-        last_seen_ts: "Zeitstempel",
-        last_seen_ip: "IP-Adresse",
-        role: "Rolle",
-      },
-      type: {
-        default: "Standard",
-        free: "Basic",
-        limited: "Eingeschränkt",
      },
      helper: {
        deactivate:
@@ -154,11 +129,6 @@ export default {
      action: {
        erase: "Lösche Benutzerdaten",
      },
-      roles: {
-        user: "Nutzer",
-        mod: "Moderator",
-        admin: "Administrator",
-      },
    },
    rooms: {
      name: "Raum |||| Räume",
@@ -167,8 +137,6 @@ export default {
        name: "Name",
        canonical_alias: "Alias",
        joined_members: "Mitglieder",
-        invite_members: "Mitglieder einladen",
-        invitees: "Einladungen",
        joined_local_members: "Lokale Mitglieder",
        joined_local_devices: "Lokale Endgeräte",
        state_events: "Zustandsereignisse / Komplexität",
@@ -184,6 +152,10 @@ export default {
        topic: "Thema",
        avatar: "Avatar",
      },
+      helper: {
+        forward_extremities:
+          "Forward extremities are the leaf events at the end of a Directed acyclic graph (DAG) in a room, aka events that have no children. The more exist in a room, the more state resolution that Synapse needs to perform (hint: it's an expensive operation). While Synapse has code to prevent too many of these existing at one time in a room, bugs can sometimes make them crop up again. If a room has >10 forward extremities, it's worth checking which room is the culprit and potentially removing them using the SQL queries mentioned in #1760.",
+      },
      enums: {
        join_rules: {
          public: "Öffentlich",
@@ -327,6 +299,15 @@ export default {
        media_length: "Größe der Dateien",
      },
    },
+    forward_extremities: {
+      name: "Vorderextremitäten",
+      fields: {
+        id: "Event-ID",
+        received_ts: "Zeitstempel",
+        depth: "Tiefe",
+        state_group: "Zustandsgruppe",
+      },
+    },
    room_state: {
      name: "Zustandsereignisse",
      fields: {
@@ -381,5 +362,10 @@ export default {
      empty: "Keine Einträge vorhanden",
      invite: "",
    },
+    navigation: {
+      ...germanMessages.ra.navigation,
+      skip_nav: "Zum Inhalt springen",
+    },
  },
 };
+export default de;
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -1,6 +1,6 @@
 import englishMessages from "ra-language-english";

-export default {
+const en = {
  ...englishMessages,
  synapseadmin: {
    auth: {
@@ -11,25 +11,11 @@ export default {
      protocol_error: "URL has to start with 'http://' or 'https://'",
      url_error: "Not a valid Matrix server URL",
    },
-    action: {
-      save_and_show: "Create QR code",
-      save_only: "Save",
-      download_pdf: "Download PDF",
-    },
    users: {
      invalid_user_id:
        "Must be a fully qualified Matrix user-id, e.g. @user_id:homeserver",
    },
    rooms: {
-      details: "Room Details",
-      room_name: "Room Name",
-      make_public: "Make room public",
-      encrypt: "Encrypt room",
-      room_name_required: "Must be provided",
-      alias_required_if_public: "Must be provided for a public room",
-      alias: "Alias",
-      alias_too_long:
-        "Must not exceed 255 bytes including the domain of the homeserver.",
      tabs: {
        basic: "Basic",
        members: "Members",
@@ -133,17 +119,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",
-        role: "Role",
-      },
-      type: {
-        default: "Standard",
-        free: "Basic",
-        limited: "Limited",
      },
      helper: {
        deactivate: "You must provide a password to re-activate an account.",
@@ -152,11 +127,6 @@ export default {
      action: {
        erase: "Erase user data",
      },
-      roles: {
-        user: "User",
-        mod: "Moderator",
-        admin: "Administrator",
-      },
    },
    rooms: {
      name: "Room |||| Rooms",
@@ -165,8 +135,6 @@ export default {
        name: "Name",
        canonical_alias: "Alias",
        joined_members: "Members",
-        invite_members: "Invite Members",
-        invitees: "Invitations",
        joined_local_members: "Local members",
        joined_local_devices: "Local devices",
        state_events: "State events / Complexity",
@@ -182,6 +150,10 @@ export default {
        topic: "Topic",
        avatar: "Avatar",
      },
+      helper: {
+        forward_extremities:
+          "Forward extremities are the leaf events at the end of a Directed acyclic graph (DAG) in a room, aka events that have no children. The more exist in a room, the more state resolution that Synapse needs to perform (hint: it's an expensive operation). While Synapse has code to prevent too many of these existing at one time in a room, bugs can sometimes make them crop up again. If a room has >10 forward extremities, it's worth checking which room is the culprit and potentially removing them using the SQL queries mentioned in #1760.",
+      },
      enums: {
        join_rules: {
          public: "Public",
@@ -260,7 +232,7 @@ export default {
      name: "Media",
      fields: {
        media_id: "Media ID",
-        media_length: "Lenght",
+        media_length: "File Size (in Bytes)",
        media_type: "Type",
        upload_name: "File name",
        quarantined_by: "Quarantined by",
@@ -323,6 +295,15 @@ export default {
        media_length: "Media length",
      },
    },
+    forward_extremities: {
+      name: "Forward Extremities",
+      fields: {
+        id: "Event ID",
+        received_ts: "Timestamp",
+        depth: "Depth",
+        state_group: "State group",
+      },
+    },
    room_state: {
      name: "State events",
      fields: {
@@ -351,3 +332,4 @@ export default {
    },
  },
 };
+export default en;
--- a/src/i18n/zh.js
+++ b/src/i18n/zh.js
@@ -1,6 +1,6 @@
 import chineseMessages from "ra-language-chinese";

-export default {
+const zh = {
  ...chineseMessages,
  synapseadmin: {
    auth: {
@@ -288,3 +288,4 @@ export default {
    },
  },
 };
+export default zh;
--- a/src/setupTests.js
+++ b/src/setupTests.js
@@ -1,6 +1,3 @@
-import { configure } from "enzyme";
-import Adapter from "enzyme-adapter-react-16";
 import fetchMock from "jest-fetch-mock";

-configure({ adapter: new Adapter() });
 fetchMock.enableMocks();
--- a/src/synapse/authProvider.js
+++ b/src/synapse/authProvider.js
@@ -3,6 +3,9 @@ import { fetchUtils } from "react-admin";
 const authProvider = {
  // called when the user attempts to log in
  login: ({ base_url, username, password }) => {
+    // force homeserver for protection in case the form is manipulated
+    base_url = process.env.REACT_APP_SERVER || base_url;
+
    console.log("login ");
    const options = {
      method: "POST",
@@ -10,6 +13,7 @@ const authProvider = {
        type: "m.login.password",
        user: username,
        password: password,
+        device_id: localStorage.getItem("device_id"),
        initial_device_display_name: "Synapse Admin",
      }),
    };
@@ -17,6 +21,7 @@ const authProvider = {
    // use the base_url from login instead of the well_known entry from the
    // server, since the admin might want to access the admin API via some
    // private address
+    base_url = base_url.replace(/\/+$/g, "");
    localStorage.setItem("base_url", base_url);

    const decoded_base_url = window.decodeURIComponent(base_url);
@@ -48,7 +53,6 @@ const authProvider = {
    if (typeof access_token === "string") {
      fetchUtils.fetchJson(logout_api_url, options).then(({ json }) => {
        localStorage.removeItem("access_token");
-        localStorage.removeItem("device_id");
      });
    }
    return Promise.resolve();
--- a/src/synapse/dataProvider.js
+++ b/src/synapse/dataProvider.js
@@ -25,16 +25,6 @@ const mxcUrlToHttp = mxcUrl => {
  return `${homeserver}/_matrix/media/r0/thumbnail/${serverName}/${mediaId}?width=24&height=24&method=scale`;
 };

-const powerLevelToRole = powerLevel =>
-  powerLevel < 100 ? (powerLevel < 50 ? "user" : "mod") : "admin";
-
-const POWER_LEVELS = {
-  admin: 100,
-  mod: 50,
-  user: 0,
-};
-const roleToPowerLevel = role => POWER_LEVELS[role] || 0;
-
 const resourceMap = {
  users: {
    path: "/_synapse/admin/v2/users",
@@ -45,7 +35,6 @@ const resourceMap = {
      is_guest: !!u.is_guest,
      admin: !!u.admin,
      deactivated: !!u.deactivated,
-      displayname: u.display_name || u.displayname,
      // need timestamp in milliseconds
      creation_ts_ms: u.creation_ts * 1000,
    }),
@@ -74,40 +63,8 @@ const resourceMap = {
      public: !!r.public,
    }),
    data: "rooms",
-    total: json => json.total_rooms,
-    create: data => ({
-      endpoint: "/_synapse/admin/v1/rooms",
-      body: {
-        owner: data.owner,
-        name: data.name,
-        room_alias_name: data.canonical_alias,
-        visibility: data.public ? "public" : "private",
-        invite:
-          Array.isArray(data.invitees) && data.invitees.length > 0
-            ? data.invitees
-            : undefined,
-        initial_state: data.encrypt
-          ? [
-              {
-                type: "m.room.encryption",
-                state_key: "",
-                content: {
-                  algorithm: "m.megolm.v1.aes-sha2",
-                },
-              },
-            ]
-          : undefined,
-      },
-      method: "POST",
-    }),
-    transformBeforeUpdate: data => {
-      return {
-        ...data,
-        member_roles: (data.member_roles || []).map(member => ({
-          member_id: member.member_id,
-          power_level: roleToPowerLevel(member.role),
-        })),
-      };
+    total: json => {
+      return json.total_rooms;
    },
    delete: params => ({
      endpoint: `/_synapse/admin/v1/rooms/${params.id}/delete`,
@@ -251,6 +208,22 @@ const resourceMap = {
      return json.total;
    },
  },
+  forward_extremities: {
+    map: fe => ({
+      ...fe,
+      id: fe.event_id,
+    }),
+    reference: id => ({
+      endpoint: `/_synapse/admin/v1/rooms/${id}/forward_extremities`,
+    }),
+    data: "results",
+    total: json => {
+      return json.count;
+    },
+    delete: params => ({
+      endpoint: `/_synapse/admin/v1/rooms/${params.id}/forward_extremities`,
+    }),
+  },
  room_directory: {
    path: "/_matrix/client/r0/publicRooms",
    map: rd => ({
@@ -326,7 +299,7 @@ const dataProvider = {
  },

  getOne: (resource, params) => {
-    console.log("getOne " + resource, params);
+    console.log("getOne " + resource);
    const homeserver = localStorage.getItem("base_url");
    if (!homeserver || !(resource in resourceMap)) return Promise.reject();

@@ -357,10 +330,13 @@ const dataProvider = {
  getManyReference: (resource, params) => {
    console.log("getManyReference " + resource);
    const { page, perPage } = params.pagination;
+    const { field, order } = params.sort;
    const from = (page - 1) * perPage;
    const query = {
      from: from,
      limit: perPage,
+      order_by: field,
+      dir: getSearchOrder(order),
    };

    const homeserver = localStorage.getItem("base_url");
@@ -384,13 +360,10 @@ const dataProvider = {

    const res = resourceMap[resource];

-    const transform = res.transformBeforeUpdate || (x => x);
-    const data = transform(params.data);
-
    const endpoint_url = homeserver + res.path;
    return jsonClient(`${endpoint_url}/${params.data.id}`, {
      method: "PUT",
-      body: JSON.stringify(data, filterNullValues),
+      body: JSON.stringify(params.data, filterNullValues),
    }).then(({ json }) => ({
      data: res.map(json),
    }));
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Michael Albert	985673b161	Increment version Change-Id: I149896f55be7840b240d92fed5880e3f5624b857	2021-05-25 15:03:15 +02:00
John Francis Sukamto	d72357f64f	Update en.js (#144 ) Suggested a UI name change for media size (assuming length is size in bytes)	2021-05-25 15:01:13 +02:00
Dirk Klimpel	e19c34324b	Allow fixed homeserver (#142 )	2021-05-18 12:39:53 +02:00
Dirk Klimpel	3ea1f51eb5	Add a new tab to rooms with forward extremities (#107 ) Add a new tab to rooms with forward extremities.	2021-05-08 19:10:51 +02:00
Manuel Stahl	229518e456	Show room alias or room id in room list if room has no name Change-Id: Iad769f31347566ccf0b8a978b31f5123553e9dbc	2021-05-05 20:24:15 +02:00
Dirk Klimpel	5a5a7143af	Enable sorting of user list (#133 ) New in Synapse 1.32.0 Fixes: #132, #136	2021-05-05 19:36:47 +02:00
Manuel Stahl	dda8ba5e85	Update nodejs version for travis Change-Id: I7d44f5df7d4479efcb1d44f5ba23467effad147e	2021-05-05 19:31:50 +02:00
Manuel Stahl	5208198b76	Replace enzyme with testing-library/react Enzyme is not compatible with react 17. Change-Id: If9bca2c482bfe10a18d2ee2bc213dab966849b5b	2021-05-05 19:23:01 +02:00
Manuel Stahl	c8082a7198	Remove TestContext from App.test.js The TestContext is only required for components that depend on react-admin, but not for the Admin component itself. Change-Id: I3e07cb6bfa592f1bf59ca282cdf1c2e6c922f619	2021-05-05 19:23:01 +02:00
Michael Albert	10831796e3	Add missing translation Change-Id: Iab3203742498d2c6768b5885c0522ff8365b58f2	2021-05-05 09:41:05 +00:00
Michael Albert	5ee5288edf	Fix some DOM errors Change-Id: I22a108fd5ce6a344e629e4af0345a0221de44052	2021-05-05 09:40:48 +00:00
Manuel Stahl	a5528d9fe7	yarn: Upgrade packages - eslint 7.25 - ra-language-german 3.13 - react-admin 3.15 - react-dom 17.0 - react-scripts 4.0 Change-Id: Iad982cf647470bc16194000519a72c401009c9fa	2021-05-04 18:42:05 +02:00
Manuel Stahl	e2fd934851	Allow base URL with path Ignore and remove trailing slashes. Fixes #134. Change-Id: Iedf266e9a93e6939f7f66707fee59a2b56226216	2021-05-04 18:41:54 +02:00
Manuel Stahl	0bc1ce3226	Reuse device_id for synapse-admin on login Change-Id: I47bbfd1e33ef8bffb618101ae233aeb093cf0ada	2021-05-04 17:10:49 +02:00
Manuel Stahl	41ce58bac8	Enable sorting in tab of users' media (#138 )	2021-05-04 16:18:12 +02:00