From 3cd8bf2d7f30d2be87d7e67acdcae1a4cfef69f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 16:05:40 +0900
Subject: [PATCH] Move token request construction to LoadAsyncComplete to
 better allow DI usage

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs     | 5 +++++
 osu.Game/Screens/Play/SubmittingPlayer.cs                   | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 3797adf360..a5adcdb8ad 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -61,6 +61,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
 
             HUDOverlay.Add(loadingDisplay = new LoadingLayer(true) { Depth = float.MaxValue });
+        }
+
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
 
             if (Token == null)
                 return; // Todo: Somehow handle token retrieval failure.
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index d876cad941..356f70f4bf 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -28,11 +28,11 @@ namespace osu.Game.Screens.Play
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadAsyncComplete()
         {
-            Token = null;
+            base.LoadAsyncComplete();
 
+            // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
             bool failed = false;
 
             var req = CreateTokenRequestRequest();