jrrribeiro commited on
Commit
ee30873
·
1 Parent(s): b734a17

Fix email-only invite acceptance

Browse files
src/auth/auth_service.py CHANGED
@@ -417,6 +417,21 @@ class AuthService:
417
  email = (profile.hf_email or "").strip()
418
  return email or None
419
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
420
  def create_project_invite(
421
  self,
422
  project_slug: str,
@@ -483,7 +498,14 @@ class AuthService:
483
 
484
  def list_pending_invites(self, username: str) -> List[ProjectInvite]:
485
  self._prune_expired_invites()
486
- invites = list(self._pending_invites.get(username, {}).values())
 
 
 
 
 
 
 
487
  invites.sort(key=lambda item: item.created_at)
488
  return invites
489
 
@@ -497,32 +519,34 @@ class AuthService:
497
 
498
  def accept_project_invite(self, username: str, project_slug: str) -> tuple[bool, str]:
499
  self._prune_expired_invites()
500
- pending = self._pending_invites.get(username, {})
501
- invite = pending.get(project_slug)
502
- if invite is None:
503
  return False, f"Invite not found for {username} in {project_slug}"
504
 
505
  self.upsert_user_project_role(username, project_slug, invite.role)
506
  del pending[project_slug]
507
  if not pending:
508
- self._pending_invites.pop(username, None)
509
  return True, f"✅ Invite accepted for {project_slug} as {invite.role.value}"
510
 
511
  def reject_project_invite(self, username: str, project_slug: str) -> tuple[bool, str]:
512
  self._prune_expired_invites()
513
- pending = self._pending_invites.get(username, {})
514
- invite = pending.get(project_slug)
515
- if invite is None:
516
  return False, f"Invite not found for {username} in {project_slug}"
517
 
518
  del pending[project_slug]
519
  if not pending:
520
- self._pending_invites.pop(username, None)
521
  return True, f"✅ Invite rejected for {project_slug}"
522
 
523
  def accept_all_project_invites(self, username: str) -> tuple[int, int, str]:
524
  self._prune_expired_invites()
525
- pending = self._pending_invites.get(username, {})
 
 
 
 
526
  if not pending:
527
  return 0, 0, "No pending invites"
528
 
@@ -538,12 +562,12 @@ class AuthService:
538
 
539
  def revoke_project_invite(self, username: str, project_slug: str) -> tuple[bool, str]:
540
  self._prune_expired_invites()
541
- pending = self._pending_invites.get(username, {})
542
- if project_slug not in pending:
543
  return False, f"Invite not found for {username} in {project_slug}"
544
  del pending[project_slug]
545
  if not pending:
546
- self._pending_invites.pop(username, None)
547
  return True, f"✅ Invite revoked for {username} in {project_slug}"
548
 
549
  def export_user_access_map(self, include_inactive: bool = False) -> Dict[str, Dict[str, str]]:
 
417
  email = (profile.hf_email or "").strip()
418
  return email or None
419
 
420
+ def _pending_invite_keys_for_username(self, username: str) -> list[str]:
421
+ keys = [username]
422
+ known_email = self.get_known_email_for_user(username)
423
+ if known_email:
424
+ keys.insert(0, f"email:{known_email}")
425
+ return keys
426
+
427
+ def _find_pending_invite_bucket(self, username: str, project_slug: str) -> tuple[str | None, dict[str, ProjectInvite] | None, ProjectInvite | None]:
428
+ for invite_key in self._pending_invite_keys_for_username(username):
429
+ pending = self._pending_invites.get(invite_key, {})
430
+ invite = pending.get(project_slug)
431
+ if invite is not None:
432
+ return invite_key, pending, invite
433
+ return None, None, None
434
+
435
  def create_project_invite(
436
  self,
437
  project_slug: str,
 
498
 
499
  def list_pending_invites(self, username: str) -> List[ProjectInvite]:
500
  self._prune_expired_invites()
501
+ invites: list[ProjectInvite] = []
502
+ seen_projects: set[str] = set()
503
+ for invite_key in self._pending_invite_keys_for_username(username):
504
+ for invite in self._pending_invites.get(invite_key, {}).values():
505
+ if invite.project_slug in seen_projects:
506
+ continue
507
+ seen_projects.add(invite.project_slug)
508
+ invites.append(invite)
509
  invites.sort(key=lambda item: item.created_at)
510
  return invites
511
 
 
519
 
520
  def accept_project_invite(self, username: str, project_slug: str) -> tuple[bool, str]:
521
  self._prune_expired_invites()
522
+ invite_key, pending, invite = self._find_pending_invite_bucket(username, project_slug)
523
+ if invite_key is None or pending is None or invite is None:
 
524
  return False, f"Invite not found for {username} in {project_slug}"
525
 
526
  self.upsert_user_project_role(username, project_slug, invite.role)
527
  del pending[project_slug]
528
  if not pending:
529
+ self._pending_invites.pop(invite_key, None)
530
  return True, f"✅ Invite accepted for {project_slug} as {invite.role.value}"
531
 
532
  def reject_project_invite(self, username: str, project_slug: str) -> tuple[bool, str]:
533
  self._prune_expired_invites()
534
+ invite_key, pending, invite = self._find_pending_invite_bucket(username, project_slug)
535
+ if invite_key is None or pending is None or invite is None:
 
536
  return False, f"Invite not found for {username} in {project_slug}"
537
 
538
  del pending[project_slug]
539
  if not pending:
540
+ self._pending_invites.pop(invite_key, None)
541
  return True, f"✅ Invite rejected for {project_slug}"
542
 
543
  def accept_all_project_invites(self, username: str) -> tuple[int, int, str]:
544
  self._prune_expired_invites()
545
+ pending_keys = self._pending_invite_keys_for_username(username)
546
+ pending: dict[str, ProjectInvite] = {}
547
+ for invite_key in pending_keys:
548
+ pending.update(self._pending_invites.get(invite_key, {}))
549
+
550
  if not pending:
551
  return 0, 0, "No pending invites"
552
 
 
562
 
563
  def revoke_project_invite(self, username: str, project_slug: str) -> tuple[bool, str]:
564
  self._prune_expired_invites()
565
+ invite_key, pending, invite = self._find_pending_invite_bucket(username, project_slug)
566
+ if invite_key is None or pending is None or invite is None:
567
  return False, f"Invite not found for {username} in {project_slug}"
568
  del pending[project_slug]
569
  if not pending:
570
+ self._pending_invites.pop(invite_key, None)
571
  return True, f"✅ Invite revoked for {username} in {project_slug}"
572
 
573
  def export_user_access_map(self, include_inactive: bool = False) -> Dict[str, Dict[str, str]]:
tests/unit/test_auth_service.py CHANGED
@@ -3,7 +3,7 @@
3
  import pytest
4
  from datetime import UTC, datetime, timedelta
5
 
6
- from src.auth.auth_service import AuthService, Session, UserProjectAccess
7
  from src.domain.models import Role
8
 
9
 
@@ -337,6 +337,29 @@ class TestAuthService:
337
  assert session.username == "pending_user"
338
  assert session.authorized_projects == []
339
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
340
  def test_reject_invite_removes_pending(self, auth_service):
341
  ok, _ = auth_service.create_project_invite(
342
  username="pending_user",
 
3
  import pytest
4
  from datetime import UTC, datetime, timedelta
5
 
6
+ from src.auth.auth_service import AuthService, Session, UserProjectAccess, UserProfile
7
  from src.domain.models import Role
8
 
9
 
 
337
  assert session.username == "pending_user"
338
  assert session.authorized_projects == []
339
 
340
+ def test_email_only_invite_is_visible_and_accepts_for_known_email(self, auth_service):
341
+ ok, _ = auth_service.create_project_invite(
342
+ project_slug="proj-email",
343
+ role=Role.validator,
344
+ invited_by="owner",
345
+ invitee_email="invitee@example.org",
346
+ )
347
+ assert ok is True
348
+
349
+ auth_service._user_profiles["invitee_user"] = UserProfile(
350
+ username="invitee_user",
351
+ hf_email="invitee@example.org",
352
+ )
353
+
354
+ pending = auth_service.list_pending_invites("invitee_user")
355
+ assert len(pending) == 1
356
+ assert pending[0].project_slug == "proj-email"
357
+
358
+ accepted, _ = auth_service.accept_project_invite("invitee_user", "proj-email")
359
+ assert accepted is True
360
+ assert auth_service.get_user_role_for_project("invitee_user", "proj-email") == Role.validator
361
+ assert auth_service.list_pending_invites("invitee_user") == []
362
+
363
  def test_reject_invite_removes_pending(self, auth_service):
364
  ok, _ = auth_service.create_project_invite(
365
  username="pending_user",