@@ -, +, @@ --- installer/data/mysql/atomicupdate/two-fa.perl | 12 ++++++++++++ installer/data/mysql/kohastructure.sql | 2 ++ 2 files changed, 14 insertions(+) --- a/installer/data/mysql/atomicupdate/two-fa.perl +++ a/installer/data/mysql/atomicupdate/two-fa.perl @@ -15,6 +15,18 @@ if( CheckVersion( $DBversion ) ) { if( !column_exists( 'deletedborrowers', 'secret' ) ) { $dbh->do(q{ ALTER TABLE deletedborrowers ADD COLUMN `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA' AFTER `password` + }); + } + + if( !column_exists( 'borrowers', 'auth_method' ) ) { + $dbh->do(q{ + ALTER TABLE borrowers ADD COLUMN `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method' AFTER `secret` + }); + } + + if( !column_exists( 'deletedborrowers', 'auth_method' ) ) { + $dbh->do(q{ + ALTER TABLE deletedborrowers ADD COLUMN `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method' AFTER `secret` }); } --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -1424,6 +1424,7 @@ CREATE TABLE `borrowers` ( `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender', `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s Bcrypt encrypted password', `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA', + `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method', `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions', `userid` varchar(75) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s opac and/or staff interface log in', `opacnote` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'a note on the patron/borrower''s account that is visible in the OPAC and staff interface', @@ -2433,6 +2434,7 @@ CREATE TABLE `deletedborrowers` ( `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender', `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s encrypted password', `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA', + `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method', `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions', `userid` varchar(75) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s opac and/or staff interface log in', `opacnote` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'a note on the patron/borrower''s account that is visible in the OPAC and staff interface', --