Compare commits

..

2 Commits

Author SHA1 Message Date
27710e92af Merge branch 'main' into Richards_Branch 2023-01-23 08:59:38 +01:00
ec2d3b581d fixed salt 2023-01-17 13:47:24 +01:00

View File

@ -106,9 +106,15 @@ public class AccountMgr {
String[] pwH = {"email"};
String[] pwD = {email};
List<String> foundEmail = Database.select("user",pwH,pwD);
String salt;
if(foundEmail.size() == 1){
String[] userParts = foundEmail.get(0).split(":");
String[] pwParts = userParts[4].split("\\.");
String salt = pwParts[1];
salt = pwParts[1];
}else{
//no unique user found; still calculating a hash for security reasons
salt = getSalt();
}
String[] userH = {"email","password"};
String[] userD = {email,hashAndSalt(pw,salt)};
return Database.getSingleId("user",userH,userD);