whekin/household-bot
1
0
Fork 0
mirror of https://github.com/whekin/household-bot.git synced 2026-03-31 14:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(bot): restrict setup admin bootstrap

Browse Source
This commit is contained in:
whekin
2026-03-09 06:35:23 +04:00
parent d5872ede57
commit b23208af26
11 changed files with 117 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/bot/src/anonymous-feedback.test.ts
View File

@@ -148,6 +148,7 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
isAdmin: input.isAdmin === true
}),
getHouseholdMember: async () => null,
listHouseholdMembers: async () => [],
listHouseholdMembersByTelegramUserId: async () => [
{
id: 'member-123456',

1
apps/bot/src/miniapp-admin.test.ts
View File

@@ -64,6 +64,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
isAdmin: input.isAdmin === true
}),
getHouseholdMember: async () => null,
listHouseholdMembers: async () => [],
listHouseholdMembersByTelegramUserId: async () => [],
listPendingHouseholdMembers: async () => [
{

2
apps/bot/src/miniapp-auth.test.ts
View File

@@ -95,6 +95,8 @@ function onboardingRepository(): HouseholdConfigurationRepository {
return member
},
getHouseholdMember: async (_householdId, telegramUserId) => members.get(telegramUserId) ?? null,
listHouseholdMembers: async (householdId) =>
[...members.values()].filter((member) => member.householdId === householdId),
listHouseholdMembersByTelegramUserId: async (telegramUserId) => {
const member = members.get(telegramUserId)
return member ? [member] : []

1
apps/bot/src/miniapp-dashboard.test.ts
View File

@@ -121,6 +121,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
isAdmin: input.isAdmin === true
}),
getHouseholdMember: async () => null,
listHouseholdMembers: async () => [],
listHouseholdMembersByTelegramUserId: async () => [],
listPendingHouseholdMembers: async () => [],
approvePendingHouseholdMember: async () => null

16
packages/adapters-db/src/household-config-repository.ts
View File

@@ -595,6 +595,22 @@ export function createDbHouseholdConfigurationRepository(databaseUrl: string): {
return row ? toHouseholdMemberRecord(row) : null
},
async listHouseholdMembers(householdId) {
const rows = await db
.select({
id: schema.members.id,
householdId: schema.members.householdId,
telegramUserId: schema.members.telegramUserId,
displayName: schema.members.displayName,
isAdmin: schema.members.isAdmin
})
.from(schema.members)
.where(eq(schema.members.householdId, householdId))
.orderBy(schema.members.displayName, schema.members.telegramUserId)
return rows.map(toHouseholdMemberRecord)
},
async listHouseholdMembersByTelegramUserId(telegramUserId) {
const rows = await db
.select({

2
packages/application/src/household-admin-service.test.ts
View File

@@ -92,6 +92,8 @@ function createRepositoryStub() {
return record
},
getHouseholdMember: async (_householdId, telegramUserId) => members.get(telegramUserId) ?? null,
listHouseholdMembers: async (householdId) =>
[...members.values()].filter((member) => member.householdId === householdId),
listHouseholdMembersByTelegramUserId: async (telegramUserId) =>
[...members.values()].filter((member) => member.telegramUserId === telegramUserId),
listPendingHouseholdMembers: async () => [...pendingMembers.values()],

3
packages/application/src/household-onboarding-service.test.ts
View File

@@ -101,6 +101,9 @@ function createRepositoryStub() {
async getHouseholdMember(_householdId, telegramUserId) {
return members.get(telegramUserId) ?? null
},
async listHouseholdMembers(householdId) {
return [...members.values()].filter((member) => member.householdId === householdId)
},
async listHouseholdMembersByTelegramUserId(telegramUserId) {
const member = members.get(telegramUserId)
return member ? [member] : []

75
packages/application/src/household-setup-service.test.ts
View File

@@ -176,6 +176,10 @@ function createRepositoryStub() {
return members.get(`${householdId}:${telegramUserId}`) ?? null
},
async listHouseholdMembers(householdId) {
return [...members.values()].filter((member) => member.householdId === householdId)
},
async listHouseholdMembersByTelegramUserId(telegramUserId) {
return [...members.values()].filter((member) => member.telegramUserId === telegramUserId)
},
@@ -240,6 +244,77 @@ describe('createHouseholdSetupService', () => {
})
})
test('ensures the actor becomes admin when rerunning setup for an existing household with no admins', async () => {
const { repository } = createRepositoryStub()
const service = createHouseholdSetupService(repository)
await service.setupGroupChat({
actorIsAdmin: true,
telegramChatId: '-100123',
telegramChatType: 'supergroup',
title: 'Kojori House'
})
const result = await service.setupGroupChat({
actorIsAdmin: true,
actorTelegramUserId: '77',
actorDisplayName: 'Mia',
telegramChatId: '-100123',
telegramChatType: 'supergroup',
title: 'Kojori House'
})
expect(result.status).toBe('existing')
if (result.status !== 'existing') {
return
}
const admin = await repository.getHouseholdMember(result.household.householdId, '77')
expect(admin).toEqual({
id: 'member-77',
householdId: result.household.householdId,
telegramUserId: '77',
displayName: 'Mia',
isAdmin: true
})
})
test('does not grant admin when rerunning setup for an existing household that already has admins', async () => {
const { repository } = createRepositoryStub()
const service = createHouseholdSetupService(repository)
const created = await service.setupGroupChat({
actorIsAdmin: true,
actorTelegramUserId: '42',
actorDisplayName: 'Stan',
telegramChatId: '-100123',
telegramChatType: 'supergroup',
title: 'Kojori House'
})
expect(created.status).toBe('created')
if (created.status !== 'created') {
return
}
const result = await service.setupGroupChat({
actorIsAdmin: true,
actorTelegramUserId: '77',
actorDisplayName: 'Mia',
telegramChatId: '-100123',
telegramChatType: 'supergroup',
title: 'Kojori House'
})
expect(result.status).toBe('existing')
if (result.status !== 'existing') {
return
}
const admin = await repository.getHouseholdMember(result.household.householdId, '77')
expect(admin).toBeNull()
})
test('rejects setup when the actor is not a group admin', async () => {
const { repository } = createRepositoryStub()
const service = createHouseholdSetupService(repository)

21
packages/application/src/household-setup-service.ts
View File

@@ -85,13 +85,20 @@ export function createHouseholdSetupService(
: {})
})
if (registered.status === 'created' && input.actorTelegramUserId && input.actorDisplayName) {
await repository.ensureHouseholdMember({
householdId: registered.household.householdId,
telegramUserId: input.actorTelegramUserId,
displayName: input.actorDisplayName,
isAdmin: true
})
if (input.actorTelegramUserId && input.actorDisplayName) {
const existingMembers = await repository.listHouseholdMembers(
registered.household.householdId
)
const hasAdmin = existingMembers.some((member) => member.isAdmin)
if (registered.status === 'created' || !hasAdmin) {
await repository.ensureHouseholdMember({
householdId: registered.household.householdId,
telegramUserId: input.actorTelegramUserId,
displayName: input.actorDisplayName,
isAdmin: true
})
}
}
return {

1
packages/application/src/miniapp-admin-service.test.ts
View File

@@ -53,6 +53,7 @@ function repository(): HouseholdConfigurationRepository {
isAdmin: input.isAdmin === true
}),
getHouseholdMember: async () => null,
listHouseholdMembers: async () => [],
listHouseholdMembersByTelegramUserId: async () => [],
listPendingHouseholdMembers: async () => [
{

1
packages/ports/src/household-config.ts
View File

@@ -105,6 +105,7 @@ export interface HouseholdConfigurationRepository {
householdId: string,
telegramUserId: string
): Promise<HouseholdMemberRecord | null>
listHouseholdMembers(householdId: string): Promise<readonly HouseholdMemberRecord[]>
listHouseholdMembersByTelegramUserId(
telegramUserId: string
): Promise<readonly HouseholdMemberRecord[]>