Skip to content

[IMP] Ensure login unicity for users coming from cross server client #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paradoxxxzero merged 1 commit into from
Apr 3, 2025
Merged

[IMP] Ensure login unicity for users coming from cross server client #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cross_connect_server/models/cross_connect_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def _request_access(self, access_request):
lambda u: u.cross_connect_client_user_id == access_request.id
)
vals = {
"login": access_request.login,
"login": f"{self.id}_{access_request.id}_{access_request.login}",
"email": access_request.email,
"name": access_request.name,
"lang": access_request.lang,
Expand Down
6 changes: 4 additions & 2 deletions cross_connect_server/tests/test_cross_connect_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def test_access_ok(self):
self.assertEqual(len(rc.records), 1)
new_user = rc.records[0]
self.assertEqual(new_user.name, "Client User")
self.assertEqual(new_user.login, "user@client.example.org")
self.assertEqual(new_user.login, f"{self.client.id}_12_user@client.example.org")
self.assertEqual(new_user.email, "user@client.example.org")
self.assertEqual(new_user.lang, "en_US")
self.assertEqual(new_user.cross_connect_client_id.id, self.client.id)
Expand Down Expand Up @@ -271,7 +271,9 @@ def test_access_existing(self):
self.assertEqual(len(rc2.records), 0)
new_user = rc.records[0]
self.assertEqual(new_user.name, "Client User2")
self.assertEqual(new_user.login, "user2@client.example.org")
self.assertEqual(
new_user.login, f"{self.client.id}_12_user2@client.example.org"
)
self.assertEqual(new_user.email, "user2@client.example.org")
self.assertEqual(new_user.lang, "en_US")
self.assertIn(self.env.ref("fastapi.group_fastapi_user"), new_user.groups_id)
Expand Down