Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Resend email verification works.

  • Loading branch information...
commit 1b369d6edc970fc776d83dab56533339f33044de 1 parent 82e44a0
@flurdy authored
View
2  .gitignore
@@ -12,3 +12,5 @@
/target
.history
/dist
+/.ensime
+/.ensime_lucene
View
12 app/controllers/RecipientController.scala
@@ -61,16 +61,8 @@ object RecipientController extends Controller with Secured {
case (username, email, password) => {
ValidEmailAddress.findFirstIn(email.trim).isDefined
}
- }) verifying("Authentication failed", fields => fields match {
- case (username, email, password) => Recipient.findByUsernameAndEmail(username,email).isDefined
- }) verifying("Authentication failed", fields => fields match {
- case (username, email, password) => Recipient.authenticate(username, password).isDefined
-// })verifying("Email already verified", fields => fields match {
-// case (username, email, password) => {
-// Recipient.findByUsernameAndEmail(username,email).map { recipient =>
-// !Recipient.authenticate(username, password).isDefined || Recipient.isEmailVerified(recipient)
-// }.getOrElse(true)
-// }
+ }) verifying("Authentication failed or username and email does not match", fields => fields match {
+ case (username, email, password) => Recipient.findByUsernameAndEmail(username,email).isDefined && Recipient.authenticate(username, password).isDefined
})
)
View
2  app/views/recipient/emailverification.scala.html
@@ -9,7 +9,7 @@
}{
<div id="password-reset-page">
- <h2>Email verification</h2>
+ <h2>Resend email verification</h2>
View
2  conf/evolutions/default/9.sql
@@ -4,7 +4,7 @@
CREATE TABLE emailverification (
- recipientid BIGINT UNIQUE REFERENCES recipient (recipientid) ON DELETE CASCADE,
+ recipientid BIGINT REFERENCES recipient (recipientid) ON DELETE CASCADE,
email VARCHAR(100),
verificationhash VARCHAR(100),
verified boolean default false
View
2  public/stylesheets/site.css
@@ -57,7 +57,7 @@
0053cf
335577
*/
-body { background-color: #444444; color: white; }
+body { background-color: #444444; color: black; }
#hull { background-color: #ffffff; }
#bow { }
#tug > .compartment > iframe, #tug > .compartment img ,
Please sign in to comment.
Something went wrong with that request. Please try again.