Homeoffice/Essensbestellungsverwaltung
5
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Homeoffice:27710e92afb227cfb0e5662d3ebef53d022dbe48
Branches Tags
Homeoffice:main
Homeoffice:stable
Homeoffice:feat/kindErstellen
Homeoffice:Richards_Branch
Homeoffice:feat/essensplanErstellen
..
compare: Homeoffice:a3c3ee0fe00a240625b01b9cfe65d7ebb553d8d9
Branches Tags
Homeoffice:stable
Homeoffice:main
Homeoffice:feat/kindErstellen
Homeoffice:Richards_Branch
Homeoffice:feat/essensplanErstellen

No commits in common. "27710e92afb227cfb0e5662d3ebef53d022dbe48" and "a3c3ee0fe00a240625b01b9cfe65d7ebb553d8d9" have entirely different histories.
27710e92af ... a3c3ee0fe0

1 changed files with 3 additions and 9 deletions
Show Stats Expand all files Collapse all files

12
src/main/java/com/bib/essensbestellungsverwaltung/AccountMgr.java
View File

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