added login widget in debug menu & removed forced login from dynamic …

…scene loader
decentraland · Dec 20, 2023 · 20f043e · 20f043e
1 parent 3e60f70
commit 20f043e
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 8 deletions.
diff --git a/Explorer/Assets/DCL/PluginSystem/Global/ProfilePlugin.cs b/Explorer/Assets/DCL/PluginSystem/Global/ProfilePlugin.cs
@@ -2,7 +2,6 @@
 using Cysharp.Threading.Tasks;
 using DCL.Profiles;
 using ECS.StreamableLoading.Cache;
-using System;
 using System.Threading;
 using Utility.Multithreading;
 

diff --git a/Explorer/Assets/DCL/PluginSystem/Global/Web3AuthenticationPlugin.cs b/Explorer/Assets/DCL/PluginSystem/Global/Web3AuthenticationPlugin.cs
@@ -0,0 +1,42 @@
+using Arch.SystemGroups;
+using Cysharp.Threading.Tasks;
+using DCL.DebugUtilities;
+using DCL.Web3Authentication;
+using System.Threading;
+
+namespace DCL.PluginSystem.Global
+{
+    public class Web3AuthenticationPlugin : IDCLGlobalPlugin
+    {
+        private readonly IWeb3Authenticator web3Authenticator;
+        private readonly IDebugContainerBuilder debugContainerBuilder;
+
+        private CancellationTokenSource? cancellationTokenSource;
+
+        public Web3AuthenticationPlugin(IWeb3Authenticator web3Authenticator,
+            IDebugContainerBuilder debugContainerBuilder)
+        {
+            this.web3Authenticator = web3Authenticator;
+            this.debugContainerBuilder = debugContainerBuilder;
+        }
+
+        public void Dispose() { }
+
+        public UniTask Initialize(IPluginSettingsContainer container, CancellationToken ct) =>
+            UniTask.CompletedTask;
+
+        public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in GlobalPluginArguments arguments)
+        {
+            debugContainerBuilder.AddWidget("Web3 Authentication")
+                                 .AddSingleButton("Login", Login);
+        }
+
+        private void Login()
+        {
+            cancellationTokenSource?.Cancel();
+            cancellationTokenSource?.Dispose();
+            cancellationTokenSource = new CancellationTokenSource();
+            web3Authenticator.LoginAsync(cancellationTokenSource.Token).Forget();
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/PluginSystem/Global/Web3AuthenticationPlugin.cs.meta b/Explorer/Assets/DCL/PluginSystem/Global/Web3AuthenticationPlugin.cs.meta
diff --git a/Explorer/Assets/DCL/PluginSystem/csc.rsp b/Explorer/Assets/DCL/PluginSystem/csc.rsp
@@ -0,0 +1 @@
+-nullable:enable
diff --git a/Explorer/Assets/DCL/PluginSystem/csc.rsp.meta b/Explorer/Assets/DCL/PluginSystem/csc.rsp.meta
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
@@ -75,7 +75,6 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
             try
             {
                 web3Authenticator = new DappWeb3Authenticator(new UnityAppWebBrowser());
-                IWeb3Identity web3Identity = await web3Authenticator.LoginAsync(ct);
 
                 // First load the common global plugin
                 bool isLoaded;
@@ -125,7 +124,7 @@ void OnPluginInitialized<TPluginInterface>((TPluginInterface plugin, bool succes
                 }
 
                 globalWorld = dynamicWorldContainer.GlobalWorldFactory.Create(sceneSharedContainer.SceneFactory,
-                    dynamicWorldContainer.EmptyScenesWorldFactory, staticContainer.CharacterObject, web3Identity);
+                    dynamicWorldContainer.EmptyScenesWorldFactory, staticContainer.CharacterObject);
 
                 dynamicWorldContainer.DebugContainer.Builder.Build(debugUiRoot);
 

diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs
@@ -1,6 +1,5 @@
 using CommunicationData.URLHelpers;
 using Cysharp.Threading.Tasks;
-using DCL.AvatarRendering.AvatarShape.Systems;
 using DCL.AvatarRendering.Wearables;
 using DCL.DebugUtilities;
 using DCL.ParcelsService;
@@ -95,6 +94,7 @@ public void Dispose()
                 new MinimapPlugin(staticContainer.AssetsProvisioner, mvcManager, mapRendererContainer, placesAPIService),
                 new ExplorePanelPlugin(staticContainer.AssetsProvisioner, mvcManager, mapRendererContainer, placesAPIService, parcelServiceContainer.TeleportController),
                 new WebRequestsPlugin(staticContainer.WebRequestsContainer.AnalyticsContainer, debugBuilder),
+                new Web3AuthenticationPlugin(web3Authenticator, debugBuilder),
             };
 
             globalPlugins.AddRange(staticContainer.SharedPlugins);

diff --git a/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs b/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs
@@ -17,7 +17,6 @@
 using DCL.Systems;
 using DCL.Time;
 using DCL.Time.Systems;
-using DCL.Web3Authentication;
 using DCL.WebRequests;
 using ECS;
 using ECS.Groups;
@@ -94,8 +93,7 @@ public GlobalWorldFactory(in StaticContainer staticContainer,
             physicsTickProvider = staticContainer.PhysicsTickProvider;
         }
 
-        public GlobalWorld Create(ISceneFactory sceneFactory, IEmptyScenesWorldFactory emptyScenesWorldFactory, ICharacterObject characterObject,
-            IWeb3Identity web3Identity)
+        public GlobalWorld Create(ISceneFactory sceneFactory, IEmptyScenesWorldFactory emptyScenesWorldFactory, ICharacterObject characterObject)
         {
             var world = World.Create();
 
@@ -114,7 +112,6 @@ public GlobalWorld Create(ISceneFactory sceneFactory, IEmptyScenesWorldFactory e
                 new TransformComponent { Transform = characterObject.Transform },
                 new PBAvatarShape
                 {
-                    Id = web3Identity.Address,
                     BodyShape = BodyShape.MALE,
                     Wearables = { WearablesConstants.DefaultWearables.GetDefaultWearablesForBodyShape(BodyShape.MALE) },
                     Name = "Player",