From c7b34f331821f02e6cdbb99e166ad46cad79cdb1 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Thu, 14 Oct 2021 12:01:14 +0200 Subject: [PATCH 1/4] Add more information what happens when a user is deactivated --- docs/admin_api/user_admin_api.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/admin_api/user_admin_api.md b/docs/admin_api/user_admin_api.md index 60dc9139154c..2fbbbe18e3a5 100644 --- a/docs/admin_api/user_admin_api.md +++ b/docs/admin_api/user_admin_api.md @@ -341,11 +341,13 @@ The following actions are performed when deactivating an user: - Remove all 3PIDs from the homeserver - Delete all devices and E2EE keys - Delete all access tokens +- Delete all pushers - Delete the password hash - Removal from all rooms the user is a member of - Remove the user from the user directory - Reject all pending invites - Remove all account validity information related to the user +- Remove from monthly active users The following additional actions are performed during deactivation if `erase` is set to `true`: @@ -354,6 +356,14 @@ is set to `true`: - Remove the user's avatar URL - Mark the user as erased +The following actions are **NOT** performed. The list may be incomplete. + +- Remove mappings of SSO IDs +- [Delete media uploaded](#delete-media-uploaded-by-a-user) by user (included avatar images) +- Delete send and received messages +- Delete E2E cross signing keys +- Remove creation timestamp +- [Remove overwritten ratelimit](#override-ratelimiting-for-users) ## Reset password From c106a13a16c2e1865ff7db131e76622e81f0a1a9 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Thu, 14 Oct 2021 12:07:44 +0200 Subject: [PATCH 2/4] newsfile --- changelog.d/11083.doc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/11083.doc diff --git a/changelog.d/11083.doc b/changelog.d/11083.doc new file mode 100644 index 000000000000..40bf361b74ba --- /dev/null +++ b/changelog.d/11083.doc @@ -0,0 +1 @@ +Add more information what happens when a user is deactivated. \ No newline at end of file From a2da148c00a1fd49b0a0d84b8ea05e230160120c Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Tue, 19 Oct 2021 19:15:28 +0200 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: reivilibre --- changelog.d/11083.doc | 2 +- docs/admin_api/user_admin_api.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/changelog.d/11083.doc b/changelog.d/11083.doc index 40bf361b74ba..245dd3758da6 100644 --- a/changelog.d/11083.doc +++ b/changelog.d/11083.doc @@ -1 +1 @@ -Add more information what happens when a user is deactivated. \ No newline at end of file +Add more information about what happens when a user is deactivated. \ No newline at end of file diff --git a/docs/admin_api/user_admin_api.md b/docs/admin_api/user_admin_api.md index 2fbbbe18e3a5..b710055e8cba 100644 --- a/docs/admin_api/user_admin_api.md +++ b/docs/admin_api/user_admin_api.md @@ -360,10 +360,10 @@ The following actions are **NOT** performed. The list may be incomplete. - Remove mappings of SSO IDs - [Delete media uploaded](#delete-media-uploaded-by-a-user) by user (included avatar images) -- Delete send and received messages -- Delete E2E cross signing keys -- Remove creation timestamp -- [Remove overwritten ratelimit](#override-ratelimiting-for-users) +- Delete sent and received messages +- Delete E2E cross-signing keys +- Remove the user's creation (registration) timestamp +- [Remove rate limit overrides](#override-ratelimiting-for-users) ## Reset password From 596d0b62eb677ab0ce038250c7e20352d1a2a315 Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Wed, 20 Oct 2021 13:04:17 +0200 Subject: [PATCH 4/4] Update doc, because of #11127 --- docs/admin_api/user_admin_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin_api/user_admin_api.md b/docs/admin_api/user_admin_api.md index b710055e8cba..534f8400ba45 100644 --- a/docs/admin_api/user_admin_api.md +++ b/docs/admin_api/user_admin_api.md @@ -347,7 +347,6 @@ The following actions are performed when deactivating an user: - Remove the user from the user directory - Reject all pending invites - Remove all account validity information related to the user -- Remove from monthly active users The following additional actions are performed during deactivation if `erase` is set to `true`: @@ -364,6 +363,7 @@ The following actions are **NOT** performed. The list may be incomplete. - Delete E2E cross-signing keys - Remove the user's creation (registration) timestamp - [Remove rate limit overrides](#override-ratelimiting-for-users) +- Remove from monthly active users ## Reset password