Merge pull request #808 from code-corps/update-password-reset

Update password reset to add email
code-corps · May 30, 2017 · eadef90 · eadef90
2 parents 96354a8 + 267fcff
commit eadef90
Show file tree

Hide file tree

Showing 14 changed files with 255 additions and 139 deletions.
diff --git a/config/dev.exs b/config/dev.exs
@@ -60,6 +60,7 @@ config :code_corps, CodeCorps.Mailer,
   adapter: Bamboo.LocalAdapter
 
 config :code_corps,
+  postmark_forgot_password_template: "123",
   postmark_project_acceptance_template: "123",
   postmark_receipt_template: "123"
 

diff --git a/config/prod.exs b/config/prod.exs
@@ -61,6 +61,7 @@ config :code_corps, CodeCorps.Mailer,
   api_key: System.get_env("POSTMARK_API_KEY")
 
 config :code_corps,
+  postmark_forgot_password_template: "1989483",
   postmark_project_acceptance_template: "1447041",
   postmark_receipt_template: "1255222"
 

diff --git a/config/remote-development.exs b/config/remote-development.exs
@@ -43,6 +43,7 @@ config :code_corps, CodeCorps.Mailer,
   adapter: Bamboo.LocalAdapter
 
 config :code_corps,
+  postmark_forgot_password_template: "123",
   postmark_project_acceptance_template: "123",
   postmark_receipt_template: "123"
 

diff --git a/config/staging.exs b/config/staging.exs
@@ -59,6 +59,7 @@ config :code_corps, CodeCorps.Mailer,
   api_key: System.get_env("POSTMARK_API_KEY")
 
 config :code_corps,
+postmark_forgot_password_template: "1989481",
   postmark_project_acceptance_template: "1447022",
   postmark_receipt_template: "1252361"
 

diff --git a/config/test.exs b/config/test.exs
@@ -48,6 +48,7 @@ config :code_corps, CodeCorps.Mailer,
   adapter: Bamboo.TestAdapter
 
 config :code_corps,
+  postmark_forgot_password_template: "123",
   postmark_project_acceptance_template: "123",
   postmark_receipt_template: "123"
 

diff --git a/emails/forgot_password.html b/emails/forgot_password.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Here's the link to reset your password.</title>
+    <!--
+    Make sure you copy the styles from styles.css into the email template in Postmark before saving there.
+
+    <style type="text/css" rel="stylesheet" media="all">
+    </style>
+    -->
+    <link rel="stylesheet" type="text/css" href="styles.css" media="screen" />
+  </head>
+  <body>
+    <span class="preheader">Here's the link to reset your password.</span>
+    <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0">
+      <tr>
+        <td align="center">
+          <table class="email-content" width="100%" cellpadding="0" cellspacing="0">
+            <tr>
+              <td class="email-masthead" width="100%" cellpadding="0" cellspacing="0">
+                <table class="email-masthead_inner" align="center" width="570" cellpadding="0" cellspacing="0">
+                  <tr>
+                    <td>
+                      <a href="https://www.codecorps.org">
+                        <img src="https://d3pgew4wbk2vb1.cloudfront.net/emails/images/logo-small@2x.png" class="email-masthead_logo" />
+                      </a>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <!-- Email Body -->
+            <tr>
+              <td class="email-body" width="100%" cellpadding="0" cellspacing="0">
+                <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0">
+                  <!-- Body content -->
+                  <tr>
+                    <td class="content-cell">
+                      <table width="100%" cellpadding="0" cellspacing="0">
+                        <tr>
+                          <td>
+                            <p>Hi there,</p>
+                            <p>To reset your password, please <a href="{{link}}">click here</a> or paste this link into your browser:</p>
+                            <p><a href="{{link}}">{{link}}</a></p>
+                            <p>Your link is only valid for the next hour.</p>
+                            <p>If you have any issues, don't hesitate to <a href="https://help.codecorps.org">contact us</a>.</p>
+                          </td>
+                        </tr>
+                      </table>
+                      <table class="body-signature">
+                        <tr>
+                          <td>
+                            <p>
+                              Thanks!
+                              <br><strong>The Code Corps Team</strong>
+                            </p>
+                            <p class="center small">
+                              Questions? Feedback?
+                              <br>Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.</p>
+                          </td>
+                        </tr>
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0">
+                  <tr>
+                    <td class="content-cell" align="center">
+                      <p class="sub align-center">
+                        Code Corps PBC
+                        <br>4166 Wilson Ave #1
+                        <br>San Diego, CA 92104
+                      </p>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/lib/code_corps/cloudex/cloudex_test.ex b/lib/code_corps/cloudex/cloudex_test.ex
@@ -6,8 +6,11 @@ defmodule CloudexTest do
   """
 
   defmodule Url do
-    def for(public_id, options) do
-      {public_id, options}
+    def for(_public_id, %{height: height, width: width}) do
+      "https://placehold.it/#{width}x#{height}"
+    end
+    def for(_public_id, _options) do
+      "https://placehold.it/500x500"
     end
   end
 end
diff --git a/lib/code_corps/services/forgot_password.ex b/lib/code_corps/services/forgot_password.ex
@@ -3,7 +3,7 @@ defmodule CodeCorps.Services.ForgotPasswordService do
   alias CodeCorps.{AuthToken, Emails, Mailer, Repo, User}
 
   @doc"""
-  forgot_password should take an email and generate an AuthToken model and send an email
+  Generates an AuthToken model and sends to the provided email.
   """
   def forgot_password(email) do
     with %User{} = user <- Repo.get_by(User, email: email),
@@ -14,5 +14,4 @@ defmodule CodeCorps.Services.ForgotPasswordService do
       nil -> nil
     end
   end
-
 end