diff --git a/src/main/java/me/exzork/gcauth/GCAuth.java b/src/main/java/me/exzork/gcauth/GCAuth.java index b8c3f58..a0390b4 100644 --- a/src/main/java/me/exzork/gcauth/GCAuth.java +++ b/src/main/java/me/exzork/gcauth/GCAuth.java @@ -3,7 +3,10 @@ package me.exzork.gcauth; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import emu.grasscutter.Grasscutter; +import emu.grasscutter.auth.DefaultAuthentication; import emu.grasscutter.plugin.Plugin; +import static emu.grasscutter.Configuration.ACCOUNT; + import me.exzork.gcauth.handler.*; import me.exzork.gcauth.utils.Authentication; @@ -12,7 +15,6 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.nio.file.Files; -import java.util.logging.Logger; public class GCAuth extends Plugin { @@ -35,14 +37,14 @@ public class GCAuth extends Plugin { getLogger().info("GCAuth Enabled!"); config.jwtSecret = Authentication.generateRandomString(32); saveConfig(); - if (Grasscutter.getConfig().account.autoCreate) { + if (ACCOUNT.autoCreate) { getLogger().warn("GCAuth does not support automatic account creation. Please disable in the server's config.json or just ignore this warning."); } } @Override public void onDisable() { - + Grasscutter.setAuthenticationSystem(new DefaultAuthentication()); } public void loadConfig() { diff --git a/src/main/java/me/exzork/gcauth/handler/GCAuthAuthentication.java b/src/main/java/me/exzork/gcauth/handler/GCAuthAuthentication.java index c439ac5..fcecaa8 100644 --- a/src/main/java/me/exzork/gcauth/handler/GCAuthAuthentication.java +++ b/src/main/java/me/exzork/gcauth/handler/GCAuthAuthentication.java @@ -1,9 +1,6 @@ package me.exzork.gcauth.handler; -import emu.grasscutter.auth.AuthenticationSystem; -import emu.grasscutter.auth.Authenticator; -import emu.grasscutter.auth.DefaultAuthenticators; -import emu.grasscutter.auth.ExternalAuthenticator; +import emu.grasscutter.auth.*; import emu.grasscutter.server.http.objects.ComboTokenResJson; import emu.grasscutter.server.http.objects.LoginResultJson; @@ -11,16 +8,16 @@ public class GCAuthAuthentication implements AuthenticationSystem { private final Authenticator gcAuthAuthenticator = new GCAuthenticators.GCAuthAuthenticator(); private final Authenticator tokenAuthenticator = new DefaultAuthenticators.TokenAuthenticator(); private final Authenticator sessionKeyAuthenticator = new DefaultAuthenticators.SessionKeyAuthenticator(); - private final GCAuthAuthenticationHandler handler = new GCAuthAuthenticationHandler(); + private final GCAuthAuthenticationHandler externalAuthenticator = new GCAuthAuthenticationHandler(); @Override public void createAccount(String username, String password) { - + // Unhandled. } @Override - public void resetPassword(String s) { - + public void resetPassword(String username) { + // Unhandled. } @Override @@ -45,6 +42,6 @@ public class GCAuthAuthentication implements AuthenticationSystem { @Override public ExternalAuthenticator getExternalAuthenticator() { - return handler; + return externalAuthenticator; } } diff --git a/src/main/java/me/exzork/gcauth/handler/GCAuthAuthenticationHandler.java b/src/main/java/me/exzork/gcauth/handler/GCAuthAuthenticationHandler.java index 7c34bca..61e9ecf 100644 --- a/src/main/java/me/exzork/gcauth/handler/GCAuthAuthenticationHandler.java +++ b/src/main/java/me/exzork/gcauth/handler/GCAuthAuthenticationHandler.java @@ -6,6 +6,7 @@ import emu.grasscutter.auth.AuthenticationSystem; import emu.grasscutter.auth.ExternalAuthenticator; import emu.grasscutter.database.DatabaseHelper; import emu.grasscutter.game.Account; +import express.http.Response; import me.exzork.gcauth.GCAuth; import me.exzork.gcauth.json.AuthResponseJson; import me.exzork.gcauth.json.ChangePasswordAccount; @@ -17,8 +18,11 @@ public class GCAuthAuthenticationHandler implements ExternalAuthenticator { @Override public void handleLogin(AuthenticationSystem.AuthenticationRequest authenticationRequest) { AuthResponseJson authResponse = new AuthResponseJson(); + Response response = authenticationRequest.getResponse(); + assert response != null; // This should never be null. + try { - String requestBody = authenticationRequest.getRequest().ctx().body(); + String requestBody = response.ctx().body(); if (requestBody.isEmpty()) { authResponse.success = false; authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request" @@ -55,15 +59,18 @@ public class GCAuthAuthenticationHandler implements ExternalAuthenticator { Grasscutter.getLogger().error("[Dispatch] An error occurred while a user was logging in."); e.printStackTrace(); } - authenticationRequest.getResponse().send(authResponse); + response.send(authResponse); } @Override public void handleAccountCreation(AuthenticationSystem.AuthenticationRequest authenticationRequest) { AuthResponseJson authResponse = new AuthResponseJson(); + Response response = authenticationRequest.getResponse(); + assert response != null; // This should never be null. + Account account = null; try { - String requestBody = authenticationRequest.getRequest().ctx().body(); + String requestBody = response.ctx().body(); if (requestBody.isEmpty()) { authResponse.success = false; authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request" @@ -129,14 +136,17 @@ public class GCAuthAuthenticationHandler implements ExternalAuthenticator { } } } - authenticationRequest.getResponse().send(authResponse); + response.send(authResponse); } @Override public void handlePasswordReset(AuthenticationSystem.AuthenticationRequest authenticationRequest) { AuthResponseJson authResponse = new AuthResponseJson(); + Response response = authenticationRequest.getResponse(); + assert response != null; // This should never be null. + try { - String requestBody = authenticationRequest.getRequest().ctx().body(); + String requestBody = response.ctx().body(); if (requestBody.isEmpty()) { authResponse.success = false; authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request" @@ -183,6 +193,6 @@ public class GCAuthAuthenticationHandler implements ExternalAuthenticator { e.printStackTrace(); } - authenticationRequest.getResponse().send(authResponse); + response.send(authResponse); } } diff --git a/src/main/java/me/exzork/gcauth/handler/GCAuthenticators.java b/src/main/java/me/exzork/gcauth/handler/GCAuthenticators.java index bcc6809..468ac67 100644 --- a/src/main/java/me/exzork/gcauth/handler/GCAuthenticators.java +++ b/src/main/java/me/exzork/gcauth/handler/GCAuthenticators.java @@ -3,7 +3,6 @@ package me.exzork.gcauth.handler; import emu.grasscutter.Grasscutter; import emu.grasscutter.auth.AuthenticationSystem; import emu.grasscutter.auth.Authenticator; -import emu.grasscutter.database.DatabaseHelper; import emu.grasscutter.game.Account; import emu.grasscutter.server.http.objects.LoginResultJson; import me.exzork.gcauth.utils.Authentication; @@ -17,7 +16,8 @@ public class GCAuthenticators { var response = new LoginResultJson(); var requestData = authenticationRequest.getPasswordRequest(); - assert requestData != null; + assert requestData != null; // This should never be null. + Account account = Authentication.getAccountByOneTimeToken(requestData.account); if(account == null) { Grasscutter.getLogger().info("[GCAuth] Client " + requestData.account + " tried to login with invalid one time token."); diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 05f68d5..899645a 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "GCAuth", "description": "GCAuth is a plugin that allows you to implement authentication for your server.", - "version": "1.0.0", + "version": "2.2.0", "author": ["ExZork"], "mainClass": "me.exzork.gcauth.GCAuth" -} \ No newline at end of file +}