Revert "Revert "release the newsletter to prod (#2495)" (#2497)" (#2500)

This reverts commit ed5c9be.

Author: jzbahrai

app/main/views/newsletter.py

@@ -1,4 +1,4 @@
-from flask import abort, current_app, flash, redirect, render_template, request, url_for
+from flask import current_app, flash, redirect, render_template, request, url_for
 from flask_babel import _
 from flask_login import current_user
 from notifications_python_client.errors import HTTPError
@@ -13,8 +13,6 @@
 @main.route("/newsletter/subscribe", methods=["GET", "POST"])
 def newsletter_subscription():
     """Handle newsletter subscription form submissions and display"""
-    if current_app.config["NOTIFY_ENVIRONMENT"].lower() == "production":
-        abort(404)
     newsletter_form = NewsletterSubscriptionForm()
 
     # Handle GET request - display the form
@@ -73,9 +71,6 @@ def newsletter_subscription():
 @main.route("/newsletter/confirm/<subscriber_id>", methods=["GET"])
 @main.route("/newsletter/<subscriber_id>/confirm", methods=["GET"])
 def confirm_newsletter_subscriber(subscriber_id):
-    if current_app.config["NOTIFY_ENVIRONMENT"].lower() == "production":
-        abort(404)
-
     # send an api request with the subscriber_id
     newsletter_api_client.confirm_subscriber(subscriber_id=subscriber_id)
 
@@ -86,8 +81,6 @@ def confirm_newsletter_subscriber(subscriber_id):
 @main.route("/newsletter/check-email", methods=["GET"])
 def newsletter_check_email():
     """Newsletter subscription check email page"""
-    if current_app.config["NOTIFY_ENVIRONMENT"].lower() == "production":
-        abort(404)
 
     email = request.args.get("email")
     if not email:
@@ -100,8 +93,6 @@ def newsletter_check_email():
 @main.route("/newsletter/<subscriber_id>/subscribed", methods=["GET", "POST"])
 def newsletter_subscribed(subscriber_id):
     """Newsletter subscription confirmation page"""
-    if current_app.config["NOTIFY_ENVIRONMENT"].lower() == "production":
-        abort(404)
     language_form = NewsletterLanguageForm()
     # Get subscriber data including email
     subscriber_data = newsletter_api_client.get_subscriber(subscriber_id=subscriber_id)
@@ -113,8 +104,6 @@ def newsletter_subscribed(subscriber_id):
 @main.route("/newsletter/<subscriber_id>/send-latest", methods=["GET"])
 def send_latest_newsletter(subscriber_id):
     """Send the latest newsletter to a subscriber"""
-    if current_app.config["NOTIFY_ENVIRONMENT"].lower() == "production":
-        abort(404)
 
     # Call API to send latest newsletter
     try:
@@ -132,8 +121,6 @@ def send_latest_newsletter(subscriber_id):
 @main.route("/newsletter/<subscriber_id>/change-language", methods=["GET", "POST"])
 def newsletter_change_language(subscriber_id):
     """Newsletter subscription management page"""
-    if current_app.config["NOTIFY_ENVIRONMENT"].lower() == "production":
-        abort(404)
     language_form = NewsletterLanguageForm()
     # Get subscriber data including email
     subscriber_data = newsletter_api_client.get_subscriber(subscriber_id=subscriber_id)
@@ -164,8 +151,6 @@ def newsletter_change_language(subscriber_id):
 @main.route("/newsletter/<subscriber_id>/unsubscribe", methods=["GET"])
 def newsletter_unsubscribe(subscriber_id):
     """Newsletter unsubscribe confirmation page"""
-    if current_app.config["NOTIFY_ENVIRONMENT"].lower() == "production":
-        abort(404)
 
     # Call API to unsubscribe
     subscriber_data = newsletter_api_client.unsubscribe(subscriber_id)

app/templates/admin_template.html

@@ -24,7 +24,7 @@
             {% include 'partials/flash_messages.html' %}
             {% block maincolumn_content %}{% endblock %}
           {% endif %}
-          {% if isHome and config["NOTIFY_ENVIRONMENT"].lower() != "production" %}
+          {% if isHome %}
             {% include 'partials/newsletter/subscribe_cta.html' %}
           {% endif %}
         </main>