04/27 Updated customer invitation allow customer to create username & password 3

app/utils/forms.py

@@ -228,33 +228,29 @@ class CustomerUserForm(FlaskForm):
             raise ValidationError('Password is required for new accounts.')
 
 class CustomerInviteForm(FlaskForm):
-    """Form for creating a customer account.
+    """Simplified form for creating a customer account via email invitation.
 
-    Admin enters Full Name, Email, Username, and Password on behalf of the
-    customer.  The account is immediately active — no emailed setup link
-    is required, though an invitation email is still sent so the customer
-    knows their credentials have been created.
+    Admin enters Full Name and Email only. A username is auto-generated
+    from the email address. The customer sets their own username and
+    password via the emailed link.
     """
-    full_name        = StringField('Full Name',        validators=[DataRequired(), Length(max=150)])
-    email            = StringField('Email',            validators=[DataRequired(), Email(), Length(max=255)])
-    username         = StringField('Username',         validators=[DataRequired(), Length(min=3, max=100)])
-    password         = PasswordField('Password',       validators=[DataRequired(), Length(min=8, max=100)])
-    confirm_password = PasswordField('Confirm Password',
-                                     validators=[DataRequired(),
-                                                 EqualTo('password', message='Passwords must match.')])
+    full_name = StringField('Full Name', validators=[DataRequired(), Length(max=150)])
+    email     = StringField('Email',     validators=[DataRequired(), Email(), Length(max=255)])
 
     def validate_email(self, field):
         if User.query.filter_by(email=field.data.strip().lower()).first():
             raise ValidationError('An account with this email address already exists.')
 
-    def validate_username(self, field):
-        if User.query.filter_by(username=field.data.strip()).first():
-            raise ValidationError('This username is already taken.')
-
 
 class SetPasswordForm(FlaskForm):
-    """Public form for customer to set their password via emailed link."""
-    password         = PasswordField('Password', validators=[DataRequired(), Length(min=8, max=100)])
+    """Public form for customer to choose their username and password via emailed link."""
+    username         = StringField('Choose a Username', validators=[DataRequired(), Length(min=3, max=100)])
+    password         = PasswordField('Password',        validators=[DataRequired(), Length(min=8, max=100)])
     confirm_password = PasswordField('Confirm Password',
                                      validators=[DataRequired(),
-                                                 EqualTo('password', message='Passwords must match.')])
+                                                 EqualTo('password', message='Passwords must match.')])
+
+    def validate_username(self, field):
+        existing = User.query.filter_by(username=field.data.strip()).first()
+        if existing:
+            raise ValidationError('This username is already taken. Please choose another.')