From 20a45eb8df68196bc771b01c3b6d43ed24b46a69 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Wed, 12 Apr 2023 09:34:38 -0100 Subject: [PATCH] app type extended_authentication Signed-off-by: Maxence Lange --- lib/base.php | 1 + lib/private/Updater.php | 2 +- ocs/v1.php | 1 + public.php | 1 + remote.php | 1 + resources/app-info-shipped.xsd | 1 + resources/app-info.xsd | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index 9b9f86699f2ec..dbf873c817842 100644 --- a/lib/base.php +++ b/lib/base.php @@ -1018,6 +1018,7 @@ public static function handleRequest() { // Always load authentication apps OC_App::loadApps(['authentication']); + OC_App::loadApps(['extended_authentication']); // Load minimum set of apps if (!\OCP\Util::needUpgrade() diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 78613ddbb0c28..6aadf832a6c46 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -333,7 +333,7 @@ protected function doCoreUpgrade(): void { */ protected function doAppUpgrade(): void { $apps = \OC_App::getEnabledApps(); - $priorityTypes = ['authentication', 'filesystem', 'logging']; + $priorityTypes = ['authentication', 'extended_authentication', 'filesystem', 'logging']; $pseudoOtherType = 'other'; $stacks = [$pseudoOtherType => []]; diff --git a/ocs/v1.php b/ocs/v1.php index 3fba48b13c86d..055398993729a 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -50,6 +50,7 @@ try { OC_App::loadApps(['session']); OC_App::loadApps(['authentication']); + OC_App::loadApps(['extended_authentication']); // load all apps to get all api routes properly setup // FIXME: this should ideally appear after handleLogin but will cause diff --git a/public.php b/public.php index d9d15d7d5424f..2956d7f79dd81 100644 --- a/public.php +++ b/public.php @@ -66,6 +66,7 @@ // Load all required applications \OC::$REQUESTEDAPP = $app; OC_App::loadApps(['authentication']); + OC_App::loadApps(['extended_authentication']); OC_App::loadApps(['filesystem', 'logging']); if (!\OC::$server->getAppManager()->isInstalled($app)) { diff --git a/remote.php b/remote.php index 43376424af8ff..0c33fabc762aa 100644 --- a/remote.php +++ b/remote.php @@ -153,6 +153,7 @@ function resolveService($service) { // Load all required applications \OC::$REQUESTEDAPP = $app; OC_App::loadApps(['authentication']); + OC_App::loadApps(['extended_authentication']); OC_App::loadApps(['filesystem', 'logging']); switch ($app) { diff --git a/resources/app-info-shipped.xsd b/resources/app-info-shipped.xsd index c11264142ebfb..ddf8a010f3e4b 100644 --- a/resources/app-info-shipped.xsd +++ b/resources/app-info-shipped.xsd @@ -340,6 +340,7 @@ + +