Independent adversarial audit verdict was NOT SAFE; fixed: - P0-1 /auth/confirm no longer trusts the query `type` (pinned to 'email_change'); a public endpoint feeding an attacker-chosen OTP type into verifyOtp was an unintended auth entrypoint. - P0-2 email sync uses the verifyOtp response user, not a follow-up getUser() that may not reflect the just-verified identity; /me now reconciles space_members.email against the authoritative auth email on load, so a missed sync self-heals (no permanent stale email). - P1-1 requestEmailChange builds the confirm origin from NEXT_PUBLIC_APP_URL only, never request headers (forged Host could redirect the confirmation link / capture token_hash). - P2-1 isSecretConfigField also catches password/token/private_key/ *_token/*_password so non-conventionally-named credentials can't be stored in plaintext integrations.config. 521 tests; build clean.
140 lines
4.8 KiB
TypeScript
140 lines
4.8 KiB
TypeScript
import { redirect } from 'next/navigation'
|
|
import { createClient } from '@/lib/supabase/server'
|
|
import { createAdminClient } from '@/lib/supabase/admin'
|
|
import { PageHeader, PageTitle } from '@/components/ui/page-title'
|
|
import { PERMISSIONS, PERMISSION_CODES } from '@/lib/permissions-catalog'
|
|
import { getMyClassSignups, getMyReservations, getMyCards, getMyVisits, getMyBilling, getMyNotifications, getMyPayments } from '@/lib/actions'
|
|
import {
|
|
MePortalClient,
|
|
type Grant,
|
|
type ClassSignup,
|
|
type Reservation,
|
|
type MyCard,
|
|
type MyVisit,
|
|
type MyNotif,
|
|
type MyPayment,
|
|
} from './me-portal-client'
|
|
|
|
export const dynamic = 'force-dynamic'
|
|
|
|
export default async function MePage() {
|
|
const supabase = await createClient()
|
|
const {
|
|
data: { user },
|
|
} = await supabase.auth.getUser()
|
|
if (!user) redirect('/login')
|
|
|
|
const { data: member } = await supabase
|
|
.from('space_members')
|
|
.select(
|
|
'id, space_id, role, email, display_name, handle, phone, bio, skills, interests, willing_to, affiliations',
|
|
)
|
|
.eq('user_id', user.id)
|
|
.in('status', ['current', 'unverified', 'late'])
|
|
.maybeSingle()
|
|
if (!member) redirect('/signup')
|
|
|
|
// Self-heal: auth.users.email is authoritative (only changes after Supabase
|
|
// confirmation). If the denormalized space_members.email drifted (e.g. the
|
|
// /auth/confirm sync was missed because the second secure-change link was
|
|
// opened in a different browser), reconcile it here on the owner's own row.
|
|
if (user.email && member.email !== user.email) {
|
|
await createAdminClient()
|
|
.from('space_members')
|
|
.update({ email: user.email })
|
|
.eq('id', member.id)
|
|
.eq('space_id', member.space_id)
|
|
member.email = user.email
|
|
}
|
|
|
|
const profile = {
|
|
email: (member.email as string | null) ?? '',
|
|
display_name: (member.display_name as string | null) ?? '',
|
|
handle: (member.handle as string | null) ?? '',
|
|
phone: (member.phone as string | null) ?? '',
|
|
bio: (member.bio as string | null) ?? '',
|
|
skills: (member.skills as string[] | null) ?? [],
|
|
interests: (member.interests as string[] | null) ?? [],
|
|
willing_to: (member.willing_to as string[] | null) ?? [],
|
|
affiliations: (member.affiliations as string[] | null) ?? [],
|
|
}
|
|
|
|
const { data: grantsRaw } = await supabase
|
|
.from('member_certifications')
|
|
.select(
|
|
'id, granted_at, expires_at, revoked_at, revoked_reason, note, certifications(name, description, validity_months)',
|
|
)
|
|
.eq('space_id', member.space_id)
|
|
.eq('member_id', member.id)
|
|
.order('granted_at', { ascending: false })
|
|
const grants = (grantsRaw ?? []) as unknown as Grant[]
|
|
|
|
// Effective permissions (read-only view). admin implicitly holds everything.
|
|
let heldCodes: string[] = []
|
|
if (member.role === 'admin') {
|
|
heldCodes = [...PERMISSION_CODES]
|
|
} else {
|
|
const { data: roles } = await supabase.rpc('user_effective_roles', {
|
|
uid: user.id,
|
|
sid: member.space_id,
|
|
})
|
|
const subjects = (roles ?? []) as string[]
|
|
if (subjects.length > 0) {
|
|
const { data: perms } = await supabase
|
|
.from('space_role_permissions')
|
|
.select('permission')
|
|
.eq('space_id', member.space_id)
|
|
.in('subject', subjects)
|
|
heldCodes = Array.from(new Set((perms ?? []).map(p => p.permission as string)))
|
|
}
|
|
}
|
|
const held = PERMISSIONS.filter(p => heldCodes.includes(p.code)).map(p => ({
|
|
code: p.code,
|
|
label: p.label,
|
|
}))
|
|
|
|
const signupRes = await getMyClassSignups()
|
|
const classSignups: ClassSignup[] = 'data' in signupRes ? (signupRes.data as ClassSignup[]) : []
|
|
|
|
const reservationRes = await getMyReservations()
|
|
const reservations: Reservation[] = 'data' in reservationRes ? (reservationRes.data as Reservation[]) : []
|
|
|
|
const cardsRes = await getMyCards()
|
|
const myCards: MyCard[] = 'data' in cardsRes ? (cardsRes.data as MyCard[]) : []
|
|
|
|
const visitsRes = await getMyVisits()
|
|
const myVisits: MyVisit[] = 'data' in visitsRes ? (visitsRes.data as MyVisit[]) : []
|
|
|
|
const billingRes = await getMyBilling()
|
|
const billing = ('data' in billingRes ? billingRes.data : null) as
|
|
| { status: string | null; currentPeriodEnd: string | null; hasCustomer: boolean }
|
|
| null
|
|
|
|
const notifsRes = await getMyNotifications()
|
|
const notifs: MyNotif[] = 'data' in notifsRes ? (notifsRes.data as MyNotif[]) : []
|
|
|
|
const paymentsRes = await getMyPayments()
|
|
const payments: MyPayment[] = 'data' in paymentsRes ? (paymentsRes.data as MyPayment[]) : []
|
|
|
|
return (
|
|
<>
|
|
<PageHeader>
|
|
<PageTitle>My membership</PageTitle>
|
|
</PageHeader>
|
|
|
|
<MePortalClient
|
|
profile={profile}
|
|
grants={grants}
|
|
held={held}
|
|
billing={billing}
|
|
payments={payments}
|
|
notifs={notifs}
|
|
classSignups={classSignups}
|
|
reservations={reservations}
|
|
myCards={myCards}
|
|
myVisits={myVisits}
|
|
/>
|
|
</>
|
|
)
|
|
}
|