mirror of
https://github.com/djdevin/recflare.git
synced 2026-09-08 22:51:30 -07:00
getting clubs semiworking
This commit is contained in:
Devin Zuczek
@@ -19,6 +19,21 @@ beforeAll(async () => {
|
||||
await adminSecretsStore(env.JWT_SECRET).create('test-signing-key')
|
||||
// Build the club / club_member tables (mirrors the migration).
|
||||
for (const stmt of SCHEMA_DDL) await env.DB.prepare(stmt).run()
|
||||
|
||||
// Accounts table (owned by the auth worker) — a player's home club is a field on
|
||||
// their account row, so /club/home/me reads and writes it here.
|
||||
await env.DB.prepare(
|
||||
`CREATE TABLE IF NOT EXISTS account (
|
||||
data TEXT NOT NULL,
|
||||
account_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.accountId')) VIRTUAL
|
||||
)`
|
||||
).run()
|
||||
const insertAccount = env.DB.prepare('INSERT OR IGNORE INTO account (data) VALUES (?1)')
|
||||
await env.DB.batch(
|
||||
[42, 9100, 9101].map((accountId) =>
|
||||
insertAccount.bind(JSON.stringify({ accountId, username: `Player${accountId}` }))
|
||||
)
|
||||
)
|
||||
})
|
||||
|
||||
// Mint a token the way the `auth` worker does, signing with the shared test key seeded into the JWT_SECRET store.
|
||||
@@ -53,10 +68,10 @@ describe('clubs endpoints', () => {
|
||||
expect(res.status).toBe(401)
|
||||
})
|
||||
|
||||
test('GET /club/home/me returns an empty object with a valid token', async () => {
|
||||
test('GET /club/home/me 404s when the player has no home club', async () => {
|
||||
// The client expects a 404 here, and errors on an empty object.
|
||||
const res = await exports.default.fetch(`${ORIGIN}/club/home/me`, { headers: await bearer() })
|
||||
expect(res.status).toBe(200)
|
||||
expect(await res.json()).toEqual({})
|
||||
expect(res.status).toBe(404)
|
||||
})
|
||||
|
||||
test('GET /subscription/mine/member returns an empty array without a token', async () => {
|
||||
@@ -90,8 +105,12 @@ describe('clubs endpoints', () => {
|
||||
expect(await res.json()).toEqual([])
|
||||
})
|
||||
|
||||
test('GET /club/mine/member is auth-gated and lists the caller’s clubs', async () => {
|
||||
expect((await exports.default.fetch(`${ORIGIN}/club/mine/member`)).status).toBe(401)
|
||||
test('GET /club/mine/member lists the caller’s clubs; signed out is an empty list', async () => {
|
||||
// Signed out is "no clubs", not an error — a 401 here breaks the client's shelf.
|
||||
const anon = await exports.default.fetch(`${ORIGIN}/club/mine/member`)
|
||||
expect(anon.status).toBe(200)
|
||||
expect(await anon.json()).toEqual([])
|
||||
|
||||
const res = await exports.default.fetch(`${ORIGIN}/club/mine/member`, {
|
||||
headers: await bearer('4242'),
|
||||
})
|
||||
@@ -99,6 +118,643 @@ describe('clubs endpoints', () => {
|
||||
expect(await res.json()).toEqual([])
|
||||
})
|
||||
|
||||
test('GET /club/mine/created returns an empty list when signed out', async () => {
|
||||
const res = await exports.default.fetch(`${ORIGIN}/club/mine/created`)
|
||||
expect(res.status).toBe(200)
|
||||
expect(await res.json()).toEqual([])
|
||||
})
|
||||
|
||||
test('the my-clubs lists exclude subscription clubs (ClubType 1)', async () => {
|
||||
// A subscription club the player both created and is a member of. It's reached
|
||||
// through /subscription/*, so it must not show up among their clubs.
|
||||
const club = {
|
||||
ClubId: 9001,
|
||||
Name: 'Subscribers',
|
||||
Description: '',
|
||||
Category: '',
|
||||
Visibility: 1,
|
||||
Joinability: 0,
|
||||
AllowJuniors: true,
|
||||
MainImageName: '',
|
||||
ClubType: 1,
|
||||
ClubhouseRoomId: null,
|
||||
CreatorAccountId: 4343,
|
||||
IsRRO: false,
|
||||
MinLevel: 0,
|
||||
State: 0,
|
||||
MemberCount: 1,
|
||||
CreatedAt: '2026-07-01T00:00:00Z',
|
||||
}
|
||||
await env.DB.prepare('INSERT INTO club (data) VALUES (?1)').bind(JSON.stringify(club)).run()
|
||||
await env.DB.prepare(
|
||||
'INSERT INTO club_member (club_id, account_id, membership_type, created_at) VALUES (?1, ?2, ?3, ?4)'
|
||||
)
|
||||
.bind(9001, 4343, 100, '2026-07-01T00:00:00Z')
|
||||
.run()
|
||||
|
||||
const created = await exports.default.fetch(`${ORIGIN}/club/mine/created`, {
|
||||
headers: await bearer('4343'),
|
||||
})
|
||||
expect(await created.json()).toEqual([])
|
||||
const member = await exports.default.fetch(`${ORIGIN}/club/mine/member`, {
|
||||
headers: await bearer('4343'),
|
||||
})
|
||||
expect(await member.json()).toEqual([])
|
||||
})
|
||||
|
||||
test('POST /club/create takes the client’s lowercase form and answers the envelope', async () => {
|
||||
// The exact request the client sends: lowercase name/description/category.
|
||||
const res = await exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
...(await bearer('5000')),
|
||||
'Content-Type': 'application/x-www-form-urlencoded',
|
||||
},
|
||||
body: 'name=clubz&description=da%20best%20club&category=Creative',
|
||||
})
|
||||
expect(res.status).toBe(200)
|
||||
const body = (await res.json()) as {
|
||||
error: string
|
||||
success: boolean
|
||||
value: {
|
||||
Club: { Name: string; Description: string; Category: string; CreatorAccountId: number }
|
||||
ClubId: number
|
||||
CustomTags: string[]
|
||||
AdditionalImages: unknown[]
|
||||
MyMembershipType: number
|
||||
CoownerPermissions: { Type: number; EditDetails: boolean }
|
||||
ModeratorPermissions: { Type: number; BanUnban: boolean; EditDetails: boolean }
|
||||
MemberPermissions: { Type: number; BanUnban: boolean }
|
||||
}
|
||||
}
|
||||
expect(body.error).toBe('')
|
||||
expect(body.success).toBe(true)
|
||||
expect(body.value.Club).toMatchObject({
|
||||
Name: 'clubz',
|
||||
Description: 'da best club',
|
||||
Category: 'Creative',
|
||||
CreatorAccountId: 5000,
|
||||
})
|
||||
expect(body.value.ClubId).toBeGreaterThan(0)
|
||||
expect(body.value.MyMembershipType).toBe(100) // creator
|
||||
expect(body.value.CustomTags).toEqual([])
|
||||
expect(body.value.AdditionalImages).toEqual([])
|
||||
// Co-owners get everything, moderators approve/ban only, members nothing.
|
||||
expect(body.value.CoownerPermissions).toMatchObject({ Type: 30, EditDetails: true })
|
||||
expect(body.value.ModeratorPermissions).toMatchObject({
|
||||
Type: 20,
|
||||
BanUnban: true,
|
||||
EditDetails: false,
|
||||
})
|
||||
expect(body.value.MemberPermissions).toMatchObject({ Type: 10, BanUnban: false })
|
||||
})
|
||||
|
||||
test('POST /club/create defaults the category and rejects bad names', async () => {
|
||||
const create = async (fields: Record<string, string>): Promise<Response> =>
|
||||
exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
...(await bearer('5001')),
|
||||
'Content-Type': 'application/x-www-form-urlencoded',
|
||||
},
|
||||
body: new URLSearchParams(fields).toString(),
|
||||
})
|
||||
|
||||
// No category → Social.
|
||||
const defaulted = (await (await create({ name: 'Catless' })).json()) as {
|
||||
value: { Club: { Category: string } }
|
||||
}
|
||||
expect(defaulted.value.Club.Category).toBe('Social')
|
||||
|
||||
// Emoji and other non-Latin scripts are rejected; the error rides the envelope.
|
||||
const emoji = await create({ name: 'club 🎉' })
|
||||
expect(emoji.status).toBe(400)
|
||||
expect(await emoji.json()).toMatchObject({ success: false, value: null })
|
||||
|
||||
// Names cap at 16 characters.
|
||||
expect((await create({ name: 'a'.repeat(17) })).status).toBe(400)
|
||||
expect((await create({ name: 'a'.repeat(16) })).status).toBe(200)
|
||||
|
||||
// Basic punctuation is allowed.
|
||||
expect((await create({ name: "Bob's Club (2)" })).status).toBe(200)
|
||||
})
|
||||
|
||||
test('PUT /club/:id/modifydetails edits the club, co-owner only', async () => {
|
||||
type Details = {
|
||||
error: string
|
||||
success: boolean
|
||||
value: {
|
||||
Club: {
|
||||
Visibility: number
|
||||
Joinability: number
|
||||
AllowJuniors: boolean
|
||||
Name: string
|
||||
Description: string
|
||||
}
|
||||
CustomTags: string[]
|
||||
}
|
||||
}
|
||||
const create = await exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer('6000')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'name=Editable&description=before',
|
||||
})
|
||||
const clubId = ((await create.json()) as { value: { ClubId: number } }).value.ClubId
|
||||
|
||||
const modify = async (body: string, sub = '6000'): Promise<Response> =>
|
||||
exports.default.fetch(`${ORIGIN}/club/${clubId}/modifydetails`, {
|
||||
method: 'PUT',
|
||||
headers: { ...(await bearer(sub)), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body,
|
||||
})
|
||||
|
||||
// The client's exact request: enums by name, and a custom tag.
|
||||
const res = await modify('visibility=Public&joinability=Open&allowJuniors=True&customTags=devi')
|
||||
expect(res.status).toBe(200)
|
||||
const body = (await res.json()) as Details
|
||||
expect(body).toMatchObject({ error: '', success: true })
|
||||
expect(body.value.Club).toMatchObject({
|
||||
Visibility: 1, // Public
|
||||
Joinability: 0, // Open
|
||||
AllowJuniors: true,
|
||||
// Fields the request didn't mention are untouched.
|
||||
Name: 'Editable',
|
||||
Description: 'before',
|
||||
})
|
||||
expect(body.value.CustomTags).toEqual(['devi'])
|
||||
|
||||
// The other enum spellings land on the right numbers.
|
||||
const priv = (await (
|
||||
await modify('visibility=Private&joinability=AskToJoin&allowJuniors=False')
|
||||
).json()) as Details
|
||||
expect(priv.value.Club).toMatchObject({
|
||||
Visibility: 0,
|
||||
Joinability: 2,
|
||||
AllowJuniors: false,
|
||||
})
|
||||
const invite = (await (await modify('joinability=InviteOnly')).json()) as Details
|
||||
expect(invite.value.Club.Joinability).toBe(1)
|
||||
|
||||
// customTags replaces the set wholesale, de-duplicated case-insensitively.
|
||||
const retagged = (await (
|
||||
await modify('customTags=Alpha&customTags=alpha&customTags=Beta')
|
||||
).json()) as Details
|
||||
expect(retagged.value.CustomTags).toEqual(['Alpha', 'Beta'])
|
||||
// Omitting customTags leaves the existing tags alone.
|
||||
const untouched = (await (await modify('category=Social')).json()) as Details
|
||||
expect(untouched.value.CustomTags).toEqual(['Alpha', 'Beta'])
|
||||
|
||||
// A plain member can't edit; a non-member can't either; signed out is a 401.
|
||||
await exports.default.fetch(`${ORIGIN}/club/${clubId}/join`, {
|
||||
method: 'POST',
|
||||
headers: await bearer('6001'),
|
||||
})
|
||||
expect((await modify('name=Hijacked', '6001')).status).toBe(403)
|
||||
expect((await modify('name=Hijacked', '6002')).status).toBe(403)
|
||||
const anon = await exports.default.fetch(`${ORIGIN}/club/${clubId}/modifydetails`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'name=Hijacked',
|
||||
})
|
||||
expect(anon.status).toBe(401)
|
||||
|
||||
// Editing a club that doesn't exist 404s.
|
||||
const missing = await exports.default.fetch(`${ORIGIN}/club/99999/modifydetails`, {
|
||||
method: 'PUT',
|
||||
headers: { ...(await bearer('6000')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'name=Ghost',
|
||||
})
|
||||
expect(missing.status).toBe(404)
|
||||
})
|
||||
|
||||
test('GET/PUT /club/:id/mainimage reads and sets the club image, co-owner only', async () => {
|
||||
type Details = { error: string; success: boolean; value: { Club: { MainImageName: string } } }
|
||||
const create = await exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer('7000')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'name=Picturesque',
|
||||
})
|
||||
const clubId = ((await create.json()) as { value: { ClubId: number } }).value.ClubId
|
||||
|
||||
// GET reads the current image (the create default) without auth.
|
||||
const read = await exports.default.fetch(`${ORIGIN}/club/${clubId}/mainimage`)
|
||||
expect(read.status).toBe(200)
|
||||
expect(((await read.json()) as Details).value.Club.MainImageName).toBe('DefaultImgPurple')
|
||||
|
||||
// PUT sets it from an uploaded image's name.
|
||||
const put = async (body: string, sub = '7000'): Promise<Response> =>
|
||||
exports.default.fetch(`${ORIGIN}/club/${clubId}/mainimage`, {
|
||||
method: 'PUT',
|
||||
headers: { ...(await bearer(sub)), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body,
|
||||
})
|
||||
const set = await put('imageName=2026-07-12%2Fclub.jpg')
|
||||
expect(set.status).toBe(200)
|
||||
const body = (await set.json()) as Details
|
||||
expect(body).toMatchObject({ error: '', success: true })
|
||||
expect(body.value.Club.MainImageName).toBe('2026-07-12/club.jpg')
|
||||
|
||||
// It sticks, and the GET reflects it.
|
||||
const reread = await exports.default.fetch(`${ORIGIN}/club/${clubId}/mainimage`)
|
||||
expect(((await reread.json()) as Details).value.Club.MainImageName).toBe('2026-07-12/club.jpg')
|
||||
|
||||
// imageName is required; non-co-owners can't set it; signed out is a 401.
|
||||
expect((await put('')).status).toBe(400)
|
||||
expect((await put('imageName=x.jpg', '7001')).status).toBe(403)
|
||||
const anon = await exports.default.fetch(`${ORIGIN}/club/${clubId}/mainimage`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'imageName=x.jpg',
|
||||
})
|
||||
expect(anon.status).toBe(401)
|
||||
|
||||
// An unknown club 404s on both verbs.
|
||||
expect((await exports.default.fetch(`${ORIGIN}/club/99999/mainimage`)).status).toBe(404)
|
||||
})
|
||||
|
||||
test('GET /club/:id/members filters by membershipType and sorts', async () => {
|
||||
type Member = {
|
||||
ClubMemberId: number
|
||||
ClubId: number
|
||||
AccountId: number
|
||||
MembershipType: number
|
||||
}
|
||||
type Body = { error: string; success: boolean; value: Member[] }
|
||||
|
||||
const create = await exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer('8000')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'name=Crowded',
|
||||
})
|
||||
const clubId = ((await create.json()) as { value: { ClubId: number } }).value.ClubId
|
||||
|
||||
// 8002 then 8001 join as plain members (Member = 10); 8000 is the Creator (100).
|
||||
for (const sub of ['8002', '8001']) {
|
||||
await exports.default.fetch(`${ORIGIN}/club/${clubId}/join`, {
|
||||
method: 'POST',
|
||||
headers: await bearer(sub),
|
||||
})
|
||||
}
|
||||
const members = async (query = ''): Promise<Body> => {
|
||||
const res = await exports.default.fetch(`${ORIGIN}/club/${clubId}/members${query}`)
|
||||
expect(res.status).toBe(200)
|
||||
return (await res.json()) as Body
|
||||
}
|
||||
|
||||
// Default order: highest tier first, then oldest membership.
|
||||
const all = await members()
|
||||
expect(all).toMatchObject({ error: '', success: true })
|
||||
expect(all.value.map((m) => m.AccountId)).toEqual([8000, 8002, 8001])
|
||||
expect(all.value[0]).toMatchObject({ ClubId: clubId, MembershipType: 100 })
|
||||
|
||||
// sortBy=1 orders by account id; sortBy=2 by join time.
|
||||
expect((await members('?sortBy=1')).value.map((m) => m.AccountId)).toEqual([8000, 8001, 8002])
|
||||
expect((await members('?sortBy=2')).value.map((m) => m.AccountId)).toEqual([8000, 8002, 8001])
|
||||
|
||||
// membershipType is an exact match, not a threshold.
|
||||
expect((await members('?membershipType=10')).value.map((m) => m.AccountId)).toEqual([
|
||||
8002, 8001,
|
||||
])
|
||||
expect((await members('?membershipType=100')).value.map((m) => m.AccountId)).toEqual([8000])
|
||||
// The client's request: co-owners only — nobody holds that tier here.
|
||||
expect((await members('?membershipType=30&sortBy=0')).value).toEqual([])
|
||||
|
||||
// An unknown club is an empty list, not a 404.
|
||||
const ghost = await exports.default.fetch(`${ORIGIN}/club/99999/members`)
|
||||
expect(ghost.status).toBe(200)
|
||||
expect(((await ghost.json()) as Body).value).toEqual([])
|
||||
})
|
||||
|
||||
test('GET /club/:id/hasDisabledClubChat reports chat enabled', async () => {
|
||||
// Nothing can disable club chat yet → always false, for any club.
|
||||
const res = await exports.default.fetch(`${ORIGIN}/club/1/hasDisabledClubChat`)
|
||||
expect(res.status).toBe(200)
|
||||
expect(await res.json()).toBe(false)
|
||||
})
|
||||
|
||||
test('PUT /club/home/me sets the home club; GET serves it once it has a clubhouse', async () => {
|
||||
type Club = { ClubId: number; ClubhouseRoomId: number | null }
|
||||
const form = async (path: string, method: string, body: string, sub: string) =>
|
||||
exports.default.fetch(`${ORIGIN}${path}`, {
|
||||
method,
|
||||
headers: { ...(await bearer(sub)), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body,
|
||||
})
|
||||
|
||||
const create = await exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer('9100')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'name=Homely',
|
||||
})
|
||||
const clubId = ((await create.json()) as { value: { ClubId: number } }).value.ClubId
|
||||
|
||||
// No home club yet → 404.
|
||||
const before = await exports.default.fetch(`${ORIGIN}/club/home/me`, {
|
||||
headers: await bearer('9100'),
|
||||
})
|
||||
expect(before.status).toBe(404)
|
||||
|
||||
// You must be a member of the club you're making your home.
|
||||
expect((await form('/club/home/me', 'PUT', `clubId=${clubId}`, '9101')).status).toBe(403)
|
||||
// A missing/zero clubId is a 400, an unknown club a 404.
|
||||
expect((await form('/club/home/me', 'PUT', 'clubId=0', '9100')).status).toBe(400)
|
||||
expect((await form('/club/home/me', 'PUT', 'clubId=99999', '9100')).status).toBe(404)
|
||||
|
||||
const set = await form('/club/home/me', 'PUT', `clubId=${clubId}`, '9100')
|
||||
expect(set.status).toBe(200)
|
||||
expect(await set.json()).toMatchObject({ error: '', success: true })
|
||||
|
||||
// The club has no clubhouse room yet, so there's still nowhere to spawn → 404.
|
||||
const noClubhouse = await exports.default.fetch(`${ORIGIN}/club/home/me`, {
|
||||
headers: await bearer('9100'),
|
||||
})
|
||||
expect(noClubhouse.status).toBe(404)
|
||||
|
||||
// Give it a clubhouse → the home club now resolves.
|
||||
const clubhouse = await form(`/club/${clubId}/clubhouse`, 'PUT', 'roomId=77', '9100')
|
||||
expect(clubhouse.status).toBe(200)
|
||||
expect(await clubhouse.json()).toEqual({ error: '', success: true, value: null })
|
||||
|
||||
const home = await exports.default.fetch(`${ORIGIN}/club/home/me`, {
|
||||
headers: await bearer('9100'),
|
||||
})
|
||||
expect((await home.json()) as Club).toMatchObject({ ClubId: clubId, ClubhouseRoomId: 77 })
|
||||
|
||||
// Clearing the clubhouse takes the home club away again.
|
||||
await form(`/club/${clubId}/clubhouse`, 'PUT', '', '9100')
|
||||
const cleared = await exports.default.fetch(`${ORIGIN}/club/home/me`, {
|
||||
headers: await bearer('9100'),
|
||||
})
|
||||
expect(cleared.status).toBe(404)
|
||||
|
||||
// Only co-owners may set the clubhouse; signed out is a 401 on both.
|
||||
expect((await form(`/club/${clubId}/clubhouse`, 'PUT', 'roomId=1', '9101')).status).toBe(403)
|
||||
const anon = await exports.default.fetch(`${ORIGIN}/club/home/me`, { method: 'PUT' })
|
||||
expect(anon.status).toBe(401)
|
||||
})
|
||||
|
||||
test('GET /club/search filters by category/query and sorts', async () => {
|
||||
type Result = {
|
||||
Clubs: Array<{ ClubId: number; Name: string; Category: string }>
|
||||
ContinuationToken: null
|
||||
TotalClubs: number
|
||||
}
|
||||
const create = async (fields: Record<string, string>, sub: string): Promise<number> => {
|
||||
const res = await exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer(sub)), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: new URLSearchParams(fields).toString(),
|
||||
})
|
||||
return ((await res.json()) as { value: { ClubId: number } }).value.ClubId
|
||||
}
|
||||
const search = async (query: string): Promise<Result> => {
|
||||
const res = await exports.default.fetch(`${ORIGIN}/club/search?${query}`)
|
||||
expect(res.status).toBe(200)
|
||||
return (await res.json()) as Result
|
||||
}
|
||||
|
||||
// Own category, so clubs the other tests created (which default to Social) don't
|
||||
// wander into these assertions. The second club gains a member, so it outranks
|
||||
// the first on the default sort.
|
||||
const alpha = await create({ name: 'Chess Fans', category: 'Boardgames' }, '9200')
|
||||
const beta = await create(
|
||||
{ name: 'Board Gamers', description: 'we love chess', category: 'Boardgames' },
|
||||
'9201'
|
||||
)
|
||||
await create({ name: 'Painters', category: 'Creative' }, '9202')
|
||||
await exports.default.fetch(`${ORIGIN}/club/${beta}/join`, {
|
||||
method: 'POST',
|
||||
headers: await bearer('9203'),
|
||||
})
|
||||
|
||||
// Default sort → most members first. Category filters out the Creative club.
|
||||
const listed = await search('sort=0&category=Boardgames&count=32')
|
||||
expect(listed.ContinuationToken).toBeNull()
|
||||
expect(listed.Clubs.map((c) => c.ClubId)).toEqual([beta, alpha])
|
||||
expect(listed.TotalClubs).toBe(2)
|
||||
expect(listed.Clubs.every((c) => c.Category === 'Boardgames')).toBe(true)
|
||||
|
||||
// sort=2 orders by name.
|
||||
expect((await search('sort=2&category=Boardgames')).Clubs.map((c) => c.Name)).toEqual([
|
||||
'Board Gamers',
|
||||
'Chess Fans',
|
||||
])
|
||||
|
||||
// `query` matches the name or the description.
|
||||
const chess = await search('query=chess&category=Boardgames')
|
||||
expect(chess.Clubs.map((c) => c.ClubId).sort()).toEqual([alpha, beta].sort())
|
||||
expect((await search('query=nomatch')).Clubs).toEqual([])
|
||||
|
||||
// `count` caps the page, but TotalClubs reports the full match count.
|
||||
const capped = await search('category=Boardgames&count=1')
|
||||
expect(capped.Clubs).toHaveLength(1)
|
||||
expect(capped.TotalClubs).toBe(2)
|
||||
|
||||
// Private clubs never show up in search.
|
||||
await exports.default.fetch(`${ORIGIN}/club/${alpha}/modifydetails`, {
|
||||
method: 'PUT',
|
||||
headers: { ...(await bearer('9200')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'visibility=Private',
|
||||
})
|
||||
expect((await search('category=Boardgames')).Clubs.map((c) => c.ClubId)).toEqual([beta])
|
||||
|
||||
// The client's own request shape still answers cleanly.
|
||||
const clientRequest = await search('sort=0&category=Social&count=32')
|
||||
expect(clientRequest.ContinuationToken).toBeNull()
|
||||
expect(clientRequest.TotalClubs).toBeGreaterThanOrEqual(clientRequest.Clubs.length)
|
||||
expect(clientRequest.Clubs.every((c) => c.Category === 'Social')).toBe(true)
|
||||
})
|
||||
|
||||
test('GET /club/:id/details serves the bare details object', async () => {
|
||||
type Details = {
|
||||
Club: { ClubId: number; Name: string }
|
||||
ClubId: number
|
||||
CustomTags: string[]
|
||||
AdditionalImages: unknown[]
|
||||
MyMembershipType: number
|
||||
CoownerPermissions: { Type: number }
|
||||
ModeratorPermissions: { Type: number }
|
||||
MemberPermissions: { Type: number }
|
||||
}
|
||||
const create = await exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer('9300')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'name=Detailed',
|
||||
})
|
||||
const clubId = ((await create.json()) as { value: { ClubId: number } }).value.ClubId
|
||||
await exports.default.fetch(`${ORIGIN}/club/${clubId}/modifydetails`, {
|
||||
method: 'PUT',
|
||||
headers: { ...(await bearer('9300')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'customTags=tagged',
|
||||
})
|
||||
|
||||
// Not enveloped — the details object is the whole body.
|
||||
const res = await exports.default.fetch(`${ORIGIN}/club/${clubId}/details`, {
|
||||
headers: await bearer('9300'),
|
||||
})
|
||||
expect(res.status).toBe(200)
|
||||
const body = (await res.json()) as Details & { success?: boolean; value?: unknown }
|
||||
expect(body.success).toBeUndefined()
|
||||
expect(body.value).toBeUndefined()
|
||||
expect(body.Club).toMatchObject({ ClubId: clubId, Name: 'Detailed' })
|
||||
expect(body.ClubId).toBe(clubId)
|
||||
expect(body.CustomTags).toEqual(['tagged'])
|
||||
expect(body.AdditionalImages).toEqual([])
|
||||
expect(body.MyMembershipType).toBe(100) // the creator
|
||||
expect(body.CoownerPermissions.Type).toBe(30)
|
||||
expect(body.ModeratorPermissions.Type).toBe(20)
|
||||
expect(body.MemberPermissions.Type).toBe(10)
|
||||
|
||||
// Public: a signed-out viewer sees the club with no membership of their own.
|
||||
const anon = await exports.default.fetch(`${ORIGIN}/club/${clubId}/details`)
|
||||
expect(((await anon.json()) as Details).MyMembershipType).toBe(0)
|
||||
|
||||
// An unknown club 404s.
|
||||
expect((await exports.default.fetch(`${ORIGIN}/club/99999/details`)).status).toBe(404)
|
||||
})
|
||||
|
||||
test('GET/POST /announcements/club/:id serves and posts the noticeboard', async () => {
|
||||
type Announcement = {
|
||||
AnnouncementId: number
|
||||
Title: string
|
||||
Body: string
|
||||
AccountId: number
|
||||
ImageName: string
|
||||
Meta: string
|
||||
}
|
||||
type Board = {
|
||||
error: string
|
||||
success: boolean
|
||||
value: {
|
||||
Announcements: Announcement[]
|
||||
ClubId: number
|
||||
LastAnnouncementId: number | null
|
||||
LastReadAnnouncementId: number
|
||||
}
|
||||
}
|
||||
const create = await exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer('9400')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'name=Newsy',
|
||||
})
|
||||
const clubId = ((await create.json()) as { value: { ClubId: number } }).value.ClubId
|
||||
const board = async (): Promise<Board> => {
|
||||
const res = await exports.default.fetch(`${ORIGIN}/announcements/club/${clubId}`)
|
||||
expect(res.status).toBe(200)
|
||||
return (await res.json()) as Board
|
||||
}
|
||||
const post = async (body: string, sub = '9400'): Promise<Response> =>
|
||||
exports.default.fetch(`${ORIGIN}/announcements/club/${clubId}`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer(sub)), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body,
|
||||
})
|
||||
|
||||
// An empty board: no announcements, and no "last" one.
|
||||
const empty = await board()
|
||||
expect(empty).toMatchObject({ error: '', success: true })
|
||||
expect(empty.value).toMatchObject({
|
||||
Announcements: [],
|
||||
ClubId: clubId,
|
||||
LastAnnouncementId: null,
|
||||
LastReadAnnouncementId: 0,
|
||||
})
|
||||
|
||||
// Posting returns the new announcement's id in the envelope.
|
||||
const first = await post('title=Hello&body=First+post')
|
||||
expect(first.status).toBe(200)
|
||||
const firstId = ((await first.json()) as { value: number }).value
|
||||
expect(firstId).toBeGreaterThan(0)
|
||||
const secondId = ((await (await post('title=Again&body=Second')).json()) as { value: number })
|
||||
.value
|
||||
|
||||
// Newest first, and LastAnnouncementId points at it.
|
||||
const posted = await board()
|
||||
expect(posted.value.Announcements.map((a) => a.AnnouncementId)).toEqual([secondId, firstId])
|
||||
expect(posted.value.LastAnnouncementId).toBe(secondId)
|
||||
expect(posted.value.Announcements[0]).toMatchObject({
|
||||
Title: 'Again',
|
||||
Body: 'Second',
|
||||
AccountId: 9400,
|
||||
})
|
||||
|
||||
// The client's exact post: an image name plus a `meta` JSON string, which is
|
||||
// stored verbatim (it's an opaque blob to us, not something we re-serialize).
|
||||
const real = await post(
|
||||
'title=wooo&body=test&imageName=DefaultClubImage2k.jpg&meta=%7B%22Type%22%3A0%2C%22JsonData%22%3A%22%22%7D'
|
||||
)
|
||||
expect(real.status).toBe(200)
|
||||
const realId = ((await real.json()) as { value: number }).value
|
||||
const withMeta = (await board()).value.Announcements.find((a) => a.AnnouncementId === realId)
|
||||
expect(withMeta).toMatchObject({
|
||||
Title: 'wooo',
|
||||
Body: 'test',
|
||||
ImageName: 'DefaultClubImage2k.jpg',
|
||||
Meta: '{"Type":0,"JsonData":""}',
|
||||
})
|
||||
|
||||
// Only co-owners may post; signed out is a 401; an unknown club 404s.
|
||||
expect((await post('title=Nope', '9401')).status).toBe(403)
|
||||
const anon = await exports.default.fetch(`${ORIGIN}/announcements/club/${clubId}`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'title=Nope',
|
||||
})
|
||||
expect(anon.status).toBe(401)
|
||||
const missing = await exports.default.fetch(`${ORIGIN}/announcements/club/99999`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer('9400')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'title=Ghost',
|
||||
})
|
||||
expect(missing.status).toBe(404)
|
||||
})
|
||||
|
||||
test('PUT /club/:id/minlevel sets the join level, co-owner only', async () => {
|
||||
type Details = { error: string; success: boolean; value: { Club: { MinLevel: number } } }
|
||||
const create = await exports.default.fetch(`${ORIGIN}/club/create`, {
|
||||
method: 'POST',
|
||||
headers: { ...(await bearer('9500')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'name=Gated',
|
||||
})
|
||||
const clubId = ((await create.json()) as { value: { ClubId: number } }).value.ClubId
|
||||
const put = async (body: string, sub = '9500'): Promise<Response> =>
|
||||
exports.default.fetch(`${ORIGIN}/club/${clubId}/minlevel`, {
|
||||
method: 'PUT',
|
||||
headers: { ...(await bearer(sub)), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body,
|
||||
})
|
||||
|
||||
const res = await put('minLevel=5')
|
||||
expect(res.status).toBe(200)
|
||||
const body = (await res.json()) as Details
|
||||
expect(body).toMatchObject({ error: '', success: true })
|
||||
expect(body.value.Club.MinLevel).toBe(5)
|
||||
|
||||
// It sticks on the club.
|
||||
const details = await exports.default.fetch(`${ORIGIN}/club/${clubId}/details`)
|
||||
expect(((await details.json()) as { Club: { MinLevel: number } }).Club.MinLevel).toBe(5)
|
||||
|
||||
// Zero is valid (no level requirement); garbage and negatives are not.
|
||||
expect((await put('minLevel=0')).status).toBe(200)
|
||||
expect((await put('minLevel=abc')).status).toBe(400)
|
||||
expect((await put('minLevel=-1')).status).toBe(400)
|
||||
|
||||
// Non-co-owners can't; signed out is a 401; an unknown club 404s.
|
||||
expect((await put('minLevel=5', '9501')).status).toBe(403)
|
||||
const anon = await exports.default.fetch(`${ORIGIN}/club/${clubId}/minlevel`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'minLevel=5',
|
||||
})
|
||||
expect(anon.status).toBe(401)
|
||||
const missing = await exports.default.fetch(`${ORIGIN}/club/99999/minlevel`, {
|
||||
method: 'PUT',
|
||||
headers: { ...(await bearer('9500')), 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: 'minLevel=5',
|
||||
})
|
||||
expect(missing.status).toBe(404)
|
||||
})
|
||||
|
||||
test('unknown routes 404', async () => {
|
||||
const res = await exports.default.fetch(`${ORIGIN}/nope`)
|
||||
expect(res.status).toBe(404)
|
||||
@@ -128,14 +784,20 @@ describe('clubs endpoints', () => {
|
||||
})
|
||||
|
||||
// Create requires auth.
|
||||
expect((await post('/club', null, { Name: 'Nope' })).status).toBe(401)
|
||||
expect((await post('/club/create', null, { name: 'Nope' })).status).toBe(401)
|
||||
// Create requires a name.
|
||||
expect((await post('/club', '800', { Name: ' ' })).status).toBe(400)
|
||||
expect((await post('/club/create', '800', { name: ' ' })).status).toBe(400)
|
||||
|
||||
// 800 creates a club → defaults applied, creator auto-joined (MemberCount 1).
|
||||
const created = (await (
|
||||
await post('/club', '800', { Name: 'Speedrunners', Category: 'Competitive' })
|
||||
).json()) as Club
|
||||
const createRes = (await (
|
||||
await post('/club/create', '800', { name: 'Speedrunners', category: 'Competitive' })
|
||||
).json()) as {
|
||||
error: string
|
||||
success: boolean
|
||||
value: { Club: Club; MyMembershipType: number }
|
||||
}
|
||||
expect(createRes).toMatchObject({ error: '', success: true })
|
||||
const created = createRes.value.Club
|
||||
expect(created).toMatchObject({
|
||||
Name: 'Speedrunners',
|
||||
Category: 'Competitive',
|
||||
@@ -145,6 +807,8 @@ describe('clubs endpoints', () => {
|
||||
CreatorAccountId: 800,
|
||||
MemberCount: 1,
|
||||
})
|
||||
// The creator's own membership comes back on the details.
|
||||
expect(createRes.value.MyMembershipType).toBe(100)
|
||||
const clubId = created.ClubId
|
||||
|
||||
// Public get by id returns it; unknown id 404s.
|
||||
@@ -174,7 +838,9 @@ describe('clubs endpoints', () => {
|
||||
expect(((await (await post(`/club/${clubId}/join`, '801')).json()) as Club).MemberCount).toBe(2)
|
||||
|
||||
// 801 leaves → back to 1, and it drops out of their member list.
|
||||
expect(((await (await post(`/club/${clubId}/leave`, '801')).json()) as Club).MemberCount).toBe(1)
|
||||
expect(((await (await post(`/club/${clubId}/leave`, '801')).json()) as Club).MemberCount).toBe(
|
||||
1
|
||||
)
|
||||
const afterLeave = (await (
|
||||
await exports.default.fetch(`${ORIGIN}/club/mine/member`, { headers: await bearer('801') })
|
||||
).json()) as Club[]
|
||||
@@ -194,9 +860,11 @@ describe('clubs endpoints', () => {
|
||||
type Club = { ClubId: number; Joinability: number; MemberCount: number }
|
||||
|
||||
// 810 creates an ask-to-join club (Joinability 2) → only the creator counts.
|
||||
const club = (await (
|
||||
await post('/club', '810', { Name: 'Inner Circle', Joinability: '2' })
|
||||
).json()) as Club
|
||||
const club = (
|
||||
(await (
|
||||
await post('/club/create', '810', { name: 'Inner Circle', joinability: '2' })
|
||||
).json()) as { value: { Club: Club } }
|
||||
).value.Club
|
||||
expect(club).toMatchObject({ Joinability: 2, MemberCount: 1 })
|
||||
|
||||
// 811 asks to join → pending, so MemberCount is unchanged and it isn't a membership.
|
||||
|
||||
Reference in New Issue
Block a user