mirror of
https://github.com/exzork/GCAuth.git
synced 2024-11-24 00:23:58 +00:00
Merge pull request #7 from exzork/development
fix registerhandler and bump version
This commit is contained in:
commit
f0594825bc
@ -10,7 +10,7 @@ sourceCompatibility = 17
|
||||
targetCompatibility = 17
|
||||
|
||||
group 'me.exzork.gcauth'
|
||||
version '2.1.2'
|
||||
version '2.1.3'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
@ -29,6 +29,7 @@ public class RegisterHandler implements HttpContextHandler {
|
||||
if (registerAccount.password.equals(registerAccount.password_confirmation)) {
|
||||
if (registerAccount.password.length() >= 8) {
|
||||
String password = Authentication.generateHash(registerAccount.password);
|
||||
try{
|
||||
Account account = Authentication.getAccountByUsernameAndPassword(registerAccount.username, "");
|
||||
if (account != null) {
|
||||
account.setPassword(password);
|
||||
@ -48,6 +49,11 @@ public class RegisterHandler implements HttpContextHandler {
|
||||
authResponse.jwt = "";
|
||||
}
|
||||
}
|
||||
}catch (Exception ignored){
|
||||
authResponse.success = false;
|
||||
authResponse.message = "UNKNOWN"; // ENG = "Username has already been taken by another user."
|
||||
authResponse.jwt = "";
|
||||
}
|
||||
} else {
|
||||
authResponse.success = false;
|
||||
authResponse.message = "PASSWORD_INVALID"; // ENG = "Password must be at least 8 characters long"
|
||||
|
@ -16,6 +16,7 @@ public final class Authentication {
|
||||
|
||||
public static Account getAccountByUsernameAndPassword(String username, String password) {
|
||||
Account account = DatabaseHelper.getAccountByName(username);
|
||||
if (account == null) return null;
|
||||
if(account.getPassword() != null && !account.getPassword().isEmpty()) {
|
||||
if(!verifyPassword(password, account.getPassword())) account = null;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user