users: Require email address when the user is created

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index bc0a0cd5505b21f6a4a837978c2b3c158d816d5d..2364a1245c060d551b0810751b8a2567e639e53c 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -56,7 +56,7 @@ class Users(base.Object):
 
                return res.count
 
-       def create(self, name, realname=None, notify=True):
+       def create(self, name, email, realname=None, notify=True):
                # XXX check if username has the correct name
 
                # Check if name is already taken
@@ -70,6 +70,9 @@ class Users(base.Object):
 
                log.debug("Created user %s" % user.name)
 
+               # Add email address
+               user.add_email(email, activated=True)
+
                # Send a welcome email
                if notify:
                        user._send_welcome_email()

diff --git a/tests/test.py b/tests/test.py
index fa08be5786898363f7d78c0afc3494e776948bc7..2ee1a41b2fe7a478e63757e6a1811fe03cf619e5 100644 (file)
--- a/tests/test.py
+++ b/tests/test.py
@@ -123,9 +123,6 @@ class TestCase(unittest.IsolatedAsyncioTestCase):
                # Create a user
                self.user = self.backend.users.create("tester", "Joe Tester")
 
-               # Add an email address
-               self.user.add_email("joe.tester@ipfire.org", activated=True)
-
                # Create a distribution
                self.distro = self.backend.distros.create("Default Test Distribution", "test1")