public EmailAddress(User owner, String address, Locale mailLocale) throws GigiApiException {
address = address.toLowerCase();
- if ( !EmailProvider.MAIL.matcher(address).matches()) {
+ if ( !EmailProvider.isValidMailAddress(address)) {
throw new IllegalArgumentException("Invalid email.");
}
this.address = address;
if (id != 0) {
throw new IllegalStateException("already inserted.");
}
- try (GigiPreparedStatement psCheck = new GigiPreparedStatement("SELECT 1 FROM `emails` WHERE email=? AND deleted is NULL"); GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `emails` SET memid=?, email=?")) {
- ps.setInt(1, owner.getId());
- ps.setString(2, address);
+ try (GigiPreparedStatement psCheck = new GigiPreparedStatement("SELECT 1 FROM `emails` WHERE email=? AND deleted is NULL")) {
psCheck.setString(1, address);
GigiResultSet res = psCheck.executeQuery();
if (res.next()) {
throw new GigiApiException("The email address is already known to the system.");
}
+ }
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `emails` SET memid=?, email=?")) {
+ ps.setInt(1, owner.getId());
+ ps.setString(2, address);
ps.execute();
id = ps.lastInsertId();
}
}
public synchronized void verify(String hash) throws GigiApiException {
- try (GigiPreparedStatement stmt = new GigiPreparedStatement("UPDATE `emailPinglog` SET `status`='success'::`pingState` WHERE `email`=? AND `uid`=? AND `type`='active' AND `challenge`=?")) {
+ try (GigiPreparedStatement stmt = new GigiPreparedStatement("UPDATE `emailPinglog` SET `status`='success'::`pingState` WHERE `email`=? AND `uid`=? AND `type`='active' AND `challenge`=? AND `status`='open'::`pingState`")) {
stmt.setString(1, address);
stmt.setInt(2, owner.getId());
stmt.setString(3, hash);
- stmt.executeUpdate();
+ if ( !stmt.executeMaybeUpdate()) {
+ throw new IllegalArgumentException("Given token could not be found to complete the verification process (Domain Ping).");
+ }
}
// Verify user with that primary email
try (GigiPreparedStatement ps2 = new GigiPreparedStatement("update `users` set `verified`='1' where `id`=? and `email`=? and `verified`='0'")) {