From b531bb58ca9626b5b52f8932e62df19d57d4d2c4 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 5 Aug 2019 13:43:06 +0200 Subject: [PATCH 1/3] Let user know their account has been deactivated upon trying to login --- src/components/structures/auth/Login.js | 4 +++- src/i18n/strings/en_EN.json | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js index 27378447d5..31cb92d982 100644 --- a/src/components/structures/auth/Login.js +++ b/src/components/structures/auth/Login.js @@ -217,7 +217,9 @@ module.exports = React.createClass({ ); } else if (error.httpStatus === 401 || error.httpStatus === 403) { - if (SdkConfig.get()['disable_custom_urls']) { + if (error.errcode === 'M_USER_DEACTIVATED') { + errorText = _t('This account has been deactivated.'); + } else if (SdkConfig.get()['disable_custom_urls']) { errorText = (
{ _t('Incorrect username and/or password.') }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index c5ef2fd989..9ad20bf56c 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1574,6 +1574,7 @@ "General failure": "General failure", "This homeserver does not support login using email address.": "This homeserver does not support login using email address.", "Please contact your service administrator to continue using this service.": "Please contact your service administrator to continue using this service.", + "This account has been deactivated.": "This account has been deactivated.", "Incorrect username and/or password.": "Incorrect username and/or password.", "Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.", "Failed to perform homeserver discovery": "Failed to perform homeserver discovery", From 92aec936a0f2fce076f0ec17ac441d55f67fa0a5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 5 Aug 2019 14:33:58 +0100 Subject: [PATCH 2/3] Prepare changelog for v1.5.1 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6803f0352b..9eac5efc98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [1.5.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.5.1) (2019-08-05) +=================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.5.0-rc.1...v1.5.1) + + * Let user know their account has been deactivated upon trying to login + [\#3281](https://github.com/matrix-org/matrix-react-sdk/pull/3281) + * Don't load guest sessions on post-registration login link + [\#3277](https://github.com/matrix-org/matrix-react-sdk/pull/3277) + Changes in [1.5.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.5.0-rc.1) (2019-07-31) ============================================================================================================= [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.4.0...v1.5.0-rc.1) From 9016be22a46a635bbb24b9879617802f584848d4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 5 Aug 2019 14:33:58 +0100 Subject: [PATCH 3/3] v1.5.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2fd07cd92..3765d6aedf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "1.5.0-rc.1", + "version": "1.5.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {