Merge branch 'main' into jskinne3-upgrade-and-protect-demo-modules

app/__init__.py

@@ -117,7 +117,6 @@ def create_app(application):
     document_download_client.init_app(application)
 
     register_blueprint(application)
-    register_v2_blueprints(application)
 
     # avoid circular imports by importing this file later
     from app.commands import setup_commands
@@ -252,34 +251,6 @@ def register_blueprint(application):
     application.register_blueprint(upload_blueprint)
 
 
-def register_v2_blueprints(application):
-    from app.authentication.auth import requires_auth
-    from app.v2.inbound_sms.get_inbound_sms import v2_inbound_sms_blueprint
-    from app.v2.notifications import (  # noqa
-        get_notifications,
-        post_notifications,
-        v2_notification_blueprint,
-    )
-    from app.v2.template import (  # noqa
-        get_template,
-        post_template,
-        v2_template_blueprint,
-    )
-    from app.v2.templates.get_templates import v2_templates_blueprint
-
-    v2_notification_blueprint.before_request(requires_auth)
-    application.register_blueprint(v2_notification_blueprint)
-
-    v2_templates_blueprint.before_request(requires_auth)
-    application.register_blueprint(v2_templates_blueprint)
-
-    v2_template_blueprint.before_request(requires_auth)
-    application.register_blueprint(v2_template_blueprint)
-
-    v2_inbound_sms_blueprint.before_request(requires_auth)
-    application.register_blueprint(v2_inbound_sms_blueprint)
-
-
 def init_app(app):
     @app.before_request
     def record_request_details():

app/celery/tasks.py

@@ -19,12 +19,12 @@
 from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id
 from app.dao.templates_dao import dao_get_template_by_id
 from app.enums import JobStatus, KeyType, NotificationType
+from app.errors import TotalRequestsError
 from app.notifications.process_notifications import persist_notification
 from app.notifications.validators import check_service_over_total_message_limit
 from app.serialised_models import SerialisedService, SerialisedTemplate
 from app.service.utils import service_allowed_to_send_to
 from app.utils import DATETIME_FORMAT, hilite, scrub, utc_now
-from app.v2.errors import TotalRequestsError
 from notifications_utils.recipients import RecipientCSV
 
 
@@ -189,7 +189,11 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i
     # Return False when trial mode services try sending notifications
     # to non-team and non-simulated recipients.
     if not service_allowed_to_send_to(notification["to"], service, KeyType.NORMAL):
-        current_app.logger.info(hilite(scrub(f"service not allowed to send to {notification['to']}, aborting")))
+        current_app.logger.info(
+            hilite(
+                scrub(f"service not allowed to send to {notification['to']}, aborting")
+            )
+        )
         current_app.logger.debug(
             "SMS {} failed as restricted service".format(notification_id)
         )
@@ -220,7 +224,9 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i
         )
 
         # Kick off sns process in provider_tasks.py
-        current_app.logger.info(hilite(scrub(f"Going to deliver sms for recipient: {notification['to']}")))
+        current_app.logger.info(
+            hilite(scrub(f"Going to deliver sms for recipient: {notification['to']}"))
+        )
         provider_tasks.deliver_sms.apply_async(
             [str(saved_notification.id)], queue=QueueNames.SEND_SMS
         )

app/errors.py

@@ -5,6 +5,7 @@
 from sqlalchemy.orm.exc import NoResultFound
 
 from app.authentication.auth import AuthError
+from app.enums import KeyType
 from app.exceptions import ArchiveValidationError
 from notifications_utils.recipients import InvalidEmailError
 
@@ -113,3 +114,45 @@ def internal_server_error(e):
         e = getattr(e, "original_exception", e)
         current_app.logger.exception(e)
         return jsonify(result="error", message="Internal server error"), 500
+
+
+class TooManyRequestsError(InvalidRequest):
+    status_code = 429
+    message_template = "Exceeded send limits ({}) for today"
+
+    def __init__(self, sending_limit):
+        self.message = self.message_template.format(sending_limit)
+
+
+class TotalRequestsError(InvalidRequest):
+    status_code = 429
+    message_template = "Exceeded total application limits ({}) for today"
+
+    def __init__(self, sending_limit):
+        self.message = self.message_template.format(sending_limit)
+
+
+class RateLimitError(InvalidRequest):
+    status_code = 429
+    message_template = (
+        "Exceeded rate limit for key type {} of {} requests per {} seconds"
+    )
+
+    def __init__(self, sending_limit, interval, key_type):
+        # normal keys are spoken of as "live" in the documentation
+        # so using this in the error messaging
+        if key_type == KeyType.NORMAL:
+            key_type = "live"
+
+        self.message = self.message_template.format(
+            key_type.upper(), sending_limit, interval
+        )
+
+
+class BadRequestError(InvalidRequest):
+    message = "An error occurred"
+
+    def __init__(self, fields=None, message=None, status_code=400):
+        self.status_code = status_code
+        self.fields = fields or []
+        self.message = message if message else self.message

app/models.py

@@ -1215,7 +1215,6 @@ class Template(TemplateBase):
     )
 
     def get_link(self):
-        # TODO: use "/v2/" route once available
         return url_for(
             "template.get_template_by_id_and_service_id",
             service_id=self.service_id,
@@ -1284,8 +1283,9 @@ def template_redacted(cls):
 
     def get_link(self):
         return url_for(
-            "v2_template.get_template_by_id",
+            "template.get_template_by_id_and_service_id",
             template_id=self.id,
+            service_id=self.service.id,
             version=self.version,
             _external=True,
         )

app/notifications/process_notifications.py

@@ -10,9 +10,9 @@
     dao_delete_notifications_by_id,
 )
 from app.enums import KeyType, NotificationStatus, NotificationType
+from app.errors import BadRequestError
 from app.models import Notification
 from app.utils import hilite, scrub, utc_now
-from app.v2.errors import BadRequestError
 from notifications_utils.recipients import (
     format_email_address,
     get_international_phone_info,
@@ -110,7 +110,11 @@ def persist_notification(
         formatted_recipient = validate_and_format_phone_number(
             recipient, international=True
         )
-        current_app.logger.info(hilite(scrub(f"Persisting notification with recipient {formatted_recipient}")))
+        current_app.logger.info(
+            hilite(
+                scrub(f"Persisting notification with recipient {formatted_recipient}")
+            )
+        )
         recipient_info = get_international_phone_info(formatted_recipient)
         notification.normalised_to = formatted_recipient
         notification.international = recipient_info.international

app/notifications/validators.py

@@ -6,12 +6,12 @@
 from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id
 from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id
 from app.enums import KeyType, NotificationType, ServicePermissionType, TemplateType
+from app.errors import BadRequestError, RateLimitError, TotalRequestsError
 from app.models import ServicePermission
 from app.notifications.process_notifications import create_content_for_notification
 from app.serialised_models import SerialisedTemplate
 from app.service.utils import service_allowed_to_send_to
 from app.utils import get_public_notify_type_text
-from app.v2.errors import BadRequestError, RateLimitError, TotalRequestsError
 from notifications_utils import SMS_CHAR_COUNT_LIMIT
 from notifications_utils.clients.redis import (
     rate_limit_cache_key,

app/service/send_notification.py

@@ -7,6 +7,7 @@
 from app.dao.templates_dao import dao_get_template_by_id_and_service_id
 from app.dao.users_dao import get_user_by_id
 from app.enums import KeyType, NotificationType, TemplateProcessType
+from app.errors import BadRequestError
 from app.notifications.process_notifications import (
     persist_notification,
     send_notification_to_queue,
@@ -16,7 +17,6 @@
     validate_and_format_recipient,
     validate_template,
 )
-from app.v2.errors import BadRequestError
 
 
 def validate_created_by(service, created_by_id):