public void setDob(Date dob) {
writeSELog("SE dob change");
- target.setDob(dob);
+ target.setDoB(dob);
}
public void revokeAllCertificates() {
public User() {}
- public String getFname() {
+ public String getFName() {
return name.fname;
}
- public String getLname() {
+ public String getLName() {
return name.lname;
}
- public String getMname() {
+ public String getMName() {
return name.mname;
}
return name;
}
- public void setMname(String mname) {
+ public void setMName(String mname) {
this.name.mname = mname;
}
this.name.suffix = suffix;
}
- public Date getDob() {
+ public Date getDoB() {
return dob;
}
- public void setDob(Date dob) {
+ public void setDoB(Date dob) {
this.dob = dob;
}
this.email = email;
}
- public void setFname(String fname) {
+ public void setFName(String fname) {
this.name.fname = fname;
}
- public void setLname(String lname) {
+ public void setLName(String lname) {
this.name.lname = lname;
}
public void updateUserData() throws GigiApiException {
synchronized (Notary.class) {
+ // FIXME: No assurance, not no points.
if (getAssurancePoints() != 0) {
throw new GigiApiException("No change after assurance allowed.");
}
+
GigiPreparedStatement update = DatabaseConnection.getInstance().prepare("UPDATE users SET fname=?, lname=?, mname=?, suffix=?, dob=? WHERE id=?");
- update.setString(1, getFname());
- update.setString(2, getLname());
- update.setString(3, getMname());
+ update.setString(1, getFName());
+ update.setString(2, getLName());
+ update.setString(3, getMName());
update.setString(4, getSuffix());
- update.setDate(5, getDob());
+ update.setDate(5, getDoB());
update.setInt(6, getId());
update.executeUpdate();
}
public MyDetailsForm(HttpServletRequest hsr, User target) {
super(hsr);
this.target = target;
- this.ds = new DateSelector("day", "month", "year", target.getDob());
+ this.ds = new DateSelector("day", "month", "year", target.getDoB());
}
@Override
if (newLname.isEmpty()) {
throw new GigiApiException("Last name cannot be empty.");
}
- target.setFname(newFname);
- target.setLname(newLname);
- target.setMname(newMname);
+ target.setFName(newFname);
+ target.setLName(newLname);
+ target.setMName(newMname);
target.setSuffix(newSuffix);
ds.update(req);
- target.setDob(ds.getDate());
+ target.setDoB(ds.getDate());
target.updateUserData();
} else {
throw new GigiApiException("No change after assurance allowed.");
@Override
protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
- vars.put("fname", HTMLEncoder.encodeHTML(target.getFname()));
- vars.put("mname", target.getMname() == null ? "" : HTMLEncoder.encodeHTML(target.getMname()));
- vars.put("lname", HTMLEncoder.encodeHTML(target.getLname()));
+ vars.put("fname", HTMLEncoder.encodeHTML(target.getFName()));
+ vars.put("mname", target.getMName() == null ? "" : HTMLEncoder.encodeHTML(target.getMName()));
+ vars.put("lname", HTMLEncoder.encodeHTML(target.getLName()));
vars.put("suffix", target.getSuffix() == null ? "" : HTMLEncoder.encodeHTML(target.getSuffix()));
vars.put("details", "");
if (target.getAssurancePoints() == 0) {
vars.put("DoB", ds);
templ.output(out, l, vars);
} else {
- vars.put("DoB", DateSelector.getDateFormat().format(target.getDob()));
+ vars.put("DoB", DateSelector.getDateFormat().format(target.getDoB()));
assured.output(out, l, vars);
}
}
protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
vars.put("name", u.getName());
vars.put("email", u.getEmail());
- vars.put("DoB", DateSelector.getDateFormat().format(u.getDob()));
+ vars.put("DoB", DateSelector.getDateFormat().format(u.getDoB()));
vars.put("uid", Integer.toString(u.getId()));
t.output(out, l, vars);
}
@Override
protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
vars.put("mail", user.getEmail());
- vars.put("fname", user.getFname());
- vars.put("mname", user.getMname());
- vars.put("lname", user.getLname());
+ vars.put("fname", user.getFName());
+ vars.put("mname", user.getMName());
+ vars.put("lname", user.getLName());
vars.put("suffix", user.getSuffix());
vars.put("assurer", user.canAssure());
- vars.put("dob", new DateSelector("dobd", "dobm", "doby", user.getDob()));
+ vars.put("dob", new DateSelector("dobd", "dobm", "doby", user.getDoB()));
vars.put("blockedassurer", user.isInGroup(Group.BLOCKEDASSURER));
vars.put("codesign", user.isInGroup(Group.CODESIGNING));
vars.put("orgassurer", user.isInGroup(Group.ORGASSURER));
public Signup(HttpServletRequest hsr) {
super(hsr);
t = new Template(Signup.class.getResource("Signup.templ"));
- buildup.setFname("");
- buildup.setMname("");
- buildup.setLname("");
+ buildup.setFName("");
+ buildup.setMName("");
+ buildup.setLName("");
buildup.setSuffix("");
buildup.setEmail("");
- buildup.setDob(new Date(0));
+ buildup.setDoB(new Date(0));
}
DateSelector myDoB = new DateSelector("day", "month", "year");
@Override
public void outputContent(PrintWriter out, Language l, Map<String, Object> outerVars) {
HashMap<String, Object> vars = new HashMap<String, Object>();
- vars.put("fname", HTMLEncoder.encodeHTML(buildup.getFname()));
- vars.put("mname", HTMLEncoder.encodeHTML(buildup.getMname()));
- vars.put("lname", HTMLEncoder.encodeHTML(buildup.getLname()));
+ vars.put("fname", HTMLEncoder.encodeHTML(buildup.getFName()));
+ vars.put("mname", HTMLEncoder.encodeHTML(buildup.getMName()));
+ vars.put("lname", HTMLEncoder.encodeHTML(buildup.getLName()));
vars.put("suffix", HTMLEncoder.encodeHTML(buildup.getSuffix()));
vars.put("dob", myDoB);
vars.put("email", HTMLEncoder.encodeHTML(buildup.getEmail()));
private void update(HttpServletRequest r) {
if (r.getParameter("fname") != null) {
- buildup.setFname(r.getParameter("fname"));
+ buildup.setFName(r.getParameter("fname"));
}
if (r.getParameter("lname") != null) {
- buildup.setLname(r.getParameter("lname"));
+ buildup.setLName(r.getParameter("lname"));
}
if (r.getParameter("mname") != null) {
- buildup.setMname(r.getParameter("mname"));
+ buildup.setMName(r.getParameter("mname"));
}
if (r.getParameter("suffix") != null) {
buildup.setSuffix(r.getParameter("suffix"));
@Override
public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
update(req);
- if (buildup.getLname().trim().equals("")) {
+ if (buildup.getLName().trim().equals("")) {
outputError(out, req, "Last name were blank.");
}
if ( !myDoB.isValid()) {
try {
DatabaseConnection.getInstance().beginTransaction();
buildup.setPreferredLocale(Page.getLanguage(req).getLocale());
- buildup.setDob(myDoB.getDate());
+ buildup.setDoB(myDoB.getDate());
buildup.insert(password);
int memid = buildup.getId();
EmailAddress ea = new EmailAddress(buildup, buildup.getEmail());
super(hsr);
this.assuree = assuree;
assureeName = this.assuree.getName();
- dob = this.assuree.getDob();
+ dob = this.assuree.getDoB();
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
res.put("nameExplicit", assuree.getName());
res.put("name", assuree.getName().toString());
res.put("maxpoints", assuree.getMaxAssurePoints());
- res.put("dob", sdf.format(assuree.getDob()));
- res.put("dobFmt2", sdf2.format(assuree.getDob()));
+ res.put("dob", sdf.format(assuree.getDoB()));
+ res.put("dobFmt2", sdf2.format(assuree.getDoB()));
templ.output(out, l, res);
}
gae.mergeInto(e);
}
- if ( !assuree.getName().equals(assureeName) || !assuree.getDob().equals(dob)) {
+ if ( !assuree.getName().equals(assureeName) || !assuree.getDoB().equals(dob)) {
gae.mergeInto(new GigiApiException("The person you are assuring changed his personal details."));
}
if (awarded > assurer.getMaxAssurePoints() || awarded < 0) {
if (contained(pw, u.getEmail())) {
light -= 2;
}
- if (contained(pw, u.getFname())) {
+ if (contained(pw, u.getFName())) {
light -= 2;
}
- if (contained(pw, u.getLname())) {
+ if (contained(pw, u.getLName())) {
light -= 2;
}
- if (contained(pw, u.getMname())) {
+ if (contained(pw, u.getMName())) {
light -= 2;
}
if (contained(pw, u.getSuffix())) {
assertThat(User.getById(uid), is(sameInstance(User.getById(uid))));
User u = new User();
- u.setFname("fname");
- u.setMname("mname");
+ u.setFName("fname");
+ u.setMName("mname");
u.setSuffix("suffix");
- u.setLname("lname");
+ u.setLName("lname");
u.setEmail(createUniqueName() + "@example.org");
Calendar c = Calendar.getInstance();
c.set(1950, 1, 1);
- u.setDob(new Date(c.getTime().getTime()));
+ u.setDoB(new Date(c.getTime().getTime()));
u.setPreferredLocale(Locale.ENGLISH);
u.insert(TEST_PASSWORD);
@Test
public void testStoreAndLoad() throws SQLException {
User u = new User();
- u.setFname("user");
- u.setLname("last");
- u.setMname("");
+ u.setFName("user");
+ u.setLName("last");
+ u.setMName("");
u.setSuffix("");
u.setPreferredLocale(Locale.ENGLISH);
long dob = System.currentTimeMillis();
dob -= dob % (1000 * 60 * 60 * 24);
- u.setDob(new java.sql.Date(dob));
+ u.setDoB(new java.sql.Date(dob));
u.setEmail(createUniqueName() + "a@email.org");
u.insert("password");
int id = u.getId();
User u2 = User.getById(id);
assertEquals(u.getName(), u2.getName());
- assertEquals(u.getDob().toString(), u2.getDob().toString());
+ assertEquals(u.getDoB().toString(), u2.getDoB().toString());
assertEquals(u.getEmail(), u2.getEmail());
}
int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
User u = User.getById(id);
- assertEquals("aä", u.getFname());
- assertEquals("b", u.getLname());
- assertEquals("", u.getMname());
+ assertEquals("aä", u.getFName());
+ assertEquals("b", u.getLName());
+ assertEquals("", u.getMName());
}
@Test
assertTrue(u.hasPassedCATS());
assertEquals(10, u.getMaxAssurePoints());
- assertEquals("aä", u.getFname());
- assertEquals("b", u.getLname());
- assertEquals("", u.getMname());
+ assertEquals("aä", u.getFName());
+ assertEquals("b", u.getLName());
+ assertEquals("", u.getMName());
}
@Test
@Test
public void testDoubleInsert() {
User u = new User();
- u.setFname("f");
- u.setLname("l");
- u.setMname("m");
+ u.setFName("f");
+ u.setLName("l");
+ u.setMName("m");
u.setSuffix("s");
u.setEmail(createUniqueName() + "@example.org");
- u.setDob(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 365));
+ u.setDoB(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 365));
u.setPreferredLocale(Locale.ENGLISH);
u.insert(TEST_PASSWORD);
try {
String newName = createUniqueName();
assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "fname=" + newName + "&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
User u = User.getById(id);
- assertEquals(newName, u.getFname());
+ assertEquals(newName, u.getFName());
}
@Test
String newName = createUniqueName();
assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=" + newName + "&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
User u = User.getById(id);
- assertEquals(newName, u.getLname());
+ assertEquals(newName, u.getLName());
}
@Test
String newName = createUniqueName();
assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=" + newName + "&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
User u = User.getById(id);
- assertEquals(newName, u.getMname());
+ assertEquals(newName, u.getMName());
}
@Test
public void testUnsetFname() throws IOException {
assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "fname=&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
User u = User.getById(id);
- assertEquals("", u.getFname());
+ assertEquals("", u.getFName());
}
public void testUnsetLname() throws IOException {
assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
User u = User.getById(id);
- assertEquals("Hansel", u.getLname());
+ assertEquals("Hansel", u.getLName());
}
@Test
String newName = createUniqueName();
assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=" + newName + "&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
User u = User.getById(id);
- assertEquals(newName, u.getMname());
+ assertEquals(newName, u.getMName());
assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
clearCaches();
u = User.getById(id);
- assertEquals("", u.getMname());
+ assertEquals("", u.getMName());
}
cal.set(Calendar.DAY_OF_MONTH, Calendar.FEBRUARY);
cal.set(Calendar.MONTH, 1);
Date d = new Date(cal.getTimeInMillis());
- assertEquals(d.toString(), u.getDob().toString());
+ assertEquals(d.toString(), u.getDoB().toString());
}
@Test
};
try {
- Notary.assure(assurer, users[0], users[0].getName(), users[0].getDob(), -1, "test-notary", "2014-01-01");
+ Notary.assure(assurer, users[0], users[0].getName(), users[0].getDoB(), -1, "test-notary", "2014-01-01");
fail("This shouldn't have passed");
} catch (GigiApiException e) {
// expected
assertEquals(result[i], assurer.getMaxAssurePoints());
assuranceFail(assurer, users[i], result[i] + 1, "test-notary", "2014-01-01");
- Notary.assure(assurer, users[i], users[i].getName(), users[i].getDob(), result[i], "test-notary", "2014-01-01");
+ Notary.assure(assurer, users[i], users[i].getName(), users[i].getDoB(), result[i], "test-notary", "2014-01-01");
assuranceFail(assurer, users[i], result[i], "test-notary", "2014-01-01");
}
private void assuranceFail(User assurer, User user, int i, String location, String date) throws SQLException {
try {
- Notary.assure(assurer, user, user.getName(), user.getDob(), i, location, date);
+ Notary.assure(assurer, user, user.getName(), user.getDoB(), i, location, date);
fail("This shouldn't have passed");
} catch (GigiApiException e) {
// expected
for (int i = 0; i < users.length; i++) {
assuranceFail(assurer, users[i], -1, "test-notary", "2014-01-01");
assuranceFail(assurer, users[i], 11, "test-notary", "2014-01-01");
- Notary.assure(assurer, users[i], users[i].getName(), users[i].getDob(), 10, "test-notary", "2014-01-01");
+ Notary.assure(assurer, users[i], users[i].getName(), users[i].getDoB(), 10, "test-notary", "2014-01-01");
assuranceFail(assurer, users[i], 10, "test-notary", "2014-01-01");
}
}
assuranceFail(assuree, assuranceUser, 10, "notary-junit-test", "2014-01-01");
// valid
- Notary.assure(assuranceUser, assuree, assuree.getName(), assuree.getDob(), 10, "notary-junit-test", "2014-01-01");
+ Notary.assure(assuranceUser, assuree, assuree.getName(), assuree.getDoB(), 10, "notary-junit-test", "2014-01-01");
// assure double
assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", "2014-01-01");
public TestPasswordStrengthChecker() {
u = new User();
- u.setFname("fname");
- u.setLname("lname");
- u.setMname("mname");
+ u.setFName("fname");
+ u.setLName("lname");
+ u.setMName("mname");
u.setEmail("email");
u.setSuffix("suffix");
}
private void createUser(String email) throws GigiApiException, IllegalAccessException {
User u = new User();
- u.setFname("Först");
- u.setMname("Müddle");
- u.setLname("Läst");
+ u.setFName("Först");
+ u.setMName("Müddle");
+ u.setLName("Läst");
u.setSuffix("Süffix");
u.setEmail(email);
Calendar gc = GregorianCalendar.getInstance();
gc.set(1990, 0, 1);
- u.setDob(new Date(gc.getTime().getTime()));
+ u.setDoB(new Date(gc.getTime().getTime()));
u.setPreferredLocale(Locale.ENGLISH);
u.insert("xvXV12°§");
EmailAddress ea = new EmailAddress(u, email);
}
try {
for (int i = 0; i < getAssurers().length; i++) {
- Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDob(), 10, "Testmanager Assure up code", "2014-11-06");
+ Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDoB(), 10, "Testmanager Assure up code", "2014-11-06");
}
} catch (GigiApiException e) {
throw new Error(e);