From f7bf983fb6647d08f0e8c03199a96ffd396ac2cc Mon Sep 17 00:00:00 2001 From: func0der <529819+func0der@users.noreply.github.com> Date: Sun, 17 Sep 2023 22:28:31 +0000 Subject: [PATCH 1/2] fix(encryption): Inform user about master key generation on encryption enabling Signed-off-by: func0der <529819+func0der@users.noreply.github.com> --- .../src/components/Encryption/EncryptionWarningDialog.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/settings/src/components/Encryption/EncryptionWarningDialog.vue b/apps/settings/src/components/Encryption/EncryptionWarningDialog.vue index 4d6b6274ff57e..f229544a7d988 100644 --- a/apps/settings/src/components/Encryption/EncryptionWarningDialog.vue +++ b/apps/settings/src/components/Encryption/EncryptionWarningDialog.vue @@ -52,6 +52,9 @@ function onUpdateOpen(isOpen: boolean) {
\n\t\t\t\n\t\t\t{{ t('settings', 'Enforce two-factor authentication') }}\n\t\t
\n\t\t\n\t\t\t\t{{ t('settings', 'Two-factor authentication is enforced for all members of the following groups.') }}\n\t\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t
\n\t\t\t\t{{ t('settings', 'Two-factor authentication is not enforced for members of the following groups.') }}\n\t\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t
\n\t\t\t\t\n\t\t\t\t\t\x3c!-- this text is also found in the documentation. update it there as well if it ever changes --\x3e\n\t\t\t\t\t{{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if an account has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If an account is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }}\n\t\t\t\t\n\t\t\t
\n\t\t\n\t\t\n\t\t\t
\\n\\t\\t\\t\\n\\t\\t\\t{{ t('settings', 'Enforce two-factor authentication') }}\\n\\t\\t
\\n\\t\\t\\n\\t\\t\\t\\t{{ t('settings', 'Two-factor authentication is enforced for all members of the following groups.') }}\\n\\t\\t\\t
\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t
\\n\\t\\t\\t\\t{{ t('settings', 'Two-factor authentication is not enforced for members of the following groups.') }}\\n\\t\\t\\t
\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t
\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t{{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if an account has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If an account is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }}\\n\\t\\t\\t\\t\\n\\t\\t\\t
\\n\\t\\t\\n\\t\\t\\n\\t\\t\\t
\\n\\t\\t\\t\\t{{ textExistingFilesNotEncrypted }}\\n\\t\\t\\t\\t{{ t('settings', 'To encrypt all existing files run this OCC command:') }}\\n\\t\\t\\t
\\n\\t\\t\\t\\n\\t\\t\\t\\tocc encryption:encrypt-all
\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t{{ t('settings', 'Disabling server side encryption is only possible using OCC, please refer to the documentation.') }}\\n\\t\\t
\\n\\n\\t\\t\\n\\t\\t\\t\\t{{ t('settings', 'Please read carefully before activating server-side encryption:') }}\\n\\t\\t\\t\\t
\\n\\t\\t\\t{{ t('settings', 'This is the final warning: Do you really want to enable encryption?') }}\\n\\t\\t
\\n\\t\n\t\t\t\n\t\t\t{{ t('settings', 'Enforce two-factor authentication') }}\n\t\t
\n\t\t\n\t\t\t\t{{ t('settings', 'Two-factor authentication is enforced for all members of the following groups.') }}\n\t\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t
\n\t\t\t\t{{ t('settings', 'Two-factor authentication is not enforced for members of the following groups.') }}\n\t\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t
\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if an account has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If an account is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }}\n\t\t\t\t\n\t\t\t
\n\t\t\n\t\t\n\t\t\t
\\n\\t\\t\\t\\n\\t\\t\\t{{ t('settings', 'Enforce two-factor authentication') }}\\n\\t\\t
\\n\\t\\t\\n\\t\\t\\t\\t{{ t('settings', 'Two-factor authentication is enforced for all members of the following groups.') }}\\n\\t\\t\\t
\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t
\\n\\t\\t\\t\\t{{ t('settings', 'Two-factor authentication is not enforced for members of the following groups.') }}\\n\\t\\t\\t
\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t
\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t{{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if an account has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If an account is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }}\\n\\t\\t\\t\\t\\n\\t\\t\\t
\\n\\t\\t\\n\\t\\t\\n\\t\\t\\t
\\n\\t\\t\\t\\t{{ textExistingFilesNotEncrypted }}\\n\\t\\t\\t\\t{{ t('settings', 'To encrypt all existing files run this OCC command:') }}\\n\\t\\t\\t
\\n\\t\\t\\t\\n\\t\\t\\t\\tocc encryption:encrypt-all
\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t{{ t('settings', 'Disabling server side encryption is only possible using OCC, please refer to the documentation.') }}\\n\\t\\t
\\n\\n\\t\\t\\n\\t\\t\\t\\t{{ t('settings', 'Please read carefully before activating server-side encryption:') }}\\n\\t\\t\\t\\t
\\n\\t\\t\\t{{ t('settings', 'This is the final warning: Do you really want to enable encryption?') }}\\n\\t\\t
\\n\\t