Merge pull request #4042 from alphagov/bump-werkzeug-v2.0.2

Bump Werkzeug to version 2.0.2

requirements.in

@@ -7,6 +7,7 @@ humanize==3.6.0
 Flask==1.1.2  # pyup: <2
 Flask-WTF==0.15.1
 Flask-Login==0.5.0
+werkzeug==2.0.2
 
 blinker==1.4
 pyexcel==0.6.6

requirements.txt

@@ -41,6 +41,8 @@ cryptography==3.3.2
     # via
     #   -r requirements.in
     #   fido2
+dataclasses==0.8
+    # via werkzeug
 dnspython==1.16.0
     # via eventlet
 docopt==0.6.2
@@ -216,8 +218,10 @@ urllib3==1.26.5
     #   requests
 webencodings==0.5.1
     # via bleach
-werkzeug==1.0.1
-    # via flask
+werkzeug==2.0.2
+    # via
+    #   -r requirements.in
+    #   flask
 wtforms==2.3.3
     # via flask-wtf
 xlrd==1.2.0

tests/app/main/views/test_add_service.py

@@ -1,5 +1,5 @@
 import pytest
-from flask import session, url_for
+from flask import url_for
 from freezegun import freeze_time
 from notifications_python_client.errors import HTTPError
 
@@ -170,7 +170,8 @@ def test_should_add_service_and_redirect_to_tour_when_no_services(
         ),
         101,
     )
-    assert session['service_id'] == 101
+    with client_request.session_transaction() as session:
+        assert session['service_id'] == 101
 
 
 def test_add_service_has_to_choose_org_type(
@@ -283,7 +284,8 @@ def test_should_add_service_and_redirect_to_dashboard_when_existing_service(
         email_from='testing.the.post',
     )
     assert len(mock_create_service_template.call_args_list) == 0
-    assert session['service_id'] == 101
+    with client_request.session_transaction() as session:
+        assert session['service_id'] == 101
 
 
 @pytest.mark.parametrize('name, error_message', [

tests/app/main/views/test_register.py

@@ -2,9 +2,9 @@ from unittest.mock import ANY
 
 import pytest
 from bs4 import BeautifulSoup
-from flask import session, url_for
-from flask_login import current_user
+from flask import url_for
 
+from app.models.user import User
 from tests.conftest import normalize_spaces
 
 
@@ -145,7 +145,8 @@ def test_should_add_user_details_to_session(
         },
     )
     assert response.status_code == 302
-    assert session['user_details']['email'] == email_address
+    with client.session_transaction() as session:
+        assert session['user_details']['email'] == email_address
 
 
 def test_should_return_200_if_password_is_on_list_of_commonly_used_passwords(
@@ -334,11 +335,13 @@ def test_register_from_email_auth_invite(
     fake_uuid,
     mocker,
 ):
+    mock_login_user = mocker.patch('app.models.user.login_user')
     sample_invite['auth_type'] = 'email_auth'
     sample_invite['email_address'] = invite_email_address
     with client.session_transaction() as session:
         session['invited_user_id'] = sample_invite['id']
-    assert not current_user.is_authenticated
+        # Prove that the user isn’t already signed in
+        assert 'user_id' not in session
 
     data = {
         'name': 'invited user',
@@ -367,11 +370,22 @@ def test_register_from_email_auth_invite(
     # this is actually called twice, at the beginning of the function and then by the activate_user function
     mock_get_invited_user_by_id.assert_called_with(sample_invite['id'])
     mock_accept_invite.assert_called_once_with(sample_invite['service'], sample_invite['id'])
+
     # just logs them in
-    assert current_user.is_authenticated
-    assert mock_add_user_to_service.called
+    mock_login_user.assert_called_once_with(User({
+        'id': fake_uuid,  # This ID matches the return value of mock_register_user
+        'platform_admin': False
+    }))
+    mock_add_user_to_service.assert_called_once_with(
+        sample_invite['service'],
+        fake_uuid,  # This ID matches the return value of mock_register_user
+        {'manage_api_keys', 'manage_service', 'send_messages', 'view_activity'},
+        [],
+    )
 
     with client.session_transaction() as session:
+        # The user is signed in
+        assert 'user_id' in session
         # invited user details are still there so they can get added to the service
         assert session['invited_user_id'] == sample_invite['id']
 

tests/app/main/views/test_sign_out.py

@@ -1,4 +1,3 @@
-import flask
 from flask import url_for
 
 from tests.conftest import SERVICE_ONE_ID
@@ -7,13 +6,15 @@ from tests.conftest import SERVICE_ONE_ID
 def test_render_sign_out_redirects_to_sign_in(
     logged_in_client_with_session
 ):
-    assert flask.session
+    with logged_in_client_with_session.session_transaction() as session:
+        assert session
     response = logged_in_client_with_session.get(
         url_for('main.sign_out'))
     assert response.status_code == 302
     assert response.location == url_for(
         'main.index', _external=True)
-    assert not flask.session
+    with logged_in_client_with_session.session_transaction() as session:
+        assert not session
 
 
 def test_sign_out_user(
@@ -57,7 +58,8 @@ def test_sign_out_of_two_sessions(
 ):
     logged_in_client_with_session.get(
         url_for('main.sign_out'))
-    assert not flask.session
+    with logged_in_client_with_session.session_transaction() as session:
+        assert not session
     response = logged_in_client_with_session.get(
         url_for('main.sign_out'))