Commit 10fe5d11 authored by Benjamin Elsdon's avatar Benjamin Elsdon Committed by Melledy
Browse files

AuthenticationSystem::verifyUser now returns the user's Account instead of a boolean

parent cc98c569
package emu.grasscutter.auth; package emu.grasscutter.auth;
import emu.grasscutter.game.Account;
import emu.grasscutter.server.http.objects.*; import emu.grasscutter.server.http.objects.*;
import express.http.Request; import express.http.Request;
import express.http.Response; import express.http.Response;
...@@ -30,10 +31,10 @@ public interface AuthenticationSystem { ...@@ -30,10 +31,10 @@ public interface AuthenticationSystem {
/** /**
* Called by plugins to internally verify a user's identity. * Called by plugins to internally verify a user's identity.
* @param details A unique, one-time token to verify the user. * @param details A unique identifier to identify the user. (For example: a JWT token)
* @return True if the user is verified, False otherwise. * @return The user's account if the verification was successful, null if the user was unable to be verified.
*/ */
boolean verifyUser(String details); Account verifyUser(String details);
/** /**
* This is the authenticator used for password authentication. * This is the authenticator used for password authentication.
......
...@@ -2,6 +2,7 @@ package emu.grasscutter.auth; ...@@ -2,6 +2,7 @@ package emu.grasscutter.auth;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
import emu.grasscutter.auth.DefaultAuthenticators.*; import emu.grasscutter.auth.DefaultAuthenticators.*;
import emu.grasscutter.game.Account;
import emu.grasscutter.server.http.objects.ComboTokenResJson; import emu.grasscutter.server.http.objects.ComboTokenResJson;
import emu.grasscutter.server.http.objects.LoginResultJson; import emu.grasscutter.server.http.objects.LoginResultJson;
...@@ -26,11 +27,11 @@ public final class DefaultAuthentication implements AuthenticationSystem { ...@@ -26,11 +27,11 @@ public final class DefaultAuthentication implements AuthenticationSystem {
public void resetPassword(String username) { public void resetPassword(String username) {
// Unhandled. The default authenticator doesn't store passwords. // Unhandled. The default authenticator doesn't store passwords.
} }
@Override @Override
public boolean verifyUser(String details) { public Account verifyUser(String details) {
Grasscutter.getLogger().info(translate("dispatch.authentication.default_unable_to_verify")); Grasscutter.getLogger().info(translate("dispatch.authentication.default_unable_to_verify"));
return false; return null;
} }
@Override @Override
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment