Merge pull request #568 from CityOfNewYork/johnyu95-remove-agency-rec…

…aptcha Remove Agency Recaptcha
CityOfNewYork · Oct 31, 2023 · bde8d95 · bde8d95
2 parents 547020c + 9311867
commit bde8d95
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/app/main/views.py b/app/main/views.py
@@ -47,7 +47,7 @@ def status():
 @main.route('/technical-support', methods=['GET', 'POST'])
 def technical_support():
     if request.method == 'POST':
-        if current_app.config['RECAPTCHA_ENABLED']:
+        if current_app.config['RECAPTCHA_ENABLED'] and not current_user.is_agency:
             try:
                 # Verify recaptcha token and return error if failed
                 recaptcha_response = requests.post(

diff --git a/app/request/views.py b/app/request/views.py
@@ -98,7 +98,7 @@ def new():
     new_request_template = "request/new_request_" + template_suffix
 
     if flask_request.method == "POST":
-        if current_app.config['RECAPTCHA_ENABLED']:
+        if current_app.config['RECAPTCHA_ENABLED'] and not current_user.is_agency:
             try:
                 # Verify recaptcha token and return error if failed
                 recaptcha_response = requests.post(

diff --git a/app/templates/main/contact.html b/app/templates/main/contact.html
@@ -33,7 +33,7 @@ <h1 class="text-center">Technical Support</h1>
                 <p id="message-character-count" class="character-counter">5000 characters remaining</p>
 
                 <br>
-                {% if config['RECAPTCHA_ENABLED'] %}
+                {% if config['RECAPTCHA_ENABLED'] and not current_user.is_agency %}
                     <input id="send"
                            name="send"
                            type="submit"

diff --git a/app/templates/request/new_request_agency.html b/app/templates/request/new_request_agency.html
@@ -245,18 +245,7 @@ <h3>Address</h3>
                     placeholder="12345") }}<br>
                 </div>
                 <input type="hidden" name="tz-name">
-                {% if config['RECAPTCHA_ENABLED'] %}
-                    <input id="submit"
-                           class="g-recaptcha btn-primary"
-                           value="Submit Request"
-                           aria-label="Submit request button"
-                           type="submit"
-                           data-sitekey='{{ config['RECAPTCHA_PUBLIC_KEY'] }}'
-                           data-callback='onSubmitRequest'
-                           data-action='newRequestAgency'>
-                {% else %}
-                    {{ form.submit(id="submit", class="btn-primary") }}
-                {% endif %}
+                {{ form.submit(id="submit", class="btn-primary") }}
                 {% include "request/_pii_warning_modal.html" %}
                 <span id="processing-submission" hidden>
                     <img src="{{ url_for("static", filename="img/loading.gif") }}"