StephanRichter/Widerhall
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

pre-filling subscription form for logged-in users

Browse Source
This commit is contained in:
Stephan Richter
2022-04-16 23:45:17 +02:00
parent f8ff180891
commit 9bd2cceb7d
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/srsoftware/widerhall/data/ListMember.java
View File

@@ -77,7 +77,7 @@ public class ListMember {
public static String stateText(int state) {
var words = new ArrayList<String>();
if ((state & STATE_OWNER) > 0) words.add("owener");
if ((state & STATE_OWNER) > 0) words.add("owner");
if ((state & STATE_SUBSCRIBER) > 0) words.add("subscriber");
return String.join(", ",words);
}

16
src/main/java/de/srsoftware/widerhall/web/Web.java
View File

@@ -313,7 +313,7 @@ public class Web extends HttpServlet {
var email = req.getParameter(EMAIL);
var pass = req.getParameter(PASSWORD);
var list = req.getParameter(LIST);
var data = new HashMap<String,String>();
var data = new HashMap<String,Object>();
data.put(NAME,name);
data.put(EMAIL,email);
data.put(LIST,list);
@@ -329,12 +329,12 @@ public class Web extends HttpServlet {
if (pass != null && pass.isBlank()) pass = null;
try {
User.create(email,name,pass);
data.put(USER,User.create(email,name,pass).safeMap());
} catch (SQLException sqle) {
var cause = getCausingException(sqle);
int code = cause.getErrorCode();
if (code == PRIMARY_KEY_CONSTRAINT) try {// user already exists
User.load(email,pass);
data.put(USER,User.load(email,pass).safeMap());
// success → subscribe
} catch (InvalidKeyException | SQLException e) {
// invalid credentials
@@ -346,9 +346,13 @@ public class Web extends HttpServlet {
ListMember.create(list,email,ListMember.STATE_SUBSCRIBER);
data.put(NOTES,t("Successfully subscribed '{}' to '{}'.",email,list));
return loadTemplate(INDEX,data,resp);
} catch (SQLException e) {
LOG.debug("List subscription failed: ",e);
data.put(ERROR,t("Subscription failed: {}",e.getMessage()));
} catch (SQLException sqle) {
LOG.debug("List subscription failed: ",sqle);
var cause = getCausingException(sqle);
int code = cause.getErrorCode();
if (code == PRIMARY_KEY_CONSTRAINT) {// user already exists
data.put(ERROR,t("You already are member of this list!",sqle.getMessage()));
} else data.put(ERROR,t("Subscription failed: {}",sqle.getMessage()));
return loadTemplate(SUBSCRIBE,data,resp);
}
}