Merge pull request #6195 from freedomofpress/no-refresh

Remove "Refresh codename" feature
freedomofpress · Dec 10, 2021 · 12b6c67 · 12b6c67
2 parents 90b3a08 + 365755f
commit 12b6c67
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 31 deletions.
diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2
@@ -290,7 +290,6 @@
   /var/www/securedrop/static/i/font-awesome/info-circle-black.png r,
   /var/www/securedrop/static/i/font-awesome/lock-black.png r,
   /var/www/securedrop/static/i/font-awesome/refresh-blue.png r,
-  /var/www/securedrop/static/i/font-awesome/refresh-white.png r,
   /var/www/securedrop/static/i/font-awesome/times-white.png r,
   /var/www/securedrop/static/i/font-awesome/white/exclamation-circle.svg r,
   /var/www/securedrop/static/i/font-awesome/white/guard.svg r,

diff --git a/securedrop/sass/source.sass b/securedrop/sass/source.sass
@@ -276,22 +276,6 @@ p#max-file-size
   margin-bottom: 10px
   margin-top: 5px
 
-#regenerate-submit
-  span
-    font-size: 0
-
-    &:after
-      content: ""
-      display: inline-block
-      background:
-        image: url(/static/i/font-awesome/refresh-white.png)
-        position: center
-        repeat: no-repeat
-        size: contain
-      opacity: 0.9
-      height: 20px
-      width: 20px
-
 #cancel
   &:before
     content: ""
@@ -323,4 +307,4 @@ p#max-file-size
 
     background:
       image: url(/static/icons/chevron-left.png)
-      size: contain
+      size: contain
diff --git a/securedrop/source_app/main.py b/securedrop/source_app/main.py
@@ -34,7 +34,7 @@ def make_blueprint(config: SDConfig) -> Blueprint:
     def index() -> str:
         return render_template('index.html')
 
-    @view.route('/generate', methods=('GET', 'POST'))
+    @view.route('/generate', methods=('GET',))
     def generate() -> Union[str, werkzeug.Response]:
         if SessionManager.is_user_logged_in(db_session=db.session):
             flash(gettext(

diff --git a/securedrop/source_templates/generate.html b/securedrop/source_templates/generate.html
@@ -14,14 +14,6 @@ <h1>{{ gettext('Welcome') }}</h1>
   <h2 id="codename-heading" class="visually-hidden">{{ gettext('Codename') }}</h2>
   <mark id="codename" class="codename"
     aria-describedby="codename-instructions codename-explanation">{{ codename }}</mark>
-  <div class="pull-right">
-    <form id="regenerate-form" method="post">
-      <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
-      <button type="submit" id="regenerate-submit" class="small">
-        <span>{{ gettext('Refresh codename') }}</span>
-      </button>
-    </form>
-  </div>
 </section>
 
 <p class="explanation">
@@ -38,4 +30,4 @@ <h2 id="codename-heading" class="visually-hidden">{{ gettext('Codename') }}</h2>
     {{ gettext('SUBMIT DOCUMENTS') }}
   </button>
 </form>
-{% endblock %}
+{% endblock %}
diff --git a/securedrop/source_templates/index.html b/securedrop/source_templates/index.html
@@ -108,4 +108,4 @@ <h2 id="return-visit-heading" class="welcome-text">
 
 </body>
 
-</html>
+</html>
diff --git a/securedrop/static/i/font-awesome/refresh-white.png b/securedrop/static/i/font-awesome/refresh-white.png
diff --git a/securedrop/tests/functional/source_navigation_steps.py b/securedrop/tests/functional/source_navigation_steps.py
@@ -47,7 +47,7 @@ def _source_clicks_submit_documents_on_homepage(self):
         assert self._is_on_generate_page()
 
     def _source_regenerates_codename(self):
-        self.safe_click_by_id("regenerate-submit")
+        self.driver.refresh()
 
     def _source_chooses_to_submit_documents(self):
         self._source_clicks_submit_documents_on_homepage()

diff --git a/securedrop/tests/functional/test_source.py b/securedrop/tests/functional/test_source.py
@@ -146,7 +146,7 @@ def test_duplicate_generate_pages(self):
 
     def test_refreshed_duplicate_generate_pages(self):
         # Test generation of multiple codenames in different browser tabs, including behavior
-        # of refreshing the codemae in each tab. Ref. issue 4458.
+        # of refreshing the codename in each tab. Ref. issue 4458.
 
         # Generate a codename in Tab A
         assert len(self.driver.window_handles) == 1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -108,4 +108,4 @@ <h2 id="return-visit-heading" class="welcome-text">

		</body>

		</html>
		</html>