Merge pull request #61560 from nextcloud/refactor/oc

refactor: consolidate app loading logic in bootstrap process

Author: provokateurin

lib/OC.php

@@ -1157,16 +1157,11 @@ public static function handleRequest(): void {
 		$appManager->loadApps(['authentication']);
 		$appManager->loadApps(['extended_authentication']);
 
-		// Load minimum set of apps
-		if (!\OCP\Util::needUpgrade()
-			&& !((bool)$systemConfig->getValue('maintenance', false))) {
-			// For logged-in users: Load everything
-			if (Server::get(IUserSession::class)->isLoggedIn()) {
-				$appManager->loadApps();
-			} else {
-				// For guests: Load only filesystem and logging
-				$appManager->loadApps(['filesystem', 'logging']);
-
+		// Try to login the user if not in maintenance mode and not logged in
+		$needsUpdate = \OCP\Util::needUpgrade();
+		$isMaintenanceMode = (bool)$systemConfig->getValue('maintenance', false);
+		if (!$needsUpdate && !$isMaintenanceMode) {
+			if (!Server::get(IUserSession::class)->isLoggedIn()) {
 				// Don't try to login when a client is trying to get a OAuth token.
 				// OAuth needs to support basic auth too, so the login is not valid
 				// inside Nextcloud and the Login exception would ruin it.
@@ -1194,25 +1189,31 @@ public static function handleRequest(): void {
 					}
 				}
 			}
+
+			// After logging in the user load the minimum required apps
+			$appManager->loadApps(['filesystem', 'logging']);
+
+			// when not on CLI load all apps
+			if (!self::$CLI) {
+				$appManager->loadApps();
+			}
+		} elseif (!$needsUpdate && $serveAppApiDuringMaintenance) {
+			// In case we are in maintenance mode and the request is for app_api, we need to load the app_api app
+			$appManager->loadApp('app_api');
 		}
 
+		// All apps are now loaded to handle the request
+		// if we are not on CLI, try to match the request to a route and handle it
 		if (!self::$CLI) {
 			try {
-				if (!\OCP\Util::needUpgrade()) {
-					$appManager->loadApps(['filesystem', 'logging']);
-					$appManager->loadApps();
-				}
-				if ($serveAppApiDuringMaintenance) {
-					// loadApps() above is a no-op during maintenance, load app_api explicitly
-					$appManager->loadApp('app_api');
-				}
 				Server::get(\OC\Route\Router::class)->match($request->getRawPathInfo());
 				return;
-			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
-				//header('HTTP/1.0 404 Not Found');
 			} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
 				http_response_code(405);
 				return;
+			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+				// we fall through here as the following code will check for special cases
+				// in case nothing matched we will at the end of this function try to display the 404-page.
 			}
 		}