mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-06-26 01:54:51 +08:00
Compare commits
2 Commits
b0aa294c26
...
138c436982
Author | SHA1 | Date | |
---|---|---|---|
|
138c436982 | ||
|
e54cd086f4 |
@ -60,6 +60,12 @@ public interface AuthenticationSystem {
|
|||||||
*/
|
*/
|
||||||
ExternalAuthenticator getExternalAuthenticator();
|
ExternalAuthenticator getExternalAuthenticator();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is the authenticator used for handling OAuth authentication requests.
|
||||||
|
* @return An authenticator.
|
||||||
|
*/
|
||||||
|
OAuthAuthenticator getOAuthAuthenticator();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A data container that holds relevant data for authenticating a client.
|
* A data container that holds relevant data for authenticating a client.
|
||||||
*/
|
*/
|
||||||
@ -125,4 +131,16 @@ public interface AuthenticationSystem {
|
|||||||
return AuthenticationRequest.builder().request(request)
|
return AuthenticationRequest.builder().request(request)
|
||||||
.response(response).build();
|
.response(response).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generates an authentication request from a {@link Response} object.
|
||||||
|
* @param request The Express request.
|
||||||
|
* @param jsonData The JSON data.
|
||||||
|
* @return An authentication request.
|
||||||
|
*/
|
||||||
|
static AuthenticationRequest fromOAuthRequest(Request request, Response response) {
|
||||||
|
return AuthenticationRequest.builder().request(request)
|
||||||
|
.response(response).build();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,7 @@ public final class DefaultAuthentication implements AuthenticationSystem {
|
|||||||
private final Authenticator<LoginResultJson> tokenAuthenticator = new TokenAuthenticator();
|
private final Authenticator<LoginResultJson> tokenAuthenticator = new TokenAuthenticator();
|
||||||
private final Authenticator<ComboTokenResJson> sessionKeyAuthenticator = new SessionKeyAuthenticator();
|
private final Authenticator<ComboTokenResJson> sessionKeyAuthenticator = new SessionKeyAuthenticator();
|
||||||
private final ExternalAuthenticator externalAuthenticator = new ExternalAuthentication();
|
private final ExternalAuthenticator externalAuthenticator = new ExternalAuthentication();
|
||||||
|
private final OAuthAuthenticator oAuthAuthenticator = new OAuthAuthentication();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void createAccount(String username, String password) {
|
public void createAccount(String username, String password) {
|
||||||
@ -53,4 +54,9 @@ public final class DefaultAuthentication implements AuthenticationSystem {
|
|||||||
public ExternalAuthenticator getExternalAuthenticator() {
|
public ExternalAuthenticator getExternalAuthenticator() {
|
||||||
return this.externalAuthenticator;
|
return this.externalAuthenticator;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public OAuthAuthenticator getOAuthAuthenticator() {
|
||||||
|
return this.oAuthAuthenticator;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -174,4 +174,29 @@ public final class DefaultAuthenticators {
|
|||||||
request.getResponse().send("Authentication is not available with the default authentication method.");
|
request.getResponse().send("Authentication is not available with the default authentication method.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles authentication requests from OAuth sources.
|
||||||
|
*/
|
||||||
|
public static class OAuthAuthentication implements OAuthAuthenticator {
|
||||||
|
@Override public void handleLogin(AuthenticationRequest request) {
|
||||||
|
assert request.getResponse() != null;
|
||||||
|
request.getResponse().send("Authentication is not available with the default authentication method.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void handleDesktopRedirection(AuthenticationRequest request) {
|
||||||
|
assert request.getResponse() != null;
|
||||||
|
request.getResponse().send("Authentication is not available with the default authentication method.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void handleMobileRedirection(AuthenticationRequest request) {
|
||||||
|
assert request.getResponse() != null;
|
||||||
|
request.getResponse().send("Authentication is not available with the default authentication method.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void handleTokenProcess(AuthenticationRequest request) {
|
||||||
|
assert request.getResponse() != null;
|
||||||
|
request.getResponse().send("Authentication is not available with the default authentication method.");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
28
src/main/java/emu/grasscutter/auth/OAuthAuthenticator.java
Normal file
28
src/main/java/emu/grasscutter/auth/OAuthAuthenticator.java
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
package emu.grasscutter.auth;
|
||||||
|
|
||||||
|
import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles authentication via OAuth routes.
|
||||||
|
*/
|
||||||
|
public interface OAuthAuthenticator {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when an OAuth login request is made.
|
||||||
|
* @param request The authentication request.
|
||||||
|
*/
|
||||||
|
void handleLogin(AuthenticationRequest request);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when an client requests to redirect to login page.
|
||||||
|
* @param request The authentication request.
|
||||||
|
*/
|
||||||
|
void handleDesktopRedirection(AuthenticationRequest request);
|
||||||
|
void handleMobileRedirection(AuthenticationRequest request);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when an OAuth login requests callback.
|
||||||
|
* @param request The authentication request.
|
||||||
|
*/
|
||||||
|
void handleTokenProcess(AuthenticationRequest request);
|
||||||
|
}
|
@ -2,6 +2,8 @@ package emu.grasscutter.command;
|
|||||||
|
|
||||||
import emu.grasscutter.Grasscutter;
|
import emu.grasscutter.Grasscutter;
|
||||||
import emu.grasscutter.game.player.Player;
|
import emu.grasscutter.game.player.Player;
|
||||||
|
import emu.grasscutter.server.event.game.CommandResponseEvent;
|
||||||
|
import emu.grasscutter.server.event.types.ServerEvent;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -19,6 +21,8 @@ public interface CommandHandler {
|
|||||||
} else {
|
} else {
|
||||||
player.dropMessage(message);
|
player.dropMessage(message);
|
||||||
}
|
}
|
||||||
|
CommandResponseEvent event = new CommandResponseEvent(ServerEvent.Type.GAME,player, message);
|
||||||
|
event.call();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -0,0 +1,24 @@
|
|||||||
|
package emu.grasscutter.server.event.game;
|
||||||
|
|
||||||
|
import emu.grasscutter.game.player.Player;
|
||||||
|
import emu.grasscutter.server.event.types.GameEvent;
|
||||||
|
import emu.grasscutter.server.event.types.ServerEvent;
|
||||||
|
|
||||||
|
public class CommandResponseEvent extends ServerEvent {
|
||||||
|
private String message;
|
||||||
|
private Player player;
|
||||||
|
|
||||||
|
public CommandResponseEvent(Type type, Player player,String message) {
|
||||||
|
super(type);
|
||||||
|
this.message = message;
|
||||||
|
this.player = player;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMessage() {
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Player getPlayer() {
|
||||||
|
return player;
|
||||||
|
}
|
||||||
|
}
|
@ -33,6 +33,14 @@ public final class DispatchHandler implements Router {
|
|||||||
.handleAccountCreation(AuthenticationSystem.fromExternalRequest(request, response)));
|
.handleAccountCreation(AuthenticationSystem.fromExternalRequest(request, response)));
|
||||||
express.post("/authentication/change_password", (request, response) -> Grasscutter.getAuthenticationSystem().getExternalAuthenticator()
|
express.post("/authentication/change_password", (request, response) -> Grasscutter.getAuthenticationSystem().getExternalAuthenticator()
|
||||||
.handlePasswordReset(AuthenticationSystem.fromExternalRequest(request, response)));
|
.handlePasswordReset(AuthenticationSystem.fromExternalRequest(request, response)));
|
||||||
|
|
||||||
|
// OAuth login
|
||||||
|
express.post("/hk4e_global/mdk/shield/api/loginByThirdparty", (request, response) -> Grasscutter.getAuthenticationSystem().getOAuthAuthenticator().handleLogin(AuthenticationSystem.fromOAuthRequest(request, response)));
|
||||||
|
// OAuth querystring convert redirection
|
||||||
|
express.get("/authentication/openid/redirect", (request, response) -> Grasscutter.getAuthenticationSystem().getOAuthAuthenticator().handleTokenProcess(AuthenticationSystem.fromOAuthRequest(request, response)));
|
||||||
|
// OAuth redirection
|
||||||
|
express.get("/Api/twitter_login", (request, response) -> Grasscutter.getAuthenticationSystem().getOAuthAuthenticator().handleDesktopRedirection(AuthenticationSystem.fromOAuthRequest(request, response)));
|
||||||
|
express.get("/sdkTwitterLogin.html", (request, response) -> Grasscutter.getAuthenticationSystem().getOAuthAuthenticator().handleMobileRedirection(AuthenticationSystem.fromOAuthRequest(request, response)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user