feat(access): демо-QR — многоразовое приглашение для показа
CI / ruff · mypy · pytest (pull_request) Successful in 1h3m54s
CI / ruff · mypy · pytest (pull_request) Successful in 1h3m54s
- invites.max_uses/uses: обычное приглашение — 1 вход, демо-QR — до DEMO_INVITE_MAX_USES (50), живёт DEMO_INVITE_TTL_HOURS (3 ч); захват атомарный, UPDATE … WHERE uses < max_uses - users.guest: вошедшие по демо-QR; «🧹 Отключить гостей демо» отзывает всех и гасит демо-QR - «👥 Участники»: кнопка «🎤 Демо-QR», гости в списке — 🎟 - миграция 0003 (ADD COLUMN без batch — SQLite не пересоздаёт users); проверена на Postgres - SPEC A-3a, ADR-017, DEMO.md, .env.example Refs #55 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -136,3 +136,72 @@ async def test_touch_is_throttled_but_tracks_renames(svc: AccessService, clock:
|
||||
await svc.touch(same, TgUser(ADMIN, "Новое имя", "boss"))
|
||||
renamed = await svc.get_member(ADMIN)
|
||||
assert renamed is not None and renamed.full_name == "Новое имя"
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
async def demo_svc(sessions: SessionMaker, clock: Clock) -> AccessService:
|
||||
settings = AccessSettings(admin_ids=frozenset({ADMIN}), demo_invite_max_uses=3, demo_invite_ttl_hours=2)
|
||||
service = AccessService(sessions, settings, clock=clock)
|
||||
await service.bootstrap_admins()
|
||||
return service
|
||||
|
||||
|
||||
def guest(n: int) -> TgUser:
|
||||
return TgUser(tg_id=700 + n, full_name=f"Гость {n}")
|
||||
|
||||
|
||||
async def test_demo_invite_lets_in_up_to_the_limit(
|
||||
demo_svc: AccessService, sessions: SessionMaker, clock: Clock
|
||||
) -> None:
|
||||
invite = await demo_svc.create_invite(ADMIN, demo=True)
|
||||
assert invite.max_uses == 3 and invite.expires_at == clock.now + timedelta(hours=2)
|
||||
|
||||
assert [await demo_svc.redeem(invite.token, guest(n)) for n in range(4)] == [RedeemStatus.OK] * 3 + [
|
||||
RedeemStatus.REJECTED
|
||||
]
|
||||
for n in range(3):
|
||||
member = await demo_svc.get_member(guest(n).tg_id)
|
||||
assert member is not None and member.guest and member.role is Role.MEMBER
|
||||
async with sessions() as s:
|
||||
stored = await s.scalar(select(Invite))
|
||||
assert stored is not None and stored.uses == 3
|
||||
assert await s.get(User, guest(3).tg_id) is None
|
||||
|
||||
|
||||
async def test_demo_invite_expires(demo_svc: AccessService, clock: Clock) -> None:
|
||||
invite = await demo_svc.create_invite(ADMIN, demo=True)
|
||||
clock.now += timedelta(hours=2, seconds=1)
|
||||
|
||||
assert await demo_svc.redeem(invite.token, guest(0)) is RedeemStatus.REJECTED
|
||||
|
||||
|
||||
async def test_personal_invite_is_not_a_guest_one(demo_svc: AccessService) -> None:
|
||||
invite = await demo_svc.create_invite(ADMIN)
|
||||
assert invite.max_uses == 1
|
||||
await demo_svc.redeem(invite.token, NEWBIE)
|
||||
|
||||
member = await demo_svc.get_member(NEWBIE.tg_id)
|
||||
assert member is not None and not member.guest
|
||||
|
||||
|
||||
async def test_revoke_guests_cuts_off_only_guests_and_kills_the_qr(demo_svc: AccessService) -> None:
|
||||
await demo_svc.redeem((await demo_svc.create_invite(ADMIN)).token, NEWBIE)
|
||||
demo = await demo_svc.create_invite(ADMIN, demo=True)
|
||||
for n in range(2):
|
||||
await demo_svc.redeem(demo.token, guest(n))
|
||||
|
||||
assert await demo_svc.revoke_guests() == 2
|
||||
|
||||
assert [m.tg_id for m in await demo_svc.list_members()] == [ADMIN, NEWBIE.tg_id]
|
||||
assert await demo_svc.redeem(demo.token, guest(2)) is RedeemStatus.REJECTED
|
||||
assert await demo_svc.revoke_guests() == 0
|
||||
|
||||
|
||||
async def test_guest_invited_personally_later_is_no_longer_a_guest(demo_svc: AccessService) -> None:
|
||||
await demo_svc.redeem((await demo_svc.create_invite(ADMIN, demo=True)).token, guest(0))
|
||||
await demo_svc.revoke_guests()
|
||||
|
||||
await demo_svc.redeem((await demo_svc.create_invite(ADMIN)).token, guest(0))
|
||||
|
||||
member = await demo_svc.get_member(guest(0).tg_id)
|
||||
assert member is not None and not member.guest
|
||||
|
||||
@@ -21,8 +21,8 @@ def tg(texts: Texts, sessions: SessionMaker, access: AccessService, repo: Upload
|
||||
return TgClient(build_dispatcher(texts, sessions, access, repo))
|
||||
|
||||
|
||||
async def invite_token(tg: TgClient) -> str:
|
||||
await tg.press(ADMIN, MembersCb(action=MembersAction.INVITE).pack())
|
||||
async def invite_token(tg: TgClient, action: MembersAction = MembersAction.INVITE) -> str:
|
||||
await tg.press(ADMIN, MembersCb(action=action).pack())
|
||||
[photo] = tg.session.sent(SendPhoto)
|
||||
match = re.search(r"https://t\.me/tgit_test_bot\?start=([A-Za-z0-9_-]+)", photo.caption or "")
|
||||
assert match, photo.caption
|
||||
@@ -93,3 +93,23 @@ async def test_cancel_revoke_returns_to_list(tg: TgClient, texts: Texts) -> None
|
||||
|
||||
[edit] = tg.session.sent(EditMessageText)
|
||||
assert edit.text.startswith(texts.members.title.format(count=1))
|
||||
|
||||
|
||||
async def test_demo_qr_lets_many_in_and_guests_are_revoked_together(tg: TgClient, texts: Texts) -> None:
|
||||
token = await invite_token(tg, MembersAction.DEMO_INVITE)
|
||||
|
||||
for n in range(3):
|
||||
await tg.send(NEWBIE + n, f"/start {token}")
|
||||
assert [r.text for r in tg.session.sent(SendMessage)] == [texts.start.welcome] * 3
|
||||
|
||||
tg.session.requests.clear()
|
||||
await tg.press(ADMIN, MembersCb(action=MembersAction.ASK_REVOKE_GUESTS).pack())
|
||||
await tg.press(ADMIN, MembersCb(action=MembersAction.REVOKE_GUESTS).pack())
|
||||
confirm, done = tg.session.sent(EditMessageText)
|
||||
assert confirm.text == texts.members.confirm_guests
|
||||
assert done.text.startswith(texts.members.guests_revoked.format(count=3))
|
||||
|
||||
tg.session.requests.clear()
|
||||
await tg.send(NEWBIE, texts.menu.commit)
|
||||
await tg.send(NEWBIE + 10, f"/start {token}")
|
||||
assert [r.text for r in tg.session.sent(SendMessage)] == [texts.start.no_access, texts.start.invite_rejected]
|
||||
|
||||
@@ -80,3 +80,24 @@ async def test_deleting_draft_cascades_to_changes(sessions: SessionMaker) -> Non
|
||||
await s.execute(text("DELETE FROM drafts"))
|
||||
async with sessions() as s:
|
||||
assert (await s.execute(text("SELECT count(*) FROM draft_changes"))).scalar_one() == 0
|
||||
|
||||
|
||||
async def test_0003_marks_redeemed_invites_spent() -> None:
|
||||
eng = make_engine("sqlite+aiosqlite://")
|
||||
try:
|
||||
await upgrade(eng, "0002")
|
||||
async with eng.begin() as conn:
|
||||
await conn.execute(INSERT_USER, {"id": 1, "role": "admin"})
|
||||
await conn.execute(
|
||||
text(
|
||||
"INSERT INTO invites (token_hash, created_by, created_at, expires_at, used_by) VALUES "
|
||||
"('a', 1, '2026-01-01', '2026-01-02', 1), ('b', 1, '2026-01-01', '2026-01-02', NULL)"
|
||||
)
|
||||
)
|
||||
await upgrade(eng)
|
||||
async with eng.connect() as conn:
|
||||
rows = (await conn.execute(text("SELECT token_hash, max_uses, uses FROM invites ORDER BY 1"))).all()
|
||||
assert [tuple(r) for r in rows] == [("a", 1, 1), ("b", 1, 0)]
|
||||
assert (await conn.execute(text("SELECT guest FROM users"))).scalar_one() in (0, False)
|
||||
finally:
|
||||
await eng.dispose()
|
||||
|
||||
Reference in New Issue
Block a user