started working on templates and api
This commit is contained in:
@@ -1,16 +1,23 @@
|
||||
package de.srsoftware.widerhall.data;
|
||||
|
||||
import de.srsoftware.widerhall.Util;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.security.InvalidKeyException;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static de.srsoftware.widerhall.Util.t;
|
||||
import static de.srsoftware.widerhall.data.Database.*;
|
||||
|
||||
public class User {
|
||||
private static final Logger LOG = LoggerFactory.getLogger(User.class);
|
||||
private static Database database = Database.open();
|
||||
private String email, salt, hashedPass, name;
|
||||
|
||||
@@ -51,7 +58,50 @@ public class User {
|
||||
throw new InvalidKeyException();
|
||||
}
|
||||
|
||||
private static boolean noUsers() throws SQLException {
|
||||
public String email() {
|
||||
return email;
|
||||
}
|
||||
|
||||
|
||||
public String hashedPassword() {
|
||||
return hashedPass;
|
||||
}
|
||||
|
||||
public boolean is(String test){
|
||||
if (test == null) return false;
|
||||
return test.equals(name) || test.equals(email);
|
||||
}
|
||||
|
||||
public static List<User> list() {
|
||||
var userList = new ArrayList<User>();
|
||||
try {
|
||||
var rs = database.query("SELECT * FROM Users").exec();
|
||||
while (rs.next()){
|
||||
var email = rs.getString(EMAIL);
|
||||
var name = rs.getString(NAME);
|
||||
var salt = rs.getString(SALT);
|
||||
var hashedPassword = rs.getString(HASHED_PASS);
|
||||
userList.add(new User(email,name,salt,hashedPassword));
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
LOG.warn("Error loading user list!",e);
|
||||
}
|
||||
return userList;
|
||||
}
|
||||
|
||||
public Map<String,String> map() {
|
||||
return Map.of(EMAIL,email,NAME,name);
|
||||
}
|
||||
|
||||
private boolean matching(String password) {
|
||||
return hashedPass.equals(Util.sha256(password+salt));
|
||||
}
|
||||
|
||||
public String name() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public static boolean noUsers() throws SQLException {
|
||||
var rs = database.query("SELECT count(*) FROM users").exec();
|
||||
try {
|
||||
if (rs.next()) {
|
||||
@@ -63,10 +113,6 @@ public class User {
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean matching(String password) {
|
||||
return hashedPass.equals(Util.sha256(password+salt));
|
||||
}
|
||||
|
||||
private User save() throws SQLException {
|
||||
database.insertInto("Users")
|
||||
.values(Map.of(EMAIL,email,NAME,name,SALT,salt,HASHED_PASS,hashedPass))
|
||||
@@ -74,7 +120,4 @@ public class User {
|
||||
return this;
|
||||
}
|
||||
|
||||
public Map<String,String> map() {
|
||||
return Map.of(EMAIL,email,NAME,name);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user