Subscription emails

.env.sample

@@ -27,8 +27,8 @@ DOMAINS_FOLDER_PATH=
 CERTIFICATES_FOLDER_PATH=
 
 # hCaptcha
-HCAPTCHA_SECRET_KEY=
-HCAPTCHA_SITE_KEY=
+HCAPTCHA_SECRET_KEY=0x0000000000000000000000000000000000000000
+HCAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
 
 # Domain Events
 #SNS_TOPIC_ARN=

.gitignore

@@ -26,6 +26,8 @@
 
 # Ignore ENV variables config
 .env
+.env.*
+!.env.sample
 .ssh
 
 dump.rdb

app/mailers/subscription_mailer.rb

@@ -52,6 +52,8 @@ def weekly_digest(sub_id)
 
   def new_subscription(subscription)
     @author = subscription.author
+    @subscriber = subscription.subscriber
+
     return if @author.email_verified == false
 
     mail(to: subscription.author.email, subject: "New subscriber to #{subscription.author.title}")

app/views/subscription_mailer/new_subscription.html.erb

@@ -4,5 +4,8 @@
         methods: :verified_subscriptions.as_json(
             only: :id
         )
-    )
+    ),
+    subscriber: @subscriber.as_json(
+        only: :email
+    ),
 }) %>

client/app/components/authors/Subscribe.jsx

@@ -11,10 +11,6 @@ const Subscribe = ({
         {(!subscribedToAuthor || !subscriptionForAuthor.verification_sent_at) && (
             <p className="p1">
                 You&apos;ll only receive email when the author publishes something new.
-                {" "}
-                { displayAuthor.title }
-                {" "}
-                will not be able to see your email.
             </p>
         )}
         <div id="subscription-form">

client/app/components/subscription_mailer/NewSubscription.jsx

@@ -1,19 +1,13 @@
 import PropTypes from "prop-types";
 import React from "react";
 
-const NewSubscription = ({ author }) => (
+const NewSubscription = ({ author, subscriber }) => (
     <div>
         <p>
-            Good news! Someone just subscribed to your blog.
-            They&apos;ll automatically be notified every time you publish a new post.
-        </p>
-        <p>
-            You now have
-            {" "}
-            {author.verified_subscriptions.length}
-            {" "}
-            subscriber(s). Keep up the good work!
+            Good news! {subscriber.email} just subscribed to your blog. They&apos;ll automatically be notified every
+            time you publish a new post.
         </p>
+        <p>You now have {author.verified_subscriptions.length} subscriber(s). Keep up the good work!</p>
     </div>
 );
 
@@ -25,6 +19,9 @@ NewSubscription.propTypes = {
             }),
         ).isRequired,
     }).isRequired,
+    subscriber: PropTypes.shape({
+        email: PropTypes.string.isRequired,
+    }).isRequired,
 };
 
 export default NewSubscription;

db/migrate/20181201104051_create_simple_captcha_data.rb

@@ -1,11 +1,11 @@
-class CreateSimpleCaptchaData < ActiveRecord::Migration
+class CreateSimpleCaptchaData < ActiveRecord::Migration[5.0]
   def self.up
     create_table :simple_captcha_data do |t|
       t.string :key, :limit => 40
       t.string :value, :limit => 6
       t.timestamps
     end
-    
+
     add_index :simple_captcha_data, :key, :name => "idx_key"
   end