Merge pull request #3537 from GSA-TTS/main

backend/cypress/support/login-gov.js

@@ -5,7 +5,7 @@ const LOGIN_TEST_OTP_SECRET = Cypress.env('LOGIN_TEST_OTP_SECRET');
 
 export function testLoginGovLogin(
   email=LOGIN_TEST_EMAIL, password=LOGIN_TEST_PASSWORD, secret=LOGIN_TEST_OTP_SECRET) {
-  cy.get('a.usa-button.sign-in-button').click();
+  cy.get('a.usa-link[href="/openid/login/"][role="button"]').click();
   cy.get('button.usa-button.sign-in-button')
     .should('contain.text', 'Authenticate with Login.gov')
     .click();

backend/cypress/support/unlock-cert.js

@@ -6,7 +6,7 @@ export function testUnlock() {
         const reportId = url.split('/').pop();
         cy.get('.usa-button').contains('Unlock').click();
         cy.get('#continue').contains('Unlock submission').click();
-        cy.get('img[alt="FAC.gov"]').should('exist').click();
+        cy.get('#basic-logo').should('exist').click();
         cy.url().should('match', /\/audit\//);
         cy.contains('td', `${reportId}`)
             .siblings()

backend/dissemination/views.py

@@ -9,6 +9,8 @@
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import View
 
 from config.settings import STATE_ABBREVS, SUMMARY_REPORT_DOWNLOAD_LIMIT
@@ -111,6 +113,10 @@ def run_search(form_data):
 
 
 class Search(View):
+    @method_decorator(csrf_exempt)
+    def dispatch(self, *args, **kwargs):
+        return super(Search, self).dispatch(*args, **kwargs)
+
     def get(self, request, *args, **kwargs):
         """
         When accessing the search page through get, return the blank search page.

backend/gunicorn.conf.py

@@ -1,4 +1,13 @@
+from psycogreen.gevent import patch_psycopg  # use this if you use gevent workers
+
+
+def post_fork(server, worker):
+    patch_psycopg()
+    worker.log.info("Made Psycopg2 Green")
+
+
 max_requests = 500
 max_requests_jitter = 50
 timeout = 120
 workers = 4
+worker_class = "gevent"

backend/requirements/requirements.in

@@ -12,15 +12,16 @@ django-fsm
 environs[django]
 faker
 fs
-greenlet==2.0.2
-gunicorn
+greenlet>=3.0rc3
+gunicorn[gevent]
 jsonpath-ng
 jsonschema
 newrelic
 oic
 openpyxl
 pandas
 peewee
+psycogreen
 psycopg2-binary
 pycryptodome>=3.19.1
 pycryptodomex>=3.19.1

backend/schemas/source/excel/libs/SheetValidations.libsonnet

@@ -119,9 +119,8 @@ local AwardReferenceValidation = {
     type: 'list',
     formula1: '=Y{0}:Y{0}',
     errorStyle: 'warning',
-    custom_error: 'If known, the Program Name should have been provided for you. ' +
-                  'Please do not change the Program Name unless absolutely necessary ' +
-                  'or the Program Name is unknown. The Program Name must be 300 characters or less. ' +
+    custom_error: 'If the Program Name was provided, please, do not change it unless necessary or unknown. ' +
+                  'The Program Name must be under 300 characters.' +
                   'If the drop-down menu is empty, you may need to enter an Agency Prefix ' +
                   'and ALN in columns B and C.' +
                   'Continue?',