Skip to content

Commit 52bd7ff

Browse files
committed
[IMP] cross_connect_client: Require and send mail
1 parent 39c1072 commit 52bd7ff

2 files changed

Lines changed: 26 additions & 4 deletions

File tree

cross_connect_client/models/cross_connect_server.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,14 @@ def _get_cross_connect_url(self, redirect_url=None):
113113
if not groups:
114114
raise UserError(_("You are not allowed to access this server"))
115115

116+
if not self.env.user.email:
117+
raise UserError(_("User email is required"))
118+
116119
data = {
117120
"id": self.env.user.id,
118121
"name": self.env.user.name,
119122
"login": self.env.user.login,
123+
"email": self.env.user.email,
120124
"lang": self.env.user.lang,
121125
"groups": [group.cross_connect_server_group_id for group in groups],
122126
}

cross_connect_client/tests/test_cross_connect_client.py

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def test_sync(self, req):
121121
self.assertEqual(
122122
self.server.menu_id.action.url, f"/cross_connect_server/{self.server.id}"
123123
)
124-
self.assertEqual(self.server.menu_id.action.target, "self")
124+
self.assertEqual(self.server.menu_id.action.target, "new")
125125

126126
self.assertTrue(self.server.web_icon_data)
127127

@@ -178,7 +178,13 @@ def test_get_cross_connect_url(self, req):
178178
)
179179
self.server.action_sync()
180180

181-
user = self.env["res.users"].create({"name": "Test User", "login": "test_user"})
181+
user = self.env["res.users"].create(
182+
{
183+
"name": "Test User",
184+
"login": "test_user",
185+
"email": "test@example.com",
186+
}
187+
)
182188
group = self.server.group_ids[0]
183189
user.write({"groups_id": [(4, group.id)]})
184190

@@ -198,6 +204,7 @@ def test_get_cross_connect_url(self, req):
198204
"id": user.id,
199205
"name": "Test User",
200206
"login": "test_user",
207+
"email": "test@example.com",
201208
"lang": "en_US",
202209
"groups": [group.cross_connect_server_group_id],
203210
},
@@ -220,7 +227,13 @@ def test_get_cross_connect_url_bad_groups(self, req):
220227
)
221228
self.server.action_sync()
222229

223-
user = self.env["res.users"].create({"name": "Test User", "login": "test_user"})
230+
user = self.env["res.users"].create(
231+
{
232+
"name": "Test User",
233+
"login": "test_user",
234+
"email": "test@example.com",
235+
}
236+
)
224237

225238
req.reset_mock()
226239
req.return_value = _mock_json({"client_id": 1, "token": "test-token"})
@@ -254,7 +267,12 @@ def test_act_url_redirect(self):
254267
server.action_sync()
255268

256269
user = self.env["res.users"].create(
257-
{"name": "Test User", "login": "test_user", "password": "user_pas$w0rd"}
270+
{
271+
"name": "Test User",
272+
"login": "test_user",
273+
"email": "test@example.com",
274+
"password": "user_pas$w0rd",
275+
}
258276
)
259277
group = server.group_ids[0]
260278
user.write({"groups_id": [(4, group.id)]})

0 commit comments

Comments
 (0)