Merge branch 'master' into amp.chat

Change-Id: I45b7a6db27456aaa2eca66b406cdaa49e492e61e
Fix QR code creation
2020-02-11 18:56:53 +01:00 · 2020-02-11 17:35:19 +00:00 · 2020-02-11 17:34:32 +00:00 · 2020-02-10 13:10:08 +01:00 · 2020-02-10 13:10:08 +01:00
13 changed files with 1405 additions and 1569 deletions
--- a/.prettierrc
+++ b/.prettierrc
@@ -6,6 +6,5 @@
  "singleQuote": false,
  "trailingComma": "es5",
  "bracketSpacing": true,
-  "jsxBracketSameLine": false,
-  "arrowParens": "avoid",
+  "jsxBracketSameLine": false
 }
--- a/package.json
+++ b/package.json
@@ -10,22 +10,25 @@
  },
  "devDependencies": {
    "@testing-library/jest-dom": "^5.1.1",
-    "@testing-library/react": "^10.0.2",
-    "@testing-library/user-event": "^10.0.1",
+    "@testing-library/react": "^9.4.0",
+    "@testing-library/user-event": "^8.1.0",
    "enzyme": "^3.11.0",
    "enzyme-adapter-react-16": "^1.15.2",
    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
+    "eslint-config-prettier": "^6.10.0",
    "eslint-plugin-prettier": "^3.1.2",
-    "prettier": "^2.0.0"
+    "prettier": "^1.19.1"
  },
  "dependencies": {
+    "@progress/kendo-drawing": "^1.6.0",
+    "@progress/kendo-react-pdf": "^3.10.1",
    "prop-types": "^15.7.2",
+    "qrcode.react": "^1.0.0",
    "ra-language-german": "^2.1.2",
-    "react": "^16.13.1",
-    "react-admin": "^3.4.0",
-    "react-dom": "^16.13.1",
-    "react-scripts": "^3.4.1"
+    "react": "^16.12.0",
+    "react-admin": "^3.1.3",
+    "react-dom": "^16.12.0",
+    "react-scripts": "^3.3.0"
  },
  "scripts": {
    "start": "react-scripts start",
@@ -33,7 +36,7 @@
    "fix:other": "yarn prettier --write",
    "fix:code": "yarn test:lint --fix",
    "fix": "yarn fix:code && yarn fix:other",
-    "prettier": "prettier \"**/*.{js,jsx,json,md,scss,yaml,yml}\"",
+    "prettier": "prettier \"**/*.{json,md,scss,yaml,yml}\"",
    "test:code": "react-scripts test",
    "test:lint": "eslint --ignore-path .gitignore --ext .js,.jsx .",
    "test:style": "yarn prettier --list-different",
--- a/public/images/logo.png
+++ b/public/images/logo.png
--- a/src/App.js
+++ b/src/App.js
@@ -10,6 +10,8 @@ import UserIcon from "@material-ui/icons/Group";
 import { ViewListIcon as RoomIcon } from "@material-ui/icons/ViewList";
 import germanMessages from "./i18n/de";
 import englishMessages from "./i18n/en";
+import ShowUserPdf from "./components/ShowUserPdf";
+import { Route } from "react-router-dom";

 // TODO: Can we use lazy loading together with browser locale?
 const messages = {
@@ -27,6 +29,9 @@ const App = () => (
    authProvider={authProvider}
    dataProvider={dataProvider}
    i18nProvider={i18nProvider}
+    customRoutes={[
+      <Route key="showpdf" path="/showpdf" component={ShowUserPdf} />,
+    ]}
  >
    <Resource
      name="users"
@@ -36,7 +41,6 @@ const App = () => (
      icon={UserIcon}
    />
    <Resource name="rooms" list={RoomList} icon={RoomIcon} />
-    <Resource name="connections" />
  </Admin>
 );

--- a/src/components/LoginPage.js
+++ b/src/components/LoginPage.js
@@ -70,7 +70,7 @@ const LoginPage = ({ theme }) => {
  var locale = useLocale();
  const setLocale = useSetLocale();
  const translate = useTranslate();
-  const homeserver = localStorage.getItem("base_url");
+  const homeserver = localStorage.getItem("home_server");

  const renderInput = ({
    meta: { touched, error } = {},
--- a/src/components/ShowUserPdf.js
+++ b/src/components/ShowUserPdf.js
@@ -0,0 +1,133 @@
+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",
+    },
+    header: {
+      height: 144,
+      width: 534,
+      marginLeft: 32,
+      marginTop: 15,
+    },
+    name: {
+      width: 233,
+      fontSize: 40,
+      float: "left",
+      marginTop: 15,
+    },
+    logo: {
+      height: 90,
+      width: 90,
+      marginTop: 20,
+      marginRight: 32,
+      float: "left",
+    },
+    code: {
+      marginLeft: 330,
+      marginTop: 86,
+    },
+    qr: {
+      marginRight: 40,
+      float: "right",
+    },
+    note: {
+      fontSize: 18,
+      marginTop: 100,
+      marginLeft: 32,
+      marginRight: 32,
+    },
+  }));
+
+  const classes = useStyles();
+
+  var resume;
+
+  const exportPDF = () => {
+    resume.save();
+  };
+
+  var qrCode = "";
+  var displayname = "";
+
+  if (
+    props.location.state &&
+    props.location.state.id &&
+    props.location.state.password
+  ) {
+    const { id, password } = props.location.state;
+
+    const username = id.substring(1, id.indexOf(":"));
+    const 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.code}>Ihr persönlicher Anmeldecode:</div>
+          <div className={classes.header}>
+            <div className={classes.name}>{displayname}</div>
+            <img className={classes.logo} alt="Logo" src="images/logo.png" />
+            <div className={classes.qr}>{qrCode}</div>
+          </div>
+          <div className={classes.note}>
+            Hier können Sie Ihre selbst gewählte Schlüsselsicherungs-Passphrase
+            notieren:
+            <br />
+            <br />
+            <br />
+            <hr />
+          </div>
+        </div>
+      </PDFExport>
+    </div>
+  );
+};
+
+export default ShowUserPdf;
--- a/src/components/rooms.js
+++ b/src/components/rooms.js
@@ -1,12 +1,8 @@
 import React from "react";
