From c63176c3d04242229139a57150a369c42b54d768 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 21 Apr 2022 14:53:18 +0100 Subject: [PATCH] Bug 29894: (follow-up) Update notice terms Register and Derigister didn't sound right, in reality we we enabling and disabling 2FA for the user so I think those terms are more understandable. Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart --- Koha/Auth/TwoFactorAuth.pm | 4 ++-- .../data/mysql/atomicupdate/bug_29894.pl | 6 +++--- .../mysql/en/mandatory/sample_notices.yml | 20 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Koha/Auth/TwoFactorAuth.pm b/Koha/Auth/TwoFactorAuth.pm index 75288a8f12f..f2cce958723 100644 --- a/Koha/Auth/TwoFactorAuth.pm +++ b/Koha/Auth/TwoFactorAuth.pm @@ -25,8 +25,8 @@ use Koha::Exceptions::Patron; use base qw( Auth::GoogleAuth ); -use constant CONFIRM_NOTICE_REG => '2FA_REGISTER'; -use constant CONFIRM_NOTICE_DEREG => '2FA_DEREGISTER'; +use constant CONFIRM_NOTICE_REG => '2FA_ENABLE'; +use constant CONFIRM_NOTICE_DEREG => '2FA_DISABLE'; =head1 NAME diff --git a/installer/data/mysql/atomicupdate/bug_29894.pl b/installer/data/mysql/atomicupdate/bug_29894.pl index 1c040fc4b55..6f0ea87e6b3 100755 --- a/installer/data/mysql/atomicupdate/bug_29894.pl +++ b/installer/data/mysql/atomicupdate/bug_29894.pl @@ -2,15 +2,15 @@ use Modern::Perl; return { bug_number => 29894, - description => "Add 2FA (de)registering notices", + description => "Add 2FA (de)enabling notices", up => sub { my ($args) = @_; my ($dbh, $out) = @$args{qw(dbh out)}; $dbh->do( q{ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES -('members', '2FA_DEREGISTER', '', 'Confirmation of deregistering two factor authentication', 1, 'Confirmation of deregistering two factor authentication', '

Dear [% borrower.firstname %] [% borrower.surname %],

\r\n

This is to confirm that we deregistered two factor authentication for you.

\r\n

If you did not deregister, someone else may be using your account. Please contact technical support.

\r\n

Your library

', 'email', 'default'), -('members', '2FA_REGISTER', '', 'Confirmation of registering two factor authentication', 1, 'Confirmation of registering two factor authentication', '

Dear [% borrower.firstname %] [% borrower.surname %],

\r\n

This is to confirm that we registered two factor authentication for you.

\r\n

If you did not register, someone else may be using your account. Please contact technical support.

\r\n

Your library

', 'email', 'default') +('members', '2FA_DISABLE', '', 'Confirmation of disabling two factor authentication', 1, 'Confirmation of disabling two factor authentication', '

Dear [% borrower.firstname %] [% borrower.surname %],

\r\n

This is to confirm that someone disabled two factor authentication on your account.

\r\n

If you did not do this, someone else may be using your account. Please contact technical support.

\r\n

Your library

', 'email', 'default'), +('members', '2FA_ENABLE', '', 'Confirmation of enabling two factor authentication', 1, 'Confirmation of enabling two factor authentication', '

Dear [% borrower.firstname %] [% borrower.surname %],

\r\n

This is to confirm that someone enabled two factor authentication on your account.

\r\n

If you did not do this, someone else may be using your account. Please contact technical support.

\r\n

Your library

', 'email', 'default') }); }, }; diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index babef2a93c9..6eb3c43084d 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -1634,29 +1634,29 @@ tables: - "Notes: <>" - module: members - code: 2FA_DEREGISTER + code: 2FA_DISABLE branchcode: "" - name: "Confirmation of deregistering two factor authentication" + name: "Confirmation of disabling two factor authentication" is_html: 1 - title: "Confirmation of deregistering two factor authentication" + title: "Confirmation of disabling two factor authentication" message_transport_type: email lang: default content: - "

Dear [% borrower.firstname %] [% borrower.surname %],

" - - "

This is to confirm that we deregistered two factor authentication for you.

" - - "

If you did not deregister, someone else may be using your account. Please contact technical support.

" + - "

This is to confirm that someone disabled two factor authentication on your account.

" + - "

If you did not do this, someone else may be using your account. Please contact technical support.

" - "

Your library

" - module: members - code: 2FA_REGISTER + code: 2FA_ENABLE branchcode: "" - name: "Confirmation of registering two factor authentication" + name: "Confirmation of enabling two factor authentication" is_html: 1 - title: "Confirmation of registering two factor authentication" + title: "Confirmation of enabling two factor authentication" message_transport_type: email lang: default content: - "

Dear [% borrower.firstname %] [% borrower.surname %],

" - - "

This is to confirm that we registered two factor authentication for you.

" - - "

If you did not register, someone else may be using your account. Please contact technical support.

" + - "

This is to confirm that someone enabled two factor authentication on your account.

" + - "

If you did not do this, someone else may be using your account. Please contact technical support.

" - "

Your library

" -- 2.25.1