Skip to content

Commit b3c3daf

Browse files
Merge pull request #4 from akretion/16.0-add-cross_connect_server-unique-user
[IMP] Ensure login unicity for users coming from cross server client
2 parents e2ff3f5 + f530a82 commit b3c3daf

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

cross_connect_server/models/cross_connect_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def _request_access(self, access_request):
7373
lambda u: u.cross_connect_client_user_id == access_request.id
7474
)
7575
vals = {
76-
"login": access_request.login,
76+
"login": f"{self.id}_{access_request.id}_{access_request.login}",
7777
"email": access_request.email,
7878
"name": access_request.name,
7979
"lang": access_request.lang,

cross_connect_server/tests/test_cross_connect_server.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def test_access_ok(self):
170170
self.assertEqual(len(rc.records), 1)
171171
new_user = rc.records[0]
172172
self.assertEqual(new_user.name, "Client User")
173-
self.assertEqual(new_user.login, "user@client.example.org")
173+
self.assertEqual(new_user.login, f"{self.client.id}_12_user@client.example.org")
174174
self.assertEqual(new_user.email, "user@client.example.org")
175175
self.assertEqual(new_user.lang, "en_US")
176176
self.assertEqual(new_user.cross_connect_client_id.id, self.client.id)
@@ -271,7 +271,9 @@ def test_access_existing(self):
271271
self.assertEqual(len(rc2.records), 0)
272272
new_user = rc.records[0]
273273
self.assertEqual(new_user.name, "Client User2")
274-
self.assertEqual(new_user.login, "user2@client.example.org")
274+
self.assertEqual(
275+
new_user.login, f"{self.client.id}_12_user2@client.example.org"
276+
)
275277
self.assertEqual(new_user.email, "user2@client.example.org")
276278
self.assertEqual(new_user.lang, "en_US")
277279
self.assertIn(self.env.ref("fastapi.group_fastapi_user"), new_user.groups_id)

0 commit comments

Comments
 (0)