-import { Datagrid, List, TextField, Pagination } from "react-admin";
-
-const RoomPagination = props => (
-  <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
-);
+import { Datagrid, List, TextField } from "react-admin";

 export const RoomList = props => (
-  <List {...props} pagination={<RoomPagination />}>
+  <List {...props}>
    <Datagrid>
      <TextField source="room_id" />
      <TextField source="name" />
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -1,20 +1,11 @@
-import React, { Fragment } from "react";
-import PersonPinIcon from "@material-ui/icons/PersonPin";
-import SettingsInputComponentIcon from "@material-ui/icons/SettingsInputComponent";
+import React from "react";
 import {
-  ArrayInput,
-  ArrayField,
  Datagrid,
-  DateField,
  Create,
  Edit,
  List,
  Filter,
-  Toolbar,
  SimpleForm,
-  SimpleFormIterator,
-  TabbedForm,
-  FormTab,
  BooleanField,
  BooleanInput,
  ImageField,
@@ -22,19 +13,11 @@ import {
  TextField,
  TextInput,
  ReferenceField,
-  SelectInput,
-  BulkDeleteButton,
-  DeleteButton,
  SaveButton,
+  Toolbar,
  regex,
-  useTranslate,
-  Pagination,
 } from "react-admin";

-const UserPagination = props => (
-  <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
-);
-
 const UserFilter = props => (
  <Filter {...props}>
    <BooleanInput source="guests" alwaysOn />
@@ -46,26 +29,12 @@ const UserFilter = props => (
  </Filter>
 );

-const UserBulkActionButtons = props => {
-  const translate = useTranslate();
-  return (
-    <Fragment>
-      <BulkDeleteButton
-        {...props}
-        label="resources.users.action.erase"
-        title={translate("resources.users.helper.erase")}
-      />
-    </Fragment>
-  );
-};
-
 export const UserList = props => (
  <List
    {...props}
    filters={<UserFilter />}
    filterDefaultValues={{ guests: true, deactivated: false }}
-    bulkActionButtons={<UserBulkActionButtons />}
-    pagination={<UserPagination />}
+    bulkActionButtons={false}
  >
    <Datagrid rowClick="edit">
      <ReferenceField
@@ -93,115 +62,100 @@ export const UserList = props => (
  </List>
 );

+function generateRandomUser() {
+  const homeserver = localStorage.getItem("home_server");
+  const user_id =
+    "@" +
+    Array(8)
+      .fill("0123456789abcdefghijklmnopqrstuvwxyz")
+      .map(
+        x =>
+          x[
+            Math.floor(
+              (crypto.getRandomValues(new Uint32Array(1))[0] /
+                (0xffffffff + 1)) *
+                x.length
+            )
+          ]
+      )
+      .join("") +
+    ":" +
+    homeserver;
+
+  const password = Array(20)
+    .fill(
+      "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz~!@-#$"
+    )
+    .map(
+      x =>
+        x[
+          Math.floor(
+            (crypto.getRandomValues(new Uint32Array(1))[0] / (0xffffffff + 1)) *
+              x.length
+          )
+        ]
+    )
+    .join("");
+
+  return {
+    id: user_id,
+    password: password,
+  };
+}
+
+// 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}>
+    <SaveButton
+      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._=\-/]+:.*/,
  "synapseadmin.users.invalid_user_id"
 );

-const UserEditToolbar = props => {
-  const translate = useTranslate();
-  return (
-    <Toolbar {...props}>
-      <SaveButton submitOnEnter={true} />
-      <DeleteButton
-        label="resources.users.action.erase"
-        title={translate("resources.users.helper.erase")}
-      />
-    </Toolbar>
-  );
-};
-
 export const UserCreate = props => (
-  <Create {...props}>
-    <SimpleForm>
+  <Create record={generateRandomUser()} {...props}>
+    <SimpleForm toolbar={<UserCreateToolbar />}>
      <TextInput source="id" autoComplete="off" validate={validateUser} />
      <TextInput source="displayname" />
      <PasswordInput source="password" autoComplete="new-password" />
      <BooleanInput source="admin" />
-      <ArrayInput source="threepids">
-        <SimpleFormIterator>
-          <SelectInput
-            source="medium"
-            choices={[
-              { id: "email", name: "resources.users.email" },
-              { id: "msisdn", name: "resources.users.msisdn" },
-            ]}
-          />
-          <TextInput source="address" />
-        </SimpleFormIterator>
-      </ArrayInput>
    </SimpleForm>
  </Create>
 );

-const UserTitle = ({ record }) => {
-  const translate = useTranslate();
-  return (
-    <span>
-      {translate("resources.users.name")}{" "}
-      {record ? `"${record.displayname}"` : ""}
-    </span>
-  );
-};
 export const UserEdit = props => (
-  <Edit {...props} title={<UserTitle />}>
-    <TabbedForm toolbar={<UserEditToolbar />}>
-      <FormTab label="resources.users.name" icon={<PersonPinIcon />}>
-        <TextInput source="id" disabled />
-        <TextInput source="displayname" />
-        <PasswordInput source="password" autoComplete="new-password" />
-        <BooleanInput source="admin" />
-        <BooleanInput
-          source="deactivated"
-          helperText="resources.users.helper.deactivate"
-        />
-        <ArrayInput source="threepids">
-          <SimpleFormIterator>
-            <SelectInput
-              source="medium"
-              choices={[
-                { id: "email", name: "resources.users.email" },
-                { id: "msisdn", name: "resources.users.msisdn" },
-              ]}
-            />
-            <TextInput source="address" />
-          </SimpleFormIterator>
-        </ArrayInput>
-      </FormTab>
-      <FormTab
-        label="resources.connections.name"
-        icon={<SettingsInputComponentIcon />}
-      >
-        <ReferenceField reference="connections" source="id" addLabel={false}>
-          <ArrayField
-            source="devices[].sessions[0].connections"
-            label="resources.connections.name"
-          >
-            <Datagrid style={{ width: "100%" }}>
-              <TextField source="ip" sortable={false} />
-              <DateField
-                source="last_seen"
-                showTime
-                options={{
-                  year: "numeric",
-                  month: "2-digit",
-                  day: "2-digit",
-                  hour: "2-digit",
-                  minute: "2-digit",
-                  second: "2-digit",
-                }}
-                sortable={false}
-              />
-              <TextField
-                source="user_agent"
-                sortable={false}
-                style={{ width: "100%" }}
-              />
-            </Datagrid>
-          </ArrayField>
-        </ReferenceField>
-      </FormTab>
-    </TabbedForm>
+  <Edit {...props}>
+    <SimpleForm toolbar={<UserCreateToolbar />}>
+      <TextInput source="id" disabled />
+      <TextInput source="displayname" />
+      <PasswordInput source="password" autoComplete="new-password" />
+      <BooleanInput source="admin" />
+      <BooleanInput source="deactivated" />
+    </SimpleForm>
  </Edit>
 );
--- a/src/i18n/de.js
+++ b/src/i18n/de.js
@@ -7,6 +7,11 @@ export default {
      homeserver: "Heimserver",
      welcome: "Willkommen bei Synapse-admin",
    },
+    action: {
+      save_and_show: "QR Code erzeugen",
+      save_only: "Speichern",
+      download_pdf: "PDF speichern",
+    },
    users: {
      invalid_user_id:
        "Muss eine vollständige Matrix Benutzer-ID sein, z.B. @benutzer_id:homeserver",
@@ -14,10 +19,7 @@ export default {
  },
  resources: {
    users: {
-      backtolist: "Zurück zur Liste",
      name: "Benutzer",
-      email: "E-Mail",
-      msisdn: "Telefon",
      fields: {
        avatar: "Avatar",
        id: "Benutzer-ID",
@@ -30,17 +32,6 @@ export default {
        user_id: "Suche Benutzer",
        displayname: "Anzeigename",
        password: "Passwort",
-        avatar_url: "Avatar URL",
-        medium: "Medium",
-        threepids: "3PIDs",
-        address: "Adresse",
-      },
-      helper: {
-        deactivate: "Deaktivierte Nutzer können nicht wieder aktiviert werden.",
-        erase: "DSGVO konformes Löschen der Benutzerdaten",
-      },
-      action: {
-        erase: "Lösche Benutzerdaten",
      },
    },
    rooms: {
@@ -52,13 +43,5 @@ export default {
        joined_members: "Mitglieder",
      },
    },
-    connections: {
-      name: "Verbindungen",
-      fields: {
-        last_seen: "Datum",
-        ip: "IP-Adresse",
-        user_agent: "User Agent",
-      },
-    },
  },
 };
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -7,6 +7,11 @@ export default {
      homeserver: "Homeserver",
      welcome: "Welcome to Synapse-admin",
    },
+    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",
@@ -14,10 +19,7 @@ export default {
  },
  resources: {
    users: {
-      backtolist: "Back to list",
      name: "User |||| Users",
-      email: "Email",
-      msisdn: "Phone",
      fields: {
        avatar: "Avatar",
        id: "User-ID",
@@ -30,17 +32,6 @@ export default {
        user_id: "Search user",
        displayname: "Displayname",
        password: "Password",
-        avatar_url: "Avatar URL",
-        medium: "Medium",
-        threepids: "3PIDs",
-        address: "Address",
-      },
-      helper: {
-        deactivate: "Deactivated users cannot be reactivated",
-        erase: "Mark the user as GDPR-erased",
-      },
-      action: {
-        erase: "Erase user data",
      },
    },
    rooms: {
@@ -52,13 +43,5 @@ export default {
        joined_members: "Members",
      },
    },
-    connections: {
-      name: "Connections",
-      fields: {
-        last_seen: "Date",
-        ip: "IP address",
-        user_agent: "User agent",
-      },
-    },
  },
 };
--- a/src/synapse/authProvider.js
+++ b/src/synapse/authProvider.js
@@ -1,20 +1,5 @@
 import { fetchUtils } from "react-admin";

-const ensureHttpsForUrl = url => {
-  if (/^https:\/\//i.test(url)) {
-    return url;
-  }
-  const domain = url.replace(/http.?:\/\//g, "");
-  return "https://" + domain;
-};
-
-const stripTrailingSlash = str => {
-  if (!str) {
-    return;
-  }
-  return str.endsWith("/") ? str.slice(0, -1) : str;
-};
-
 const authProvider = {
  // called when the user attempts to log in
  login: ({ homeserver, username, password }) => {
@@ -28,17 +13,16 @@ const authProvider = {
      }),
    };

-    const url = window.decodeURIComponent(homeserver);
-    const trimmed_url = url.trim().replace(/\s/g, "");
-    const login_api_url =
-      ensureHttpsForUrl(trimmed_url) + "/_matrix/client/r0/login";
+    // add 'https://' to homeserver url if its missing
+    let newUrl = window.decodeURIComponent(homeserver);
+    newUrl = newUrl.trim().replace(/\s/g, "");
+    if (!/^https?:\/\//i.test(newUrl)) {
+      homeserver = `https://${newUrl}`;
+    }

-    return fetchUtils.fetchJson(login_api_url, options).then(({ json }) => {
-      const normalized_base_url = stripTrailingSlash(
-        json.well_known["m.homeserver"].base_url
-      );
-      localStorage.setItem("base_url", normalized_base_url);
-      localStorage.setItem("home_server_url", json.home_server);
+    const url = homeserver + "/_matrix/client/r0/login";
+    return fetchUtils.fetchJson(url, options).then(({ json }) => {
+      localStorage.setItem("home_server", json.home_server);
      localStorage.setItem("user_id", json.user_id);
      localStorage.setItem("access_token", json.access_token);
      localStorage.setItem("device_id", json.device_id);
--- a/src/synapse/dataProvider.js
+++ b/src/synapse/dataProvider.js
@@ -25,16 +25,9 @@ const resourceMap = {
      deactivated: !!u.deactivated,
    }),
    data: "users",
-    total: (json, from, perPage) => {
-      return json.next_token
-        ? parseInt(json.next_token, 10) + perPage
-        : from + json.users.length;
+    total: (json, perPage) => {
+      return parseInt(json.next_token, 10) + perPage;
    },
-    delete: id => ({
-      endpoint: `/_synapse/admin/v1/deactivate/${id}`,
-      body: { erase: true },
-      method: "POST",
-    }),
  },
  rooms: {
    path: "/_synapse/admin/v1/rooms",
@@ -49,14 +42,6 @@ const resourceMap = {
      return json.total_rooms;
    },
  },
-  connections: {
-    path: "/_synapse/admin/v1/whois",
-    map: c => ({
-      ...c,
-      id: c.user_id,
-    }),
-    data: "connections",
-  },
 };

 function filterNullValues(key, value) {
@@ -70,53 +55,48 @@ function filterNullValues(key, value) {
 const dataProvider = {
  getList: (resource, params) => {
    console.log("getList " + resource);
-    const { user_id, guests, deactivated } = params.filter;
+    const { user_id, guests } = params.filter;
    const { page, perPage } = params.pagination;
-    const from = (page - 1) * perPage;
    const query = {
-      from: from,
+      from: (page - 1) * perPage,
      limit: perPage,
      user_id: user_id,
      guests: guests,
-      deactivated: deactivated,
    };
-    const homeserver = localStorage.getItem("base_url");
+    const homeserver = localStorage.getItem("home_server");
    if (!homeserver || !(resource in resourceMap)) return Promise.reject();

    const res = resourceMap[resource];
-
-    const endpoint_url = homeserver + res.path;
-    const url = `${endpoint_url}?${stringify(query)}`;
+    const homeserver_url = "https://" + homeserver + res.path;
+    const url = `${homeserver_url}?${stringify(query)}`;

    return jsonClient(url).then(({ json }) => ({
      data: json[res.data].map(res.map),
-      total: res.total(json, from, perPage),
+      total: res.total(json, perPage),
    }));
  },

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

    const res = resourceMap[resource];
-
-    const endpoint_url = homeserver + res.path;
-    return jsonClient(`${endpoint_url}/${params.id}`).then(({ json }) => ({
+    const homeserver_url = "https://" + homeserver + res.path;
+    return jsonClient(`${homeserver_url}/${params.id}`).then(({ json }) => ({
      data: res.map(json),
    }));
  },

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

    const res = resourceMap[resource];
-
-    const endpoint_url = homeserver + res.path;
+    const homeserver_url = "https://" + homeserver + res.path;
    return Promise.all(
-      params.ids.map(id => jsonClient(`${endpoint_url}/${id}`))
+      params.ids.map(id => jsonClient(`${homeserver_url}/${id}`))
    ).then(responses => ({
      data: responses.map(({ json }) => res.map(json)),
    }));
@@ -136,29 +116,33 @@ const dataProvider = {
      }),
    };

-    const homeserver = localStorage.getItem("base_url");
+    const homeserver = localStorage.getItem("home_server");
    if (!homeserver || !(resource in resourceMap)) return Promise.reject();

    const res = resourceMap[resource];
-
-    const endpoint_url = homeserver + res.path;
-    const url = `${endpoint_url}?${stringify(query)}`;
+    const homeserver_url = "https://" + homeserver + res.path;
+    const url = `${homeserver_url}?${stringify(query)}`;

    return jsonClient(url).then(({ headers, json }) => ({
      data: json,
-      total: parseInt(headers.get("content-range").split("/").pop(), 10),
+      total: parseInt(
+        headers
+          .get("content-range")
+          .split("/")
+          .pop(),
+        10
+      ),
    }));
  },

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

    const res = resourceMap[resource];
-
-    const endpoint_url = homeserver + res.path;
-    return jsonClient(`${endpoint_url}/${params.data.id}`, {
+    const homeserver_url = "https://" + homeserver + res.path;
+    return jsonClient(`${homeserver_url}/${params.data.id}`, {
      method: "PUT",
      body: JSON.stringify(params.data, filterNullValues),
    }).then(({ json }) => ({
@@ -168,14 +152,13 @@ const dataProvider = {

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

    const res = resourceMap[resource];
-
-    const endpoint_url = homeserver + res.path;
+    const homeserver_url = "https://" + homeserver + res.path;
    return Promise.all(
-      params.ids.map(id => jsonClient(`${endpoint_url}/${id}`), {
+      params.ids.map(id => jsonClient(`${homeserver_url}/${id}`), {
        method: "PUT",
        body: JSON.stringify(params.data, filterNullValues),
      })
@@ -186,13 +169,12 @@ const dataProvider = {

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

    const res = resourceMap[resource];
-
-    const endpoint_url = homeserver + res.path;
-    return jsonClient(`${endpoint_url}/${params.data.id}`, {
+    const homeserver_url = "https://" + homeserver + res.path;
+    return jsonClient(`${homeserver_url}/${params.data.id}`, {
      method: "PUT",
      body: JSON.stringify(params.data, filterNullValues),
    }).then(({ json }) => ({
@@ -202,64 +184,35 @@ const dataProvider = {

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

    const res = resourceMap[resource];
-
-    if ("delete" in res) {
-      const del = res["delete"](params.id);
-      const endpoint_url = homeserver + del.endpoint;
-      return jsonClient(endpoint_url, {
-        method: del.method,
-        body: JSON.stringify(del.body),
-      }).then(({ json }) => ({
-        data: json,
-      }));
-    } else {
-      const endpoint_url = homeserver + res.path;
-      return jsonClient(`${endpoint_url}/${params.id}`, {
-        method: "DELETE",
-        body: JSON.stringify(params.data, filterNullValues),
-      }).then(({ json }) => ({
-        data: json,
-      }));
-    }
+    const homeserver_url = "https://" + homeserver + res.path;
+    return jsonClient(`${homeserver_url}/${params.id}`, {
+      method: "DELETE",
+    }).then(({ json }) => ({
+      data: json,
+    }));
  },

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

    const res = resourceMap[resource];
-
-    if ("delete" in res) {
-      return Promise.all(
-        params.ids.map(id => {
-          const del = res["delete"](id);
-          const endpoint_url = homeserver + del.endpoint;
-          return jsonClient(endpoint_url, {
-            method: del.method,
-            body: JSON.stringify(del.body),
-          });
-        })
-      ).then(responses => ({
-        data: responses.map(({ json }) => json),
-      }));
-    } else {
-      const endpoint_url = homeserver + res.path;
-      return Promise.all(
-        params.ids.map(id =>
-          jsonClient(`${endpoint_url}/${id}`, {
-            method: "DELETE",
-            body: JSON.stringify(params.data, filterNullValues),
-          })
-        )
-      ).then(responses => ({
-        data: responses.map(({ json }) => json),
-      }));
-    }
+    const homeserver_url = "https://" + homeserver + res.path;
+    return Promise.all(
+      params.ids.map(id =>
+        jsonClient(`${homeserver_url}/${id}`, {
+          method: "DELETE",
+          body: JSON.stringify(params.data, filterNullValues),
+        }).then(responses => ({
+          data: responses.map(({ json }) => json),
+        }))
+      )
+    );
  },
 };

--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Manuel Stahl	bf7867f106	Merge branch 'master' into amp.chat Change-Id: I45b7a6db27456aaa2eca66b406cdaa49e492e61e	2020-02-11 18:56:53 +01:00
Michael Albert	f0e32abc4f	Fix QR code creation Change-Id: If05856a6fdafa43a93c6b57963820710db188d42	2020-02-11 17:35:19 +00:00
Michael Albert	61b1580735	Fix redirect after create/edit user Change-Id: Icdb797bf6b1a47cbeff901b1952672584b2e8e8f	2020-02-11 17:34:32 +00:00
Manuel Stahl	0f7e4c1909	Create PDF with QR code on user create/edit Change-Id: Ib89b68e956d96002ddbf6ac5ddcaea73b5b3e3fb	2020-02-10 13:10:08 +01:00
Michael Albert	c9bce409d2	Prefill user_id and password on user creation Change-Id: I3f604f38c1842f155f3b39da20ba45992ba522be	2020-02-10 13:10:08 +01:00