Add config and handling for IsAutoRegister and IsFlippedUsername, res…

…olves #75
Kaioru · Sep 29, 2023 · 72b770b · 72b770b
1 parent 7d6b0f7
commit 72b770b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/src/app/Edelstein.Application.Server/Configs/ProgramConfigStageLogin.cs b/src/app/Edelstein.Application.Server/Configs/ProgramConfigStageLogin.cs
@@ -5,4 +5,7 @@ namespace Edelstein.Application.Server.Configs;
 public record ProgramConfigStageLogin : ProgramConfigStage, ILoginStageOptions
 {
     public byte[] Worlds { get; set; }
+
+    public bool IsAutoRegister { get; set; } = true;
+    public bool IsFlippedUsername { get; set; } = false;
 }
diff --git a/src/app/Edelstein.Application.Server/appsettings.json b/src/app/Edelstein.Application.Server/appsettings.json
@@ -8,7 +8,9 @@
         "Worlds": [
           0,
           1
-        ]
+        ],
+        "IsAutoRegister": true,
+        "IsFlippedUsername": false
       }
     ],
     "GameStages": [

diff --git a/src/common/Edelstein.Common.Gameplay.Login/Handlers/CheckPasswordHandler.cs b/src/common/Edelstein.Common.Gameplay.Login/Handlers/CheckPasswordHandler.cs
@@ -17,9 +17,17 @@ public CheckPasswordHandler(IPipeline<UserOnPacketCheckPassword> pipeline) : bas
     public override bool Check(ILoginStageUser user) => user.State == LoginState.CheckPassword;
 
     public override UserOnPacketCheckPassword Serialize(ILoginStageUser user, IPacketReader reader)
-        => new(
+    {
+        var username = reader.ReadString();
+        var password = reader.ReadString();
+
+        if (user.Context.Options.IsFlippedUsername)
+            (username, password) = (password, username);
+
+        return new(
             user,
-            reader.ReadString(),
-            reader.ReadString()
+            username,
+            password
         );
+    }
 }
diff --git a/src/common/Edelstein.Common.Gameplay.Login/Plugs/UserOnPacketCheckPasswordPlug.cs b/src/common/Edelstein.Common.Gameplay.Login/Plugs/UserOnPacketCheckPasswordPlug.cs
@@ -50,7 +50,7 @@ public async Task Handle(IPipelineContext ctx, UserOnPacketCheckPassword message
                 _ => LoginResult.Unknown
             };
 
-            if (result == LoginResult.NotRegistered)
+            if (message.User.Context.Options.IsAutoRegister && result == LoginResult.NotRegistered)
             {
                 // TODO: Move autoregister this to plugin
                 result = LoginResult.Success;

diff --git a/src/protocol/Edelstein.Protocol.Gameplay.Login/ILoginStageOptions.cs b/src/protocol/Edelstein.Protocol.Gameplay.Login/ILoginStageOptions.cs
@@ -5,4 +5,8 @@ namespace Edelstein.Protocol.Gameplay.Login;
 public interface ILoginStageOptions : IIdentifiable<string>
 {
     byte[] Worlds { get; }
+
+    // TODO move this to plugins
+    bool IsAutoRegister { get; }
+    bool IsFlippedUsername { get; }
 }