Merge remote-tracking branch 'synapse-admin/master' into user_cts

Conflicts:
	README.md

.github/workflows/build-test.yml

@@ -0,0 +1,21 @@
+name: build-test
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - name: Install dependencies
+        run: yarn --frozen-lockfile
+      - name: Run tests
+        run: yarn test

README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/Awesome-Technologies/synapse-admin.svg?branch=master)](https://travis-ci.org/Awesome-Technologies/synapse-admin)
+[![build-test](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/build-test.yml/badge.svg)](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/build-test.yml)
 
 # Synapse admin ui
 
@@ -40,7 +41,7 @@ or by editing it in the [.env](.env) file. See also the
 
 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`
+- 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`
 
   > note: if you're building on an architecture other than amd64 (for example a raspberry pi), make sure to define a maximum ram for node. otherwise the build will fail.
 

src/components/users.js

@@ -3,6 +3,7 @@ import { connect } from "react-redux";
 import { Chip } from "@material-ui/core";
 import Avatar from "@material-ui/core/Avatar";
 import PersonPinIcon from "@material-ui/icons/PersonPin";
+import AssignmentIndIcon from "@material-ui/icons/AssignmentInd";
 import ContactMailIcon from "@material-ui/icons/ContactMail";
 import DevicesIcon from "@material-ui/icons/Devices";
 import GetAppIcon from "@material-ui/icons/GetApp";
@@ -382,6 +383,23 @@ export const UserEdit = props => {
           </ArrayInput>
         </FormTab>
 
+        <FormTab
+          label="synapseadmin.users.tabs.sso"
+          icon={<AssignmentIndIcon />}
+          path="sso"
+        >
+          <ArrayField source="external_ids" label={false}>
+            <Datagrid style={{ width: "100%" }}>
+              <TextField source="auth_provider" sortable={false} />
+              <TextField
+                source="external_id"
+                label="resources.users.fields.id"
+                sortable={false}
+              />
+            </Datagrid>
+          </ArrayField>
+        </FormTab>
+
         <FormTab
           label={translate("resources.devices.name", { smart_count: 2 })}
           icon={<DevicesIcon />}

src/i18n/de.js

@@ -14,6 +14,7 @@ const de = {
     users: {
       invalid_user_id:
         "Muss eine vollständige Matrix Benutzer-ID sein, z.B. @benutzer_id:homeserver",
+      tabs: { sso: "SSO" },
     },
     rooms: {
       details: "Raumdetails",
@@ -120,6 +121,7 @@ const de = {
         address: "Adresse",
         creation_ts_ms: "Zeitpunkt der Erstellung",
         consent_version: "Zugestimmte Geschäftsbedingungen",
+        auth_provider: "Provider",
       },
       helper: {
         deactivate:

src/i18n/en.js

@@ -14,6 +14,7 @@ const en = {
     users: {
       invalid_user_id:
         "Must be a fully qualified Matrix user-id, e.g. @user_id:homeserver",
+      tabs: { sso: "SSO" },
     },
     rooms: {
       tabs: {
@@ -119,6 +120,7 @@ const en = {
         address: "Address",
         creation_ts_ms: "Creation timestamp",
         consent_version: "Consent version",
+        auth_provider: "Provider",
       },
       helper: {
         deactivate: "You must provide a password to re-activate an account.",