From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 14 Oct 2022 14:25:38 +0000 (+0000)
Subject: users: Require email address when the user is created
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aede21a25b8e9dccde34fa1e7c489ede8add9db1;p=pbs.git

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 bc0a0cd5..2364a124 100644
--- 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 fa08be57..2ee1a41b 100644
--- 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")