Fixed tests with the new required email field for users.

mosp/commands.py

@@ -9,7 +9,7 @@
 import mosp.models
 from mosp.bootstrap import application, db
 
-logger = logging.getLogger('commands')
+logger = logging.getLogger("commands")
 
 
 @application.cli.command("uml_graph")
@@ -30,8 +30,11 @@ def db_empty():
 def db_create():
     "Will create the database."
     with application.app_context():
-        mosp.models.db_create(db, application.config['DB_CONFIG_DICT'],
-                        application.config['DATABASE_NAME'])
+        mosp.models.db_create(
+            db,
+            application.config["DB_CONFIG_DICT"],
+            application.config["DATABASE_NAME"],
+        )
 
 
 @application.cli.command("db_init")
@@ -50,8 +53,8 @@ def import_licenses_from_spdx():
 
 
 @application.cli.command("create_user")
-@click.option('--login', default='admin', help='Login')
-@click.option('--password', default='password', help='Password')
+@click.option("--login", default="admin", help="Login")
+@click.option("--password", default="password", help="Password")
 def create_user(login, password):
     "Initializes a user"
     print("Creation of the user {} ...".format(login))
@@ -60,8 +63,8 @@ def create_user(login, password):
 
 
 @application.cli.command("create_admin")
-@click.option('--login', default='admin', help='Login')
-@click.option('--password', default='password', help='Password')
+@click.option("--login", default="admin", help="Login")
+@click.option("--password", default="password", help="Password")
 def create_admin(login, password):
     "Initializes an admin user"
     print("Creation of the admin user {} ...".format(login))

mosp/web/forms.py

@@ -13,7 +13,7 @@
     SubmitField,
     validators,
     HiddenField,
-    SelectMultipleField
+    SelectMultipleField,
 )
 from wtforms.fields.html5 import EmailField
 from wtforms.validators import Email, InputRequired
@@ -146,7 +146,7 @@ class SchemaForm(FlaskForm):
         lazy_gettext("Organization"),
         [validators.Required(lazy_gettext("Please select an organization"))],
         coerce=int,
-        default=0
+        default=0,
     )
     org_id.choices = [(0, "")]
 
@@ -166,7 +166,13 @@ class UserForm(FlaskForm):
         ],
     )
     password = PasswordField(lazy_gettext("Password"))
-    email = EmailField("Email", [InputRequired("Please enter your email address."), Email("Please enter your email address.")])
+    email = EmailField(
+        "Email",
+        [
+            InputRequired("Please enter your email address."),
+            Email("Please enter your email address."),
+        ],
+    )
     public_profile = BooleanField(lazy_gettext("Public profile"), default=True)
     is_active = BooleanField(lazy_gettext("Active"), default=True)
     is_admin = BooleanField(lazy_gettext("Admin"), default=False)
@@ -221,6 +227,12 @@ class ProfileForm(FlaskForm):
         ],
     )
     password = PasswordField(lazy_gettext("Password"))
-    email = EmailField("Email", [InputRequired("Please enter your email address."), Email("Please enter your email address.")])
+    email = EmailField(
+        "Email",
+        [
+            InputRequired("Please enter your email address."),
+            Email("Please enter your email address."),
+        ],
+    )
     public_profile = BooleanField(lazy_gettext("Public profile"), default=True)
     submit = SubmitField(lazy_gettext("Save"))

mosp/web/lib/objects_utils.py

@@ -75,8 +75,8 @@ def generate_misp_galaxy_cluster(json_object):
                 "uuid": value.pop("uuid", ""),
                 "value": value.pop("code", ""),
                 "description": value.pop("label")
-                    if value.get("label", False)
-                    else value.pop("description", ""),
+                if value.get("label", False)
+                else value.pop("description", ""),
                 "meta": value,
             }
         )

tests/test_user.py

@@ -4,7 +4,11 @@
 
 
 def test_user(session):
-    user = User(login="john", pwdhash=generate_password_hash("password"))
+    user = User(
+        login="john",
+        pwdhash=generate_password_hash("password"),
+        email="[email protected]"
+    )
 
     session.add(user)
     session.commit()
@@ -14,4 +18,4 @@ def test_user(session):
     assert user.is_api is False
     assert user.public_profile is True
     assert user.check_password("password") is True
-    assert user.apikey != ''
+    assert user.apikey != ""