Update dependencies

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

news/PR828.dependency

@@ -0,0 +1 @@
+Update to Flask 2.0, and update other dependencies

noggin/form/base.py

@@ -1,10 +1,9 @@
 from flask_wtf import FlaskForm
 from markupsafe import escape, Markup
 from wtforms import Field, SubmitField
-from wtforms.fields.core import FieldList, SelectField, StringField
+from wtforms.fields import FieldList, SelectField, StringField
 from wtforms.utils import unset_value
-from wtforms.widgets import TextInput
-from wtforms.widgets.core import html_params
+from wtforms.widgets import html_params, TextInput
 
 
 class BaseForm(FlaskForm):

noggin/form/edit_user.py

@@ -3,16 +3,17 @@
 
 from flask_babel import lazy_gettext as _
 from pyotp import TOTP
-from wtforms import (
+from wtforms.fields import (
     BooleanField,
+    EmailField,
     FieldList,
     HiddenField,
     PasswordField,
     SelectField,
     StringField,
     TextAreaField,
+    URLField,
 )
-from wtforms.fields.html5 import EmailField, URLField
 from wtforms.validators import (
     AnyOf,
     DataRequired,
@@ -187,7 +188,10 @@ class UserSettingsConfirmOTPForm(ModestForm):
         "secret",
         validators=[DataRequired(message=_('Could not find the token secret'))],
     )
-    description = HiddenField("description", validators=[Optional()],)
+    description = HiddenField(
+        "description",
+        validators=[Optional()],
+    )
     code = StringField(
         _("Verification Code"),
         validators=[DataRequired(message=_('You must provide a verification code'))],

noggin/form/register_user.py

@@ -1,6 +1,11 @@
 from flask_babel import lazy_gettext as _
-from wtforms import BooleanField, HiddenField, PasswordField, StringField
-from wtforms.fields.html5 import EmailField
+from wtforms.fields import (
+    BooleanField,
+    EmailField,
+    HiddenField,
+    PasswordField,
+    StringField,
+)
 from wtforms.validators import DataRequired, EqualTo, Length
 
 from noggin.form.validators import Email, PasswordLength, StopOnError, username_format

noggin/tests/unit/controller/test_root.py

@@ -116,15 +116,17 @@ def test_healthz_liveness(client):
     """Test the /healthz/live check endpoint"""
     result = client.get('/healthz/live')
     assert result.status_code == 200
-    assert result.data == b'OK\n'
+    assert result.json == {"status": 200, "title": "OK"}
+    assert result.data == b'{"status": 200, "title": "OK"}'
 
 
 @pytest.mark.vcr()
 def test_healthz_readiness_ok(client):
     """Test the /healthz/ready check endpoint"""
     result = client.get('/healthz/ready')
     assert result.status_code == 200
-    assert result.data == b'OK\n'
+    assert result.json == {"status": 200, "title": "OK"}
+    assert result.data == b'{"status": 200, "title": "OK"}'
 
 
 @pytest.mark.vcr()
@@ -134,7 +136,14 @@ def test_healthz_readiness_not_ok(client):
         ipaping.side_effect = Exception()
         result = client.get('/healthz/ready')
     assert result.status_code == 503
-    assert result.data == b"Can't connect to the FreeIPA Server\n"
+    assert result.json == {
+        "status": 503,
+        "title": "Can't connect to the FreeIPA Server",
+    }
+    assert (
+        result.data
+        == b'{"status": 503, "title": "Can\'t connect to the FreeIPA Server"}'
+    )
 
 
 @pytest.mark.vcr()

noggin/utility/token.py

@@ -24,7 +24,7 @@ def make_token(data, audience, ttl=None):
     if ttl is not None:
         data["exp"] = datetime.utcnow() + timedelta(minutes=ttl)
     token = jwt.encode(data, current_app.config["SECRET_KEY"], algorithm="HS256")
-    return str(token, "ascii")
+    return token
 
 
 def read_token(token, audience=None):
@@ -41,5 +41,6 @@ def make_password_change_token(user):
     if lpc is not None:
         lpc = lpc.isoformat()
     return make_token(
-        {"sub": user.username, "lpc": lpc}, audience=Audience.password_reset,
+        {"sub": user.username, "lpc": lpc},
+        audience=Audience.password_reset,
     )