From f69a3ef8755b9e82f1912055e3049b47dd0becf9 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Tue, 12 Feb 2019 00:39:57 +0000 Subject: [PATCH] Bug 22132: Add RESTBasicAuth syspref - Revert This reverts commit 5b020c98163c9af74b60338d126887eb2fd7ec9f. Signed-off-by: Lucas Gass --- .../mysql/atomicupdate/bug_22132_basic_auth.perl | 13 ------------- installer/data/mysql/sysprefs.sql | 1 - .../en/modules/admin/preferences/web_services.pref | 6 ------ 3 files changed, 20 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_22132_basic_auth.perl diff --git a/installer/data/mysql/atomicupdate/bug_22132_basic_auth.perl b/installer/data/mysql/atomicupdate/bug_22132_basic_auth.perl deleted file mode 100644 index ae98472abc..0000000000 --- a/installer/data/mysql/atomicupdate/bug_22132_basic_auth.perl +++ /dev/null @@ -1,13 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - - $dbh->do(q{ - INSERT IGNORE INTO systempreferences - (variable, value, options, explanation, type ) - VALUES - ('RESTBasicAuth','0',NULL,'If enabled, Basic authentication is enabled for the REST API.','YesNo') - }); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 22132 - Add Basic authentication)\n"; -} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index cc05a74541..0623715a42 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -467,7 +467,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'), ('ReservesMaxPickUpDelay','7','','Define the Maximum delay to pick up an item on hold','Integer'), ('ReservesNeedReturns','1','','If ON, a hold placed on an item available in this library must be checked-in, otherwise, a hold on a specific item, that is in the library & available is considered available','YesNo'), -('RESTBasicAuth','0',NULL,'If enabled, Basic authentication is enabled for the REST API.','YesNo'), ('RESTdefaultPageSize','20','','Default page size for endpoints listing objects','Integer'), ('RESTOAuth2ClientCredentials','0',NULL,'If enabled, the OAuth2 client credentials flow is enabled for the REST API.','YesNo'), ('RestrictedPageLocalIPs','',NULL,'Beginning of IP addresses considered as local (comma separated ex: "127.0.0,127.0.2")','Free'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref index 8abda28f28..15fc8343b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref @@ -1,11 +1,5 @@ Web services: REST API: - - - - pref: RESTBasicAuth - choices: - yes: Enable - no: "Disable" - - 'Basic authentication for the REST API.' - - "Set the default number of results returned by the REST API endpoints to" - pref: "RESTdefaultPageSize" -- 2.39.5