Merge branch 'master' into amp.chat

Change-Id: I6141964157bcb7218e2e6368a3ca8d20eb4855e9

src/synapse/authProvider.js

@@ -1,23 +1,8 @@
 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 }) => {
+  login: ({ base_url, username, password }) => {
     console.log("login ");
     const options = {
       method: "POST",
@@ -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";
+    // 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
+    localStorage.setItem("base_url", base_url);
+
+    const decoded_base_url = window.decodeURIComponent(base_url);
+    const login_api_url = decoded_base_url + "/_matrix/client/r0/login";
 
     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);
+      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);

src/synapse/dataProvider.js

@@ -27,6 +27,11 @@ const resourceMap = {
     }),
     data: "users",
     total: json => json.total,
+    create: data => ({
+      endpoint: `/_synapse/admin/v2/users/${data.id}`,
+      body: data,
+      method: "PUT",
+    }),
     delete: id => ({
       endpoint: `/_synapse/admin/v1/deactivate/${id}`,
       body: { erase: true },
@@ -41,23 +46,19 @@ const resourceMap = {
     }),
     data: "rooms",
     total: json => json.total_rooms,
-    create: params => {
-      let invitees = params.data.invitees;
-      return {
-        method: "POST",
-        endpoint: "/_matrix/client/r0/createRoom",
-        body: {
-          name: params.data.name,
-          room_alias_name: params.data.canonical_alias,
-          visibility: params.data.public ? "public" : "private",
-          invite:
-            Array.isArray(invitees) && invitees.length > 0
-              ? invitees
-              : undefined,
-        },
-        map: r => ({ id: r.room_id }),
-      };
-    },
+    create: data => ({
+      endpoint: "/_matrix/client/r0/createRoom",
+      body: {
+        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,
+      },
+      method: "POST",
+    })
   },
   connections: {
     path: "/_synapse/admin/v1/whois",
@@ -67,6 +68,20 @@ const resourceMap = {
     }),
     data: "connections",
   },
+  servernotices: {
+    map: n => ({ id: n.event_id }),
+    create: data => ({
+      endpoint: "/_synapse/admin/v1/send_server_notice",
+      body: {
+        user_id: data.id,
+        content: {
+          msgtype: "m.text",
+          body: data.body,
+        },
+      },
+      method: "POST",
+    }),
+  },
 };
 
 function filterNullValues(key, value) {
@@ -200,25 +215,16 @@ const dataProvider = {
     if (!homeserver || !(resource in resourceMap)) return Promise.reject();
 
     const res = resourceMap[resource];
+    if (!("create" in res)) return Promise.reject();
 
-    if ("create" in res) {
-      const create = res["create"](params);
-      const endpoint_url = homeserver + create.endpoint;
-      return jsonClient(endpoint_url, {
-        method: create.method,
-        body: JSON.stringify(create.body, filterNullValues),
-      }).then(({ json }) => ({
-        data: create.map(json),
-      }));
-    } else {
-      const endpoint_url = homeserver + res.path;
-      return jsonClient(`${endpoint_url}/${params.data.id}`, {
-        method: "PUT",
-        body: JSON.stringify(params.data, filterNullValues),
-      }).then(({ json }) => ({
-        data: res.map(json),
-      }));
-    }
+    const create = res["create"](params.data);
+    const endpoint_url = homeserver + create.endpoint;
+    return jsonClient(endpoint_url, {
+      method: create.method,
+      body: JSON.stringify(create.body, filterNullValues),
+    }).then(({ json }) => ({
+      data: res.map(json),
+    }));
   },
 
   delete: (resource, params) => {