Big feature batch driven by the super-audit findings and the user's follow-up requests. Schema migration 021 (folded into schema.sql Section 13): - forum_threads + polymorphic comments table keyed on (entity_type, entity_id). Entity types: forum_thread, proposal, incident, policy. Trigger maintains forum_threads.comment_count and last_comment_at. - space_tiers per-space with monthly_price_cents, billing_cadence, is_system, sort_order. Trigger seeds plus/basic/associate on every space INSERT and backfills existing spaces. space_members.tier_id FK added and backfilled from the legacy enum value. - space_role_labels (rename/recolor built-in roles per space). space_custom_roles + space_member_custom_roles for non-privileged extra labels. RLS gates by admin/board. - space_invites: multi-code invites with expires_at, max_uses, uses_count, is_enabled. Legacy spaces.invite_code backfilled as a permanent enabled invite. - secrets.encrypted_value bytea + encryption_version. Secrets RLS tightened. New comms_channels INSERT policy: any member can create; default channels are protected from deletion. - knowledge_base.render_markdown boolean (default true). Secrets encryption-at-rest: - AES-256-GCM in lib/secrets/crypto.ts. Master key from SECRETS_ENCRYPTION_KEY env (64 hex chars). - New revealSecret(id) server action: only path to plaintext, writes secret.revealed to activity_log. - /ops/page.tsx no longer selects value or encrypted_value on the list endpoint - the original screenshot bug where ciphertext was already in the page bundle before "Reveal" is fixed. UI: - /forum index, /forum/new, /forum/[id]. Pin/lock/delete actions for admin/board. - CommentThread component embedded on /proposals/[id], /incidents/[id], /policies/[slug]. Markdown rendering via react-markdown + remark-gfm. - /comms sidebar: inline "+ New channel" form. - /ops KB: row click opens markdown-rendering viewer modal. - /settings: new Tiers tab and Invites tab. Inline price edit and archive/delete on tiers; copy/enable/disable/delete on invites. - AtlasLogo replaces the terminal icon on the landing nav and footer. public/logo.svg wired as the favicon in app/layout.tsx metadata. - Sidebar has a Forum nav link. Server actions added: - lib/actions/forum.ts, comms.ts, tiers.ts, roles.ts, invites.ts. - lib/actions/secrets.ts rewritten with updateSecret + revealSecret. Auth flow: - joinSpace honors codes from space_invites first (enabled, expiry, use cap), falls back to legacy spaces.invite_code, increments uses_count on success. Env: - SECRETS_ENCRYPTION_KEY documented in .env.example and set on the Droplet's /opt/hackerspace-ops/.env.production. README: live site link added (https://hackerspace.sh). 266/266 unit tests pass. Production build clean. Migration 021 will be applied on the next deploy via /opt/hackerspace-ops/deploy.sh's idempotent migration runner.
261 lines
7.2 KiB
TypeScript
261 lines
7.2 KiB
TypeScript
'use server'
|
|
|
|
import { createClient } from '@/lib/supabase/server'
|
|
import { createAdminClient } from '@/lib/supabase/admin'
|
|
import { redirect } from 'next/navigation'
|
|
import { checkRateLimit, sanitizeString, sanitizeSlug } from '@/lib/security'
|
|
|
|
function generateInviteCode() {
|
|
const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
|
|
const prefix = 'HSL'
|
|
const year = new Date().getFullYear()
|
|
let code = ''
|
|
for (let i = 0; i < 4; i++) code += chars.charAt(Math.floor(Math.random() * chars.length))
|
|
return `${prefix}-${year}-${code}`
|
|
}
|
|
|
|
export async function createSpace(formData: {
|
|
spaceName: string
|
|
spaceSlug: string
|
|
spaceCity?: string
|
|
displayName: string
|
|
}) {
|
|
// Verify user is authenticated using regular client
|
|
const supabase = await createClient()
|
|
const { data: { user }, error: userErr } = await supabase.auth.getUser()
|
|
if (userErr || !user) return { error: 'Not authenticated' }
|
|
|
|
// Rate limit space creation
|
|
const rateLimit = checkRateLimit(`createspace:${user.id}`, 3, 3600000) // 3 per hour
|
|
if (!rateLimit.allowed) {
|
|
return { error: 'Too many space creation attempts. Please try again later.' }
|
|
}
|
|
|
|
// Sanitize inputs
|
|
const spaceName = sanitizeString(formData.spaceName).slice(0, 100)
|
|
const spaceSlug = sanitizeSlug(formData.spaceSlug)
|
|
const spaceCity = formData.spaceCity ? sanitizeString(formData.spaceCity).slice(0, 100) : null
|
|
const displayName = sanitizeString(formData.displayName).slice(0, 100)
|
|
|
|
if (!spaceName || !spaceSlug || !displayName) {
|
|
return { error: 'Invalid input. Please check your entries.' }
|
|
}
|
|
|
|
// Use admin client for inserts (bypasses RLS)
|
|
const admin = createAdminClient()
|
|
|
|
// Check if slug already exists
|
|
const { data: existingSpace } = await admin
|
|
.from('spaces')
|
|
.select('id')
|
|
.eq('slug', spaceSlug)
|
|
.maybeSingle()
|
|
|
|
if (existingSpace) {
|
|
return { error: 'A space with this URL slug already exists. Please choose a different one.' }
|
|
}
|
|
|
|
// Create the space
|
|
const { data: space, error: spaceErr } = await admin
|
|
.from('spaces')
|
|
.insert({
|
|
name: spaceName,
|
|
slug: spaceSlug,
|
|
city: spaceCity,
|
|
invite_code: generateInviteCode(),
|
|
})
|
|
.select('id')
|
|
.single()
|
|
|
|
if (spaceErr || !space) {
|
|
if (spaceErr?.code === '23505') {
|
|
return { error: 'A space with this URL slug already exists. Please choose a different one.' }
|
|
}
|
|
return { error: spaceErr?.message ?? 'Failed to create space' }
|
|
}
|
|
|
|
// Add user as admin
|
|
const { error: memberErr } = await admin
|
|
.from('space_members')
|
|
.insert({
|
|
space_id: space.id,
|
|
user_id: user.id,
|
|
display_name: displayName || user.email,
|
|
email: user.email,
|
|
role: 'admin',
|
|
tier: 'plus',
|
|
status: 'current',
|
|
approved: true,
|
|
})
|
|
|
|
if (memberErr) {
|
|
return { error: memberErr.message }
|
|
}
|
|
|
|
return { success: true }
|
|
}
|
|
|
|
export async function joinSpace(formData: {
|
|
inviteCode: string
|
|
displayName: string
|
|
}) {
|
|
// Verify user is authenticated
|
|
const supabase = await createClient()
|
|
const { data: { user }, error: userErr } = await supabase.auth.getUser()
|
|
if (userErr || !user) return { error: 'Not authenticated' }
|
|
|
|
// Use admin client for operations
|
|
const admin = createAdminClient()
|
|
|
|
const code = formData.inviteCode.trim().toUpperCase()
|
|
|
|
// Try the new multi-code invites table first. Falls back to the legacy
|
|
// spaces.invite_code (a permanent default) if the code isn't found there.
|
|
let invite: { id: string; space_id: string; max_uses: number | null; uses_count: number; expires_at: string | null; is_enabled: boolean } | null = null
|
|
const { data: inviteRow } = await admin
|
|
.from('space_invites')
|
|
.select('id, space_id, max_uses, uses_count, expires_at, is_enabled')
|
|
.eq('code', code)
|
|
.maybeSingle()
|
|
if (inviteRow) invite = inviteRow as typeof invite
|
|
|
|
let spaceId: string | null = null
|
|
if (invite) {
|
|
if (!invite.is_enabled) return { error: 'This invite is disabled.' }
|
|
if (invite.expires_at && new Date(invite.expires_at) < new Date()) return { error: 'This invite has expired.' }
|
|
if (invite.max_uses !== null && invite.uses_count >= invite.max_uses) return { error: 'This invite has reached its use cap.' }
|
|
spaceId = invite.space_id
|
|
} else {
|
|
const { data: legacy } = await admin
|
|
.from('spaces')
|
|
.select('id')
|
|
.eq('invite_code', code)
|
|
.maybeSingle()
|
|
if (!legacy) return { error: 'Invalid invite code' }
|
|
spaceId = legacy.id
|
|
}
|
|
|
|
const { data: space, error: lookupErr } = await admin
|
|
.from('spaces')
|
|
.select('id, require_approval')
|
|
.eq('id', spaceId)
|
|
.single()
|
|
|
|
if (lookupErr || !space) return { error: 'Invalid invite code' }
|
|
|
|
const { error: memberErr } = await admin
|
|
.from('space_members')
|
|
.insert({
|
|
space_id: space.id,
|
|
user_id: user.id,
|
|
display_name: formData.displayName || user.email,
|
|
email: user.email,
|
|
role: 'member',
|
|
tier: 'basic',
|
|
status: space.require_approval ? 'unverified' : 'current',
|
|
approved: true,
|
|
})
|
|
|
|
if (memberErr) return { error: memberErr.message }
|
|
|
|
// Increment invite usage counter for the multi-code path.
|
|
if (invite) {
|
|
await admin
|
|
.from('space_invites')
|
|
.update({ uses_count: invite.uses_count + 1 })
|
|
.eq('id', invite.id)
|
|
}
|
|
|
|
return { success: true }
|
|
}
|
|
|
|
export async function signIn(email: string, password: string) {
|
|
// Rate limit by email to prevent brute force
|
|
const rateLimit = checkRateLimit(`signin:${email.toLowerCase()}`, 5, 60000)
|
|
if (!rateLimit.allowed) {
|
|
return { error: 'Too many login attempts. Please try again later.' }
|
|
}
|
|
|
|
const supabase = await createClient()
|
|
|
|
const { data, error } = await supabase.auth.signInWithPassword({
|
|
email,
|
|
password,
|
|
})
|
|
|
|
if (error) {
|
|
return { error: error.message }
|
|
}
|
|
|
|
return { data }
|
|
}
|
|
|
|
export async function signUp(formData: {
|
|
email: string
|
|
password: string
|
|
fullName: string
|
|
action: 'create' | 'join'
|
|
spaceName?: string
|
|
spaceSlug?: string
|
|
city?: string
|
|
inviteCode?: string
|
|
}) {
|
|
const supabase = await createClient()
|
|
|
|
const { data: authData, error: authError } = await supabase.auth.signUp({
|
|
email: formData.email,
|
|
password: formData.password,
|
|
options: {
|
|
data: {
|
|
full_name: formData.fullName,
|
|
action: formData.action,
|
|
space_name: formData.spaceName,
|
|
space_slug: formData.spaceSlug,
|
|
city: formData.city,
|
|
invite_code: formData.inviteCode,
|
|
},
|
|
},
|
|
})
|
|
|
|
if (authError) {
|
|
return { error: authError.message }
|
|
}
|
|
|
|
return { data: authData }
|
|
}
|
|
|
|
export async function signOut() {
|
|
const supabase = await createClient()
|
|
await supabase.auth.signOut()
|
|
redirect('/login')
|
|
}
|
|
|
|
export async function getUser() {
|
|
const supabase = await createClient()
|
|
const { data: { user }, error } = await supabase.auth.getUser()
|
|
|
|
if (error || !user) {
|
|
return null
|
|
}
|
|
|
|
return user
|
|
}
|
|
|
|
export async function getCurrentMembership() {
|
|
const supabase = await createClient()
|
|
const user = await getUser()
|
|
|
|
if (!user) return null
|
|
|
|
const { data, error } = await supabase
|
|
.from('space_members')
|
|
.select('*, spaces(*)')
|
|
.eq('user_id', user.id)
|
|
.in('status', ['current', 'unverified', 'late'])
|
|
.maybeSingle()
|
|
|
|
if (error || !data) return null
|
|
|
|
return data
|
|
}
|