Bugzilla – Attachment 133665 Details for
Bug 29894
2FA: Add few validations, clear secret, send register notice
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29894: (follow-up) Update notice terms
Bug-29894-follow-up-Update-notice-terms.patch (text/plain), 6.14 KB, created by
Jonathan Druart
on 2022-04-22 10:30:41 UTC
(
hide
)
Description:
Bug 29894: (follow-up) Update notice terms
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-04-22 10:30:41 UTC
Size:
6.14 KB
patch
obsolete
>From c63176c3d04242229139a57150a369c42b54d768 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >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 <martin.renvoize@ptfs-europe.com> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > 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', '<p>Dear [% borrower.firstname %] [% borrower.surname %],</p>\r\n<p>This is to confirm that we deregistered two factor authentication for you.</p>\r\n<p>If you did not deregister, someone else may be using your account. Please contact technical support.</p>\r\n<p>Your library</p>', 'email', 'default'), >-('members', '2FA_REGISTER', '', 'Confirmation of registering two factor authentication', 1, 'Confirmation of registering two factor authentication', '<p>Dear [% borrower.firstname %] [% borrower.surname %],</p>\r\n<p>This is to confirm that we registered two factor authentication for you.</p>\r\n<p>If you did not register, someone else may be using your account. Please contact technical support.</p>\r\n<p>Your library</p>', 'email', 'default') >+('members', '2FA_DISABLE', '', 'Confirmation of disabling two factor authentication', 1, 'Confirmation of disabling two factor authentication', '<p>Dear [% borrower.firstname %] [% borrower.surname %],</p>\r\n<p>This is to confirm that someone disabled two factor authentication on your account.</p>\r\n<p>If you did not do this, someone else may be using your account. Please contact technical support.</p>\r\n<p>Your library</p>', 'email', 'default'), >+('members', '2FA_ENABLE', '', 'Confirmation of enabling two factor authentication', 1, 'Confirmation of enabling two factor authentication', '<p>Dear [% borrower.firstname %] [% borrower.surname %],</p>\r\n<p>This is to confirm that someone enabled two factor authentication on your account.</p>\r\n<p>If you did not do this, someone else may be using your account. Please contact technical support.</p>\r\n<p>Your library</p>', '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: <<recalls.recallnotes>>" > > - 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: > - "<p>Dear [% borrower.firstname %] [% borrower.surname %],</p>" >- - "<p>This is to confirm that we deregistered two factor authentication for you.</p>" >- - "<p>If you did not deregister, someone else may be using your account. Please contact technical support.</p>" >+ - "<p>This is to confirm that someone disabled two factor authentication on your account.</p>" >+ - "<p>If you did not do this, someone else may be using your account. Please contact technical support.</p>" > - "<p>Your library</p>" > > - 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: > - "<p>Dear [% borrower.firstname %] [% borrower.surname %],</p>" >- - "<p>This is to confirm that we registered two factor authentication for you.</p>" >- - "<p>If you did not register, someone else may be using your account. Please contact technical support.</p>" >+ - "<p>This is to confirm that someone enabled two factor authentication on your account.</p>" >+ - "<p>If you did not do this, someone else may be using your account. Please contact technical support.</p>" > - "<p>Your library</p>" >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 29894
:
129538
|
129539
|
129669
|
129670
|
129689
|
129690
|
129691
|
129692
|
133286
|
133287
|
133288
|
133289
|
133562
|
133563
|
133564
|
133565
|
133566
|
133618
|
133661
|
133662
|
133663
|
133664
| 133665 |
133666
|
133667