From 361643c3da5e3ed996bf275c32d3d42d5a468c2b Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Tue, 17 Aug 2021 08:22:36 +0200 Subject: [PATCH 1/4] Fix link in README.md (#175) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 69f574d..5f69c33 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,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. From 634341ea077258f444ed964b226a3ed03632298b Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Wed, 18 Aug 2021 09:18:09 +0200 Subject: [PATCH 2/4] Add GitHub Action to run CI tests (#162) --- .github/workflows/build-test.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/build-test.yml diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 0000000..4d95e63 --- /dev/null +++ b/.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 From 07b1df5855b85cc21a48adac2273538e7c4ef4ee Mon Sep 17 00:00:00 2001 From: Manuel Stahl <37705355+awesome-manuel@users.noreply.github.com> Date: Wed, 18 Aug 2021 09:27:25 +0200 Subject: [PATCH 3/4] Add Github action badge for build checks --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5f69c33..c6e81ca 100644 --- a/README.md +++ b/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 From bf3d13916f5e13a64deaa018c90752288d01486e Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Wed, 18 Aug 2021 09:33:22 +0200 Subject: [PATCH 4/4] Add SSO `external_ids` to user (#168) --- README.md | 2 +- src/components/users.js | 18 ++++++++++++++++++ src/i18n/de.js | 2 ++ src/i18n/en.js | 2 ++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c6e81ca..e6c9780 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This project is built using [react-admin](https://marmelab.com/react-admin/). -It needs at least Synapse v1.34.0 for all functions to work as expected! +It needs at least Synapse v1.38.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://matrix-org.github.io/synapse/develop/admin_api/version_api.html). diff --git a/src/components/users.js b/src/components/users.js index de415d2..8e198c9 100644 --- a/src/components/users.js +++ b/src/components/users.js @@ -1,6 +1,7 @@ import React, { cloneElement, Fragment } from "react"; 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"; @@ -332,6 +333,23 @@ export const UserEdit = props => { + } + path="sso" + > + + + + + + + + } diff --git a/src/i18n/de.js b/src/i18n/de.js index 385c479..7de0286 100644 --- a/src/i18n/de.js +++ b/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: diff --git a/src/i18n/en.js b/src/i18n/en.js index 5f38c8b..b8f239e 100644 --- a/src/i18n/en.js +++ b/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.",