Migrate to RegisterFormV2

Author: mreid-tt

spkrepo/app.py

@@ -16,7 +16,7 @@
     PackageView,
     ScreenshotView,
     ServiceView,
-    SpkrepoConfirmRegisterForm,
+    SpkrepoRegisterForm,
     UserView,
     VersionView,
     api,
@@ -32,6 +32,7 @@ def create_app(config=None, register_blueprints=True, init_admin=True):
     # Configuration
     app.config.from_object(default_config)
     app.config.from_envvar("SPKREPO_CONFIG", silent=True)
+    app.config.update(SECURITY_PASSWORD_CONFIRM_REQUIRED=False)
 
     # Enable or disable Flask’s subdomain routing per config
     app.subdomain_matching = app.config.get("SUBDOMAIN_MATCHING", False)
@@ -74,9 +75,7 @@ def create_app(config=None, register_blueprints=True, init_admin=True):
     db.init_app(app)
 
     # Security
-    security.init_app(
-        app, user_datastore, confirm_register_form=SpkrepoConfirmRegisterForm
-    )
+    security.init_app(app, user_datastore, register_form=SpkrepoRegisterForm)
 
     # Migrate
     migrate.init_app(app, db, directory=app.config["MIGRATE_DIRECTORY"])

spkrepo/views/__init__.py

@@ -11,5 +11,5 @@
     VersionView,
 )
 from .api import api
-from .frontend import SpkrepoConfirmRegisterForm, frontend
+from .frontend import SpkrepoRegisterForm, frontend
 from .nas import nas

spkrepo/views/frontend.py

@@ -3,7 +3,7 @@
 import os
 
 from flask import Blueprint, abort, redirect, render_template, url_for
-from flask_security import ConfirmRegisterForm, current_user, login_required
+from flask_security import RegisterFormV2, current_user, login_required
 from flask_security.forms import ChangePasswordForm
 from flask_wtf import FlaskForm
 from wtforms import StringField, SubmitField, ValidationError
@@ -107,7 +107,7 @@ def unique_user_username(form, field):
         raise ValidationError("Username already taken")
 
 
-class SpkrepoConfirmRegisterForm(ConfirmRegisterForm):
+class SpkrepoRegisterForm(RegisterFormV2):
     username = StringField(
         "Username", [InputRequired(), Length(min=4), unique_user_username]
     )