Move oidc.load_metadata() startup into _base.start()

synapse/app/_base.py

@@ -625,6 +625,16 @@ def run_sighup(*args: Any, **kwargs: Any) -> None:
     # Apply the cache config.
     hs.config.caches.resize_all_caches()
 
+    # Load the OIDC provider metadatas, if OIDC is enabled.
+    if hs.config.oidc.oidc_enabled:
+        oidc = hs.get_oidc_handler()
+        # Loading the provider metadata also ensures the provider config is valid.
+        #
+        # FIXME: It feels a bit strange to validate and block on startup as one of these
+        # OIDC providers could be temporarily unavailable and cause Synapse to be unable
+        # to start.
+        await oidc.load_metadata()
+
     # Load the certificate from disk.
     refresh_certificate(hs)
 

synapse/app/homeserver.py

@@ -425,13 +425,11 @@ def setup(
         handle_startup_exception(e)
 
     async def _start_when_reactor_running() -> None:
-        # TODO: Feels like this should be moved somewhere else.
-        #
-        # Load the OIDC provider metadatas, if OIDC is enabled.
-        if hs.config.oidc.oidc_enabled:
-            oidc = hs.get_oidc_handler()
-            # Loading the provider metadata also ensures the provider config is valid.
-            await oidc.load_metadata()
+        """
+        Specific to the `SynapseHomeServer` (main homeserver process).
+
+        Should be called once the reactor is running.
+        """
 
         await _base.start(hs, freeze)