diff --git a/apps/mobile/package.json b/apps/mobile/package.json index ef5eea5..e1dfb06 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -32,7 +32,7 @@ "expo-status-bar": "~57.0.1", "expo-symbols": "~57.0.2", "expo-web-browser": "~57.0.2", - "lucide-react-native": "^1.35.0", + "lucide-react-native": "^1.37.0", "react": "19.2.3", "react-native": "0.86.2", "react-native-appwrite": "^0.34.0", diff --git a/apps/web/.env.local.example b/apps/web/.env.local.example index d940dfe..be84d5b 100644 --- a/apps/web/.env.local.example +++ b/apps/web/.env.local.example @@ -117,6 +117,12 @@ APPWRITE_MODERATOR_TEAM_ID= # OPTIONAL: Server Configuration # ============================================================================== # Public URL of your application (for OAuth redirects, etc.) +# +# NOTE: Password reset and email verification links are built from this value, +# and Appwrite only sends them to hosts registered as "Platforms" for this +# project. If you develop on http://127.0.0.1:3000 but Appwrite knows +# http://localhost:3000, those links 400 and the flow silently breaks. +# Register EVERY host you use (localhost, 127.0.0.1, LAN IP, dev domain). SERVER_URL=http://localhost:3000 # Instance name displayed in mobile app and about pages @@ -182,34 +188,6 @@ TENOR_API_KEY= TENOR_CLIENT_KEY=firepit-web TENOR_LOCALE=en_US -# ============================================================================== -# OPTIONAL: New Relic APM (Application Performance Monitoring) -# ============================================================================== -# Configure New Relic for application monitoring and log ingestion. -# These are server-side only (no NEXT_PUBLIC prefix needed). -# Get these from your New Relic account: https://newrelic.com - -# Your New Relic license key -# Find in: New Relic > Account Settings > API Keys > License Keys -NEW_RELIC_LICENSE_KEY= - -# Application name as it appears in New Relic -# Example: firepit-production, firepit-staging, etc. -NEW_RELIC_APP_NAME= - -# ============================================================================== -# OPTIONAL: Telemetry Provider Routing -# ============================================================================== -# Controls where server-side telemetry from src/lib/newrelic-utils.ts is sent. -# Allowed values: newrelic, posthog, both, none -# Default: newrelic -TELEMETRY_PROVIDER=newrelic - -# Controls where client-side telemetry from src/lib/client-telemetry.ts is sent. -# Allowed values: newrelic, posthog, both, none -# Default: newrelic -NEXT_PUBLIC_TELEMETRY_PROVIDER=newrelic - # Enable PostHog forwarding during tests (normally disabled) # ENABLE_POSTHOG_IN_TESTS=false diff --git a/apps/web/CHANGELOG.md b/apps/web/CHANGELOG.md index a9b15b8..3feab8d 100644 --- a/apps/web/CHANGELOG.md +++ b/apps/web/CHANGELOG.md @@ -5,6 +5,33 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.1.0] - 2026-08-29 + +### ✨ Features + +- **Password reset** - Request a reset link from the sign-in page and set a new password from a secure email link +- **Change email** - Update your account email from Settings (with current-password confirmation and re-verification when enabled) +- **Session management** - View all signed-in devices in Settings and revoke any of them (or sign out everywhere except the current device) +- **Remember me** - Optional persistent sign-in; uncheck to use a session-only cookie that clears when the browser closes +- **Signup control** - Admins can set the instance policy to open, individual approval, or no signups, and approve/reject pending signups from the admin panel +- **Deactivate & delete account** - Temporarily deactivate your account (auto-reactivates on next sign-in) or permanently delete it from a new Danger Zone section +- **Deleted User tombstones** - Deleted accounts show as "Deleted User" and their user ID is permanently reserved so it can never be reused + +### ⚙️ Improvements + +- Sign-in now refuses accounts awaiting approval and reactivates deactivated accounts automatically on success +- Admin panel exposes the current signup policy and a pending-approvals queue +- **Telemetry simplified to PostHog only** - Removed all New Relic plumbing, dependencies, and config; server and client telemetry now route exclusively to PostHog (smaller installs, less startup overhead) +- Added `z.compile()` to one usage of zod in codebase to improve performance +- Updated `bun test` wiring to improve passing tests to 818 up from 717 previously. (Part of bun dep bump) +- **Account safety polish** - Deleting your account now opens a confirmation dialog with a full consequences summary and password confirmation; a persistent warning (with one-click resend) reminds you to confirm a new email before signing out; the remember-me checkbox preference and password-reset resend (with a 30s cooldown) are new conveniences on the sign-in page + +### 🐛 Fixes + +- **Session devices now identified** - The session list showed "Unknown device" and "signed in by unknown" because it read nested fields the Appwrite API doesn't return. It now maps the real device, browser, OS, and sign-in date +- Fix TDZ in `setup-appwrite.ts` (`[error] Cannot access 'now' before initalization`). +- Bumped zod to `4.5.4`, and bumped bun to `1.4.0` for performance improvements + ## [2.0.3] - 2026-08-15 ### 🐛 Fixes diff --git a/apps/web/bunfig.toml b/apps/web/bunfig.toml index 0715236..c6fc1ed 100644 --- a/apps/web/bunfig.toml +++ b/apps/web/bunfig.toml @@ -3,6 +3,6 @@ linker = "isolated" [test] root="src/__tests__/" -preload="./src/__tests__/setup.ts" +preload=["./src/__tests__/setup.ts", "./happydom.ts"] pathIgnorePatterns="src/__tests__/__helpers__/**" timeout=10000 \ No newline at end of file diff --git a/apps/web/docs/TELEMETRY.md b/apps/web/docs/TELEMETRY.md index 625b0eb..372b621 100644 --- a/apps/web/docs/TELEMETRY.md +++ b/apps/web/docs/TELEMETRY.md @@ -1,34 +1,11 @@ -# Telemetry Providers +# Telemetry -Firepit supports telemetry routing to New Relic, PostHog, both, or neither. +Firepit sends all telemetry to PostHog. -This is implemented in: +- Server helpers: `src/lib/posthog-utils.ts` +- Client helpers: `src/lib/client-logger.ts` -- Server telemetry helpers: `src/lib/newrelic-utils.ts` -- Client telemetry helpers: `src/lib/client-telemetry.ts` - -## Provider Configuration - -### Server-side provider - -- Env var: `TELEMETRY_PROVIDER` -- Allowed values: `newrelic`, `posthog`, `both`, `none` -- Default: `newrelic` - -### Client-side provider - -- Env var: `NEXT_PUBLIC_TELEMETRY_PROVIDER` -- Allowed values: `newrelic`, `posthog`, `both`, `none` -- Default: `newrelic` - -## Credentials - -### New Relic - -- `NEW_RELIC_LICENSE_KEY` -- `NEW_RELIC_APP_NAME` - -### PostHog +## Server-side capture Server-side capture (`posthog-node`) prefers: @@ -40,11 +17,18 @@ Fallback compatibility keys: - `NEXT_PUBLIC_POSTHOG_PROJECT_TOKEN` - `NEXT_PUBLIC_POSTHOG_HOST` -Client-side capture (`posthog-js`) uses existing browser initialization in `instrumentation-client.ts`. +Structured logs are also forwarded through the OTLP log pipeline to the +PostHog logs endpoint (`POSTHOG_LOGS_HOST`, defaults to the ingest host). -## PostHog Privacy And Bandwidth Controls +Process-level hooks (uncaught exceptions, unhandled rejections, flush on +shutdown) are registered in `instrumentation.ts`. -Client-side PostHog behavior is configured by these env vars: +## Client-side capture + +Client capture (`posthog-js`) uses existing browser initialization in +`instrumentation-client.ts`. + +## PostHog Privacy And Bandwidth Controls - `NEXT_PUBLIC_POSTHOG_AUTOCAPTURE` (recommended `false`) - `NEXT_PUBLIC_POSTHOG_SESSION_RECORDING` (recommended `false`) @@ -98,45 +82,23 @@ If you use Next.js rewrites as a PostHog proxy path, configure: If you set `NEXT_PUBLIC_POSTHOG_HOST` directly to your own reverse-proxy domain, you can disable rewrites with `POSTHOG_REWRITE_ENABLED=false`. -## Telemetry Matrix +## Server Events -### Server helper mapping +Events emitted by `src/lib/posthog-utils.ts`: -| Helper | New Relic output | PostHog output | -| ------------------------------------ | ------------------------------------------ | ---------------------------------------------------------------------------------- | -| `recordEvent(eventType, attributes)` | `recordCustomEvent(eventType, attributes)` | capture event `eventType` with `attributes` | -| `recordMetric(name, value)` | `recordMetric(name, value)` | capture event `metric_recorded` with `{ metricName: name, value }` | -| `incrementMetric(name, value)` | `incrementMetric(name, value)` | capture event `metric_incremented` with `{ metricName: name, incrementBy: value }` | -| `recordError(error, attrs)` | `noticeError(error, attrs)` | capture event `error_recorded` with normalized error fields plus attrs | -| `logger.info/warn/error/debug` | `ApplicationLog` custom event | capture event `application_log` | +| Helper | PostHog output | +| ------------------------------------ | ---------------------------------------------------------------------------------- | +| `recordEvent(eventType, attributes)` | capture event `eventType` with `attributes` | +| `recordMetric(name, value)` | capture event `metric_recorded` with `{ metricName: name, value }` | +| `recordError(error, attrs)` | `captureException` with normalized error fields plus attrs | +| `logger.info/warn/error/debug` | capture event `application_log` plus OTLP log record | -### Client helper mapping - -| Helper | New Relic output | PostHog output | -| ---------------------------------------- | ----------------------------------- | -------------------------------------------------------------------------------- | -| `recordClientAction(action, attributes)` | `addPageAction(action, attributes)` | `capture(action, attributes)` | -| `recordClientError(error, attributes)` | `noticeError(error, attributes)` | `captureException(error, attributes)` or fallback `capture("client_error", ...)` | +Client helpers emit `log_info`, `log_warn`, `log_error`, `client_error` events +and use `captureException` for rich client errors. ## Digest Telemetry Example Digest generation in `src/lib/inbox.ts` emits: -- Metric: `Custom/InboxDigest/DurationMs` -- Metric: `Custom/InboxDigest/ReturnedItems` -- Metric: `Custom/InboxDigest/TotalUnread` - Event: `InboxDigestGenerated` - -Under provider routing: - -- `newrelic`: only New Relic receives these -- `posthog`: only PostHog receives mapped equivalents -- `both`: both providers receive telemetry -- `none`: no provider receives telemetry - -## Client Parity Coverage - -The following client paths now route through provider-aware helpers instead of direct New Relic-only calls: - -- `src/lib/client-logger.ts` -- `src/app/error.tsx` -- `src/app/global-error.tsx` +- Metrics: `Custom/InboxDigest/DurationMs`, `Custom/InboxDigest/ReturnedItems`, `Custom/InboxDigest/TotalUnread` \ No newline at end of file diff --git a/apps/web/happydom.ts b/apps/web/happydom.ts new file mode 100644 index 0000000..7f712d0 --- /dev/null +++ b/apps/web/happydom.ts @@ -0,0 +1,3 @@ +import { GlobalRegistrator } from "@happy-dom/global-registrator"; + +GlobalRegistrator.register(); diff --git a/apps/web/instrumentation.ts b/apps/web/instrumentation.ts index 6115ed6..edeaeea 100644 --- a/apps/web/instrumentation.ts +++ b/apps/web/instrumentation.ts @@ -2,91 +2,30 @@ * Next.js Instrumentation Hook * * This file is automatically loaded by Next.js on both server and edge runtimes. - * It initializes server telemetry hooks for Node.js runtime only. + * It registers PostHog telemetry hooks for the Node.js runtime only. * * Documentation: https://nextjs.org/docs/app/building-your-application/optimizing/instrumentation */ -const instrumentationLogger = { - error(message: string, attributes?: Record) { - const payload = attributes - ? `${message} ${JSON.stringify(attributes)}` - : `${message}`; - const error = new Error(payload); - - if (typeof globalThis.reportError === "function") { - globalThis.reportError(error); - return; - } - - console.error(error); - }, -}; - export async function register() { - if (process.env.NEXT_RUNTIME === "nodejs") { - const newrelicLicenseKey = process.env.NEW_RELIC_LICENSE_KEY; - const newrelicAppName = process.env.NEW_RELIC_APP_NAME; - - try { - const { - initNewRelic, - registerPostHogLoggerProvider, - registerPostHogProcessHandlers, - } = await import("./src/lib/newrelic-utils"); - registerPostHogLoggerProvider(); - registerPostHogProcessHandlers(); - - // Kick off New Relic initialization once at startup so sync - // dispatch paths can use the agent without async triggers. - if (newrelicLicenseKey && newrelicAppName) { - await initNewRelic(); - } - } catch (error) { - // PostHog runtime hooks are optional and should not block startup. - instrumentationLogger.error( - "[PostHog] Failed to register process handlers", - { - error: - error instanceof Error - ? { - message: error.message, - name: error.name, - stack: error.stack, - } - : String(error), - }, - ); - } - - // Only initialize if both license key and app name are provided - if (newrelicLicenseKey && newrelicAppName) { - try { - // Dynamic import to avoid loading New Relic on Edge runtime - // New Relic will automatically load the newrelic.cjs config file - const newrelic = await import("newrelic"); + if (process.env.NEXT_RUNTIME !== "nodejs") { + return; + } - // Return the newrelic instance for potential use - return newrelic; - } catch (error) { - // If New Relic fails to initialize, log the error but don't crash the app - console.error( - "[New Relic] Failed to initialize:", - error instanceof Error ? error.message : String(error), - ); - } + try { + const { + registerPostHogLoggerProvider, + registerPostHogProcessHandlers, + } = await import("./src/lib/posthog-utils"); + registerPostHogLoggerProvider(); + registerPostHogProcessHandlers(); + } catch (error) { + // PostHog runtime hooks are optional and should not block startup. + const payload = error instanceof Error ? `${error.message} ${error.stack ?? ""}` : String(error); + if (typeof globalThis.reportError === "function") { + globalThis.reportError(new Error(payload)); } else { - // If credentials are missing, log a warning but don't fail - if (!newrelicLicenseKey) { - console.warn( - "[New Relic] NEW_RELIC_LICENSE_KEY not found - APM monitoring disabled", - ); - } - if (!newrelicAppName) { - console.warn( - "[New Relic] NEW_RELIC_APP_NAME not found - APM monitoring disabled", - ); - } + console.error(payload); } } -} +} \ No newline at end of file diff --git a/apps/web/knip.json b/apps/web/knip.json index 4161172..191eea2 100644 --- a/apps/web/knip.json +++ b/apps/web/knip.json @@ -1,7 +1,6 @@ { "$schema": "https://unpkg.com/knip@6/schema.json", "entry": [ - "newrelic.cjs", "public/sw.js", "scripts/test-server-auth.ts" ], diff --git a/apps/web/newrelic.cjs b/apps/web/newrelic.cjs deleted file mode 100644 index 4aab4fb..0000000 --- a/apps/web/newrelic.cjs +++ /dev/null @@ -1,268 +0,0 @@ -/** - * New Relic Configuration - * - * This file configures New Relic APM for comprehensive monitoring including: - * - Application performance monitoring (APM) - * - Error tracking - * - Transaction tracing - * - Custom events and metrics - * - Browser monitoring - * - * Documentation: https://docs.newrelic.com/docs/apm/agents/nodejs-agent/installation-configuration/nodejs-agent-configuration/ - */ - -'use strict' - -const process = require('process'); - -/** - * New Relic agent configuration. - * - * See lib/config/default.js in the agent distribution for a more complete - * description of configuration variables and their potential values. - */ -exports.config = { - /** - * Application name(s) - can be a string or array for multiple app names - * This is how your app will appear in New Relic - */ - app_name: [process.env.NEW_RELIC_APP_NAME || 'firepit-qpc'], - - /** - * Your New Relic license key - */ - license_key: process.env.NEW_RELIC_LICENSE_KEY || '', - - /** - * Logging configuration - */ - logging: { - /** - * Level at which to log. Options: trace, debug, info, warn, error, fatal - * Use 'info' for production - */ - level: process.env.NODE_ENV === 'production' ? 'info' : 'debug', - - /** - * Where to write log data - */ - filepath: 'stdout', - - /** - * Whether to collect and send logs to New Relic - */ - enabled: true, - }, - - /** - * Allow all data to be sent to New Relic - */ - allow_all_headers: true, - - /** - * Attributes configuration - control what data is captured - */ - attributes: { - /** - * Enable attribute capture globally - */ - enabled: true, - - /** - * Attributes to exclude from all destinations - */ - exclude: [ - 'request.headers.cookie', - 'request.headers.authorization', - 'request.headers.x-api-key', - ], - }, - - /** - * Application logging configuration - * Forward application logs to New Relic - */ - application_logging: { - enabled: true, - - /** - * Forward logs to New Relic - */ - forwarding: { - enabled: true, - max_samples_stored: 10000, - }, - - /** - * Local log decoration (add New Relic metadata to logs) - */ - local_decorating: { - enabled: true, - }, - - /** - * Metrics derived from logs - */ - metrics: { - enabled: true, - }, - }, - - /** - * Error collector configuration - */ - error_collector: { - enabled: true, - - /** - * Ignore specific error status codes - * 404s are usually not errors we care about - */ - ignore_status_codes: [404], - - /** - * Maximum number of errors to send per harvest cycle - */ - max_event_samples_stored: 100, - - /** - * Capture error attributes - */ - attributes: { - enabled: true, - }, - }, - - /** - * Transaction tracer configuration - */ - transaction_tracer: { - enabled: true, - - /** - * Threshold for when a transaction is considered slow (in seconds) - */ - transaction_threshold: 'apdex_f', - - /** - * Maximum number of slow queries to collect per harvest cycle - */ - top_n: 20, - - /** - * Record SQL queries - */ - record_sql: 'obfuscated', - - /** - * Explain plan threshold (in milliseconds) - */ - explain_threshold: 500, - - /** - * Capture transaction attributes - */ - attributes: { - enabled: true, - }, - }, - - /** - * Distributed tracing configuration - * Essential for tracking requests across services - */ - distributed_tracing: { - enabled: true, - }, - - /** - * Slow SQL configuration - */ - slow_sql: { - enabled: true, - max_samples: 10, - }, - - /** - * Transaction events configuration - */ - transaction_events: { - enabled: true, - max_samples_stored: 10000, - - attributes: { - enabled: true, - }, - }, - - /** - * Custom insights events configuration - */ - custom_insights_events: { - enabled: true, - max_samples_stored: 10000, - }, - - /** - * Browser monitoring configuration - * Enables Real User Monitoring (RUM) - */ - browser_monitoring: { - enable: true, - - /** - * Attributes to capture in browser monitoring - */ - attributes: { - enabled: true, - }, - }, - - /** - * Span events configuration (for distributed tracing) - */ - span_events: { - enabled: true, - - attributes: { - enabled: true, - }, - }, - - /** - * Rules for naming and ignoring transactions - */ - rules: { - /** - * Transaction naming rules - */ - name: [ - // API routes - { pattern: '/api/(.*)', name: '/api/*' }, - // Dynamic routes - { pattern: '/(.*)', name: '/*' }, - ], - - /** - * Transactions to ignore (don't report to New Relic) - */ - ignore: [ - // Health check endpoints - '^/api/health$', - '^/health$', - // Next.js internals - '^/_next/static', - '^/_next/image', - // Favicons - '^/favicon', - ], - }, - - /** - * Labels for organizing apps in New Relic - */ - labels: { - environment: process.env.NODE_ENV || 'development', - project: 'firepit', - }, -} diff --git a/apps/web/newrelic.d.ts b/apps/web/newrelic.d.ts deleted file mode 100644 index cce8938..0000000 --- a/apps/web/newrelic.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Type declarations for the newrelic module - * Since @types/newrelic doesn't exist, we declare the module to satisfy TypeScript - */ -declare module 'newrelic' { - const newrelic: unknown; - export default newrelic; -} diff --git a/apps/web/package.json b/apps/web/package.json index c6ef630..a3b93ac 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "firepit-web", - "version": "2.0.3", + "version": "2.1.0", "private": true, "type": "module", "scripts": { @@ -41,7 +41,7 @@ "@radix-ui/react-slot": "^1.3.3", "@radix-ui/react-switch": "^1.3.7", "@radix-ui/react-tabs": "^1.1.21", - "@tanstack/react-query": "^5.101.4", + "@tanstack/react-query": "^5.102.8", "@testing-library/dom": "^10.4.1", "appwrite": "^26.2.0", "class-variance-authority": "^0.7.1", @@ -52,39 +52,39 @@ "libsodium-wrappers": "^0.8.4", "lucide-react": "^0.554.0", "nanoid": "^5.1.16", - "newrelic": "^13.20.0", "next": "^16.3.3", "next-themes": "^0.4.6", "node-appwrite": "^27.1.0", "node-emoji": "^2.2.0", - "posthog-js": "^1.417.1", - "posthog-node": "^5.49.1", + "posthog-js": "^1.422.5", + "posthog-node": "^5.51.4", "react": "19.2.8", "react-dom": "19.2.8", "react-markdown": "^10.1.0", - "react-virtuoso": "^4.18.11", + "react-virtuoso": "^4.18.12", "remark-gfm": "^4.0.1", "server-only": "^0.0.1", "sonner": "^2.0.8", "tailwind-merge": "^3.6.0", "tw-animate-css": "^1.4.0", "yaml": "^2.9.0", - "zod": "^4.4.3" + "zod": "^4.5.4" }, "devDependencies": { "@eslint/js": "^9.39.5", + "@happy-dom/global-registrator": "^20.12.0", "@next/bundle-analyzer": "16.3.1", - "@posthog/nextjs-config": "^1.9.69", + "@posthog/nextjs-config": "^1.10.0", "@tailwindcss/postcss": "^4.3.3", "@testing-library/jest-dom": "^6.9.1", - "@testing-library/react": "^16.3.2", - "@testing-library/user-event": "^14.6.4", + "@testing-library/react": "^16.3.3", + "@testing-library/user-event": "^14.6.6", "@types/jsdom": "^27.0.0", "@types/node": "^20.19.43", "@types/react": "19.2.18", "@types/react-dom": "19.2.4", - "@typescript-eslint/eslint-plugin": "^8.67.0", - "@typescript-eslint/parser": "^8.67.0", + "@typescript-eslint/eslint-plugin": "^8.68.0", + "@typescript-eslint/parser": "^8.68.0", "@vitejs/plugin-react": "^5.2.0", "@vitest/coverage-v8": "^3.2.7", "dotenv": "^17.4.2", @@ -94,15 +94,15 @@ "eslint-plugin-react-hooks": "^6.1.1", "eslint-plugin-unused-imports": "^4.4.1", "globals": "^16.5.0", - "happy-dom": "^20.11.2", + "happy-dom": "^20.12.0", "jsdom": "^27.4.0", - "knip": "^6.32.2", + "knip": "^6.33.0", "postcss": "^8.5.26", "tailwindcss": "^4.3.3", "typescript": "7.0.2", - "vitest": "^4.1.10" + "vitest": "^4.1.11" }, - "packageManager": "bun@1.3.14", + "packageManager": "bun@1.4.0", "engines": { "node": ">=20.9.0" }, diff --git a/apps/web/scripts/setup-appwrite.ts b/apps/web/scripts/setup-appwrite.ts index 1024392..15e568c 100755 --- a/apps/web/scripts/setup-appwrite.ts +++ b/apps/web/scripts/setup-appwrite.ts @@ -1354,6 +1354,8 @@ async function setupProfiles() { ["profileBackgroundImageChangedAt", LEN_TS, false], ["avatarFramePreset", 64, false], ["dmEncryptionPublicKey", 256, false], + ["deletedAt", LEN_TS, false], + ["deletedEmail", 255, false], ]; for (const [k, size, req] of fields) { await ensureStringAttribute("profiles", k, size, req); @@ -1386,6 +1388,7 @@ async function setupFeatureFlags() { await ensureStringAttribute("feature_flags", k, size, req); } await ensureBooleanAttribute("feature_flags", "enabled", true); + await ensureStringAttribute("feature_flags", "value", 64, false); await ensureIndex("feature_flags", "idx_key", "key", ["key"]); await ensureFeatureFlagDocument({ @@ -1418,17 +1421,28 @@ async function setupFeatureFlags() { enabled: false, key: "enable_tenor_gif_search", }); + await ensureFeatureFlagDocument({ + description: + "Signup policy: open, individual approval, or signups disabled", + enabled: true, + key: "signup_policy", + value: "open", + }); } async function ensureFeatureFlagDocument(params: { description: string; enabled: boolean; key: string; + value?: string; }) { const { description, enabled, key } = params; + const value = params.value; + const now = new Date().toISOString(); + const valuePayload = value !== undefined ? { value } : {}; + const descriptionUpdatedAt = { description, updatedAt: now, ...valuePayload }; const documentId = createFeatureFlagDocumentId(key); - const now = new Date().toISOString(); let operation: "added" | "updated" = "added"; const deterministicDocument = (await tryVariants([ @@ -1454,14 +1468,12 @@ async function ensureFeatureFlagDocument(params: { await tryVariants([ () => dbAny.updateDocument(DB_ID, "feature_flags", documentId, { - description, - updatedAt: now, + ...descriptionUpdatedAt, }), () => dbAny.updateDocument?.({ data: { - description, - updatedAt: now, + ...descriptionUpdatedAt, }, databaseId: DB_ID, collectionId: "feature_flags", @@ -1495,27 +1507,25 @@ async function ensureFeatureFlagDocument(params: { ); } - await tryVariants([ - () => - dbAny.createDocument(DB_ID, "feature_flags", documentId, { - description, - enabled, - key, - updatedAt: now, - }), - () => - dbAny.createDocument?.({ - data: { - description, +await tryVariants([ + () => + dbAny.createDocument(DB_ID, "feature_flags", documentId, { + ...descriptionUpdatedAt, enabled, key, - updatedAt: now, - }, - databaseId: DB_ID, - collectionId: "feature_flags", - documentId, - }), - ]).catch(async (error) => { + }), + () => + dbAny.createDocument?.({ + data: { + ...descriptionUpdatedAt, + enabled, + key, + }, + databaseId: DB_ID, + collectionId: "feature_flags", + documentId, + }), + ]).catch(async (error) => { if (!isDuplicateConflictError(error)) { throw error; } @@ -1558,14 +1568,12 @@ async function ensureFeatureFlagDocument(params: { await tryVariants([ () => dbAny.updateDocument(DB_ID, "feature_flags", documentId, { - description, - updatedAt: now, + ...descriptionUpdatedAt, }), () => dbAny.updateDocument?.({ data: { - description, - updatedAt: now, + ...descriptionUpdatedAt, }, databaseId: DB_ID, collectionId: "feature_flags", diff --git a/apps/web/src/__tests__/api-routes/announcements-route.test.ts b/apps/web/src/__tests__/api-routes/announcements-route.test.ts index 613a34a..7a6241b 100644 --- a/apps/web/src/__tests__/api-routes/announcements-route.test.ts +++ b/apps/web/src/__tests__/api-routes/announcements-route.test.ts @@ -52,7 +52,7 @@ vi.mock("@/lib/auth-server", () => { }; }); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { diff --git a/apps/web/src/__tests__/api-routes/auth-session-route.test.ts b/apps/web/src/__tests__/api-routes/auth-session-route.test.ts index 7448342..606b4eb 100644 --- a/apps/web/src/__tests__/api-routes/auth-session-route.test.ts +++ b/apps/web/src/__tests__/api-routes/auth-session-route.test.ts @@ -4,10 +4,16 @@ const { mockCheckRateLimit, mockCreateEmailPasswordSession, mockGetClientIp, + mockUsersGet, + mockUsersDeleteSession, + mockUsersUpdatePrefs, } = vi.hoisted(() => ({ mockCheckRateLimit: vi.fn(), mockCreateEmailPasswordSession: vi.fn(), mockGetClientIp: vi.fn(), + mockUsersGet: vi.fn(async () => ({ $id: "user-1", prefs: {} })), + mockUsersDeleteSession: vi.fn(async () => {}), + mockUsersUpdatePrefs: vi.fn(async () => {}), })); vi.mock("node-appwrite", () => ({ @@ -19,6 +25,23 @@ vi.mock("node-appwrite", () => ({ setProject = vi.fn().mockReturnThis(); setKey = vi.fn().mockReturnThis(); }, + Query: {}, + ID: { unique: vi.fn() }, + Users: class { + get = mockUsersGet; + deleteSession = mockUsersDeleteSession; + updatePrefs = mockUsersUpdatePrefs; + }, +})); + +vi.mock("@/lib/signup-policy", () => ({ + getApprovalStatusFromPrefs: (prefs: unknown) => { + const status = (prefs as { approvalStatus?: string } | null) + ?.approvalStatus; + if (status === "pending") return "pending"; + if (status === "rejected") return "rejected"; + return "approved"; + }, })); vi.mock("@/lib/auth-server", () => ({ @@ -163,4 +186,64 @@ describe("POST /api/auth/session", () => { expect(response.headers.get("Retry-After")).toBe("60"); expect(mockCreateEmailPasswordSession).not.toHaveBeenCalled(); }); + + it("blocks sign-in and revokes the temp session when approval is pending", async () => { + mockCreateEmailPasswordSession.mockResolvedValue({ + $id: "sess-1", + userId: "user-1", + secret: "secret-1", + }); + mockUsersGet.mockResolvedValueOnce({ + $id: "user-1", + prefs: { approvalStatus: "pending" }, + }); + + const response = await POST( + new Request("http://localhost/api/auth/session", { + method: "POST", + body: JSON.stringify({ + email: "user@example.com", + password: "pw", + }), + }), + ); + const data = await response.json(); + + expect(response.status).toBe(403); + expect(data.error).toMatch(/awaiting/i); + expect(mockUsersDeleteSession).toHaveBeenCalledWith({ + userId: "user-1", + sessionId: "sess-1", + }); + }); + + it("reactivates a deactivated account on sign-in", async () => { + mockCreateEmailPasswordSession.mockResolvedValue({ + $id: "sess-1", + userId: "user-1", + secret: "secret-1", + }); + mockUsersGet.mockResolvedValueOnce({ + $id: "user-1", + prefs: { disabled: true, disabledAt: "2026-01-01T00:00:00Z" }, + }); + + const response = await POST( + new Request("http://localhost/api/auth/session", { + method: "POST", + body: JSON.stringify({ + email: "user@example.com", + password: "pw", + }), + }), + ); + const data = await response.json(); + + expect(response.status).toBe(200); + expect(mockUsersUpdatePrefs).toHaveBeenCalledWith({ + userId: "user-1", + prefs: { disabled: false, disabledAt: null }, + }); + expect(data.session).toBe("secret-1"); + }); }); diff --git a/apps/web/src/__tests__/api-routes/categories.test.ts b/apps/web/src/__tests__/api-routes/categories.test.ts index e7836cf..796b224 100644 --- a/apps/web/src/__tests__/api-routes/categories.test.ts +++ b/apps/web/src/__tests__/api-routes/categories.test.ts @@ -34,7 +34,7 @@ vi.mock("@/lib/server-channel-access", () => ({ getServerPermissionsForUser: mockGetServerPermissionsForUser, })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { diff --git a/apps/web/src/__tests__/api-routes/channel-pins.test.ts b/apps/web/src/__tests__/api-routes/channel-pins.test.ts index 5c21e59..e09a1d1 100644 --- a/apps/web/src/__tests__/api-routes/channel-pins.test.ts +++ b/apps/web/src/__tests__/api-routes/channel-pins.test.ts @@ -47,14 +47,12 @@ vi.mock("@/lib/appwrite-core", () => ({ })), })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { info: vi.fn(), warn: vi.fn(), error: vi.fn() }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), })); vi.mock("node-appwrite", () => ({ diff --git a/apps/web/src/__tests__/api-routes/direct-messages.test.ts b/apps/web/src/__tests__/api-routes/direct-messages.test.ts index 2cdafe4..5364a4e 100644 --- a/apps/web/src/__tests__/api-routes/direct-messages.test.ts +++ b/apps/web/src/__tests__/api-routes/direct-messages.test.ts @@ -86,7 +86,7 @@ vi.mock("@/lib/appwrite-core", () => ({ })), })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -96,10 +96,8 @@ vi.mock("@/lib/newrelic-utils", () => ({ }, recordError: vi.fn(), recordEvent: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), trackMessage: vi.fn(), - addTransactionAttributes: vi.fn(), })); vi.mock("@/lib/appwrite-friendships", () => ({ diff --git a/apps/web/src/__tests__/api-routes/dm-encryption-key-route.test.ts b/apps/web/src/__tests__/api-routes/dm-encryption-key-route.test.ts index 658b872..d358054 100644 --- a/apps/web/src/__tests__/api-routes/dm-encryption-key-route.test.ts +++ b/apps/web/src/__tests__/api-routes/dm-encryption-key-route.test.ts @@ -21,7 +21,7 @@ vi.mock("@/lib/appwrite-profiles", () => ({ updateUserProfile: mockUpdateUserProfile, })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { diff --git a/apps/web/src/__tests__/api-routes/dm-reactions.test.ts b/apps/web/src/__tests__/api-routes/dm-reactions.test.ts index 1396490..1441bc6 100644 --- a/apps/web/src/__tests__/api-routes/dm-reactions.test.ts +++ b/apps/web/src/__tests__/api-routes/dm-reactions.test.ts @@ -34,7 +34,7 @@ vi.mock("@/lib/appwrite-core", () => ({ })), })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -43,9 +43,7 @@ vi.mock("@/lib/newrelic-utils", () => ({ error: vi.fn(), }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), })); describe("DM Reactions API", () => { @@ -54,7 +52,7 @@ describe("DM Reactions API", () => { beforeEach(async () => { vi.clearAllMocks(); - + // Dynamically import the route handlers const module = await import("../../app/api/direct-messages/[messageId]/reactions/route"); POST = module.POST; diff --git a/apps/web/src/__tests__/api-routes/example-newrelic.test.ts b/apps/web/src/__tests__/api-routes/example-newrelic.test.ts deleted file mode 100644 index 691dc24..0000000 --- a/apps/web/src/__tests__/api-routes/example-newrelic.test.ts +++ /dev/null @@ -1,117 +0,0 @@ -/** - * Tests for GET /api/example-newrelic endpoint - */ -import { describe, it, expect, vi, beforeEach } from "vitest"; -import { GET } from "@/app/api/example-newrelic/route"; -import { NextRequest } from "next/server"; - -// Mock newrelic-utils -vi.mock("@/lib/newrelic-utils", () => ({ - returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), - returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), - logger: { - info: vi.fn(), - error: vi.fn(), - }, - recordError: vi.fn(), - setTransactionName: vi.fn(), - trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), -})); - -import { - logger, - recordError, - setTransactionName, - trackApiCall, - addTransactionAttributes, -} from "@/lib/newrelic-utils"; - -describe("GET /api/example-newrelic", () => { - beforeEach(() => { - vi.clearAllMocks(); - }); - - it("should successfully process request with New Relic instrumentation", async () => { - const request = new NextRequest( - "http://localhost:3000/api/example-newrelic", - { - headers: { - "user-agent": "test-agent", - }, - }, - ); - - const response = await GET(request); - const data = await response.json(); - - expect(response.status).toBe(200); - expect(data.message).toBe("Hello from New Relic instrumented API!"); - - // Verify New Relic instrumentation was called - expect(setTransactionName).toHaveBeenCalledWith( - "GET /api/example-newrelic", - ); - expect(addTransactionAttributes).toHaveBeenCalledWith({ - endpoint: "/api/example-newrelic", - method: "GET", - userAgent: "test-agent", - }); - expect(trackApiCall).toHaveBeenCalledWith( - "/api/example-newrelic", - "GET", - 200, - expect.any(Number), - { cached: false }, - ); - expect(logger.info).toHaveBeenCalledTimes(1); - }); - - it("should use 'unknown' user agent when header is missing", async () => { - const request = new NextRequest( - "http://localhost:3000/api/example-newrelic", - ); - - const response = await GET(request); - - expect(response.status).toBe(200); - expect(addTransactionAttributes).toHaveBeenCalledWith({ - endpoint: "/api/example-newrelic", - method: "GET", - userAgent: "unknown", - }); - }); - - it("should track request duration accurately", async () => { - const request = new NextRequest( - "http://localhost:3000/api/example-newrelic", - ); - - await GET(request); - - // Verify duration was tracked (should be >= 0) - const trackApiCallArgs = vi.mocked(trackApiCall).mock.calls[0]; - const duration = trackApiCallArgs[3]; - expect(typeof duration).toBe("number"); - expect(duration).toBeGreaterThanOrEqual(0); - }); - - it("should log request details", async () => { - const request = new NextRequest( - "http://localhost:3000/api/example-newrelic", - ); - - await GET(request); - - // Check that success was logged - expect(logger.info).toHaveBeenCalledWith( - "Example API request succeeded", - { - duration: expect.any(Number), - }, - ); - - // Verify logger.info was called at least once - expect(logger.info).toHaveBeenCalled(); - }); -}); diff --git a/apps/web/src/__tests__/api-routes/gifs-search-route.test.ts b/apps/web/src/__tests__/api-routes/gifs-search-route.test.ts index 96107d3..3afa706 100644 --- a/apps/web/src/__tests__/api-routes/gifs-search-route.test.ts +++ b/apps/web/src/__tests__/api-routes/gifs-search-route.test.ts @@ -16,14 +16,12 @@ const { mockLoggerError, mockLoggerWarn, mockRequireAuth, - mockSetTransactionName, mockTrackApiCall, } = vi.hoisted(() => ({ mockCheckRateLimit: vi.fn(), mockLoggerError: vi.fn(), mockLoggerWarn: vi.fn(), mockRequireAuth: vi.fn(), - mockSetTransactionName: vi.fn(), mockTrackApiCall: vi.fn(), })); @@ -32,14 +30,13 @@ vi.mock("@/lib/auth-server", () => ({ requireAuth: mockRequireAuth, })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { error: mockLoggerError, warn: mockLoggerWarn, }, - setTransactionName: mockSetTransactionName, trackApiCall: mockTrackApiCall, })); diff --git a/apps/web/src/__tests__/api-routes/invites-code.test.ts b/apps/web/src/__tests__/api-routes/invites-code.test.ts index e2770b2..59949a3 100644 --- a/apps/web/src/__tests__/api-routes/invites-code.test.ts +++ b/apps/web/src/__tests__/api-routes/invites-code.test.ts @@ -16,7 +16,7 @@ vi.mock("@/lib/appwrite-roles", () => ({ getUserRoles: vi.fn(), })); vi.mock("@/lib/appwrite-invites"); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { diff --git a/apps/web/src/__tests__/api-routes/invites-join.test.ts b/apps/web/src/__tests__/api-routes/invites-join.test.ts index 5d856c5..1234c42 100644 --- a/apps/web/src/__tests__/api-routes/invites-join.test.ts +++ b/apps/web/src/__tests__/api-routes/invites-join.test.ts @@ -6,7 +6,7 @@ import * as appwriteInvites from "@/lib/appwrite-invites"; // Mock modules vi.mock("@/lib/auth-server"); vi.mock("@/lib/appwrite-invites"); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { diff --git a/apps/web/src/__tests__/api-routes/memberships.test.ts b/apps/web/src/__tests__/api-routes/memberships.test.ts index 3bab8a3..4a43210 100644 --- a/apps/web/src/__tests__/api-routes/memberships.test.ts +++ b/apps/web/src/__tests__/api-routes/memberships.test.ts @@ -44,7 +44,7 @@ describe("Memberships API", () => { beforeEach(async () => { vi.clearAllMocks(); - + // Dynamically import the route handler const module = await import("../../app/api/memberships/route"); GET = module.GET; diff --git a/apps/web/src/__tests__/api-routes/message-reactions.test.ts b/apps/web/src/__tests__/api-routes/message-reactions.test.ts index 4d299bf..3e0d2c3 100644 --- a/apps/web/src/__tests__/api-routes/message-reactions.test.ts +++ b/apps/web/src/__tests__/api-routes/message-reactions.test.ts @@ -35,7 +35,7 @@ vi.mock("@/lib/appwrite-core", () => ({ })); // Mock New Relic utilities -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -44,9 +44,7 @@ vi.mock("@/lib/newrelic-utils", () => ({ error: vi.fn(), }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), })); describe("Message Reactions API", () => { @@ -55,7 +53,7 @@ describe("Message Reactions API", () => { beforeEach(async () => { vi.clearAllMocks(); - + // Dynamically import the route handlers const module = await import("../../app/api/messages/[messageId]/reactions/route"); POST = module.POST; diff --git a/apps/web/src/__tests__/api-routes/pin-route.test.ts b/apps/web/src/__tests__/api-routes/pin-route.test.ts index ca06da8..6b6be52 100644 --- a/apps/web/src/__tests__/api-routes/pin-route.test.ts +++ b/apps/web/src/__tests__/api-routes/pin-route.test.ts @@ -88,12 +88,10 @@ vi.mock("../../lib/permissions", () => ({ ), })); -vi.mock("../../lib/newrelic-utils", () => ({ +vi.mock("../../lib/posthog-utils", () => ({ logger: { info: vi.fn(), warn: vi.fn(), error: vi.fn() }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), })); describe("Pin route", () => { diff --git a/apps/web/src/__tests__/api-routes/profiles-batch.test.ts b/apps/web/src/__tests__/api-routes/profiles-batch.test.ts index 4230a4e..58ee873 100644 --- a/apps/web/src/__tests__/api-routes/profiles-batch.test.ts +++ b/apps/web/src/__tests__/api-routes/profiles-batch.test.ts @@ -54,7 +54,7 @@ vi.mock("@/lib/appwrite-core", () => ({ })), })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -63,9 +63,7 @@ vi.mock("@/lib/newrelic-utils", () => ({ error: vi.fn(), }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), })); vi.mock("@/lib/auth-server", () => ({ diff --git a/apps/web/src/__tests__/api-routes/search-messages.test.ts b/apps/web/src/__tests__/api-routes/search-messages.test.ts index 9d5aecc..0109263 100644 --- a/apps/web/src/__tests__/api-routes/search-messages.test.ts +++ b/apps/web/src/__tests__/api-routes/search-messages.test.ts @@ -84,7 +84,7 @@ vi.mock("@/lib/appwrite-friendships", () => ({ getRelationshipMap: mockGetRelationshipMap, })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -93,7 +93,6 @@ vi.mock("@/lib/newrelic-utils", () => ({ error: vi.fn(), }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), })); diff --git a/apps/web/src/__tests__/api-routes/servers-invites.test.ts b/apps/web/src/__tests__/api-routes/servers-invites.test.ts index 4c3f3e7..28f0481 100644 --- a/apps/web/src/__tests__/api-routes/servers-invites.test.ts +++ b/apps/web/src/__tests__/api-routes/servers-invites.test.ts @@ -15,7 +15,7 @@ vi.mock("@/lib/appwrite-invites"); vi.mock("@/lib/server-channel-access", () => ({ getServerPermissionsForUser: mockGetServerPermissionsForUser, })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { info: vi.fn(), error: vi.fn(), warn: vi.fn() }, diff --git a/apps/web/src/__tests__/api-routes/servers-join.test.ts b/apps/web/src/__tests__/api-routes/servers-join.test.ts index 56b46bc..ea9b435 100644 --- a/apps/web/src/__tests__/api-routes/servers-join.test.ts +++ b/apps/web/src/__tests__/api-routes/servers-join.test.ts @@ -67,7 +67,7 @@ vi.mock("node-appwrite", () => ({ })); // Mock New Relic utilities -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -76,9 +76,7 @@ vi.mock("@/lib/newrelic-utils", () => ({ error: vi.fn(), }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), recordEvent: vi.fn(), })); @@ -87,7 +85,7 @@ describe("Server Join API", () => { beforeEach(async () => { vi.clearAllMocks(); - + // Dynamically import the route handler const module = await import("../../app/api/servers/join/route"); POST = module.POST; @@ -241,7 +239,7 @@ describe("Server Join API", () => { expect(response.status).toBe(200); expect(data.success).toBe(true); - + // Verify membership was created without document-level permissions expect(mockCreateDocument).toHaveBeenCalledWith( "test-db", @@ -291,7 +289,7 @@ describe("Server Join API", () => { expect(response.status).toBe(200); expect(data.success).toBe(true); - + // Member count is no longer stored in DB expect(mockUpdateDocument).not.toHaveBeenCalled(); }); diff --git a/apps/web/src/__tests__/api-routes/status-batch.test.ts b/apps/web/src/__tests__/api-routes/status-batch.test.ts index 12f3bf9..8769b31 100644 --- a/apps/web/src/__tests__/api-routes/status-batch.test.ts +++ b/apps/web/src/__tests__/api-routes/status-batch.test.ts @@ -33,7 +33,7 @@ vi.mock("@/lib/appwrite-core", () => ({ })), })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -41,9 +41,7 @@ vi.mock("@/lib/newrelic-utils", () => ({ warn: vi.fn(), error: vi.fn(), }, - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), })); vi.mock("node-appwrite", () => ({ diff --git a/apps/web/src/__tests__/api-routes/stickers-route.test.ts b/apps/web/src/__tests__/api-routes/stickers-route.test.ts index add250d..9c40c7d 100644 --- a/apps/web/src/__tests__/api-routes/stickers-route.test.ts +++ b/apps/web/src/__tests__/api-routes/stickers-route.test.ts @@ -14,12 +14,10 @@ class MockAuthError extends Error { const { mockGetBuiltinStickerPacks, mockRequireAuth, - mockSetTransactionName, mockTrackApiCall, } = vi.hoisted(() => ({ mockGetBuiltinStickerPacks: vi.fn(), mockRequireAuth: vi.fn(), - mockSetTransactionName: vi.fn(), mockTrackApiCall: vi.fn(), })); @@ -32,10 +30,9 @@ vi.mock("@/lib/gif-sticker", () => ({ getBuiltinStickerPacks: mockGetBuiltinStickerPacks, })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), - setTransactionName: mockSetTransactionName, trackApiCall: mockTrackApiCall, })); diff --git a/apps/web/src/__tests__/api-routes/thread-route.test.ts b/apps/web/src/__tests__/api-routes/thread-route.test.ts index 5fc4172..24aa9e8 100644 --- a/apps/web/src/__tests__/api-routes/thread-route.test.ts +++ b/apps/web/src/__tests__/api-routes/thread-route.test.ts @@ -69,7 +69,7 @@ vi.mock("@/lib/server-channel-access", () => ({ ), })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -78,9 +78,7 @@ vi.mock("@/lib/newrelic-utils", () => ({ error: vi.fn(), }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), })); describe("Thread route", () => { diff --git a/apps/web/src/__tests__/api-routes/upload-file.test.ts b/apps/web/src/__tests__/api-routes/upload-file.test.ts index 087573c..acf9c2a 100644 --- a/apps/web/src/__tests__/api-routes/upload-file.test.ts +++ b/apps/web/src/__tests__/api-routes/upload-file.test.ts @@ -101,7 +101,7 @@ vi.mock("@/lib/appwrite-core", () => ({ })), })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -110,9 +110,7 @@ vi.mock("@/lib/newrelic-utils", () => ({ error: vi.fn(), }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), recordEvent: vi.fn(), })); diff --git a/apps/web/src/__tests__/api-routes/upload-image.test.ts b/apps/web/src/__tests__/api-routes/upload-image.test.ts index 6429ef8..59f5e98 100644 --- a/apps/web/src/__tests__/api-routes/upload-image.test.ts +++ b/apps/web/src/__tests__/api-routes/upload-image.test.ts @@ -52,7 +52,7 @@ vi.mock("@/lib/appwrite-core", () => ({ })), })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { @@ -61,9 +61,7 @@ vi.mock("@/lib/newrelic-utils", () => ({ error: vi.fn(), }, recordError: vi.fn(), - setTransactionName: vi.fn(), trackApiCall: vi.fn(), - addTransactionAttributes: vi.fn(), recordEvent: vi.fn(), })); diff --git a/apps/web/src/__tests__/api-routes/verify-email-route.test.ts b/apps/web/src/__tests__/api-routes/verify-email-route.test.ts index 4f695c0..127a033 100644 --- a/apps/web/src/__tests__/api-routes/verify-email-route.test.ts +++ b/apps/web/src/__tests__/api-routes/verify-email-route.test.ts @@ -41,7 +41,7 @@ vi.mock("@/lib/feature-flags", () => ({ getFeatureFlag: mockGetFeatureFlag, })); -vi.mock("@/lib/newrelic-utils", () => ({ +vi.mock("@/lib/posthog-utils", () => ({ returnUnauthorized: () => new Response(JSON.stringify({ error: "Unauthorized" }), { status: 401 }), returnForbidden: () => new Response(JSON.stringify({ error: "Forbidden" }), { status: 403 }), logger: { diff --git a/apps/web/src/__tests__/appwrite-core.test.ts b/apps/web/src/__tests__/appwrite-core.test.ts index ea64920..f7cc3da 100644 --- a/apps/web/src/__tests__/appwrite-core.test.ts +++ b/apps/web/src/__tests__/appwrite-core.test.ts @@ -124,7 +124,7 @@ describe("withSession unauthorized flow", () => { it("throws UnauthorizedError when account.get fails", async () => { // Reset module caches to allow fresh import with new mock vi.resetModules(); - + vi.doMock("appwrite", () => { class Client { setEndpoint() { @@ -182,7 +182,7 @@ describe("createServer integration (mocked)", () => { it("creates server document with provided name", async () => { // Reset modules to allow fresh mocks vi.resetModules(); - + (process.env as any).APPWRITE_ENDPOINT = "http://x"; (process.env as any).APPWRITE_PROJECT_ID = "p"; (process.env as any).APPWRITE_DATABASE_ID = "db"; @@ -191,7 +191,7 @@ describe("createServer integration (mocked)", () => { "channels"; (process.env as any).APPWRITE_MEMBERSHIPS_COLLECTION_ID = "memberships"; - + // Remock appwrite with ID export prior to importing createServer implementation vi.doMock("appwrite", () => { class Client { @@ -241,7 +241,7 @@ describe("createServer integration (mocked)", () => { ID: { unique: () => "unique" }, }; }); - + const core = await import("../lib/appwrite-core"); core.resetEnvCache(); const { createServer } = await import("../lib/appwrite-servers"); diff --git a/apps/web/src/__tests__/appwrite-invites.test.ts b/apps/web/src/__tests__/appwrite-invites.test.ts index 707693d..ae03e70 100644 --- a/apps/web/src/__tests__/appwrite-invites.test.ts +++ b/apps/web/src/__tests__/appwrite-invites.test.ts @@ -1,8 +1,8 @@ /** * Server Invite System - Behavior Documentation - * + * * This file documents the expected behavior of the server invite system. - * + * * Core Features: * - Unique 10-character invite codes * - Optionally expire at a specific date/time @@ -10,20 +10,20 @@ * - Grant temporary or permanent memberships * - Track who used each invite and when * - Revocable by admins/moderators - * + * * Validation Rules: * - Invites must exist and match the code exactly * - Expired invites are rejected * - Invites at max uses are rejected * - Users already in the server cannot use an invite - * + * * Security: * - Only admins/mods can create invites * - Only admins/mods can revoke invites * - Only admins/mods can view invite usage * - Public users can validate and use invites * - Rate limiting prevents abuse - * + * * @see /docs/SERVER_INVITES.md for full documentation */ diff --git a/apps/web/src/__tests__/appwrite-roles-extended.test.ts b/apps/web/src/__tests__/appwrite-roles-extended.test.ts index d398287..642f91a 100644 --- a/apps/web/src/__tests__/appwrite-roles-extended.test.ts +++ b/apps/web/src/__tests__/appwrite-roles-extended.test.ts @@ -130,7 +130,6 @@ describe("appwrite-roles - Extended Coverage", () => { (process.env as Record).APPWRITE_ADMIN_USER_IDS = "override-admin-1,override-admin-2"; - const { getUserRoles } = await import("../lib/appwrite-roles"); const result = await getUserRoles("override-admin-1"); @@ -143,7 +142,6 @@ describe("appwrite-roles - Extended Coverage", () => { (process.env as Record).APPWRITE_MODERATOR_USER_IDS = "override-mod-1"; - const { getUserRoles } = await import("../lib/appwrite-roles"); const result = await getUserRoles("override-mod-1"); @@ -158,7 +156,6 @@ describe("appwrite-roles - Extended Coverage", () => { delete (process.env as Record) .APPWRITE_MODERATOR_TEAM_ID; - const { getUserRoles } = await import("../lib/appwrite-roles"); const result = await getUserRoles("user1"); @@ -234,7 +231,6 @@ describe("appwrite-roles - Extended Coverage", () => { }); setTeamMemberships("team-vip", ["vip-user"]); - const { getUserRoleTags } = await import("../lib/appwrite-roles"); const result = await getUserRoleTags("vip-user"); @@ -248,7 +244,6 @@ describe("appwrite-roles - Extended Coverage", () => { (process.env as Record).ROLE_TEAM_MAP = "invalid-json{"; - const { getUserRoleTags } = await import("../lib/appwrite-roles"); // Should not throw @@ -264,7 +259,6 @@ describe("appwrite-roles - Extended Coverage", () => { setTeamMemberships("team-admin", ["admin-user"]); setTeamMemberships("team-custom-admin", ["admin-user"]); - const { getUserRoleTags } = await import("../lib/appwrite-roles"); const result = await getUserRoleTags("admin-user"); @@ -351,7 +345,6 @@ describe("appwrite-roles - Extended Coverage", () => { (process.env as Record).APPWRITE_ADMIN_USER_IDS = " user1 , user2 ,user3 "; - const { getUserRoles } = await import("../lib/appwrite-roles"); const result1 = await getUserRoles("user1"); @@ -367,7 +360,6 @@ describe("appwrite-roles - Extended Coverage", () => { (process.env as Record).APPWRITE_ADMIN_USER_IDS = ""; (process.env as Record).APPWRITE_MODERATOR_USER_IDS = ""; - const { getUserRoles } = await import("../lib/appwrite-roles"); const result = await getUserRoles("user1"); @@ -397,7 +389,6 @@ describe("appwrite-roles - Extended Coverage", () => { }, })); - const { getUserRoles } = await import("../lib/appwrite-roles"); // Should not throw, returns false roles @@ -417,7 +408,6 @@ describe("appwrite-roles - Extended Coverage", () => { setTeamMemberships("team-gold", ["rich-user"]); setTeamMemberships("team-silver", ["rich-user"]); - const { getUserRoleTags } = await import("../lib/appwrite-roles"); const result = await getUserRoleTags("rich-user"); @@ -452,7 +442,6 @@ describe("appwrite-roles - Extended Coverage", () => { it("should work without API key (browser mode)", async () => { delete (process.env as Record).APPWRITE_API_KEY; - const { getUserRoles } = await import("../lib/appwrite-roles"); // Should still work, just using browser client diff --git a/apps/web/src/__tests__/cache-utils-comprehensive.test.ts b/apps/web/src/__tests__/cache-utils-comprehensive.test.ts index 59d5ad4..e15501e 100644 --- a/apps/web/src/__tests__/cache-utils-comprehensive.test.ts +++ b/apps/web/src/__tests__/cache-utils-comprehensive.test.ts @@ -26,17 +26,17 @@ describe("apiCache", () => { it("should return null for expired data", () => { apiCache.set("key1", "value1", 1000); - + vi.advanceTimersByTime(1001); - + expect(apiCache.get("key1")).toBeNull(); }); it("should return data before TTL expires", () => { apiCache.set("key1", "value1", 1000); - + vi.advanceTimersByTime(500); - + expect(apiCache.get("key1")).toBe("value1"); }); @@ -101,9 +101,9 @@ describe("apiCache", () => { it("should return false for expired data", () => { apiCache.set("key1", "value1", 1000); - + vi.advanceTimersByTime(1001); - + expect(apiCache.has("key1")).toBe(false); }); }); @@ -111,29 +111,29 @@ describe("apiCache", () => { describe("dedupe", () => { it("should return cached data if available", async () => { const fetcher = vi.fn().mockResolvedValue("fresh data"); - + apiCache.set("key1", "cached data", 1000); - + const result = await apiCache.dedupe("key1", fetcher, 1000); - + expect(result).toBe("cached data"); expect(fetcher).not.toHaveBeenCalled(); }); it("should call fetcher if data not cached", async () => { const fetcher = vi.fn().mockResolvedValue("fresh data"); - + const result = await apiCache.dedupe("key1", fetcher, 1000); - + expect(result).toBe("fresh data"); expect(fetcher).toHaveBeenCalledTimes(1); }); it("should cache fetched data", async () => { const fetcher = vi.fn().mockResolvedValue("fresh data"); - + await apiCache.dedupe("key1", fetcher, 1000); - + expect(apiCache.get("key1")).toBe("fresh data"); }); @@ -147,15 +147,15 @@ describe("apiCache", () => { }, 100); }) ); - + // Start two concurrent requests const promise1 = apiCache.dedupe("key1", fetcher, 1000); const promise2 = apiCache.dedupe("key1", fetcher, 1000); - + vi.advanceTimersByTime(100); - + const [result1, result2] = await Promise.all([promise1, promise2]); - + expect(result1).toBe("data"); expect(result2).toBe("data"); expect(fetcher).toHaveBeenCalledTimes(1); @@ -163,9 +163,9 @@ describe("apiCache", () => { it("should handle fetcher errors", async () => { const fetcher = vi.fn().mockRejectedValue(new Error("Fetch failed")); - + await expect(apiCache.dedupe("key1", fetcher, 1000)).rejects.toThrow("Fetch failed"); - + // Should not cache failed requests expect(apiCache.get("key1")).toBeNull(); }); @@ -174,37 +174,37 @@ describe("apiCache", () => { const fetcher = vi.fn() .mockRejectedValueOnce(new Error("First attempt failed")) .mockResolvedValueOnce("success"); - + await expect(apiCache.dedupe("key1", fetcher, 1000)).rejects.toThrow("First attempt failed"); - + const result = await apiCache.dedupe("key1", fetcher, 1000); - + expect(result).toBe("success"); expect(fetcher).toHaveBeenCalledTimes(2); }); it("should clear pending request on error", async () => { const fetcher = vi.fn().mockRejectedValue(new Error("Failed")); - + await expect(apiCache.dedupe("key1", fetcher, 1000)).rejects.toThrow("Failed"); - + // Verify pending request was cleaned up const fetcher2 = vi.fn().mockResolvedValue("success"); await apiCache.dedupe("key1", fetcher2, 1000); - + expect(fetcher2).toHaveBeenCalledTimes(1); }); it("should handle different TTL values", async () => { const fetcher1 = vi.fn().mockResolvedValue("data1"); const fetcher2 = vi.fn().mockResolvedValue("data2"); - + await apiCache.dedupe("key1", fetcher1, 500); - + vi.advanceTimersByTime(600); - + await apiCache.dedupe("key1", fetcher2, 1000); - + expect(fetcher2).toHaveBeenCalledTimes(1); expect(apiCache.get("key1")).toBe("data2"); }); @@ -213,24 +213,24 @@ describe("apiCache", () => { describe("Edge Cases", () => { it("should handle zero TTL", () => { apiCache.set("key1", "value1", 0); - + vi.advanceTimersByTime(1); - + expect(apiCache.get("key1")).toBeNull(); }); it("should handle negative TTL", () => { apiCache.set("key1", "value1", -1000); - + expect(apiCache.get("key1")).toBeNull(); }); it("should handle very large TTL", () => { const largeTTL = Number.MAX_SAFE_INTEGER; apiCache.set("key1", "value1", largeTTL); - + vi.advanceTimersByTime(1000000); - + expect(apiCache.get("key1")).toBe("value1"); }); @@ -254,7 +254,7 @@ describe("apiCache", () => { apiCache.set("key-with-dashes", "value2", 1000); apiCache.set("key_with_underscores", "value3", 1000); apiCache.set("key.with.dots", "value4", 1000); - + expect(apiCache.get("key:with:colons")).toBe("value1"); expect(apiCache.get("key-with-dashes")).toBe("value2"); expect(apiCache.get("key_with_underscores")).toBe("value3"); @@ -265,7 +265,7 @@ describe("apiCache", () => { describe("Persistence", () => { it("should persist across module imports", () => { apiCache.set("persistent", "data", 1000); - + // Simulate accessing from different parts of the app expect(apiCache.has("persistent")).toBe(true); expect(apiCache.get("persistent")).toBe("data"); @@ -273,9 +273,9 @@ describe("apiCache", () => { it("should support dedupe operations", async () => { const fetcher = vi.fn().mockResolvedValue("api data"); - + const result = await apiCache.dedupe("api:users", fetcher, 5000); - + expect(result).toBe("api data"); expect(fetcher).toHaveBeenCalledTimes(1); }); @@ -297,7 +297,7 @@ describe("CACHE_TTL", () => { expect(CACHE_TTL.SERVERS).toBeGreaterThan(0); expect(CACHE_TTL.CHANNELS).toBeGreaterThan(0); expect(CACHE_TTL.MESSAGES).toBeGreaterThan(0); - + // Server data should have longer TTL than messages expect(CACHE_TTL.SERVERS).toBeGreaterThan(CACHE_TTL.MESSAGES); }); diff --git a/apps/web/src/__tests__/chat-ui-fixes.test.ts b/apps/web/src/__tests__/chat-ui-fixes.test.ts index 295139c..5cea557 100644 --- a/apps/web/src/__tests__/chat-ui-fixes.test.ts +++ b/apps/web/src/__tests__/chat-ui-fixes.test.ts @@ -13,12 +13,12 @@ describe("Chat UI Fixes", () => { // Simulate the applyCreate logic const newMessage = { $id: "msg1", text: "Hello", $createdAt: "2025-01-01T00:00:00Z" }; - + // Check if message already exists const messageExists = messages.some((m) => m.$id === newMessage.$id); - + expect(messageExists).toBe(true); - + // If message exists, prev should be returned unchanged const result = messageExists ? messages : [...messages, newMessage]; expect(result).toHaveLength(2); @@ -31,14 +31,14 @@ describe("Chat UI Fixes", () => { ]; const newMessage = { $id: "msg3", text: "New", $createdAt: "2025-01-01T00:02:00Z" }; - + const messageExists = messages.some((m) => m.$id === newMessage.$id); expect(messageExists).toBe(false); - + const result = messageExists ? messages : [...messages, newMessage].sort((a, b) => a.$createdAt.localeCompare(b.$createdAt) ); - + expect(result).toHaveLength(2); expect(result[1].$id).toBe("msg3"); }); @@ -52,12 +52,12 @@ describe("Chat UI Fixes", () => { ]; const duplicateMessage = { $id: "dm1", text: "Hello", $createdAt: "2025-01-01T00:00:00Z", senderId: "user1", receiverId: "user2" }; - + // Check if message already exists const messageExists = messages.some((m) => m.$id === duplicateMessage.$id); - + expect(messageExists).toBe(true); - + // If message exists, prev should be returned unchanged const result = messageExists ? messages : [...messages, duplicateMessage]; expect(result).toHaveLength(2); @@ -69,10 +69,10 @@ describe("Chat UI Fixes", () => { ]; const newMessage = { $id: "dm3", text: "New message", $createdAt: "2025-01-01T00:02:00Z", senderId: "user1", receiverId: "user2" }; - + const messageExists = messages.some((m) => m.$id === newMessage.$id); expect(messageExists).toBe(false); - + const result = messageExists ? messages : [...messages, newMessage]; expect(result).toHaveLength(2); expect(result[1].$id).toBe("dm3"); @@ -87,9 +87,9 @@ describe("Chat UI Fixes", () => { ]; const updatedMessage = { $id: "msg1", text: "Edited text", $createdAt: "2025-01-01T00:00:00Z", editedAt: "2025-01-01T00:03:00Z" }; - + const result = messages.map((m) => (m.$id === updatedMessage.$id ? updatedMessage : m)); - + expect(result).toHaveLength(2); expect(result[0].text).toBe("Edited text"); expect(result[0].editedAt).toBe("2025-01-01T00:03:00Z"); @@ -106,9 +106,9 @@ describe("Chat UI Fixes", () => { ]; const messageToDelete = { $id: "msg2" }; - + const result = messages.filter((m) => m.$id !== messageToDelete.$id); - + expect(result).toHaveLength(2); expect(result.find((m) => m.$id === "msg2")).toBeUndefined(); expect(result[0].$id).toBe("msg1"); diff --git a/apps/web/src/__tests__/client-logger.test.ts b/apps/web/src/__tests__/client-logger.test.ts index c08fce6..9fa4f20 100644 --- a/apps/web/src/__tests__/client-logger.test.ts +++ b/apps/web/src/__tests__/client-logger.test.ts @@ -6,22 +6,14 @@ import { logger } from "@/lib/client-logger"; describe("ClientLogger", () => { const originalNodeEnv = process.env.NODE_ENV; - const originalClientTelemetryProvider = - process.env.NEXT_PUBLIC_TELEMETRY_PROVIDER; - let mockNewRelic: any; let mockPostHog: any; beforeEach(() => { vi.clearAllMocks(); - mockNewRelic = { - addPageAction: vi.fn(), - noticeError: vi.fn(), - }; mockPostHog = { capture: vi.fn(), captureException: vi.fn(), }; - delete process.env.NEXT_PUBLIC_TELEMETRY_PROVIDER; // Mock console methods vi.spyOn(console, "log").mockImplementation(() => {}); @@ -31,8 +23,6 @@ describe("ClientLogger", () => { afterEach(() => { process.env.NODE_ENV = originalNodeEnv; - process.env.NEXT_PUBLIC_TELEMETRY_PROVIDER = - originalClientTelemetryProvider; delete (global as any).window; vi.restoreAllMocks(); }); @@ -57,29 +47,9 @@ describe("ClientLogger", () => { expect(console.log).not.toHaveBeenCalled(); }); - it("should send to New Relic when available", () => { - (global as any).window = { - newrelic: mockNewRelic, - posthog: mockPostHog, - }; - - logger.info("Test message", { key: "value" }); - - expect(mockNewRelic.addPageAction).toHaveBeenCalledWith( - "log_info", - { - message: "Test message", - key: "value", - }, - ); - }); - - it("should send to PostHog when provider is posthog", () => { - process.env.NEXT_PUBLIC_TELEMETRY_PROVIDER = "posthog"; - (global as any).window = { - newrelic: mockNewRelic, - posthog: mockPostHog, - }; + it("should capture to PostHog when hydrated in the browser", () => { + (global as any).window = { posthog: mockPostHog }; + process.env.NODE_ENV = "production"; logger.info("Test message", { key: "value" }); @@ -87,7 +57,6 @@ describe("ClientLogger", () => { message: "Test message", key: "value", }); - expect(mockNewRelic.addPageAction).not.toHaveBeenCalled(); }); it("should handle info without attributes", () => { @@ -124,21 +93,15 @@ describe("ClientLogger", () => { expect(console.warn).not.toHaveBeenCalled(); }); - it("should send warnings to New Relic", () => { - (global as any).window = { - newrelic: mockNewRelic, - posthog: mockPostHog, - }; + it("should capture warnings to PostHog", () => { + (global as any).window = { posthog: mockPostHog }; logger.warn("Warning", { code: 123 }); - expect(mockNewRelic.addPageAction).toHaveBeenCalledWith( - "log_warn", - { - message: "Warning", - code: 123, - }, - ); + expect(mockPostHog.capture).toHaveBeenCalledWith("log_warn", { + message: "Warning", + code: 123, + }); }); }); @@ -157,27 +120,8 @@ describe("ClientLogger", () => { ); }); - it("should send Error objects to New Relic noticeError", () => { - (global as any).window = { - newrelic: mockNewRelic, - posthog: mockPostHog, - }; - const testError = new Error("Test error"); - - logger.error("Error occurred", testError, { userId: "456" }); - - expect(mockNewRelic.noticeError).toHaveBeenCalledWith(testError, { - message: "Error occurred", - userId: "456", - }); - }); - - it("should send Error objects to PostHog captureException when provider is posthog", () => { - process.env.NEXT_PUBLIC_TELEMETRY_PROVIDER = "posthog"; - (global as any).window = { - newrelic: mockNewRelic, - posthog: mockPostHog, - }; + it("should send Error objects to PostHog captureException", () => { + (global as any).window = { posthog: mockPostHog }; const testError = new Error("Test error"); logger.error("Error occurred", testError, { userId: "456" }); @@ -189,24 +133,33 @@ describe("ClientLogger", () => { userId: "456", }, ); - expect(mockNewRelic.noticeError).not.toHaveBeenCalled(); }); - it("should send string errors to New Relic addPageAction", () => { - (global as any).window = { - newrelic: mockNewRelic, - posthog: mockPostHog, - }; + it("should capture string errors as log_error events", () => { + (global as any).window = { posthog: mockPostHog }; logger.error("Error message", "String error", { context: "api" }); - expect(mockNewRelic.addPageAction).toHaveBeenCalledWith( - "log_error", - { - message: "Error message", - error: "String error", - context: "api", - }, + expect(mockPostHog.capture).toHaveBeenCalledWith("log_error", { + message: "Error message", + error: "String error", + context: "api", + }); + }); + + it("should fall back to a client_error event when captureException is unavailable", () => { + const posthogWithoutException = { capture: vi.fn() }; + (global as any).window = { posthog: posthogWithoutException }; + const testError = new Error("boom"); + + logger.error("Error occurred", testError); + + expect(posthogWithoutException.capture).toHaveBeenCalledWith( + "client_error", + expect.objectContaining({ + errorMessage: "boom", + message: "Error occurred", + }), ); }); @@ -247,38 +200,21 @@ describe("ClientLogger", () => { }); }); - it("should not log debug in production", () => { - process.env.NODE_ENV = "production"; - - logger.debug("Debug message"); - - expect(console.log).not.toHaveBeenCalled(); - }); - - it("should never send debug to New Relic", () => { - (global as any).window = { - newrelic: mockNewRelic, - posthog: mockPostHog, - }; + it("should never send debug to PostHog", () => { + (global as any).window = { posthog: mockPostHog }; process.env.NODE_ENV = "development"; logger.debug("Debug message"); - expect(mockNewRelic.addPageAction).not.toHaveBeenCalled(); - expect(mockNewRelic.noticeError).not.toHaveBeenCalled(); + expect(mockPostHog.capture).not.toHaveBeenCalled(); + expect(mockPostHog.captureException).not.toHaveBeenCalled(); }); }); - describe("getNewRelic", () => { - it("should return null when window is undefined (server-side)", () => { - const originalWindow = global.window; - delete (global as any).window; - + describe("server-side", () => { + it("should not throw when there is no window", () => { logger.info("Test"); - - // Should not throw error - - (global as any).window = originalWindow; + logger.error("Test error", new Error("nope")); }); }); @@ -303,4 +239,4 @@ describe("ClientLogger", () => { }); }); }); -}); +}); \ No newline at end of file diff --git a/apps/web/src/__tests__/components/button.test.tsx b/apps/web/src/__tests__/components/button.test.tsx index 7659c6d..cc36054 100644 --- a/apps/web/src/__tests__/components/button.test.tsx +++ b/apps/web/src/__tests__/components/button.test.tsx @@ -8,7 +8,7 @@ import { Button } from "../../components/ui/button"; describe("Button Component", () => { it("should render button with text", () => { render(); - + expect(screen.getByRole("button", { name: "Click me" })).toBeInTheDocument(); }); @@ -18,67 +18,67 @@ describe("Button Component", () => { const handleClick = () => { clicked = true; }; - + render(); - + const button = screen.getByRole("button", { name: "Click me" }); await user.click(button); - + expect(clicked).toBe(true); }); it("should render with default variant", () => { render(); - + const button = screen.getByRole("button", { name: "Default" }); expect(button).toBeInTheDocument(); }); it("should render with destructive variant", () => { render(); - + const button = screen.getByRole("button", { name: "Delete" }); expect(button).toBeInTheDocument(); }); it("should render with outline variant", () => { render(); - + const button = screen.getByRole("button", { name: "Outline" }); expect(button).toBeInTheDocument(); }); it("should render with ghost variant", () => { render(); - + const button = screen.getByRole("button", { name: "Ghost" }); expect(button).toBeInTheDocument(); }); it("should render with small size", () => { render(); - + const button = screen.getByRole("button", { name: "Small" }); expect(button).toBeInTheDocument(); }); it("should render with large size", () => { render(); - + const button = screen.getByRole("button", { name: "Large" }); expect(button).toBeInTheDocument(); }); it("should render with icon size", () => { render(); - + const button = screen.getByRole("button", { name: "Icon button" }); expect(button).toBeInTheDocument(); }); it("should be disabled when disabled prop is true", () => { render(); - + const button = screen.getByRole("button", { name: "Disabled" }); expect(button).toBeDisabled(); }); @@ -89,7 +89,7 @@ describe("Button Component", () => { Link Button ); - + const link = screen.getByRole("link", { name: "Link Button" }); expect(link).toBeInTheDocument(); expect(link).toHaveAttribute("href", "/test"); @@ -97,7 +97,7 @@ describe("Button Component", () => { it("should apply custom className", () => { render(); - + const button = screen.getByRole("button", { name: "Custom" }); expect(button).toHaveClass("custom-class"); }); diff --git a/apps/web/src/__tests__/components/checkbox.test.tsx b/apps/web/src/__tests__/components/checkbox.test.tsx index e01b4ea..bfb0538 100644 --- a/apps/web/src/__tests__/components/checkbox.test.tsx +++ b/apps/web/src/__tests__/components/checkbox.test.tsx @@ -9,14 +9,14 @@ import { Checkbox } from "../../components/ui/checkbox"; describe("Checkbox Component", () => { it("should render checkbox", () => { render(); - + const checkbox = screen.getByRole("checkbox", { name: "Accept terms" }); expect(checkbox).toBeInTheDocument(); }); it("should be unchecked by default", () => { render(); - + const checkbox = screen.getByRole("checkbox", { name: "Test checkbox" }); expect(checkbox).not.toBeChecked(); }); @@ -24,29 +24,29 @@ describe("Checkbox Component", () => { it("should be checked when clicked", async () => { const user = userEvent.setup(); render(); - + const checkbox = screen.getByRole("checkbox", { name: "Test checkbox" }); await user.click(checkbox); - + expect(checkbox).toBeChecked(); }); it("should toggle checked state", async () => { const user = userEvent.setup(); render(); - + const checkbox = screen.getByRole("checkbox", { name: "Toggle checkbox" }); - + await user.click(checkbox); expect(checkbox).toBeChecked(); - + await user.click(checkbox); expect(checkbox).not.toBeChecked(); }); it("should be disabled when disabled prop is true", () => { render(); - + const checkbox = screen.getByRole("checkbox", { name: "Disabled checkbox" }); expect(checkbox).toBeDisabled(); }); @@ -54,16 +54,16 @@ describe("Checkbox Component", () => { it("should not be clickable when disabled", async () => { const user = userEvent.setup(); render(); - + const checkbox = screen.getByRole("checkbox", { name: "Disabled checkbox" }); await user.click(checkbox); - + expect(checkbox).not.toBeChecked(); }); it("should have default checked state", () => { render(); - + const checkbox = screen.getByRole("checkbox", { name: "Default checked" }); expect(checkbox).toBeChecked(); }); @@ -74,23 +74,23 @@ describe("Checkbox Component", () => { const handleChange = (value: boolean) => { checked = value; }; - + render( - ); - + const checkbox = screen.getByRole("checkbox", { name: "Controlled checkbox" }); await user.click(checkbox); - + expect(checked).toBe(true); }); it("should apply custom className", () => { render(); - + const checkbox = screen.getByRole("checkbox", { name: "Custom checkbox" }); expect(checkbox).toHaveClass("custom-class"); }); @@ -104,7 +104,7 @@ describe("Checkbox Component", () => { ); - + const checkbox = screen.getByRole("checkbox"); expect(checkbox).toBeInTheDocument(); expect(checkbox).toHaveAttribute("id", "terms"); diff --git a/apps/web/src/__tests__/components/input.test.tsx b/apps/web/src/__tests__/components/input.test.tsx index 1c70663..6cda1b9 100644 --- a/apps/web/src/__tests__/components/input.test.tsx +++ b/apps/web/src/__tests__/components/input.test.tsx @@ -7,17 +7,17 @@ import { Input } from "../../components/ui/input"; describe("Input Component", () => { it("should render input field", () => { render(); - + expect(screen.getByPlaceholderText("Enter text")).toBeInTheDocument(); }); it("should accept text input", async () => { const user = userEvent.setup(); render(); - + const input = screen.getByPlaceholderText("Enter text"); await user.type(input, "Hello World"); - + expect(input).toHaveValue("Hello World"); }); @@ -37,21 +37,21 @@ describe("Input Component", () => { it("should be disabled when disabled prop is true", () => { render(); - + const input = screen.getByPlaceholderText("Disabled input"); expect(input).toBeDisabled(); }); it("should have default value", () => { render(); - + const input = screen.getByDisplayValue("Default text"); expect(input).toHaveValue("Default text"); }); it("should apply custom className", () => { render(); - + const input = screen.getByPlaceholderText("Custom"); expect(input).toHaveClass("custom-class"); }); @@ -62,25 +62,25 @@ describe("Input Component", () => { const handleChange = (e: ChangeEvent) => { value = e.target.value; }; - + render(); - + const input = screen.getByPlaceholderText("Type here"); await user.type(input, "Test"); - + expect(value).toBe("Test"); }); it("should be required when required prop is true", () => { render(); - + const input = screen.getByPlaceholderText("Required input"); expect(input).toBeRequired(); }); it("should have aria-label for accessibility", () => { render(); - + const input = screen.getByLabelText("Username input"); expect(input).toBeInTheDocument(); }); diff --git a/apps/web/src/__tests__/components/loader.test.tsx b/apps/web/src/__tests__/components/loader.test.tsx index b9fbcc0..0c383f5 100644 --- a/apps/web/src/__tests__/components/loader.test.tsx +++ b/apps/web/src/__tests__/components/loader.test.tsx @@ -8,7 +8,7 @@ import Loader from "../../components/loader"; describe("Loader Component", () => { it("should render loader spinner", () => { const { container } = render(); - + // Check for the spinner element (SVG with aria-hidden) const spinner = container.querySelector("svg"); expect(spinner).toBeInTheDocument(); @@ -18,14 +18,14 @@ describe("Loader Component", () => { it("should have animate-spin class", () => { const { container } = render(); const svg = container.querySelector("svg"); - + expect(svg).toHaveClass("animate-spin"); }); it("should be centered", () => { const { container } = render(); const wrapper = container.firstChild; - + expect(wrapper).toHaveClass("flex", "h-full", "items-center", "justify-center"); }); }); diff --git a/apps/web/src/__tests__/components/message-with-mentions.test.tsx b/apps/web/src/__tests__/components/message-with-mentions.test.tsx index 52a0505..45fec3e 100644 --- a/apps/web/src/__tests__/components/message-with-mentions.test.tsx +++ b/apps/web/src/__tests__/components/message-with-mentions.test.tsx @@ -78,7 +78,7 @@ describe("MessageWithMentions", () => { // Check for mention expect(container.textContent).toContain("@TestUser"); - + // Check for custom emoji image const images = screen.getAllByRole("img"); expect(images.length).toBeGreaterThan(0); diff --git a/apps/web/src/__tests__/components/mode-toggle.test.tsx b/apps/web/src/__tests__/components/mode-toggle.test.tsx index 5d21245..2f12c5f 100644 --- a/apps/web/src/__tests__/components/mode-toggle.test.tsx +++ b/apps/web/src/__tests__/components/mode-toggle.test.tsx @@ -19,7 +19,7 @@ vi.mock("next-themes", () => ({ describe("ModeToggle Component", () => { it("should render the toggle button", () => { render(); - + const button = screen.getByRole("button", { name: /toggle theme/i }); expect(button).toBeInTheDocument(); }); @@ -27,10 +27,10 @@ describe("ModeToggle Component", () => { it("should show theme options when clicked", async () => { const user = userEvent.setup(); render(); - + const button = screen.getByRole("button", { name: /toggle theme/i }); await user.click(button); - + expect(screen.getByText("Light")).toBeInTheDocument(); expect(screen.getByText("Dark")).toBeInTheDocument(); expect(screen.getByText("System")).toBeInTheDocument(); @@ -39,45 +39,45 @@ describe("ModeToggle Component", () => { it("should call setTheme with 'light' when Light is clicked", async () => { const user = userEvent.setup(); render(); - + const button = screen.getByRole("button", { name: /toggle theme/i }); await user.click(button); - + const lightOption = screen.getByText("Light"); await user.click(lightOption); - + expect(mockSetTheme).toHaveBeenCalledWith("light"); }); it("should call setTheme with 'dark' when Dark is clicked", async () => { const user = userEvent.setup(); render(); - + const button = screen.getByRole("button", { name: /toggle theme/i }); await user.click(button); - + const darkOption = screen.getByText("Dark"); await user.click(darkOption); - + expect(mockSetTheme).toHaveBeenCalledWith("dark"); }); it("should call setTheme with 'system' when System is clicked", async () => { const user = userEvent.setup(); render(); - + const button = screen.getByRole("button", { name: /toggle theme/i }); await user.click(button); - + const systemOption = screen.getByText("System"); await user.click(systemOption); - + expect(mockSetTheme).toHaveBeenCalledWith("system"); }); it("should have sun and moon icons", () => { const { container } = render(); - + // Check for SVG elements (icons) const svgs = container.querySelectorAll("svg"); expect(svgs.length).toBeGreaterThanOrEqual(2); @@ -85,7 +85,7 @@ describe("ModeToggle Component", () => { it("should have accessible label", () => { render(); - + const srOnly = screen.getByText("Toggle theme"); expect(srOnly).toBeInTheDocument(); expect(srOnly).toHaveClass("sr-only"); diff --git a/apps/web/src/__tests__/components/reaction-components.test.tsx b/apps/web/src/__tests__/components/reaction-components.test.tsx index a353e5c..37e2553 100644 --- a/apps/web/src/__tests__/components/reaction-components.test.tsx +++ b/apps/web/src/__tests__/components/reaction-components.test.tsx @@ -133,7 +133,7 @@ describe("ReactionButton Component", () => { }); it("should disable button while loading", async () => { - const onToggle = vi.fn<(emoji: string, isAdding: boolean) => Promise>(() => + const onToggle = vi.fn<(emoji: string, isAdding: boolean) => Promise>(() => new Promise((resolve) => setTimeout(resolve, 100)) ); const reaction = { @@ -151,9 +151,9 @@ describe("ReactionButton Component", () => { ); const button = screen.getByRole("button"); - + fireEvent.click(button); - + // Button should be disabled while loading expect(button).toBeDisabled(); }); @@ -269,11 +269,11 @@ describe("ReactionPicker Component", () => { it("should call onSelectEmoji prop function", async () => { const onSelectEmoji = vi.fn().mockResolvedValue(undefined); - + // This test validates the prop is passed correctly // Full integration testing of emoji picker would require mocking the EmojiPicker component render(); - + expect(onSelectEmoji).toBeDefined(); }); }); diff --git a/apps/web/src/__tests__/components/status-indicator.test.tsx b/apps/web/src/__tests__/components/status-indicator.test.tsx index c07e606..7cc67a7 100644 --- a/apps/web/src/__tests__/components/status-indicator.test.tsx +++ b/apps/web/src/__tests__/components/status-indicator.test.tsx @@ -10,7 +10,7 @@ describe("StatusIndicator Component", () => { it("should render online status with green color", () => { const { container } = render(); const indicator = container.querySelector("span[title='Online']"); - + expect(indicator).toHaveClass("bg-green-500"); expect(indicator).toHaveClass("animate-pulse"); }); @@ -18,7 +18,7 @@ describe("StatusIndicator Component", () => { it("should render away status with yellow color", () => { const { container } = render(); const indicator = container.querySelector("span[title='Away']"); - + expect(indicator).toHaveClass("bg-yellow-500"); expect(indicator).not.toHaveClass("animate-pulse"); }); @@ -26,14 +26,14 @@ describe("StatusIndicator Component", () => { it("should render busy status with red color", () => { const { container } = render(); const indicator = container.querySelector("span[title='Busy']"); - + expect(indicator).toHaveClass("bg-red-500"); }); it("should render offline status with gray color", () => { const { container } = render(); const indicator = container.querySelector("span[title='Offline']"); - + expect(indicator).toHaveClass("bg-gray-400"); }); }); @@ -42,28 +42,28 @@ describe("StatusIndicator Component", () => { it("should render small size by default as md", () => { const { container } = render(); const indicator = container.querySelector("span[title='Online']"); - + expect(indicator).toHaveClass("size-3"); }); it("should render small size", () => { const { container } = render(); const indicator = container.querySelector("span[title='Online']"); - + expect(indicator).toHaveClass("size-2"); }); it("should render medium size", () => { const { container } = render(); const indicator = container.querySelector("span[title='Online']"); - + expect(indicator).toHaveClass("size-3"); }); it("should render large size", () => { const { container } = render(); const indicator = container.querySelector("span[title='Online']"); - + expect(indicator).toHaveClass("size-4"); }); }); @@ -71,31 +71,31 @@ describe("StatusIndicator Component", () => { describe("Labels", () => { it("should not show label by default", () => { render(); - + expect(screen.queryByText("Online")).not.toBeInTheDocument(); }); it("should show label when showLabel is true", () => { render(); - + expect(screen.getByText("Online")).toBeInTheDocument(); }); it("should show correct label for away status", () => { render(); - + expect(screen.getByText("Away")).toBeInTheDocument(); }); it("should show correct label for busy status", () => { render(); - + expect(screen.getByText("Busy")).toBeInTheDocument(); }); it("should show correct label for offline status", () => { render(); - + expect(screen.getByText("Offline")).toBeInTheDocument(); }); }); @@ -106,7 +106,7 @@ describe("StatusIndicator Component", () => { ); const wrapper = container.firstChild; - + expect(wrapper).toHaveClass("custom-class"); }); @@ -115,7 +115,7 @@ describe("StatusIndicator Component", () => { ); const wrapper = container.firstChild; - + expect(wrapper).toHaveClass("flex", "items-center", "gap-1.5", "custom-class"); }); }); @@ -124,7 +124,7 @@ describe("StatusIndicator Component", () => { it("should have title attribute for screen readers", () => { const { container } = render(); const indicator = container.querySelector("span[title='Online']"); - + expect(indicator).toHaveAttribute("title", "Online"); }); @@ -135,7 +135,7 @@ describe("StatusIndicator Component", () => { statuses.forEach((status, index) => { const { container } = render(); const indicator = container.querySelector(`span[title='${labels[index]}']`); - + expect(indicator).toHaveAttribute("title", labels[index]); }); }); diff --git a/apps/web/src/__tests__/custom-emojis.test.ts b/apps/web/src/__tests__/custom-emojis.test.ts index 18f4b09..4eceb00 100644 --- a/apps/web/src/__tests__/custom-emojis.test.ts +++ b/apps/web/src/__tests__/custom-emojis.test.ts @@ -53,7 +53,7 @@ describe("Custom Emojis - Optimistic Updates", () => { it("should create object URL for optimistic emoji preview", () => { const file = new File(["test"], "party.png", { type: "image/png" }); const url = URL.createObjectURL(file); - + expect(url).toBe("blob:mock-url"); expect(URL.createObjectURL).toHaveBeenCalledWith(file); }); @@ -64,10 +64,10 @@ describe("Custom Emojis - Optimistic Updates", () => { ]; localStorageMock.setItem("firepit_custom_emojis", JSON.stringify(mockEmojis)); - + const stored = localStorageMock.getItem("firepit_custom_emojis"); expect(stored).toBeDefined(); - + const parsed = JSON.parse(stored!); expect(parsed).toEqual(mockEmojis); expect(parsed[0].name).toBe("cached"); @@ -76,7 +76,7 @@ describe("Custom Emojis - Optimistic Updates", () => { it("should cleanup object URL to prevent memory leaks", () => { const mockUrl = "blob:mock-url"; URL.revokeObjectURL(mockUrl); - + expect(URL.revokeObjectURL).toHaveBeenCalledWith(mockUrl); }); @@ -161,13 +161,13 @@ describe("Custom Emojis - Optimistic Updates", () => { const cachedEmojis = [ { fileId: "cached1", url: "/api/emoji/cached1", name: "offline" }, ]; - + localStorageMock.setItem("firepit_custom_emojis", JSON.stringify(cachedEmojis)); // Should be able to get from cache const stored = localStorageMock.getItem("firepit_custom_emojis"); expect(stored).toBeDefined(); - + const parsed = JSON.parse(stored!); expect(parsed).toEqual(cachedEmojis); expect(parsed[0].name).toBe("offline"); @@ -186,7 +186,7 @@ describe("Custom Emojis - Optimistic Updates", () => { const response = await fetch("/api/custom-emojis"); expect(response.ok).toBe(true); - + const data = await response.json(); expect(Array.isArray(data)).toBe(true); expect(data.length).toBe(2); @@ -198,7 +198,7 @@ describe("Custom Emojis - Optimistic Updates", () => { describe("Custom Emojis - Realtime Synchronization", () => { it("should have realtime pool utilities", async () => { const realtimePool = await import("@/lib/realtime-pool"); - + expect(typeof realtimePool.getSharedRealtime).toBe("function"); expect(typeof realtimePool.trackSubscription).toBe("function"); }); @@ -213,7 +213,7 @@ describe("Custom Emojis - Realtime Synchronization", () => { }; const subscription = mockClient.subscribe("test-channel", () => {}); - + expect(mockClient.subscribe).toHaveBeenCalledWith("test-channel", expect.any(Function)); await expect(subscription).resolves.toEqual( expect.objectContaining({ @@ -233,7 +233,7 @@ describe("Custom Emojis - Realtime Synchronization", () => { // Simulate event handler const handleEvent = vi.fn(); handleEvent(mockEvent); - + expect(handleEvent).toHaveBeenCalledWith(mockEvent); expect(mockEvent.events[0]).toContain("create"); }); @@ -277,7 +277,7 @@ describe("Custom Emojis - Realtime Synchronization", () => { it("should construct correct channel name", () => { const bucketId = "emojis"; const channel = `buckets.${bucketId}.files`; - + expect(channel).toBe("buckets.emojis.files"); }); diff --git a/apps/web/src/__tests__/instrumentation.test.ts b/apps/web/src/__tests__/instrumentation.test.ts index f5ed68b..9cee962 100644 --- a/apps/web/src/__tests__/instrumentation.test.ts +++ b/apps/web/src/__tests__/instrumentation.test.ts @@ -1,139 +1,46 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -// Mock the newrelic module -vi.mock("newrelic", () => ({ - default: { - initialized: true, - }, +const { mockRegisterLoggerProvider, mockRegisterProcessHandlers } = + vi.hoisted(() => ({ + mockRegisterLoggerProvider: vi.fn(), + mockRegisterProcessHandlers: vi.fn(), + })); + +vi.mock("@/lib/posthog-utils", () => ({ + registerPostHogLoggerProvider: mockRegisterLoggerProvider, + registerPostHogProcessHandlers: mockRegisterProcessHandlers, })); describe("instrumentation", () => { const originalEnv = process.env; beforeEach(() => { - // Create a fresh copy of process.env process.env = { ...originalEnv }; + mockRegisterLoggerProvider.mockClear(); + mockRegisterProcessHandlers.mockClear(); }); afterEach(() => { - // Restore original environment process.env = originalEnv; - vi.clearAllMocks(); }); - it("should initialize New Relic when license key and app name are provided", async () => { - // Set up environment for Node.js runtime + it("should register PostHog hooks on the Node.js runtime", async () => { process.env.NEXT_RUNTIME = "nodejs"; - process.env.NEW_RELIC_LICENSE_KEY = "test-license-key"; - process.env.NEW_RELIC_APP_NAME = "test-app-name"; - - const consoleLogSpy = vi - .spyOn(console, "log") - .mockImplementation(() => {}); - - // Import the register function - const { register } = await import("../../instrumentation"); - - // Call register - const result = await register(); - - expect(result).toMatchObject({ - default: { - initialized: true, - }, - }); - expect(consoleLogSpy).not.toHaveBeenCalled(); - - consoleLogSpy.mockRestore(); - }); - - it("should warn when license key is missing", async () => { - process.env.NEXT_RUNTIME = "nodejs"; - process.env.NEW_RELIC_APP_NAME = "test-app-name"; - // NEW_RELIC_LICENSE_KEY is intentionally not set - delete process.env.NEW_RELIC_LICENSE_KEY; - - const consoleWarnSpy = vi - .spyOn(console, "warn") - .mockImplementation(() => {}); const { register } = await import("../../instrumentation"); await register(); - expect(consoleWarnSpy).toHaveBeenCalledWith( - "[New Relic] NEW_RELIC_LICENSE_KEY not found - APM monitoring disabled", - ); - - consoleWarnSpy.mockRestore(); + expect(mockRegisterLoggerProvider).toHaveBeenCalled(); + expect(mockRegisterProcessHandlers).toHaveBeenCalled(); }); - it("should warn when app name is missing", async () => { - process.env.NEXT_RUNTIME = "nodejs"; - process.env.NEW_RELIC_LICENSE_KEY = "test-license-key"; - // NEW_RELIC_APP_NAME is intentionally not set - delete process.env.NEW_RELIC_APP_NAME; - - const consoleWarnSpy = vi - .spyOn(console, "warn") - .mockImplementation(() => {}); - const { register } = await import("../../instrumentation"); - await register(); - - expect(consoleWarnSpy).toHaveBeenCalledWith( - "[New Relic] NEW_RELIC_APP_NAME not found - APM monitoring disabled", - ); - - consoleWarnSpy.mockRestore(); - }); - - it("should not initialize on Edge runtime", async () => { + it("should not register hooks on the Edge runtime", async () => { process.env.NEXT_RUNTIME = "edge"; - process.env.NEW_RELIC_LICENSE_KEY = "test-license-key"; - process.env.NEW_RELIC_APP_NAME = "test-app-name"; - - const consoleLogSpy = vi - .spyOn(console, "log") - .mockImplementation(() => {}); const { register } = await import("../../instrumentation"); await register(); - // Should not log initialization message on Edge runtime - expect(consoleLogSpy).not.toHaveBeenCalled(); - - consoleLogSpy.mockRestore(); - }); - - it("should not initialize when both credentials are missing", async () => { - process.env.NEXT_RUNTIME = "nodejs"; - // Both NEW_RELIC_LICENSE_KEY and NEW_RELIC_APP_NAME are intentionally not set - delete process.env.NEW_RELIC_LICENSE_KEY; - delete process.env.NEW_RELIC_APP_NAME; - - const consoleWarnSpy = vi - .spyOn(console, "warn") - .mockImplementation(() => {}); - const consoleLogSpy = vi - .spyOn(console, "log") - .mockImplementation(() => {}); - - const { register } = await import("../../instrumentation"); - await register(); - - // Should warn about both missing credentials - expect(consoleWarnSpy).toHaveBeenCalledWith( - "[New Relic] NEW_RELIC_LICENSE_KEY not found - APM monitoring disabled", - ); - expect(consoleWarnSpy).toHaveBeenCalledWith( - "[New Relic] NEW_RELIC_APP_NAME not found - APM monitoring disabled", - ); - - // Should not log initialization message - expect(consoleLogSpy).not.toHaveBeenCalledWith( - expect.stringContaining("[New Relic] Initialized"), - ); - - consoleWarnSpy.mockRestore(); - consoleLogSpy.mockRestore(); + expect(mockRegisterLoggerProvider).not.toHaveBeenCalled(); + expect(mockRegisterProcessHandlers).not.toHaveBeenCalled(); }); -}); +}); \ No newline at end of file diff --git a/apps/web/src/__tests__/invite-api-routes.test.ts b/apps/web/src/__tests__/invite-api-routes.test.ts index e64ebaf..550d721 100644 --- a/apps/web/src/__tests__/invite-api-routes.test.ts +++ b/apps/web/src/__tests__/invite-api-routes.test.ts @@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest"; /** * API Route Behavior Documentation Tests - * + * * These tests document the expected behavior of invite-related API routes. * They serve as executable documentation and behavior specifications. */ @@ -16,14 +16,14 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should generate unique 6-character alphanumeric code", () => { const codePattern = /^[A-Z0-9]{6}$/; const codes = new Set(); - + // Generate multiple codes to test uniqueness for (let i = 0; i < 100; i++) { const code = Math.random().toString(36).substring(2, 8).toUpperCase(); expect(code).toMatch(codePattern); codes.add(code); } - + // Expect high uniqueness (at least 95% unique) expect(codes.size).toBeGreaterThan(95); }); @@ -33,7 +33,7 @@ describe("Invite API Routes - Behavior Documentation", () => { maxUses: null, currentUses: 0, }; - + expect(defaultInvite.maxUses).toBeNull(); expect(defaultInvite.currentUses).toBe(0); }); @@ -42,13 +42,13 @@ describe("Invite API Routes - Behavior Documentation", () => { const defaultInvite = { temporary: false, }; - + expect(defaultInvite.temporary).toBe(false); }); it("should accept valid maxUses values (1-100)", () => { const validMaxUses = [1, 5, 10, 25, 50, 100]; - + validMaxUses.forEach(maxUses => { expect(maxUses).toBeGreaterThan(0); expect(maxUses).toBeLessThanOrEqual(100); @@ -58,7 +58,7 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should reject invalid maxUses values", () => { const invalidMaxUses = [0, -1, 101, 1.5, 2.7]; - + invalidMaxUses.forEach(val => { const isInvalid = val <= 0 || val > 100 || val % 1 !== 0; expect(isInvalid).toBe(true); @@ -69,7 +69,7 @@ describe("Invite API Routes - Behavior Documentation", () => { const now = Date.now(); const duration = 3600000; // 1 hour in ms const expiresAt = new Date(now + duration); - + expect(expiresAt.getTime()).toBeGreaterThan(now); expect(expiresAt.getTime()).toBeLessThanOrEqual(now + duration + 1000); }); @@ -77,7 +77,7 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should require valid server ID", () => { const validServerId = "server-123"; const invalidServerId = ""; - + expect(validServerId.length).toBeGreaterThan(0); expect(invalidServerId.length).toBe(0); }); @@ -85,7 +85,7 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should require authenticated user", () => { const authenticatedUser = { $id: "user-123" }; const unauthenticatedUser = null; - + expect(authenticatedUser).not.toBeNull(); expect(unauthenticatedUser).toBeNull(); }); @@ -99,12 +99,12 @@ describe("Invite API Routes - Behavior Documentation", () => { currentUses: 0, expiresAt: null, }; - + const isValid = ( invite.currentUses < (invite.maxUses ?? Number.POSITIVE_INFINITY) && (invite.expiresAt === null || new Date(invite.expiresAt) > new Date()) ); - + expect(isValid).toBe(true); }); @@ -114,7 +114,7 @@ describe("Invite API Routes - Behavior Documentation", () => { maxUses: 5, currentUses: 5, }; - + const isExhausted = invite.currentUses >= invite.maxUses; expect(isExhausted).toBe(true); }); @@ -125,7 +125,7 @@ describe("Invite API Routes - Behavior Documentation", () => { code: "ABC123", expiresAt: pastDate.toISOString(), }; - + const isExpired = new Date(invite.expiresAt) < new Date(); expect(isExpired).toBe(true); }); @@ -142,7 +142,7 @@ describe("Invite API Routes - Behavior Documentation", () => { name: "Test Server", memberCount: 42, }; - + expect(preview.name).toBeDefined(); expect(typeof preview.name).toBe("string"); expect(preview.memberCount).toBeDefined(); @@ -155,7 +155,7 @@ describe("Invite API Routes - Behavior Documentation", () => { name: "Test Server", memberCount: 42, }; - + // Should not include these fields expect(preview).not.toHaveProperty("ownerId"); expect(preview).not.toHaveProperty("$permissions"); @@ -171,7 +171,7 @@ describe("Invite API Routes - Behavior Documentation", () => { userId: "user-1", temporary: false, }; - + expect(membership.$id).toBeDefined(); expect(membership.serverId).toBeDefined(); expect(membership.userId).toBeDefined(); @@ -180,14 +180,14 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should increment currentUses after use", () => { const beforeUse = { currentUses: 0 }; const afterUse = { currentUses: 1 }; - + expect(afterUse.currentUses).toBe(beforeUse.currentUses + 1); }); it("should create temporary membership when invite.temporary=true", () => { const invite = { temporary: true }; const membership = { temporary: true }; - + expect(membership.temporary).toBe(invite.temporary); }); @@ -196,17 +196,17 @@ describe("Invite API Routes - Behavior Documentation", () => { serverId: "server-1", userId: "user-1", }; - + const attemptedJoin = { serverId: "server-1", userId: "user-1", }; - + const isDuplicate = ( existingMembership.serverId === attemptedJoin.serverId && existingMembership.userId === attemptedJoin.userId ); - + expect(isDuplicate).toBe(true); }); @@ -217,7 +217,7 @@ describe("Invite API Routes - Behavior Documentation", () => { serverId: "server-1", joinedAt: new Date().toISOString(), }; - + expect(usage.inviteCode).toBeDefined(); expect(usage.userId).toBeDefined(); expect(usage.serverId).toBeDefined(); @@ -234,7 +234,7 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should require invite creator or server admin", () => { const isCreator = true; const isAdmin = false; - + const canRevoke = isCreator || isAdmin; expect(canRevoke).toBe(true); }); @@ -246,7 +246,7 @@ describe("Invite API Routes - Behavior Documentation", () => { { code: "ABC123", currentUses: 0 }, { code: "XYZ789", currentUses: 2 }, ]; - + expect(Array.isArray(invites)).toBe(true); expect(invites.length).toBeGreaterThanOrEqual(0); }); @@ -254,7 +254,7 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should require server admin role", () => { const userRoles = ["member"]; const hasAdminRole = userRoles.includes("admin"); - + expect(hasAdminRole).toBe(false); }); }); @@ -263,7 +263,7 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should generate URL-safe characters only", () => { const urlSafePattern = /^[A-Za-z0-9_-]+$/; const code = "ABC123"; - + expect(code).toMatch(urlSafePattern); }); @@ -275,7 +275,7 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should avoid ambiguous characters (0/O, 1/I/l)", () => { const code = "ABC234"; // Example without ambiguous chars const hasAmbiguous = /[0O1Il]/.test(code); - + // This is aspirational - current impl may include these expect(hasAmbiguous || !hasAmbiguous).toBeDefined(); }); @@ -285,7 +285,7 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should support null (never expires)", () => { const invite = { expiresAt: null }; const isExpired = false; - + expect(invite.expiresAt).toBeNull(); expect(isExpired).toBe(false); }); @@ -293,7 +293,7 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should support ISO 8601 date strings", () => { const date = new Date(); const isoString = date.toISOString(); - + expect(isoString).toMatch(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/); }); @@ -301,7 +301,7 @@ describe("Invite API Routes - Behavior Documentation", () => { const futureDate = new Date(Date.now() + 3600000); const pastDate = new Date(Date.now() - 3600000); const now = new Date(); - + expect(futureDate > now).toBe(true); expect(pastDate < now).toBe(true); }); @@ -311,14 +311,14 @@ describe("Invite API Routes - Behavior Documentation", () => { it("should support unlimited invites (maxUses=null)", () => { const invite = { maxUses: null, currentUses: 1000 }; const hasReachedLimit = invite.currentUses >= (invite.maxUses ?? Number.POSITIVE_INFINITY); - + expect(hasReachedLimit).toBe(false); }); it("should enforce maxUses when set", () => { const invite = { maxUses: 5, currentUses: 5 }; const hasReachedLimit = invite.currentUses >= invite.maxUses; - + expect(hasReachedLimit).toBe(true); }); }); diff --git a/apps/web/src/__tests__/invite-integration.test.ts b/apps/web/src/__tests__/invite-integration.test.ts index 9fa6c3d..4cc5b50 100644 --- a/apps/web/src/__tests__/invite-integration.test.ts +++ b/apps/web/src/__tests__/invite-integration.test.ts @@ -26,7 +26,7 @@ describe("Invite Integration Tests", () => { describe("Full Invite Flow", () => { it("should complete create → validate → use → exhaust lifecycle", async () => { const mockFetch = global.fetch as ReturnType; - + // Step 1: Create invite with max uses = 1 mockFetch.mockResolvedValueOnce({ ok: true, @@ -410,7 +410,7 @@ describe("Invite Integration Tests", () => { const res = await fetch("/api/invites/track123/usage"); const usage = await res.json(); - + expect(Array.isArray(usage)).toBe(true); expect(usage.length).toBe(2); expect(usage[0].inviteCode).toBe("track123"); diff --git a/apps/web/src/__tests__/login-security.test.ts b/apps/web/src/__tests__/login-security.test.ts index 876c784..0e101ba 100644 --- a/apps/web/src/__tests__/login-security.test.ts +++ b/apps/web/src/__tests__/login-security.test.ts @@ -488,10 +488,12 @@ describe("Login Security", () => { const { registerAction } = await import("@/app/(auth)/login/actions"); mockDatabases.listDocuments + .mockResolvedValueOnce({ documents: [] }) // signup policy lookup + .mockResolvedValueOnce({ documents: [] }) // userId collision check .mockResolvedValueOnce({ documents: [{ $id: "server-default", defaultOnSignup: true }], }) - .mockResolvedValueOnce({ documents: [] }); + .mockResolvedValueOnce({ documents: [] }); // existing membership const formData = new FormData(); formData.set("email", "newuser@example.com"); @@ -517,10 +519,12 @@ describe("Login Security", () => { const { registerAction } = await import("@/app/(auth)/login/actions"); mockDatabases.listDocuments - .mockResolvedValueOnce({ documents: [] }) + .mockResolvedValueOnce({ documents: [] }) // signup policy lookup + .mockResolvedValueOnce({ documents: [] }) // userId collision check + .mockResolvedValueOnce({ documents: [] }) // default signup server .mockResolvedValueOnce({ documents: [{ $id: "server-a" }, { $id: "server-b" }], - }); + }); // single-server fallback const formData = new FormData(); formData.set("email", "newuser@example.com"); diff --git a/apps/web/src/__tests__/membership-counter.test.ts b/apps/web/src/__tests__/membership-counter.test.ts index 1ce3a5c..0389362 100644 --- a/apps/web/src/__tests__/membership-counter.test.ts +++ b/apps/web/src/__tests__/membership-counter.test.ts @@ -105,7 +105,7 @@ describe("Membership Counter", () => { callCount++; return Promise.resolve({ ok: true, - json: () => Promise.resolve({ + json: () => Promise.resolve({ memberships: initialMemberships }), }); diff --git a/apps/web/src/__tests__/message-reactions.test.ts b/apps/web/src/__tests__/message-reactions.test.ts index da13822..b513aef 100644 --- a/apps/web/src/__tests__/message-reactions.test.ts +++ b/apps/web/src/__tests__/message-reactions.test.ts @@ -7,7 +7,7 @@ function parseReactions(reactionsData: string | any[] | undefined): Array<{ count: number; }> { if (!reactionsData) return []; - + if (typeof reactionsData === "string") { try { return JSON.parse(reactionsData); @@ -15,11 +15,11 @@ function parseReactions(reactionsData: string | any[] | undefined): Array<{ return []; } } - + if (Array.isArray(reactionsData)) { return reactionsData; } - + return []; } @@ -29,7 +29,7 @@ function addReactionToMessage( userId: string ): Array<{ emoji: string; userIds: string[]; count: number }> { const existingReaction = reactions.find((r) => r.emoji === emoji); - + if (existingReaction) { if (!existingReaction.userIds.includes(userId)) { existingReaction.userIds.push(userId); @@ -42,7 +42,7 @@ function addReactionToMessage( count: 1, }); } - + return reactions; } @@ -52,17 +52,17 @@ function removeReactionFromMessage( userId: string ): Array<{ emoji: string; userIds: string[]; count: number }> { const existingReaction = reactions.find((r) => r.emoji === emoji); - + if (existingReaction) { existingReaction.userIds = existingReaction.userIds.filter((id) => id !== userId); - + if (existingReaction.userIds.length === 0) { return reactions.filter((r) => r.emoji !== emoji); } - + existingReaction.count = existingReaction.userIds.length; } - + return reactions; } @@ -72,9 +72,9 @@ describe("Message Reactions", () => { const reactionsString = JSON.stringify([ { emoji: "👍", userIds: ["user1"], count: 1 }, ]); - + const reactions = parseReactions(reactionsString); - + expect(reactions).toHaveLength(1); expect(reactions[0].emoji).toBe("👍"); expect(reactions[0].userIds).toContain("user1"); @@ -84,9 +84,9 @@ describe("Message Reactions", () => { const reactionsArray = [ { emoji: "👍", userIds: ["user1"], count: 1 }, ]; - + const reactions = parseReactions(reactionsArray); - + expect(reactions).toHaveLength(1); expect(reactions[0].emoji).toBe("👍"); }); @@ -110,9 +110,9 @@ describe("Message Reactions", () => { describe("Adding Reactions", () => { it("should add a new reaction to empty array", () => { let reactions: Array<{ emoji: string; userIds: string[]; count: number }> = []; - + reactions = addReactionToMessage(reactions, "👍", "user1"); - + expect(reactions).toHaveLength(1); expect(reactions[0].emoji).toBe("👍"); expect(reactions[0].userIds).toContain("user1"); @@ -123,9 +123,9 @@ describe("Message Reactions", () => { let reactions = [ { emoji: "👍", userIds: ["user1"], count: 1 }, ]; - + reactions = addReactionToMessage(reactions, "👍", "user2"); - + expect(reactions).toHaveLength(1); expect(reactions[0].userIds).toHaveLength(2); expect(reactions[0].userIds).toContain("user2"); @@ -136,9 +136,9 @@ describe("Message Reactions", () => { let reactions = [ { emoji: "👍", userIds: ["user1"], count: 1 }, ]; - + reactions = addReactionToMessage(reactions, "👍", "user1"); - + expect(reactions).toHaveLength(1); expect(reactions[0].userIds).toHaveLength(1); expect(reactions[0].count).toBe(1); @@ -148,9 +148,9 @@ describe("Message Reactions", () => { let reactions = [ { emoji: "👍", userIds: ["user1"], count: 1 }, ]; - + reactions = addReactionToMessage(reactions, "❤️", "user2"); - + expect(reactions).toHaveLength(2); expect(reactions[0].emoji).toBe("👍"); expect(reactions[1].emoji).toBe("❤️"); @@ -158,11 +158,11 @@ describe("Message Reactions", () => { it("should handle multiple users on different reactions", () => { let reactions: Array<{ emoji: string; userIds: string[]; count: number }> = []; - + reactions = addReactionToMessage(reactions, "👍", "user1"); reactions = addReactionToMessage(reactions, "👍", "user2"); reactions = addReactionToMessage(reactions, "❤️", "user3"); - + expect(reactions).toHaveLength(2); expect(reactions[0].count).toBe(2); expect(reactions[1].count).toBe(1); @@ -170,12 +170,12 @@ describe("Message Reactions", () => { it("should handle special emoji characters", () => { let reactions: Array<{ emoji: string; userIds: string[]; count: number }> = []; - + const specialEmojis = ["🎉", "🔥", "👀", "😂", "🚀"]; specialEmojis.forEach((emoji, index) => { reactions = addReactionToMessage(reactions, emoji, `user${index + 1}`); }); - + expect(reactions).toHaveLength(5); reactions.forEach((reaction, index) => { expect(reaction.emoji).toBe(specialEmojis[index]); @@ -188,9 +188,9 @@ describe("Message Reactions", () => { let reactions = [ { emoji: "👍", userIds: ["user1", "user2"], count: 2 }, ]; - + reactions = removeReactionFromMessage(reactions, "👍", "user1"); - + expect(reactions).toHaveLength(1); expect(reactions[0].userIds).toHaveLength(1); expect(reactions[0].userIds).not.toContain("user1"); @@ -202,9 +202,9 @@ describe("Message Reactions", () => { { emoji: "👍", userIds: ["user1"], count: 1 }, { emoji: "❤️", userIds: ["user2"], count: 1 }, ]; - + reactions = removeReactionFromMessage(reactions, "👍", "user1"); - + expect(reactions).toHaveLength(1); expect(reactions[0].emoji).toBe("❤️"); }); @@ -213,9 +213,9 @@ describe("Message Reactions", () => { let reactions = [ { emoji: "👍", userIds: ["user1"], count: 1 }, ]; - + reactions = removeReactionFromMessage(reactions, "👍", "user2"); - + expect(reactions).toHaveLength(1); expect(reactions[0].userIds).toHaveLength(1); expect(reactions[0].count).toBe(1); @@ -225,18 +225,18 @@ describe("Message Reactions", () => { let reactions = [ { emoji: "👍", userIds: ["user1"], count: 1 }, ]; - + reactions = removeReactionFromMessage(reactions, "❤️", "user1"); - + expect(reactions).toHaveLength(1); expect(reactions[0].emoji).toBe("👍"); }); it("should handle empty reactions array", () => { let reactions: Array<{ emoji: string; userIds: string[]; count: number }> = []; - + reactions = removeReactionFromMessage(reactions, "👍", "user1"); - + expect(reactions).toHaveLength(0); }); }); diff --git a/apps/web/src/__tests__/newrelic-utils.test.ts b/apps/web/src/__tests__/posthog-utils.test.ts similarity index 63% rename from apps/web/src/__tests__/newrelic-utils.test.ts rename to apps/web/src/__tests__/posthog-utils.test.ts index 4bcad50..2cc9ded 100644 --- a/apps/web/src/__tests__/newrelic-utils.test.ts +++ b/apps/web/src/__tests__/posthog-utils.test.ts @@ -2,46 +2,24 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, recordEvent, recordMetric, __resetPostHogClient, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; const { mockEmit, mockSetGlobalLoggerProvider, - mockNewRelic, mockPostHogCapture, mockPostHogCaptureException, } = vi.hoisted(() => ({ mockEmit: vi.fn(), mockSetGlobalLoggerProvider: vi.fn(), - mockNewRelic: { - recordCustomEvent: vi.fn(), - recordMetric: vi.fn(), - incrementMetric: vi.fn(), - noticeError: vi.fn(), - addCustomAttribute: vi.fn(), - addCustomAttributes: vi.fn(), - setTransactionName: vi.fn(), - getTransaction: vi.fn(), - startBackgroundTransaction: vi.fn(), - startWebTransaction: vi.fn(), - endTransaction: vi.fn(), - getBrowserTimingHeader: vi.fn(), - setLlmTokenCountCallback: vi.fn(), - }, mockPostHogCapture: vi.fn(), mockPostHogCaptureException: vi.fn(), })); -vi.mock("newrelic", () => ({ - default: mockNewRelic, -})); - vi.mock("@opentelemetry/sdk-logs", () => ({ LoggerProvider: vi.fn().mockImplementation(function () { return { @@ -93,15 +71,13 @@ vi.mock("next/server", () => ({ after: vi.fn(), })); -describe("newrelic-utils", () => { +describe("posthog-utils", () => { beforeEach(() => { __resetPostHogClient(); - Object.values(mockNewRelic).forEach((fn) => fn.mockClear()); mockEmit.mockClear(); mockSetGlobalLoggerProvider.mockClear(); mockPostHogCapture.mockClear(); mockPostHogCaptureException.mockClear(); - delete process.env.TELEMETRY_PROVIDER; delete process.env.POSTHOG_PROJECT_API_KEY; delete process.env.POSTHOG_HOST; delete process.env.NEXT_PUBLIC_POSTHOG_PROJECT_TOKEN; @@ -119,7 +95,7 @@ describe("newrelic-utils", () => { }); describe("logger", () => { - it("should log info messages", () => { + it("should log info messages to the OTLP pipeline", () => { logger.info("Test info message"); expect(console.log).toHaveBeenCalled(); expect(mockEmit).toHaveBeenCalledWith( @@ -132,35 +108,33 @@ describe("newrelic-utils", () => { it("should log info messages with attributes", () => { logger.info("Test info", { userId: "123" }); - expect(console.log).toHaveBeenCalled(); expect(mockEmit).toHaveBeenCalledWith( expect.objectContaining({ body: "Test info", - severityNumber: expect.any(Number), attributes: expect.objectContaining({ userId: "123" }), }), ); }); - it("should log error messages", () => { - logger.error("Test error message"); - expect(console.error).toHaveBeenCalled(); + it("should redact sensitive keys from log attributes", () => { + logger.info("Test info", { email: "a@b.c", userId: "123" }); expect(mockEmit).toHaveBeenCalledWith( expect.objectContaining({ - body: "Test error message", - severityNumber: expect.any(Number), + attributes: expect.objectContaining({ + email: "[REDACTED]", + userId: "123", + }), }), ); }); - it("should log error messages with attributes", () => { - logger.error("Test error", { code: 500 }); + it("should log error messages", () => { + logger.error("Test error message"); expect(console.error).toHaveBeenCalled(); expect(mockEmit).toHaveBeenCalledWith( expect.objectContaining({ - body: "Test error", + body: "Test error message", severityNumber: expect.any(Number), - attributes: expect.objectContaining({ code: 500 }), }), ); }); @@ -176,18 +150,6 @@ describe("newrelic-utils", () => { ); }); - it("should log warn messages with attributes", () => { - logger.warn("Test warning", { threshold: 100 }); - expect(console.warn).toHaveBeenCalled(); - expect(mockEmit).toHaveBeenCalledWith( - expect.objectContaining({ - body: "Test warning", - severityNumber: expect.any(Number), - attributes: expect.objectContaining({ threshold: 100 }), - }), - ); - }); - it("should log debug messages", () => { logger.debug("Test debug message"); expect(console.log).toHaveBeenCalled(); @@ -199,14 +161,19 @@ describe("newrelic-utils", () => { ); }); - it("should log debug messages with attributes", () => { - logger.debug("Test debug", { step: 1 }); - expect(console.log).toHaveBeenCalled(); - expect(mockEmit).toHaveBeenCalledWith( + it("should capture an application_log event when credentials exist", () => { + process.env.POSTHOG_PROJECT_API_KEY = "test-key"; + __resetPostHogClient(); + + logger.info("Test info", { userId: "u1" }); + + expect(mockPostHogCapture).toHaveBeenCalledWith( expect.objectContaining({ - body: "Test debug", - severityNumber: expect.any(Number), - attributes: expect.objectContaining({ step: 1 }), + event: "application_log", + distinctId: "u1", + properties: expect.objectContaining({ + message: "Test info", + }), }), ); }); @@ -245,49 +212,33 @@ describe("newrelic-utils", () => { expect(mockEmit).toHaveBeenCalledWith( expect.objectContaining({ body: "String error message", - severityNumber: expect.any(Number), attributes: expect.objectContaining({ errorMessage: "String error message", - errorName: "Error", }), }), ); }); - it("should record a string error with custom attributes", () => { - recordError("String error", { code: 404 }); - expect(console.error).toHaveBeenCalled(); + it("should capture an exception event when credentials exist", () => { + process.env.POSTHOG_PROJECT_API_KEY = "test-key"; + __resetPostHogClient(); + + recordError(new Error("boom"), { userId: "u1" }); + + expect(mockPostHogCaptureException).toHaveBeenCalledWith( + expect.any(Error), + "server", + expect.objectContaining({ + errorMessage: "boom", + userId: "u1", + }), + ); }); it("should handle null error gracefully", () => { recordError(null as never); expect(console.error).toHaveBeenCalled(); }); - - it("should handle undefined error gracefully", () => { - recordError(undefined as never); - expect(console.error).toHaveBeenCalled(); - }); - }); - - describe("setTransactionName", () => { - it("should set transaction name without error", () => { - expect(() => { - setTransactionName("/api/test"); - }).not.toThrow(); - }); - - it("should handle empty string", () => { - expect(() => { - setTransactionName(""); - }).not.toThrow(); - }); - - it("should handle special characters", () => { - expect(() => { - setTransactionName("/api/users/[id]"); - }).not.toThrow(); - }); }); describe("trackApiCall", () => { @@ -315,48 +266,6 @@ describe("newrelic-utils", () => { }); }); - describe("addTransactionAttributes", () => { - it("should add single attribute without error", () => { - expect(() => { - addTransactionAttributes({ key: "value" }); - }).not.toThrow(); - }); - - it("should add multiple attributes", () => { - expect(() => { - addTransactionAttributes({ - userId: "123", - action: "create", - timestamp: 1234567890, - }); - }).not.toThrow(); - }); - - it("should handle empty attributes", () => { - expect(() => { - addTransactionAttributes({}); - }).not.toThrow(); - }); - - it("should handle boolean attributes", () => { - expect(() => { - addTransactionAttributes({ - isAdmin: true, - isActive: false, - }); - }).not.toThrow(); - }); - - it("should handle numeric attributes", () => { - expect(() => { - addTransactionAttributes({ - count: 42, - score: 98.5, - }); - }).not.toThrow(); - }); - }); - describe("recordEvent", () => { it("should record event with name and attributes without error", () => { expect(() => { @@ -381,10 +290,21 @@ describe("newrelic-utils", () => { }).not.toThrow(); }); - it("should handle special characters in event name", () => { - expect(() => { - recordEvent("User:Signup:Success", { platform: "web" }); - }).not.toThrow(); + it("should capture the event when credentials exist", () => { + process.env.POSTHOG_PROJECT_API_KEY = "test-key"; + __resetPostHogClient(); + + recordEvent("UserLogin", { userId: "123", method: "oauth" }); + + expect(mockPostHogCapture).toHaveBeenCalledWith( + expect.objectContaining({ + event: "UserLogin", + properties: expect.objectContaining({ + userId: "123", + method: "oauth", + }), + }), + ); }); }); @@ -401,22 +321,10 @@ describe("newrelic-utils", () => { }).not.toThrow(); }); - it("should record metric with large value", () => { - expect(() => { - recordMetric("bytes.transferred", 1048576); - }).not.toThrow(); - }); - it("should record metric with decimal value", () => { expect(() => { recordMetric("cpu.usage", 45.67); }).not.toThrow(); }); - - it("should handle metric names with namespaces", () => { - expect(() => { - recordMetric("custom.metrics.api.latency", 250); - }).not.toThrow(); - }); }); -}); +}); \ No newline at end of file diff --git a/apps/web/src/__tests__/scripts/validate-env.test.ts b/apps/web/src/__tests__/scripts/validate-env.test.ts index 7784983..03f4278 100644 --- a/apps/web/src/__tests__/scripts/validate-env.test.ts +++ b/apps/web/src/__tests__/scripts/validate-env.test.ts @@ -212,15 +212,6 @@ describe("Environment Variable Validation Script", () => { }); describe("Optional Environment Variables", () => { - it("should allow NEWRELIC_LICENSE_KEY to be undefined for local dev", () => { - // New Relic is optional for local development - const newRelicKey = process.env.NEWRELIC_LICENSE_KEY; - // Test passes if it's either defined or undefined - expect( - newRelicKey === undefined || typeof newRelicKey === "string", - ).toBe(true); - }); - it("should allow custom NEXT_PUBLIC_BASE_URL", () => { const baseUrl = process.env.NEXT_PUBLIC_BASE_URL; if (baseUrl) { @@ -278,16 +269,18 @@ describe("Environment Variable Validation Script", () => { } }); - it("should have New Relic configured in production", () => { + it("should have PostHog configured in production", () => { const nodeEnv = process.env.NODE_ENV; - const newRelicKey = process.env.NEWRELIC_LICENSE_KEY; + const posthogKey = + process.env.POSTHOG_PROJECT_API_KEY ?? + process.env.NEXT_PUBLIC_POSTHOG_PROJECT_TOKEN; if (nodeEnv === "production") { - // In production, New Relic should be configured + // In production, PostHog should be configured // This is a warning, not a hard requirement - const hasNewRelic = - newRelicKey !== undefined && newRelicKey.trim().length > 0; - expect(hasNewRelic || nodeEnv !== "production").toBe(true); + const hasPostHog = + posthogKey !== undefined && posthogKey.trim().length > 0; + expect(hasPostHog || nodeEnv !== "production").toBe(true); } }); }); diff --git a/apps/web/src/__tests__/signup-policy.test.ts b/apps/web/src/__tests__/signup-policy.test.ts new file mode 100644 index 0000000..18c4d50 --- /dev/null +++ b/apps/web/src/__tests__/signup-policy.test.ts @@ -0,0 +1,44 @@ +import { describe, expect, it } from "vitest"; +import { + getApprovalStatusFromPrefs, + isSignupPolicy, +} from "@/lib/signup-policy"; + +describe("isSignupPolicy", () => { + it("accepts the known policies and rejects everything else", () => { + expect(isSignupPolicy("open")).toBe(true); + expect(isSignupPolicy("approval")).toBe(true); + expect(isSignupPolicy("disabled")).toBe(true); + + expect(isSignupPolicy("")).toBe(false); + expect(isSignupPolicy("enabled")).toBe(false); + expect(isSignupPolicy(undefined)).toBe(false); + expect(isSignupPolicy(null)).toBe(false); + }); +}); + +describe("getApprovalStatusFromPrefs", () => { + it("treats missing prefs as approved (legacy accounts)", () => { + expect(getApprovalStatusFromPrefs(undefined)).toBe("approved"); + expect(getApprovalStatusFromPrefs(null)).toBe("approved"); + expect(getApprovalStatusFromPrefs({})).toBe("approved"); + }); + + it("reads the explicit status", () => { + expect( + getApprovalStatusFromPrefs({ approvalStatus: "pending" }), + ).toBe("pending"); + expect( + getApprovalStatusFromPrefs({ approvalStatus: "rejected" }), + ).toBe("rejected"); + expect( + getApprovalStatusFromPrefs({ approvalStatus: "approved" }), + ).toBe("approved"); + }); + + it("falls back to approved for unknown values", () => { + expect(getApprovalStatusFromPrefs({ approvalStatus: "weird" })).toBe( + "approved", + ); + }); +}); \ No newline at end of file diff --git a/apps/web/src/__tests__/utils.test.ts b/apps/web/src/__tests__/utils.test.ts index 686e6c5..ea972c8 100644 --- a/apps/web/src/__tests__/utils.test.ts +++ b/apps/web/src/__tests__/utils.test.ts @@ -230,11 +230,11 @@ describe("Utils - formatMessageTimestamp", () => { const { formatMessageTimestamp } = await import("../lib/utils"); const testDate = "2025-01-15T14:30:00.000Z"; const result = formatMessageTimestamp(testDate); - + // Should contain both date and time components expect(result).toBeTruthy(); expect(result).toContain(" "); - + // Verify it's not just time (which was the old behavior) const date = new Date(testDate); const timeStr = date.toLocaleTimeString(); @@ -245,7 +245,7 @@ describe("Utils - formatMessageTimestamp", () => { const { formatMessageTimestamp } = await import("../lib/utils"); const isoDate = "2025-03-20T09:15:30.000Z"; const result = formatMessageTimestamp(isoDate); - + expect(result).toBeTruthy(); expect(typeof result).toBe("string"); }); @@ -254,11 +254,11 @@ describe("Utils - formatMessageTimestamp", () => { const { formatMessageTimestamp } = await import("../lib/utils"); const testDate = "2025-06-10T18:45:00.000Z"; const result = formatMessageTimestamp(testDate); - + const date = new Date(testDate); const dateStr = date.toLocaleDateString(); const timeStr = date.toLocaleTimeString(); - + // Result should be combination of date and time expect(result).toBe(`${dateStr} ${timeStr}`); }); diff --git a/apps/web/src/app/(auth)/login/actions.ts b/apps/web/src/app/(auth)/login/actions.ts index f49e0b6..64dee30 100644 --- a/apps/web/src/app/(auth)/login/actions.ts +++ b/apps/web/src/app/(auth)/login/actions.ts @@ -8,7 +8,12 @@ import { getEnvConfig, perms } from "@/lib/appwrite-core"; import { invalidateSessionCacheForToken } from "@/lib/auth-server"; import { assignDefaultRoleServer } from "@/lib/default-role"; import { FEATURE_FLAGS, getFeatureFlag } from "@/lib/feature-flags"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; +import { + getApprovalStatusFromPrefs, + getSignupPolicy, + markSignupPending, +} from "@/lib/signup-policy"; type AuthActionResult = | { success: true; userId: string } @@ -17,6 +22,7 @@ type AuthActionResult = error: string; message?: string; verificationRequired?: boolean; + approvalRequired?: boolean; }; type ResendVerificationResult = @@ -425,6 +431,59 @@ export async function loginAction( let shouldDeleteTemporarySession = true; try { + const approvalStatus = getApprovalStatusFromPrefs( + accountUser.prefs, + ); + if (approvalStatus === "pending") { + await deleteSessionBestEffort( + users, + session.userId, + session.$id, + ); + shouldDeleteTemporarySession = false; + + return { + success: false, + error: + "Your account is awaiting administrator approval.", + message: + "Your account is awaiting administrator approval.", + approvalRequired: true, + }; + } + + if (approvalStatus === "rejected") { + await deleteSessionBestEffort( + users, + session.userId, + session.$id, + ); + shouldDeleteTemporarySession = false; + + return { + success: false, + error: + "Your signup was not approved by an administrator.", + }; + } + + // A deactivated account is a break, not a ban: the next + // successful sign-in reactivates it automatically. + const prefs = (accountUser.prefs ?? {}) as Record; + if (prefs.disabled === true) { + try { + await users.updatePrefs({ + userId: session.userId, + prefs: { ...prefs, disabled: false, disabledAt: null }, + }); + } catch (reactivateError) { + logger.warn("Failed to clear deactivated flag on login", { + userIdHash: generateUserIdHash(session.userId), + error: sanitizeAuthError(reactivateError), + }); + } + } + if (await isEmailVerificationEnabled()) { const emailVerified = Boolean(accountUser.emailVerification); @@ -591,6 +650,29 @@ export async function resendVerificationAction( } } +/** + * Reserve a fresh random userId that is not claimed by an existing (or + * tombstoned) profile, so a deleted account's ID can never be reused. + */ +async function findAvailableUserId(): Promise { + const { databases } = getServerClient(); + const env = getEnvConfig(); + + for (let attempt = 0; attempt < 3; attempt++) { + const candidate = crypto.randomUUID(); + const existing = await databases.listDocuments( + env.databaseId, + env.collections.profiles, + [Query.equal("userId", candidate), Query.limit(1)], + ); + if (existing.documents.length === 0) { + return candidate; + } + } + + throw new Error("Unable to allocate a user ID. Please try again."); +} + /** * Server-side registration + login action. * Automatically joins the user to a default server when configured. @@ -615,11 +697,23 @@ export async function registerAction( } try { + const policy = await getSignupPolicy(); + + if (policy === "disabled") { + return { + success: false, + error: + "Sign-ups are currently disabled on this instance. Contact your administrator.", + }; + } + + const approvalRequired = policy === "approval"; + // Create account const client = createAppwriteClient(endpoint, project); const account = new Account(client); - const userId = crypto.randomUUID(); + const userId = await findAvailableUserId(); await account.create({ userId, email, @@ -627,6 +721,20 @@ export async function registerAction( name, }); + // Approval policy: hold the account until an admin approves it. + if (approvalRequired) { + await markSignupPending(userId); + + return { + success: false, + error: + "Your account is pending approval. You'll be able to sign in once an administrator approves it.", + message: + "Account created. It will be reviewed by an administrator before you can sign in.", + approvalRequired: true, + }; + } + // Immediately log in to create session const loginFormData = new FormData(); loginFormData.set("email", email); @@ -699,6 +807,86 @@ export async function registerAction( } } +type ResetPasswordResult = + | { success: true; message: string } + | { success: false; error: string }; + +/** + * Completes a password reset using the userId + secret from the recovery + * email link. Creates a new session as a side effect (matching Appwrite's + * updateRecovery behavior), so restore a fresh one gracefully. + */ +export async function resetPasswordAction( + formData: FormData, +): Promise { + const userId = formData.get("userId") as string; + const secret = formData.get("secret") as string; + const password = formData.get("password") as string; + + if (!userId || !secret || !password) { + return { success: false, error: "Missing password reset data." }; + } + + const { endpoint, project } = getEnvConfig(); + const apiKey = process.env.APPWRITE_API_KEY; + + if (!endpoint || !project || !apiKey) { + return { + success: false, + error: "Password reset is not configured on this instance.", + }; + } + + try { + const client = createAppwriteClient(endpoint, project, apiKey); + await new Account(client).updateRecovery({ + userId, + secret, + password, + }); + + return { + success: true, + message: "Password updated. You can now sign in.", + }; + } catch (error) { + if (error instanceof Error) { + const message = error.message.toLowerCase(); + + if ( + message.includes("recovery") || + message.includes("token") || + message.includes("invalid") + ) { + return { + success: false, + error: + "This password reset link is invalid or has expired. Request a new one.", + }; + } + + if ( + message.includes("password") && + (message.includes("short") || message.includes("weak")) + ) { + return { + success: false, + error: "Password must be at least 8 characters long.", + }; + } + } + + logger.error("Password reset action failed", { + error: sanitizeAuthError(error), + }); + + return { + success: false, + error: "Password reset failed. Please try again.", + }; + } +} + /** * Server-side logout action that clears the session cookie. */ diff --git a/apps/web/src/app/(auth)/login/login-form.tsx b/apps/web/src/app/(auth)/login/login-form.tsx index d7d6a2f..e2c676f 100644 --- a/apps/web/src/app/(auth)/login/login-form.tsx +++ b/apps/web/src/app/(auth)/login/login-form.tsx @@ -27,6 +27,17 @@ type LoginFormProps = { showResendVerification: boolean; }; +const REMEMBER_KEY = "firepit.remember"; + +function getRemembered(): boolean { + if (typeof window === "undefined") return true; + try { + return window.localStorage.getItem(REMEMBER_KEY) !== "false"; + } catch { + return true; + } +} + const LoginFormContent: React.FC = ({ showResendVerification }) => { const pathname = usePathname(); const router = useRouter(); @@ -34,10 +45,24 @@ const LoginFormContent: React.FC = ({ showResendVerification }) const { refreshUser } = useAuth(); const [email, setEmail] = useState(""); const [password, setPassword] = useState(""); + const [remember, setRemember] = useState(getRemembered); const [loading, setLoading] = useState(false); const [resendingVerification, setResendingVerification] = useState(false); + const [resettingPassword, setResettingPassword] = useState(false); + const [awaitingRecoveryEmail, setAwaitingRecoveryEmail] = useState(false); + const [recoverySent, setRecoverySent] = useState(false); + const [recoveryCooldown, setRecoveryCooldown] = useState(0); const notifiedVerificationStatusRef = useRef(null); + useEffect(() => { + if (recoveryCooldown <= 0) return; + const id = setInterval( + () => setRecoveryCooldown((seconds) => Math.max(0, seconds - 1)), + 1000, + ); + return () => clearInterval(id); + }, [recoveryCooldown]); + useEffect(() => { const verifiedStatus = searchParams.get("verified"); if ( @@ -78,7 +103,7 @@ const LoginFormContent: React.FC = ({ showResendVerification }) const sessionResponse = await fetch("/api/auth/session", { method: "POST", headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ email, password }), + body: JSON.stringify({ email, password, remember }), }); if (!sessionResponse.ok) { @@ -171,6 +196,49 @@ const LoginFormContent: React.FC = ({ showResendVerification }) } } + const onRequestPasswordReset = async () => { + if (!awaitingRecoveryEmail) { + setAwaitingRecoveryEmail(true); + return; + } + + if (!email) { + toast.error("Enter your email to receive a reset link."); + return; + } + + setResettingPassword(true); + try { + const response = await fetch("/api/auth/password-recovery", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ email }), + }); + const data = (await response.json().catch(() => ({}))) as { + message?: string; + error?: string; + }; + // Success responses are intentionally generic (no enumeration). + if (data.error) { + toast.error(data.error); + } else { + toast.success( + data.message ?? "Password reset link sent.", + ); + setRecoverySent(true); + setRecoveryCooldown(30); + } + } catch (err) { + const message = + err instanceof Error + ? err.message + : "Failed to request a password reset."; + toast.error(message); + } finally { + setResettingPassword(false); + } + } + return (
@@ -250,6 +318,79 @@ const LoginFormContent: React.FC = ({ showResendVerification }) value={password} />
+
+ + +
+ {awaitingRecoveryEmail && ( +
+ + setEmail(e.target.value)} + placeholder="you@example.com" + type="email" + value={email} + /> + + {recoverySent && ( +

+ Check your inbox for a reset link. If + it does not arrive, you can resend in + a moment. +

+ )} +
+ )} +
+ ) : ( +
+
+ + setPassword(e.target.value)} + required + type="password" + value={password} + /> +

+ At least 8 characters. +

+
+
+ + + setConfirmPassword(e.target.value) + } + required + type="password" + value={confirmPassword} + /> +
+ +
+ )} + +

+ Remembered your password?{" "} + + Sign in + + . +

+ + ); +} + +function ResetPasswordForm() { + return ( + + Loading... + + } + > + + + ); +} + +export default function ResetPasswordPage() { + return ; +} \ No newline at end of file diff --git a/apps/web/src/app/admin/actions.ts b/apps/web/src/app/admin/actions.ts index ce79156..b02369f 100644 --- a/apps/web/src/app/admin/actions.ts +++ b/apps/web/src/app/admin/actions.ts @@ -1,11 +1,26 @@ "use server"; import { createHash } from "node:crypto"; -import { Query, type Models } from "node-appwrite"; +import { Query, type Models, Users } from "node-appwrite"; import { getAdminClient } from "@/lib/appwrite-admin"; import { getEnvConfig } from "@/lib/appwrite-core"; +import { getServerClient } from "@/lib/appwrite-server"; +import { + deleteAvatarFile, + deleteProfileBackgroundFile, + getUserProfile, +} from "@/lib/appwrite-profiles"; import { getUserRoles } from "@/lib/appwrite-roles"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; +import { + approveSignup, + getSignupPolicy, + isSignupPolicy, + listPendingSignups, + setSignupPolicy, + type PendingSignup, + type SignupPolicy, +} from "@/lib/signup-policy"; import { getAllFeatureFlags, setFeatureFlag, @@ -464,3 +479,101 @@ export async function dispatchAnnouncementsAction( const validatedLimit = validateAnnouncementDispatchLimit(limit); return dispatchScheduledAnnouncements(validatedLimit); } + +async function requireAdminRole(userId: string) { + const roles = await getUserRoles(userId); + if (!roles.isAdmin) { + throw new Error("Forbidden"); + } + return roles; +} + +/** + * Get the current signup policy (admin only) + */ +export async function getSignupPolicyAction( + userId: string, +): Promise { + await requireAdminRole(userId); + return getSignupPolicy(); +} + +/** + * Change the instance signup policy (admin only) + */ +export async function setSignupPolicyAction( + userId: string, + policy: SignupPolicy, +): Promise<{ success: true }> { + await requireAdminRole(userId); + + if (!isSignupPolicy(policy)) { + throw new Error("Invalid signup policy"); + } + + const success = await setSignupPolicy(policy, userId); + if (!success) { + throw new Error("Failed to update signup policy"); + } + return { success: true }; +} + +/** + * List accounts awaiting approval (admin only) + */ +export async function listPendingSignupsAction( + userId: string, +): Promise { + await requireAdminRole(userId); + return listPendingSignups(); +} + +/** + * Approve a pending signup (admin only) + */ +export async function approveSignupAction( + userId: string, + pendingUserId: string, +): Promise<{ success: true }> { + await requireAdminRole(userId); + await approveSignup(pendingUserId); + return { success: true }; +} + +/** + * Reject a pending signup (admin only). Deletes the Appwrite account and any + * profile/asset data. + */ +export async function rejectSignupAction( + userId: string, + pendingUserId: string, +): Promise<{ success: true }> { + await requireAdminRole(userId); + + const env = getEnvConfig(); + const { databases } = getAdminClient(); + + const profile = await getUserProfile(pendingUserId); + + if (profile?.avatarFileId) { + await deleteAvatarFile(profile.avatarFileId).catch(() => {}); + } + if (profile?.profileBackgroundImageFileId) { + await deleteProfileBackgroundFile( + profile.profileBackgroundImageFileId, + ).catch(() => {}); + } + if (profile) { + await databases.deleteDocument( + env.databaseId, + env.collections.profiles, + profile.$id, + ); + } + + const { client } = getServerClient(); + const users = new Users(client); + await users.delete({ userId: pendingUserId }); + + return { success: true }; +} diff --git a/apps/web/src/app/admin/page.tsx b/apps/web/src/app/admin/page.tsx index 4a0c8e7..a847c66 100644 --- a/apps/web/src/app/admin/page.tsx +++ b/apps/web/src/app/admin/page.tsx @@ -14,13 +14,14 @@ import { createHash } from "node:crypto"; import { getBasicStats } from "@/lib/appwrite-admin"; import { requireAdmin } from "@/lib/auth-server"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; import { type BackfillResult, backfillServerIds } from "./actions"; import { ServerManagement } from "./server-management"; import { VersionCheck } from "./version-check"; import { FeatureFlags } from "./feature-flags"; import { AnnouncementPanel } from "./announcement-panel"; +import { SignupControls } from "./signup-controls"; const quickLinkClassName = "inline-flex items-center justify-between rounded-3xl border border-border/60 bg-background/80 px-4 py-3 text-sm font-medium text-foreground transition-all hover:-translate-y-0.5 hover:border-border hover:bg-background"; @@ -182,6 +183,8 @@ export default async function AdminPage(props: { + + = { + open: "Open (anyone can sign up)", + approval: "Individual approval required", + disabled: "No signups allowed", +}; + +export function SignupControls({ userId }: SignupControlsProps) { + const [policy, setPolicy] = useState("open"); + const [loading, setLoading] = useState(true); + const [savingPolicy, setSavingPolicy] = useState(false); + const [pending, setPending] = useState([]); + const [busy, setBusy] = useState(null); + + const load = useCallback(async () => { + try { + const [nextPolicy, pendingSignups] = await Promise.all([ + getSignupPolicyAction(userId), + listPendingSignupsAction(userId), + ]); + setPolicy(nextPolicy); + setPending(pendingSignups); + } catch (error) { + clientLogger.error( + "Failed to load signup controls:", + error instanceof Error ? error : String(error), + ); + toast.error("Failed to load signup controls"); + } finally { + setLoading(false); + } + }, [userId]); + + useEffect(() => { + void load(); + }, [load]); + + const handlePolicyChange = async (next: SignupPolicy) => { + setSavingPolicy(true); + const previous = policy; + setPolicy(next); + try { + await setSignupPolicyAction(userId, next); + toast.success("Signup policy updated"); + } catch (error) { + setPolicy(previous); + const message = + error instanceof Error + ? error.message + : "Failed to update signup policy"; + toast.error(message); + } finally { + setSavingPolicy(false); + } + }; + + const handleApprove = async (pendingUserId: string) => { + setBusy(pendingUserId); + try { + await approveSignupAction(userId, pendingUserId); + toast.success("Signup approved"); + setPending((prev) => + prev.filter((p) => p.userId !== pendingUserId), + ); + } catch (error) { + toast.error( + error instanceof Error ? error.message : "Approval failed", + ); + } finally { + setBusy(null); + } + }; + + const handleReject = async (pendingUserId: string) => { + if ( + !window.confirm( + "Rejecting deletes this signup permanently. Continue?", + ) + ) { + return; + } + setBusy(pendingUserId); + try { + await rejectSignupAction(userId, pendingUserId); + toast.success("Signup rejected and removed"); + setPending((prev) => + prev.filter((p) => p.userId !== pendingUserId), + ); + } catch (error) { + toast.error( + error instanceof Error ? error.message : "Rejection failed", + ); + } finally { + setBusy(null); + } + }; + + if (loading) { + return ( +
+
+ +

Signups

+
+

+ Loading signup controls... +

+
+ ); + } + + return ( +
+
+ +

Signups

+
+

+ Control who can create accounts on this instance. +

+ +
+ + +
+ + {policy === "approval" && ( +
+
+ +

+ Pending approvals +

+ {pending.length > 0 && ( + + {pending.length} + + )} +
+ + {pending.length === 0 ? ( +

+ No signups waiting for approval. +

+ ) : ( +
    + {pending.map((signup) => ( +
  • +
    +

    + {signup.name} +

    +

    + {signup.email} +

    +
    +
    + + +
    +
    • + ))} +
+ )} +
+ )} +
+ ); +} \ No newline at end of file diff --git a/apps/web/src/app/api/admin/audit-logs/route.ts b/apps/web/src/app/api/admin/audit-logs/route.ts index 73f84b7..271e8bd 100644 --- a/apps/web/src/app/api/admin/audit-logs/route.ts +++ b/apps/web/src/app/api/admin/audit-logs/route.ts @@ -4,7 +4,7 @@ import { clampLimit } from "@/lib/appwrite-reports"; import { getProfilesByUserIds, } from "@/lib/appwrite-profiles"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; import { requireModerator } from "@/lib/auth-server"; export async function GET(request: Request) { diff --git a/apps/web/src/app/api/admin/reports/route.ts b/apps/web/src/app/api/admin/reports/route.ts index e059dc6..1cdf036 100644 --- a/apps/web/src/app/api/admin/reports/route.ts +++ b/apps/web/src/app/api/admin/reports/route.ts @@ -7,7 +7,7 @@ import { } from "@/lib/appwrite-reports"; import { getProfilesByUserIds } from "@/lib/appwrite-profiles"; import { recordAudit } from "@/lib/appwrite-audit"; -import { logger, recordError } from "@/lib/newrelic-utils"; +import { logger, recordError } from "@/lib/posthog-utils"; import { requireModerator } from "@/lib/auth-server"; import { isDocumentNotFoundError } from "@/lib/appwrite-admin"; diff --git a/apps/web/src/app/api/announcements/dispatch/route.ts b/apps/web/src/app/api/announcements/dispatch/route.ts index b18476c..b2c54bd 100644 --- a/apps/web/src/app/api/announcements/dispatch/route.ts +++ b/apps/web/src/app/api/announcements/dispatch/route.ts @@ -6,7 +6,7 @@ import { getAnnouncementRuntimeSettings, parseLimit, } from "@/lib/appwrite-announcements"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; export async function POST(request: Request) { const { dispatcherSecret, systemSenderUserId } = diff --git a/apps/web/src/app/api/announcements/route.ts b/apps/web/src/app/api/announcements/route.ts index c112184..41c36cb 100644 --- a/apps/web/src/app/api/announcements/route.ts +++ b/apps/web/src/app/api/announcements/route.ts @@ -11,7 +11,7 @@ import type { AnnouncementStatus, } from "@/lib/types"; import { AuthError, requireAdmin } from "@/lib/auth-server"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const ALLOWED_PRIORITIES: ReadonlySet = new Set([ "normal", diff --git a/apps/web/src/app/api/auth/password-recovery/route.ts b/apps/web/src/app/api/auth/password-recovery/route.ts new file mode 100644 index 0000000..7de027e --- /dev/null +++ b/apps/web/src/app/api/auth/password-recovery/route.ts @@ -0,0 +1,121 @@ +import { NextResponse } from "next/server"; +import { Account, Client } from "node-appwrite"; +import { getEnvConfig } from "@/lib/appwrite-core"; +import { checkRateLimit, getClientIp } from "@/lib/rate-limit"; +import { logger } from "@/lib/posthog-utils"; + +const PASSWORD_RECOVERY_RATE_LIMIT = { + maxRequests: 3, + windowMs: 60 * 60 * 1000, +}; + +function getRecoveryRedirectUrl(): string { + const configuredBaseUrl = + process.env.SERVER_URL?.trim() || + process.env.NEXT_PUBLIC_BASE_URL?.trim() || + "http://localhost:3000"; + + const normalizedBaseUrl = configuredBaseUrl.replace(/\/$/, ""); + return `${normalizedBaseUrl}/reset-password`; +} + +function rateLimitResponse(retryAfter: number | undefined): NextResponse { + return NextResponse.json( + { + error: + "Too many password reset requests. Please try again in an hour.", + }, + { + status: 429, + headers: { "Retry-After": String(retryAfter ?? 3600) }, + }, + ); +} + +/** + * POST /api/auth/password-recovery + * + * Sends a password recovery (reset) email via Account.createRecovery. Kept + * generic on success so the response never reveals whether an email exists. + */ +export async function POST(request: Request) { + let email: string | undefined; + try { + const body = (await request.json()) as { email?: string }; + email = body.email; + + if (!email || typeof email !== "string") { + return NextResponse.json( + { error: "Email is required" }, + { status: 400 }, + ); + } + + const emailLimit = checkRateLimit( + `password-recovery-email:${email.toLowerCase()}`, + PASSWORD_RECOVERY_RATE_LIMIT, + ); + if (!emailLimit.allowed) { + return rateLimitResponse(emailLimit.retryAfter); + } + + const clientIp = getClientIp(request); + if (clientIp) { + const ipLimit = checkRateLimit( + `password-recovery-ip:${clientIp}`, + PASSWORD_RECOVERY_RATE_LIMIT, + ); + if (!ipLimit.allowed) { + return rateLimitResponse(ipLimit.retryAfter); + } + } + + const env = getEnvConfig(); + const apiKey = process.env.APPWRITE_API_KEY; + + if (!apiKey) { + return NextResponse.json( + { error: "Server API key not configured" }, + { status: 500 }, + ); + } + + const client = new Client() + .setEndpoint(env.endpoint) + .setProject(env.project) + .setKey(apiKey); + + await new Account(client).createRecovery({ + email, + url: getRecoveryRedirectUrl(), + }); + + // Always respond generically to prevent account enumeration. + return NextResponse.json({ + success: true, + message: + "If an account exists for that email, a password reset link has been sent.", + }); + } catch (error) { + const message = + error instanceof Error ? error.message : String(error); + if (/hostname|platform/i.test(message)) { + logger.warn( + "Password recovery URL hostname is not a registered Appwrite platform. Register this host (e.g. localhost vs 127.0.0.1) under Appwrite console -> Project -> Overview -> Platforms.", + { error: message }, + ); + } + + logger.error("Password recovery request failed", { + emailProvided: Boolean(email), + error: message, + }); + + // Even on failure, stay generic. + return NextResponse.json({ + success: true, + message: + "If an account exists for that email, a password reset link has been sent.", + }); + } +} \ No newline at end of file diff --git a/apps/web/src/app/api/auth/session/route.ts b/apps/web/src/app/api/auth/session/route.ts index 872ba9f..7fc1de4 100644 --- a/apps/web/src/app/api/auth/session/route.ts +++ b/apps/web/src/app/api/auth/session/route.ts @@ -1,9 +1,10 @@ import { createHash } from "node:crypto"; import { NextResponse } from "next/server"; -import { Account, Client } from "node-appwrite"; +import { Account, Client, Users } from "node-appwrite"; import { getEnvConfig } from "@/lib/appwrite-core"; import { debugAuth, describeAuthHeader } from "@/lib/auth-server"; import { checkRateLimit, getClientIp } from "@/lib/rate-limit"; +import { getApprovalStatusFromPrefs } from "@/lib/signup-policy"; const SESSION_LOGIN_RATE_LIMIT = { maxRequests: 5, @@ -113,6 +114,45 @@ export async function POST(request: Request) { password, }); + // Admin-control gates: pending/rejected signups can't sign in, and a + // deactivated account reactivates on its next successful sign-in. + const users = new Users(client); + const accountUser = await users.get(session.userId); + const prefs = (accountUser.prefs ?? {}) as Record; + const approvalStatus = getApprovalStatusFromPrefs(prefs); + + if (approvalStatus === "pending" || approvalStatus === "rejected") { + await users + .deleteSession({ + userId: session.userId, + sessionId: session.$id, + }) + .catch(() => {}); + + debugAuth( + `POST /api/auth/session blocked: userId=${session.userId}, status=${approvalStatus}`, + ); + + return NextResponse.json( + { + error: + approvalStatus === "pending" + ? "Your account is awaiting administrator approval." + : "Your signup was not approved by an administrator.", + }, + { status: 403 }, + ); + } + + if (prefs.disabled === true) { + await users + .updatePrefs({ + userId: session.userId, + prefs: { ...prefs, disabled: false, disabledAt: null }, + }) + .catch(() => {}); + } + debugAuth( `POST /api/auth/session success: userId=${session.userId}, hasSecret=${Boolean(session.secret)}`, ); diff --git a/apps/web/src/app/api/auth/verify-email/route.ts b/apps/web/src/app/api/auth/verify-email/route.ts index 7b8cef4..fa4f210 100644 --- a/apps/web/src/app/api/auth/verify-email/route.ts +++ b/apps/web/src/app/api/auth/verify-email/route.ts @@ -3,7 +3,7 @@ import { NextResponse } from "next/server"; import { getEnvConfig } from "@/lib/appwrite-core"; import { FEATURE_FLAGS, getFeatureFlag } from "@/lib/feature-flags"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; function buildLoginRedirect(requestUrl: string): { loginRedirectUrl: URL; diff --git a/apps/web/src/app/api/categories/route.ts b/apps/web/src/app/api/categories/route.ts index 5388f62..7207f45 100644 --- a/apps/web/src/app/api/categories/route.ts +++ b/apps/web/src/app/api/categories/route.ts @@ -10,7 +10,7 @@ import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; const env = getEnvConfig(); diff --git a/apps/web/src/app/api/channel-permissions/route.ts b/apps/web/src/app/api/channel-permissions/route.ts index 68e9a9c..c568016 100644 --- a/apps/web/src/app/api/channel-permissions/route.ts +++ b/apps/web/src/app/api/channel-permissions/route.ts @@ -8,7 +8,7 @@ import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; import { invalidateChannelAccessCache } from "@/lib/server-channel-access"; import { invalidateChannelsServerCaches } from "@/lib/channels-route-cache"; diff --git a/apps/web/src/app/api/channels/[channelId]/mute/route.ts b/apps/web/src/app/api/channels/[channelId]/mute/route.ts index fcd39b1..d5ebfb8 100644 --- a/apps/web/src/app/api/channels/[channelId]/mute/route.ts +++ b/apps/web/src/app/api/channels/[channelId]/mute/route.ts @@ -7,7 +7,7 @@ import { getServerSession } from "@/lib/auth-server"; import { muteChannel, unmuteChannel } from "@/lib/notification-settings"; import { invalidateNotificationSettingsCache } from "@/lib/notification-triggers"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; -import { returnUnauthorized, returnForbidden, logger } from "@/lib/newrelic-utils"; +import { returnUnauthorized, returnForbidden, logger } from "@/lib/posthog-utils"; import type { MuteDuration, NotificationLevel } from "@/lib/types"; interface MuteRequestBody { diff --git a/apps/web/src/app/api/channels/[channelId]/pins/route.ts b/apps/web/src/app/api/channels/[channelId]/pins/route.ts index 13b172a..54a8aa5 100644 --- a/apps/web/src/app/api/channels/[channelId]/pins/route.ts +++ b/apps/web/src/app/api/channels/[channelId]/pins/route.ts @@ -10,11 +10,9 @@ import { buildPinsResponse, listPinnedMessages } from "@/lib/pin-response"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; type RouteContext = { params: Promise<{ @@ -30,7 +28,6 @@ export async function GET(request: NextRequest, context: RouteContext) { const startTime = Date.now(); try { - setTransactionName("GET /api/channels/[channelId]/pins"); // Verify user is authenticated const user = await getServerSession(); @@ -44,11 +41,6 @@ export async function GET(request: NextRequest, context: RouteContext) { const { channelId } = await context.params; - addTransactionAttributes({ - channelId, - userId: user.$id, - }); - const env = getEnvConfig(); const { databases } = getServerClient(); diff --git a/apps/web/src/app/api/channels/[channelId]/route.ts b/apps/web/src/app/api/channels/[channelId]/route.ts index f6529f2..b3f1625 100644 --- a/apps/web/src/app/api/channels/[channelId]/route.ts +++ b/apps/web/src/app/api/channels/[channelId]/route.ts @@ -8,7 +8,7 @@ import { deleteChannel } from "@/lib/appwrite-servers"; import { isDocumentNotFoundError } from "@/lib/appwrite-admin"; import { logger, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; import { invalidateChannelsServerCaches } from "@/lib/channels-route-cache"; import type { Channel } from "@/lib/types"; diff --git a/apps/web/src/app/api/channels/route.ts b/apps/web/src/app/api/channels/route.ts index c459dc6..d849b73 100644 --- a/apps/web/src/app/api/channels/route.ts +++ b/apps/web/src/app/api/channels/route.ts @@ -13,7 +13,7 @@ import { getServerPermissionsForUser } from "@/lib/server-channel-access"; import { apiCache } from "@/lib/cache-utils"; import { invalidateChannelsServerCaches } from "@/lib/channels-route-cache"; import { listPages } from "@/lib/appwrite-pagination"; -import { returnForbidden, logger } from "@/lib/newrelic-utils"; +import { returnForbidden, logger } from "@/lib/posthog-utils"; const ROLE_ASSIGNMENTS_COLLECTION_ID = "role_assignments"; const ROLES_COLLECTION_ID = "roles"; diff --git a/apps/web/src/app/api/conversations/[conversationId]/mute/route.ts b/apps/web/src/app/api/conversations/[conversationId]/mute/route.ts index 58e31b1..0cbbc2d 100644 --- a/apps/web/src/app/api/conversations/[conversationId]/mute/route.ts +++ b/apps/web/src/app/api/conversations/[conversationId]/mute/route.ts @@ -6,7 +6,7 @@ import { isDocumentNotFoundError } from "@/lib/appwrite-admin"; import { getServerSession } from "@/lib/auth-server"; import { muteConversation, unmuteConversation } from "@/lib/notification-settings"; import { invalidateNotificationSettingsCache } from "@/lib/notification-triggers"; -import { returnUnauthorized, returnForbidden, logger } from "@/lib/newrelic-utils"; +import { returnUnauthorized, returnForbidden, logger } from "@/lib/posthog-utils"; import type { MuteDuration, NotificationLevel } from "@/lib/types"; interface MuteRequestBody { diff --git a/apps/web/src/app/api/conversations/[conversationId]/pins/route.ts b/apps/web/src/app/api/conversations/[conversationId]/pins/route.ts index 4ba0934..7ce61e7 100644 --- a/apps/web/src/app/api/conversations/[conversationId]/pins/route.ts +++ b/apps/web/src/app/api/conversations/[conversationId]/pins/route.ts @@ -5,7 +5,7 @@ import { getEnvConfig } from "@/lib/appwrite-core"; import { isDocumentNotFoundError } from "@/lib/appwrite-admin"; import { getServerSession } from "@/lib/auth-server"; import { buildPinsResponse, listPinnedMessages } from "@/lib/pin-response"; -import { returnForbidden, logger } from "@/lib/newrelic-utils"; +import { returnForbidden, logger } from "@/lib/posthog-utils"; type RouteContext = { params: Promise<{ diff --git a/apps/web/src/app/api/custom-emojis/route.ts b/apps/web/src/app/api/custom-emojis/route.ts index 7e55773..77cba77 100644 --- a/apps/web/src/app/api/custom-emojis/route.ts +++ b/apps/web/src/app/api/custom-emojis/route.ts @@ -6,7 +6,7 @@ import type { CustomEmoji } from "@/lib/types"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; const FILE_EXTENSION_REGEX = /\.[^.]+$/; diff --git a/apps/web/src/app/api/direct-messages/[messageId]/pin/route.ts b/apps/web/src/app/api/direct-messages/[messageId]/pin/route.ts index 2d49c81..67b2b01 100644 --- a/apps/web/src/app/api/direct-messages/[messageId]/pin/route.ts +++ b/apps/web/src/app/api/direct-messages/[messageId]/pin/route.ts @@ -5,7 +5,7 @@ import { ID, Query } from "node-appwrite"; import { getServerClient } from "@/lib/appwrite-server"; import { getEnvConfig } from "@/lib/appwrite-core"; import { getServerSession } from "@/lib/auth-server"; -import { returnForbidden, logger } from "@/lib/newrelic-utils"; +import { returnForbidden, logger } from "@/lib/posthog-utils"; import type { DirectMessage, PinnedMessage } from "@/lib/types"; const PIN_LIMIT = 50; diff --git a/apps/web/src/app/api/direct-messages/[messageId]/reactions/route.ts b/apps/web/src/app/api/direct-messages/[messageId]/reactions/route.ts index 9dc5f67..15734af 100644 --- a/apps/web/src/app/api/direct-messages/[messageId]/reactions/route.ts +++ b/apps/web/src/app/api/direct-messages/[messageId]/reactions/route.ts @@ -10,10 +10,8 @@ import { parseReactions } from "@/lib/reactions-utils"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; type RouteContext = { params: Promise<{ @@ -61,7 +59,6 @@ export async function POST(request: NextRequest, context: RouteContext) { const startTime = Date.now(); try { - setTransactionName("POST /api/direct-messages/[messageId]/reactions"); // Verify user is authenticated const user = await getServerSession(); @@ -84,12 +81,6 @@ export async function POST(request: NextRequest, context: RouteContext) { ); } - addTransactionAttributes({ - messageId, - userId: user.$id, - emoji, - }); - const env = getEnvConfig(); const { databases } = getServerClient(); @@ -229,7 +220,6 @@ export async function DELETE(request: NextRequest, context: RouteContext) { const startTime = Date.now(); try { - setTransactionName("DELETE /api/direct-messages/[messageId]/reactions"); // Verify user is authenticated const user = await getServerSession(); @@ -252,12 +242,6 @@ export async function DELETE(request: NextRequest, context: RouteContext) { ); } - addTransactionAttributes({ - messageId, - userId: user.$id, - emoji, - }); - const env = getEnvConfig(); const { databases } = getServerClient(); diff --git a/apps/web/src/app/api/direct-messages/[messageId]/thread/route.ts b/apps/web/src/app/api/direct-messages/[messageId]/thread/route.ts index dfe3eed..75e9492 100644 --- a/apps/web/src/app/api/direct-messages/[messageId]/thread/route.ts +++ b/apps/web/src/app/api/direct-messages/[messageId]/thread/route.ts @@ -9,7 +9,7 @@ import { upsertMentionInboxItems } from "@/lib/inbox-items"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import type { DirectMessage, FileAttachment } from "@/lib/types"; import { getAvatarUrl, getUserProfile, getUserProfilesBatch, getAvatarFrameUrlForProfile } from "@/lib/appwrite-profiles"; import { diff --git a/apps/web/src/app/api/direct-messages/route.ts b/apps/web/src/app/api/direct-messages/route.ts index 8ba6ed6..09f31d5 100644 --- a/apps/web/src/app/api/direct-messages/route.ts +++ b/apps/web/src/app/api/direct-messages/route.ts @@ -21,13 +21,11 @@ import { logger, recordError, recordEvent, - setTransactionName, trackApiCall, trackMessage, - addTransactionAttributes, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { MAX_MESSAGE_LENGTH, MESSAGE_TOO_LONG_ERROR, @@ -117,8 +115,6 @@ function normalizeDistinctIds(ids: string[], excluding?: string): string[] { ).sort(); } - - function getReadOnlyReason(relationship: { blockedByMe: boolean; blockedMe: boolean; @@ -377,14 +373,6 @@ export async function GET(request: NextRequest) { const { searchParams } = new URL(request.url); const type = searchParams.get("type"); - setTransactionName( - `GET /api/direct-messages?type=${type || "unknown"}`, - ); - addTransactionAttributes({ - userId: session.$id, - operationType: type || "unknown", - }); - // List all conversations for current user if (type === "conversations") { if (!CONVERSATIONS_COLLECTION) { @@ -1357,7 +1345,6 @@ export async function POST(request: NextRequest) { const startTime = Date.now(); try { - setTransactionName("POST /api/direct-messages"); const session = await getServerSession(); if (!session?.$id) { @@ -1557,17 +1544,6 @@ export async function POST(request: NextRequest) { const hasEncryptedText = typeof encryptedText === "string" && encryptedText.length > 0; - addTransactionAttributes({ - userId: session.$id, - conversationId: conversationId ?? "unknown", - hasImage: !!imageFileId, - hasEncryptedText, - hasAttachments: normalizedAttachments.length > 0, - attachmentCount: normalizedAttachments.length, - isReply: !!replyToId, - operation: "send-message", - }); - if ( !conversationId || !senderId || diff --git a/apps/web/src/app/api/emoji/[fileId]/route.ts b/apps/web/src/app/api/emoji/[fileId]/route.ts index 2261d34..063a396 100644 --- a/apps/web/src/app/api/emoji/[fileId]/route.ts +++ b/apps/web/src/app/api/emoji/[fileId]/route.ts @@ -2,7 +2,7 @@ import { NextResponse } from "next/server"; import { AppwriteException } from "node-appwrite"; import { getAdminClient } from "@/lib/appwrite-admin"; import { getEnvConfig } from "@/lib/appwrite-core"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; type RouteContext = { params: Promise<{ fileId: string }>; diff --git a/apps/web/src/app/api/example-newrelic/route.ts b/apps/web/src/app/api/example-newrelic/route.ts deleted file mode 100644 index 695ea4e..0000000 --- a/apps/web/src/app/api/example-newrelic/route.ts +++ /dev/null @@ -1,57 +0,0 @@ -import type { NextRequest } from "next/server"; -import { NextResponse } from "next/server"; - -import { - addTransactionAttributes, - logger, - recordError, - setTransactionName, - trackApiCall, -} from "@/lib/newrelic-utils"; - -const ENDPOINT = "/api/example-newrelic"; - -export async function GET(request: NextRequest) { - const startTime = Date.now(); - const userAgent = request.headers.get("user-agent") ?? "unknown"; - - // Disable this example endpoint outside development to avoid exposure in prod - if (process.env.NODE_ENV === "production") { - return NextResponse.json({ error: "Not found" }, { status: 404 }); - } - - setTransactionName("GET /api/example-newrelic"); - - try { - addTransactionAttributes({ - endpoint: ENDPOINT, - method: "GET", - userAgent, - }); - const result = { message: "Hello from New Relic instrumented API!" }; - - const duration = Date.now() - startTime; - trackApiCall(ENDPOINT, "GET", 200, duration, { cached: false }); - logger.info("Example API request succeeded", { duration }); - - return NextResponse.json(result); - } catch (error) { - const duration = Date.now() - startTime; - const recordPayload: string | Error = - error instanceof Error ? error : String(error); - recordError(recordPayload, { endpoint: ENDPOINT, method: "GET" }); - trackApiCall(ENDPOINT, "GET", 500, duration, { error: true }); - logger.error("Example API request failed", { - error: - recordPayload instanceof Error - ? recordPayload.message - : recordPayload, - duration, - }); - - return NextResponse.json( - { error: "Internal server error" }, - { status: 500 }, - ); - } -} diff --git a/apps/web/src/app/api/feature-flags/allow-user-servers/route.ts b/apps/web/src/app/api/feature-flags/allow-user-servers/route.ts index 4500473..ba92f45 100644 --- a/apps/web/src/app/api/feature-flags/allow-user-servers/route.ts +++ b/apps/web/src/app/api/feature-flags/allow-user-servers/route.ts @@ -1,6 +1,6 @@ import { NextResponse } from "next/server"; import { getFeatureFlag, FEATURE_FLAGS } from "@/lib/feature-flags"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; export async function GET() { try { diff --git a/apps/web/src/app/api/friends/request/route.ts b/apps/web/src/app/api/friends/request/route.ts index 6e59ba7..ac7b349 100644 --- a/apps/web/src/app/api/friends/request/route.ts +++ b/apps/web/src/app/api/friends/request/route.ts @@ -6,7 +6,7 @@ import { RelationshipError, } from "@/lib/appwrite-friendships"; import { getServerSession } from "@/lib/auth-server"; -import { getPostHogClient } from "@/lib/newrelic-utils"; +import { getPostHogClient } from "@/lib/posthog-utils"; type RequestBody = { targetUserId?: string; diff --git a/apps/web/src/app/api/gifs/search/route.ts b/apps/web/src/app/api/gifs/search/route.ts index 65534d7..9316194 100644 --- a/apps/web/src/app/api/gifs/search/route.ts +++ b/apps/web/src/app/api/gifs/search/route.ts @@ -13,7 +13,7 @@ import { type GiphySearchResponse, type TenorSearchResponse, } from "@/lib/gif-sticker"; -import { logger, setTransactionName, trackApiCall } from "@/lib/newrelic-utils"; +import { logger, trackApiCall } from "@/lib/posthog-utils"; import { checkRateLimit } from "@/lib/rate-limit"; const GIPHY_BASE_URL = "https://api.giphy.com/v1/gifs/search"; @@ -53,7 +53,6 @@ export async function GET(request: NextRequest) { const startTime = Date.now(); try { - setTransactionName("GET /api/gifs/search"); const user = await requireAuth(); diff --git a/apps/web/src/app/api/inbox/digest/route.ts b/apps/web/src/app/api/inbox/digest/route.ts index e5dfcb5..2c3941f 100644 --- a/apps/web/src/app/api/inbox/digest/route.ts +++ b/apps/web/src/app/api/inbox/digest/route.ts @@ -3,7 +3,7 @@ import type { NextRequest } from "next/server"; import { getServerSession } from "@/lib/auth-server"; import { listInboxDigest } from "@/lib/inbox"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; import type { InboxContextKind } from "@/lib/types"; const DEFAULT_LIMIT = 50; diff --git a/apps/web/src/app/api/inbox/route.ts b/apps/web/src/app/api/inbox/route.ts index 09e2468..976647b 100644 --- a/apps/web/src/app/api/inbox/route.ts +++ b/apps/web/src/app/api/inbox/route.ts @@ -6,7 +6,7 @@ import { getAdminClient } from "@/lib/appwrite-admin"; import { getEnvConfig } from "@/lib/appwrite-core"; import { getServerSession } from "@/lib/auth-server"; import { listInboxItems } from "@/lib/inbox"; -import { logger, recordEvent } from "@/lib/newrelic-utils"; +import { logger, recordEvent } from "@/lib/posthog-utils"; import { upsertThreadReads } from "@/lib/thread-read-store"; import type { InboxContextKind, InboxItemKind } from "@/lib/types"; import { Query, type Models } from "node-appwrite"; diff --git a/apps/web/src/app/api/instance/route.ts b/apps/web/src/app/api/instance/route.ts index 336fcf0..6caef2e 100644 --- a/apps/web/src/app/api/instance/route.ts +++ b/apps/web/src/app/api/instance/route.ts @@ -1,6 +1,7 @@ import { NextResponse } from "next/server"; import { getEnvConfig } from "@/lib/appwrite-core"; import { getFeatureFlag, FEATURE_FLAGS } from "@/lib/feature-flags"; +import { getSignupPolicy } from "@/lib/signup-policy"; interface InstanceInfo { instanceName: string; @@ -10,6 +11,7 @@ interface InstanceInfo { features: { emailVerification: boolean; auditLogging: boolean; + signupPolicy: string; }; support: { email: string | null; @@ -23,14 +25,17 @@ interface InstanceInfo { } async function getInstanceFeatures(): Promise { - const [emailVerification, auditLogging] = await Promise.all([ - getFeatureFlag(FEATURE_FLAGS.ENABLE_EMAIL_VERIFICATION).catch(() => false), - getFeatureFlag(FEATURE_FLAGS.ENABLE_AUDIT_LOGGING).catch(() => true), - ]); + const [emailVerification, auditLogging, signupPolicy] = + await Promise.all([ + getFeatureFlag(FEATURE_FLAGS.ENABLE_EMAIL_VERIFICATION).catch(() => false), + getFeatureFlag(FEATURE_FLAGS.ENABLE_AUDIT_LOGGING).catch(() => true), + getSignupPolicy().catch(() => "open" as const), + ]); return { emailVerification, auditLogging, + signupPolicy, }; } diff --git a/apps/web/src/app/api/invites/[code]/join/route.ts b/apps/web/src/app/api/invites/[code]/join/route.ts index b00018c..98eef2e 100644 --- a/apps/web/src/app/api/invites/[code]/join/route.ts +++ b/apps/web/src/app/api/invites/[code]/join/route.ts @@ -4,7 +4,7 @@ import { useInvite } from "@/lib/appwrite-invites"; import { logger, recordError, returnUnauthorized, getPostHogClient, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { invalidateChannelsUserCaches } from "@/lib/channels-route-cache"; /** diff --git a/apps/web/src/app/api/invites/[code]/route.ts b/apps/web/src/app/api/invites/[code]/route.ts index 0996b01..6646a92 100644 --- a/apps/web/src/app/api/invites/[code]/route.ts +++ b/apps/web/src/app/api/invites/[code]/route.ts @@ -8,7 +8,7 @@ import { } from "@/lib/appwrite-invites"; import { getServerClient } from "@/lib/appwrite-server"; import { getEnvConfig } from "@/lib/appwrite-core"; -import { logger, recordError } from "@/lib/newrelic-utils"; +import { logger, recordError } from "@/lib/posthog-utils"; /** * GET /api/invites/[code] - Get invite preview (public endpoint) diff --git a/apps/web/src/app/api/me/dm-encryption-key/route.ts b/apps/web/src/app/api/me/dm-encryption-key/route.ts index 1f6c2eb..4ab6f12 100644 --- a/apps/web/src/app/api/me/dm-encryption-key/route.ts +++ b/apps/web/src/app/api/me/dm-encryption-key/route.ts @@ -1,7 +1,7 @@ import { NextResponse } from "next/server"; import { getServerSession } from "@/lib/auth-server"; import { getOrCreateUserProfile, updateUserProfile } from "@/lib/appwrite-profiles"; -import { logger, returnUnauthorized } from "@/lib/newrelic-utils"; +import { logger, returnUnauthorized } from "@/lib/posthog-utils"; type PatchBody = { dmEncryptionPublicKey: string; diff --git a/apps/web/src/app/api/me/preferences/route.ts b/apps/web/src/app/api/me/preferences/route.ts index 52178e3..633bfbb 100644 --- a/apps/web/src/app/api/me/preferences/route.ts +++ b/apps/web/src/app/api/me/preferences/route.ts @@ -9,7 +9,7 @@ import type { NavigationItemPreferenceId, NavigationPreferences, } from "@/lib/types"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const DEFAULT_NAVIGATION_ITEM_ORDER = [ "docs", diff --git a/apps/web/src/app/api/memberships/route.ts b/apps/web/src/app/api/memberships/route.ts index 5275a7b..16750da 100644 --- a/apps/web/src/app/api/memberships/route.ts +++ b/apps/web/src/app/api/memberships/route.ts @@ -4,7 +4,7 @@ import { Query } from "node-appwrite"; import { getServerClient } from "@/lib/appwrite-server"; import { getEnvConfig } from "@/lib/appwrite-core"; import { getServerSession } from "@/lib/auth-server"; -import { returnUnauthorized, logger } from "@/lib/newrelic-utils"; +import { returnUnauthorized, logger } from "@/lib/posthog-utils"; import { listPages } from "@/lib/appwrite-pagination"; import type { Membership } from "@/lib/types"; diff --git a/apps/web/src/app/api/messages/[messageId]/pin/route.ts b/apps/web/src/app/api/messages/[messageId]/pin/route.ts index 41ccf37..000677f 100644 --- a/apps/web/src/app/api/messages/[messageId]/pin/route.ts +++ b/apps/web/src/app/api/messages/[messageId]/pin/route.ts @@ -15,10 +15,8 @@ import { getEffectivePermissions, hasPermission } from "@/lib/permissions"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; type RouteContext = { params: Promise<{ @@ -114,7 +112,6 @@ export async function POST(request: NextRequest, context: RouteContext) { const startTime = Date.now(); try { - setTransactionName("POST /api/messages/[messageId]/pin"); // Verify user is authenticated const user = await getServerSession(); @@ -128,11 +125,6 @@ export async function POST(request: NextRequest, context: RouteContext) { const { messageId } = await context.params; - addTransactionAttributes({ - messageId, - userId: user.$id, - }); - const env = getEnvConfig(); const { databases } = getServerClient(); @@ -287,7 +279,6 @@ export async function DELETE(request: NextRequest, context: RouteContext) { const startTime = Date.now(); try { - setTransactionName("DELETE /api/messages/[messageId]/pin"); // Verify user is authenticated const user = await getServerSession(); @@ -301,11 +292,6 @@ export async function DELETE(request: NextRequest, context: RouteContext) { const { messageId } = await context.params; - addTransactionAttributes({ - messageId, - userId: user.$id, - }); - const env = getEnvConfig(); const { databases } = getServerClient(); diff --git a/apps/web/src/app/api/messages/[messageId]/poll-votes/route.ts b/apps/web/src/app/api/messages/[messageId]/poll-votes/route.ts index 268f65f..5d2e118 100644 --- a/apps/web/src/app/api/messages/[messageId]/poll-votes/route.ts +++ b/apps/web/src/app/api/messages/[messageId]/poll-votes/route.ts @@ -12,7 +12,7 @@ import { getPollStateForMessage, } from "@/lib/polls-server"; import { getChannelAccessForUser } from "@/lib/server-channel-access"; -import { returnUnauthorized, returnForbidden } from "@/lib/newrelic-utils"; +import { returnUnauthorized, returnForbidden } from "@/lib/posthog-utils"; type RouteContext = { params: Promise<{ @@ -101,7 +101,6 @@ export async function POST(request: NextRequest, context: RouteContext) { ); } - const reqBody = body as { optionId?: unknown }; const optionId = typeof reqBody.optionId === "string" diff --git a/apps/web/src/app/api/messages/[messageId]/poll/close/route.ts b/apps/web/src/app/api/messages/[messageId]/poll/close/route.ts index f22b2da..87353ab 100644 --- a/apps/web/src/app/api/messages/[messageId]/poll/close/route.ts +++ b/apps/web/src/app/api/messages/[messageId]/poll/close/route.ts @@ -12,7 +12,7 @@ import { getChannelAccessForUser, getServerPermissionsForUser, } from "@/lib/server-channel-access"; -import { returnUnauthorized, returnForbidden } from "@/lib/newrelic-utils"; +import { returnUnauthorized, returnForbidden } from "@/lib/posthog-utils"; type RouteContext = { params: Promise<{ diff --git a/apps/web/src/app/api/messages/[messageId]/poll/route.ts b/apps/web/src/app/api/messages/[messageId]/poll/route.ts index d65cba7..c90e037 100644 --- a/apps/web/src/app/api/messages/[messageId]/poll/route.ts +++ b/apps/web/src/app/api/messages/[messageId]/poll/route.ts @@ -9,7 +9,7 @@ import { getChannelAccessForUser } from "@/lib/server-channel-access"; import { returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; type RouteContext = { params: Promise<{ diff --git a/apps/web/src/app/api/messages/[messageId]/reactions/route.ts b/apps/web/src/app/api/messages/[messageId]/reactions/route.ts index 9877a7c..23d1200 100644 --- a/apps/web/src/app/api/messages/[messageId]/reactions/route.ts +++ b/apps/web/src/app/api/messages/[messageId]/reactions/route.ts @@ -10,11 +10,9 @@ import { parseReactions } from "@/lib/reactions-utils"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; type RouteContext = { params: Promise<{ @@ -30,7 +28,6 @@ export async function POST(request: NextRequest, context: RouteContext) { const startTime = Date.now(); try { - setTransactionName("POST /api/messages/[messageId]/reactions"); // Verify user is authenticated const user = await getServerSession(); @@ -53,12 +50,6 @@ export async function POST(request: NextRequest, context: RouteContext) { ); } - addTransactionAttributes({ - messageId, - userId: user.$id, - emoji, - }); - const env = getEnvConfig(); const { databases } = getServerClient(); @@ -200,7 +191,6 @@ export async function DELETE(request: NextRequest, context: RouteContext) { const startTime = Date.now(); try { - setTransactionName("DELETE /api/messages/[messageId]/reactions"); // Verify user is authenticated const user = await getServerSession(); @@ -223,12 +213,6 @@ export async function DELETE(request: NextRequest, context: RouteContext) { ); } - addTransactionAttributes({ - messageId, - userId: user.$id, - emoji, - }); - const env = getEnvConfig(); const { databases } = getServerClient(); diff --git a/apps/web/src/app/api/messages/[messageId]/thread/route.ts b/apps/web/src/app/api/messages/[messageId]/thread/route.ts index 02e9a09..d046107 100644 --- a/apps/web/src/app/api/messages/[messageId]/thread/route.ts +++ b/apps/web/src/app/api/messages/[messageId]/thread/route.ts @@ -9,12 +9,10 @@ import type { Message } from "@/lib/types"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { upsertMentionInboxItems } from "@/lib/inbox-items"; import { normalizeFileAttachmentsInput } from "@/lib/file-attachments"; import { hasEveryoneMention, normalizeMentionIds } from "@/lib/mention-utils"; @@ -43,7 +41,6 @@ export async function GET(request: NextRequest, context: RouteContext) { const startTime = Date.now(); try { - setTransactionName("GET /api/messages/[messageId]/thread"); // Verify user is authenticated const user = await getServerSession(); @@ -64,12 +61,6 @@ export async function GET(request: NextRequest, context: RouteContext) { : 50; const cursor = url.searchParams.get("cursor"); - addTransactionAttributes({ - messageId, - userId: user.$id, - limit, - }); - const env = getEnvConfig(); const { databases } = getServerClient(); @@ -160,7 +151,6 @@ export async function POST(request: NextRequest, context: RouteContext) { const startTime = Date.now(); try { - setTransactionName("POST /api/messages/[messageId]/thread"); // Verify user is authenticated const user = await getServerSession(); @@ -198,13 +188,6 @@ export async function POST(request: NextRequest, context: RouteContext) { ); } - addTransactionAttributes({ - messageId, - userId: user.$id, - hasText: Boolean(text), - hasImage: Boolean(imageFileId), - }); - const env = getEnvConfig(); const { databases } = getServerClient(); diff --git a/apps/web/src/app/api/messages/route.ts b/apps/web/src/app/api/messages/route.ts index 742e711..2c7e6ef 100644 --- a/apps/web/src/app/api/messages/route.ts +++ b/apps/web/src/app/api/messages/route.ts @@ -12,13 +12,11 @@ import { logger, recordError, recordEvent, - setTransactionName, trackApiCall, trackMessage, - addTransactionAttributes, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { MAX_MESSAGE_LENGTH, MESSAGE_TOO_LONG_ERROR, @@ -138,7 +136,6 @@ function mapMessageDocument(doc: Record): Message { */ export async function GET(request: NextRequest) { try { - setTransactionName("GET /api/messages"); const user = await getServerSession(); if (!user) { @@ -333,7 +330,6 @@ export async function POST(request: NextRequest) { const startTime = Date.now(); try { - setTransactionName("POST /api/messages"); // Verify user is authenticated const user = await getServerSession(); @@ -428,15 +424,7 @@ export async function POST(request: NextRequest) { const userId = user.$id; const userName = user.name; - addTransactionAttributes({ - userId, - channelId, - serverId: "unresolved", - hasImage: !!imageFileId, - hasAttachments: normalizedAttachments.length > 0, - isReply: !!replyToId, - hasMentions: hasValidMentions, - }); // Create message permissions + // Create message permissions const permissions = perms.message(userId, { mod: env.teams.moderatorTeamId, admin: env.teams.adminTeamId, @@ -494,8 +482,6 @@ export async function POST(request: NextRequest) { transactionAttributes.serverId = normalizedServerId; } - addTransactionAttributes(transactionAttributes); - const messageData: Record = { userId, text: parsedPoll ? "" : normalizedText || "", diff --git a/apps/web/src/app/api/notifications/push/route.ts b/apps/web/src/app/api/notifications/push/route.ts index 9c389fe..ae65a5f 100644 --- a/apps/web/src/app/api/notifications/push/route.ts +++ b/apps/web/src/app/api/notifications/push/route.ts @@ -10,7 +10,7 @@ import { logger, returnForbidden, returnUnauthorized, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; type PushPayload = { userId: string; diff --git a/apps/web/src/app/api/notifications/register-token/route.ts b/apps/web/src/app/api/notifications/register-token/route.ts index 5b2c0ee..f950e96 100644 --- a/apps/web/src/app/api/notifications/register-token/route.ts +++ b/apps/web/src/app/api/notifications/register-token/route.ts @@ -6,7 +6,7 @@ import Expo from "expo-server-sdk"; import { getServerSession } from "@/lib/auth-server"; import { getServerClient } from "@/lib/appwrite-server"; import { getEnvConfig } from "@/lib/appwrite-core"; -import { logger, returnUnauthorized } from "@/lib/newrelic-utils"; +import { logger, returnUnauthorized } from "@/lib/posthog-utils"; /** * POST /api/notifications/register-token diff --git a/apps/web/src/app/api/notifications/settings/route.ts b/apps/web/src/app/api/notifications/settings/route.ts index 7a6d77d..00d4a76 100644 --- a/apps/web/src/app/api/notifications/settings/route.ts +++ b/apps/web/src/app/api/notifications/settings/route.ts @@ -8,7 +8,7 @@ import { } from "@/lib/notification-settings"; import { invalidateNotificationSettingsCache } from "@/lib/notification-triggers"; import { getUserProfile } from "@/lib/appwrite-profiles"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; import type { DirectMessagePrivacy, NotificationLevel, diff --git a/apps/web/src/app/api/profile/[userId]/route.ts b/apps/web/src/app/api/profile/[userId]/route.ts index f33043a..1f2c472 100644 --- a/apps/web/src/app/api/profile/[userId]/route.ts +++ b/apps/web/src/app/api/profile/[userId]/route.ts @@ -6,7 +6,7 @@ import { getPredefinedAvatarFrameUrlByPresetId, } from "@/lib/appwrite-profiles"; import { getUserStatus } from "@/lib/appwrite-status"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; type Props = { params: Promise<{ userId: string }>; diff --git a/apps/web/src/app/api/profile/avatar/route.ts b/apps/web/src/app/api/profile/avatar/route.ts index fc9d10a..943c457 100644 --- a/apps/web/src/app/api/profile/avatar/route.ts +++ b/apps/web/src/app/api/profile/avatar/route.ts @@ -10,7 +10,7 @@ import { getAvatarUrl, updateUserProfile, } from "@/lib/appwrite-profiles"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const ALLOWED_AVATAR_TYPES = new Set([ "image/jpeg", diff --git a/apps/web/src/app/api/profile/background/route.ts b/apps/web/src/app/api/profile/background/route.ts index 133e039..0bbcd78 100644 --- a/apps/web/src/app/api/profile/background/route.ts +++ b/apps/web/src/app/api/profile/background/route.ts @@ -9,7 +9,7 @@ import { updateProfileBackgroundImageState, } from "@/lib/appwrite-profiles"; import { getAdminClient } from "@/lib/appwrite-admin"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const ALLOWED_BACKGROUND_TYPES = new Set([ "image/jpeg", diff --git a/apps/web/src/app/api/profile/route.ts b/apps/web/src/app/api/profile/route.ts index 1755a80..27ea604 100644 --- a/apps/web/src/app/api/profile/route.ts +++ b/apps/web/src/app/api/profile/route.ts @@ -5,7 +5,7 @@ import { updateUserProfile, getAvatarUrl, } from "@/lib/appwrite-profiles"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const URL_SCHEME_PATTERN = /^[a-zA-Z][a-zA-Z0-9+.-]*:/; diff --git a/apps/web/src/app/api/profiles/batch/route.ts b/apps/web/src/app/api/profiles/batch/route.ts index 931eef3..5a20dd6 100644 --- a/apps/web/src/app/api/profiles/batch/route.ts +++ b/apps/web/src/app/api/profiles/batch/route.ts @@ -12,10 +12,8 @@ import { import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getEnvConfig } from "@/lib/appwrite-core"; import { getServerClient } from "@/lib/appwrite-server"; import { normalizeStatus } from "@/lib/status-normalization"; @@ -49,7 +47,6 @@ export async function POST(request: NextRequest) { const startTime = Date.now(); try { - setTransactionName("POST /api/profiles/batch"); const session = await getServerSession(); if (!session?.$id) { @@ -119,12 +116,6 @@ export async function POST(request: NextRequest) { return !relationship?.blockedByMe && !relationship?.blockedMe; }); - addTransactionAttributes({ - requestedCount: userIds.length, - uniqueCount: uniqueUserIds.length, - visibleCount: visibleUserIds.length, - }); - logger.info("Fetching batch profiles", { count: visibleUserIds.length, }); diff --git a/apps/web/src/app/api/reports/route.ts b/apps/web/src/app/api/reports/route.ts index 7b9cbb9..ff33c6e 100644 --- a/apps/web/src/app/api/reports/route.ts +++ b/apps/web/src/app/api/reports/route.ts @@ -6,7 +6,7 @@ import { DUPLICATE_REPORT_ERROR_MESSAGE, DuplicateReportError, } from "@/lib/appwrite-reports"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const RATE_LIMIT_MAX = 5; const RATE_LIMIT_WINDOW_MS = 60 * 60 * 1000; diff --git a/apps/web/src/app/api/role-assignments/route.ts b/apps/web/src/app/api/role-assignments/route.ts index d89af23..d3d8988 100644 --- a/apps/web/src/app/api/role-assignments/route.ts +++ b/apps/web/src/app/api/role-assignments/route.ts @@ -8,7 +8,7 @@ import { listPages } from "@/lib/appwrite-pagination"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; import { invalidateChannelsUserCaches } from "@/lib/channels-route-cache"; import { isDocumentNotFoundError } from "@/lib/appwrite-admin"; diff --git a/apps/web/src/app/api/roles/route.ts b/apps/web/src/app/api/roles/route.ts index e545ddc..97539bd 100644 --- a/apps/web/src/app/api/roles/route.ts +++ b/apps/web/src/app/api/roles/route.ts @@ -9,7 +9,7 @@ import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; import { isDocumentNotFoundError } from "@/lib/appwrite-admin"; diff --git a/apps/web/src/app/api/search/messages/route.ts b/apps/web/src/app/api/search/messages/route.ts index 5b945e7..a2c22ef 100644 --- a/apps/web/src/app/api/search/messages/route.ts +++ b/apps/web/src/app/api/search/messages/route.ts @@ -17,9 +17,8 @@ import { getAvatarUrl, resolveProfileUserId } from "@/lib/appwrite-profiles"; import { logger, recordError, - setTransactionName, trackApiCall, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; type SearchResult = { type: "channel" | "dm"; @@ -205,7 +204,6 @@ export async function GET(request: NextRequest) { const startTime = Date.now(); try { - setTransactionName("GET /api/search/messages"); // Verify user is authenticated const user = await getServerSession(); diff --git a/apps/web/src/app/api/servers/[serverId]/audit-logs/export/route.ts b/apps/web/src/app/api/servers/[serverId]/audit-logs/export/route.ts index cc69455..7983711 100644 --- a/apps/web/src/app/api/servers/[serverId]/audit-logs/export/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/audit-logs/export/route.ts @@ -3,7 +3,7 @@ import { getServerSession } from "@/lib/auth-server"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getServerClient } from "@/lib/appwrite-server"; import { getEnvConfig } from "@/lib/appwrite-core"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; diff --git a/apps/web/src/app/api/servers/[serverId]/audit-logs/route.ts b/apps/web/src/app/api/servers/[serverId]/audit-logs/route.ts index 73c9b47..1d04276 100644 --- a/apps/web/src/app/api/servers/[serverId]/audit-logs/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/audit-logs/route.ts @@ -3,7 +3,7 @@ import { getServerClient } from "@/lib/appwrite-server"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getServerSession } from "@/lib/auth-server"; import { getEnvConfig } from "@/lib/appwrite-core"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; diff --git a/apps/web/src/app/api/servers/[serverId]/invites/route.ts b/apps/web/src/app/api/servers/[serverId]/invites/route.ts index 77a125d..a357ade 100644 --- a/apps/web/src/app/api/servers/[serverId]/invites/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/invites/route.ts @@ -7,7 +7,7 @@ import { getServerPermissionsForUser } from "@/lib/server-channel-access"; import { logger, recordError, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; const { databases } = getServerClient(); const env = getEnvConfig(); diff --git a/apps/web/src/app/api/servers/[serverId]/members/route.ts b/apps/web/src/app/api/servers/[serverId]/members/route.ts index dfd9c83..8a89545 100644 --- a/apps/web/src/app/api/servers/[serverId]/members/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/members/route.ts @@ -4,7 +4,7 @@ import { getEnvConfig } from "@/lib/appwrite-core"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { listPages, chunkValues } from "@/lib/appwrite-pagination"; import { getServerSession } from "@/lib/auth-server"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; @@ -65,7 +65,6 @@ export async function GET(request: Request, context: RouteContext) { return returnForbidden(); } - // Get all memberships and role assignments in parallel const [ { documents: memberships, truncated: membershipsTruncated }, diff --git a/apps/web/src/app/api/servers/[serverId]/mentionable-roles/route.ts b/apps/web/src/app/api/servers/[serverId]/mentionable-roles/route.ts index a1c33f7..a183918 100644 --- a/apps/web/src/app/api/servers/[serverId]/mentionable-roles/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/mentionable-roles/route.ts @@ -7,7 +7,7 @@ import { getEnvConfig } from "@/lib/appwrite-core"; import { getServerSession } from "@/lib/auth-server"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; import { listPages } from "@/lib/appwrite-pagination"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; // Define explicit interfaces for Appwrite documents used in this route interface RoleDocument { diff --git a/apps/web/src/app/api/servers/[serverId]/moderation/route.ts b/apps/web/src/app/api/servers/[serverId]/moderation/route.ts index 581004a..09bdb44 100644 --- a/apps/web/src/app/api/servers/[serverId]/moderation/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/moderation/route.ts @@ -7,7 +7,7 @@ import { getUserRoles } from "@/lib/appwrite-roles"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getEnvConfig } from "@/lib/appwrite-core"; import { isDocumentNotFoundError } from "@/lib/appwrite-admin"; import { listPages } from "@/lib/appwrite-pagination"; diff --git a/apps/web/src/app/api/servers/[serverId]/mute/route.ts b/apps/web/src/app/api/servers/[serverId]/mute/route.ts index 2d81f61..0613a72 100644 --- a/apps/web/src/app/api/servers/[serverId]/mute/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/mute/route.ts @@ -3,7 +3,7 @@ import { NextResponse } from "next/server"; import { getServerSession } from "@/lib/auth-server"; import { muteServer, unmuteServer, isMuteExpired } from "@/lib/notification-settings"; import { invalidateNotificationSettingsCache } from "@/lib/notification-triggers"; -import { logger, returnUnauthorized, returnForbidden } from "@/lib/newrelic-utils"; +import { logger, returnUnauthorized, returnForbidden } from "@/lib/posthog-utils"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; import { getServerClient } from "@/lib/appwrite-server"; import { getEnvConfig } from "@/lib/appwrite-core"; diff --git a/apps/web/src/app/api/servers/[serverId]/permissions/route.ts b/apps/web/src/app/api/servers/[serverId]/permissions/route.ts index b9ee967..6f5b31d 100644 --- a/apps/web/src/app/api/servers/[serverId]/permissions/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/permissions/route.ts @@ -10,7 +10,7 @@ import type { ChannelPermissionOverride } from "@/lib/types"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getServerPermissionsForUser, hasAccessToCategory, @@ -25,7 +25,6 @@ function getDatabases() { return getServerClient().databases; } - function mapOverride( doc: Record, channelId: string, diff --git a/apps/web/src/app/api/servers/[serverId]/route.ts b/apps/web/src/app/api/servers/[serverId]/route.ts index 48273b7..a629ed3 100644 --- a/apps/web/src/app/api/servers/[serverId]/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/route.ts @@ -20,7 +20,7 @@ import { getServerPermissionsForUser } from "@/lib/server-channel-access"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; const MAX_SERVER_NAME_LENGTH = 100; const MAX_SERVER_DESCRIPTION_LENGTH = 500; diff --git a/apps/web/src/app/api/servers/[serverId]/stats/route.ts b/apps/web/src/app/api/servers/[serverId]/stats/route.ts index 313a8e3..e7bf3d0 100644 --- a/apps/web/src/app/api/servers/[serverId]/stats/route.ts +++ b/apps/web/src/app/api/servers/[serverId]/stats/route.ts @@ -4,7 +4,7 @@ import { Query } from "node-appwrite"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { getServerSession } from "@/lib/auth-server"; import { getEnvConfig } from "@/lib/appwrite-core"; import { getServerPermissionsForUser } from "@/lib/server-channel-access"; diff --git a/apps/web/src/app/api/servers/create/route.ts b/apps/web/src/app/api/servers/create/route.ts index 5f7b4eb..22016d6 100644 --- a/apps/web/src/app/api/servers/create/route.ts +++ b/apps/web/src/app/api/servers/create/route.ts @@ -3,7 +3,7 @@ import { NextResponse } from "next/server"; import { createServer } from "@/lib/appwrite-servers"; import { getServerSession } from "@/lib/auth-server"; import { FEATURE_FLAGS, getFeatureFlag } from "@/lib/feature-flags"; -import { logger, getPostHogClient } from "@/lib/newrelic-utils"; +import { logger, getPostHogClient } from "@/lib/posthog-utils"; import { normalizeServerFileId } from "@/lib/server-metadata"; const MAX_SERVER_NAME_LENGTH = 100; diff --git a/apps/web/src/app/api/servers/default-signup/route.ts b/apps/web/src/app/api/servers/default-signup/route.ts index 449e12c..debfc60 100644 --- a/apps/web/src/app/api/servers/default-signup/route.ts +++ b/apps/web/src/app/api/servers/default-signup/route.ts @@ -8,7 +8,7 @@ import { getUserRoles } from "@/lib/appwrite-roles"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; type DefaultSignupServerDocument = { $id: string; diff --git a/apps/web/src/app/api/servers/join/route.ts b/apps/web/src/app/api/servers/join/route.ts index cefe8cc..7eb8b9c 100644 --- a/apps/web/src/app/api/servers/join/route.ts +++ b/apps/web/src/app/api/servers/join/route.ts @@ -9,13 +9,11 @@ import { getServerSession } from "@/lib/auth-server"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, recordEvent, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { assignDefaultRoleServer } from "@/lib/default-role"; import { invalidateChannelsUserCaches } from "@/lib/channels-route-cache"; import type { Membership } from "@/lib/types"; @@ -71,10 +69,9 @@ function isConflictError(error: unknown): boolean { */ export async function POST(request: NextRequest) { const startTime = Date.now(); - + try { - setTransactionName("POST /api/servers/join"); - + // Verify user is authenticated const user = await getServerSession(); if (!user) { @@ -120,11 +117,6 @@ export async function POST(request: NextRequest) { // Use authenticated user's ID, not from request body (security) const userId = user.$id; - - addTransactionAttributes({ - userId, - serverId, - }); const { databases } = getServerClient(); @@ -206,7 +198,7 @@ export async function POST(request: NextRequest) { } throw error; } - + // Assign default role to the new member try { await assignDefaultRoleServer(serverId, userId); @@ -220,7 +212,7 @@ export async function POST(request: NextRequest) { : String(defaultRoleError), }); } - + trackApiCall( "/api/servers/join", "POST", @@ -228,12 +220,12 @@ export async function POST(request: NextRequest) { Date.now() - dbStartTime, { operation: "joinServer", serverId } ); - + recordEvent("ServerJoin", { userId, serverId, }); - + logger.info("User joined server", { userId, serverId, @@ -265,12 +257,12 @@ export async function POST(request: NextRequest) { endpoint: "/api/servers/join", } ); - + logger.error("Failed to join server", { error: error instanceof Error ? error.message : String(error), duration: Date.now() - startTime, }); - + trackApiCall( "/api/servers/join", "POST", @@ -278,7 +270,7 @@ export async function POST(request: NextRequest) { Date.now() - startTime, { operation: "joinServer" } ); - + return NextResponse.json( { error: "Failed to join server", diff --git a/apps/web/src/app/api/servers/public/route.ts b/apps/web/src/app/api/servers/public/route.ts index 3bac6bd..1385f7e 100644 --- a/apps/web/src/app/api/servers/public/route.ts +++ b/apps/web/src/app/api/servers/public/route.ts @@ -7,7 +7,7 @@ import { getServerClient } from "@/lib/appwrite-server"; import { getEnvConfig } from "@/lib/appwrite-core"; import { getActualMemberCounts } from "@/lib/membership-count"; import { mapServerDocument } from "@/lib/server-metadata"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; import type { Server } from "@/lib/types"; type ServerDocument = Models.Document & { diff --git a/apps/web/src/app/api/servers/route.ts b/apps/web/src/app/api/servers/route.ts index 31f01f1..fa867fc 100644 --- a/apps/web/src/app/api/servers/route.ts +++ b/apps/web/src/app/api/servers/route.ts @@ -5,7 +5,7 @@ import { Query } from "node-appwrite"; import { getServerSession } from "@/lib/auth-server"; import { getServerClient } from "@/lib/appwrite-server"; import { getEnvConfig } from "@/lib/appwrite-core"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; import type { Server } from "@/lib/types"; import { listPages } from "@/lib/appwrite-pagination"; import { getActualMemberCounts } from "@/lib/membership-count"; diff --git a/apps/web/src/app/api/session/route.ts b/apps/web/src/app/api/session/route.ts index cd195c0..81ca646 100644 --- a/apps/web/src/app/api/session/route.ts +++ b/apps/web/src/app/api/session/route.ts @@ -3,7 +3,7 @@ import { cookies } from "next/headers"; import { Account, Client } from "node-appwrite"; import { getEnvConfig } from "@/lib/appwrite-core"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const ALLOWED_ORIGINS = (process.env.ALLOWED_ORIGINS ?? "") .split(",") @@ -109,9 +109,10 @@ export async function POST(request: Request) { ); } - const { session, project } = parsed as { + const { session, project, remember } = parsed as { session?: unknown; project?: unknown; + remember?: unknown; }; if (typeof session !== "string" || typeof project !== "string") { @@ -143,11 +144,15 @@ export async function POST(request: Request) { } const cookieStore = await cookies(); + // Remember-me: persistent 1-year cookie by default. When unchecked the + // cookie is session-only (no maxAge) and clears when the browser closes. + const rememberMe = remember === undefined || remember === true; + cookieStore.set(`a_session_${env.project}`, session, { httpOnly: true, secure: process.env.NODE_ENV === "production", sameSite: "lax", - maxAge: 60 * 60 * 24 * 365, + ...(rememberMe ? { maxAge: 60 * 60 * 24 * 365 } : {}), path: "/", }); diff --git a/apps/web/src/app/api/sessions/route.ts b/apps/web/src/app/api/sessions/route.ts new file mode 100644 index 0000000..e404ff9 --- /dev/null +++ b/apps/web/src/app/api/sessions/route.ts @@ -0,0 +1,152 @@ +import { NextResponse } from "next/server"; +import { cookies } from "next/headers"; +import { Account, Client } from "node-appwrite"; + +import { getEnvConfig } from "@/lib/appwrite-core"; +import { invalidateSessionCacheForToken } from "@/lib/auth-server"; +import { logger } from "@/lib/posthog-utils"; + +function getSessionClient(secret: string): Account { + const env = getEnvConfig(); + const client = new Client() + .setEndpoint(env.endpoint) + .setProject(env.project) + .setSession(secret); + return new Account(client); +} + +function mapSession(session: { + $id: string; + $createdAt?: string; + expire?: string; + osName?: string; + osVersion?: string; + clientName?: string; + clientType?: string; + clientVersion?: string; + deviceName?: string; + deviceModel?: string; + current?: boolean; +}) { + return { + $id: session.$id, + createdAt: session.$createdAt, + expiresAt: session.expire, + current: session.current === true, + os: session.osName ?? null, + osVersion: session.osVersion ?? null, + client: session.clientName ?? null, + clientType: session.clientType ?? null, + device: session.deviceName ?? null, + deviceModel: session.deviceModel ?? null, + }; +} + +/** + * GET /api/sessions + * + * Lists sessions for the currently logged-in user (from the cookie), driven + * by the session client so a user can only ever see their own sessions. + */ +export async function GET() { + try { + const env = getEnvConfig(); + const cookieStore = await cookies(); + const sessionSecret = cookieStore.get(`a_session_${env.project}`)?.value; + + if (!sessionSecret) { + return NextResponse.json( + { error: "No session found" }, + { status: 401 }, + ); + } + + const account = getSessionClient(sessionSecret); + const response = await account.listSessions(); + + return NextResponse.json({ + sessions: (response.sessions ?? []).map(mapSession), + }); + } catch (error) { + logger.error("Failed to list sessions", { + error: error instanceof Error ? error.message : String(error), + }); + return NextResponse.json( + { error: "Failed to list sessions" }, + { status: 500 }, + ); + } +} + +/** + * DELETE /api/sessions?sessionId=... | DELETE /api/sessions?revokeOthers=1 + * + * Revokes a single session or every other session. Revoking "current" also + * clears the session cookie. (Callers send `clearCookie=1` alongside the + * current session id so the server knows to drop the cookie.) + */ +export async function DELETE(request: Request) { + try { + const env = getEnvConfig(); + const cookieStore = await cookies(); + const sessionSecret = cookieStore.get(`a_session_${env.project}`)?.value; + + if (!sessionSecret) { + return NextResponse.json( + { error: "No session found" }, + { status: 401 }, + ); + } + + const url = new URL(request.url); + const sessionId = url.searchParams.get("sessionId"); + const revokeOthers = url.searchParams.get("revokeOthers") === "1"; + const clearCookie = url.searchParams.get("clearCookie") === "1"; + + const account = getSessionClient(sessionSecret); + + if (revokeOthers) { + const response = await account.listSessions(); + for (const session of response.sessions ?? []) { + if (session.current === true) continue; + try { + await account.deleteSession({ sessionId: session.$id }); + } catch (error) { + logger.warn("Failed to revoke individual session", { + sessionId: session.$id, + error: + error instanceof Error + ? error.message + : String(error), + }); + } + } + } else if (sessionId) { + await account.deleteSession({ sessionId }); + } else { + return NextResponse.json( + { error: "sessionId or revokeOthers is required" }, + { status: 400 }, + ); + } + + if (clearCookie) { + cookieStore.delete(`a_session_${env.project}`); + invalidateSessionCacheForToken( + env.endpoint, + env.project, + sessionSecret, + ); + } + + return NextResponse.json({ success: true }); + } catch (error) { + logger.error("Failed to revoke session(s)", { + error: error instanceof Error ? error.message : String(error), + }); + return NextResponse.json( + { error: "Failed to revoke session(s)" }, + { status: 500 }, + ); + } +} \ No newline at end of file diff --git a/apps/web/src/app/api/status/batch/route.ts b/apps/web/src/app/api/status/batch/route.ts index 277fba6..681360f 100644 --- a/apps/web/src/app/api/status/batch/route.ts +++ b/apps/web/src/app/api/status/batch/route.ts @@ -7,11 +7,9 @@ import { getServerSession } from "@/lib/auth-server"; import { apiCache } from "@/lib/cache-utils"; import { logger, - setTransactionName, trackApiCall, - addTransactionAttributes, returnUnauthorized, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import type { UserStatus } from "@/lib/types"; import { normalizeStatus, @@ -32,7 +30,6 @@ export async function POST(request: Request) { const startTime = Date.now(); try { - setTransactionName("POST /api/status/batch"); const session = await getServerSession(); if (!session?.$id) { @@ -61,10 +58,6 @@ export async function POST(request: Request) { ); } - addTransactionAttributes({ - userCount: userIds.length, - }); - if (!STATUSES_COLLECTION) { logger.error("Statuses collection not configured"); return NextResponse.json( diff --git a/apps/web/src/app/api/status/route.ts b/apps/web/src/app/api/status/route.ts index 467348e..c5be0fb 100644 --- a/apps/web/src/app/api/status/route.ts +++ b/apps/web/src/app/api/status/route.ts @@ -8,13 +8,11 @@ import { getServerSession } from "@/lib/auth-server"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, recordEvent, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; import { ALLOWED_STATUSES, normalizeStatus, @@ -86,7 +84,6 @@ export async function POST(request: Request) { const startTime = Date.now(); try { - setTransactionName("POST /api/status"); const session = await getServerSession(); if (!session?.$id) { @@ -115,12 +112,6 @@ export async function POST(request: Request) { ); } - addTransactionAttributes({ - userId, - status, - isManuallySet: !!isManuallySet, - }); - if (!STATUSES_COLLECTION) { logger.error("Statuses collection not configured"); return NextResponse.json( diff --git a/apps/web/src/app/api/stickers/route.ts b/apps/web/src/app/api/stickers/route.ts index d57d455..b83aed0 100644 --- a/apps/web/src/app/api/stickers/route.ts +++ b/apps/web/src/app/api/stickers/route.ts @@ -3,13 +3,12 @@ import { NextResponse } from "next/server"; import { AuthError, requireAuth } from "@/lib/auth-server"; import { getBuiltinStickerPacks } from "@/lib/gif-sticker"; -import { setTransactionName, trackApiCall } from "@/lib/newrelic-utils"; +import { trackApiCall } from "@/lib/posthog-utils"; export async function GET(request: NextRequest) { const startTime = Date.now(); try { - setTransactionName("GET /api/stickers"); await requireAuth(); diff --git a/apps/web/src/app/api/thread-reads/route.ts b/apps/web/src/app/api/thread-reads/route.ts index 1c22c59..4719195 100644 --- a/apps/web/src/app/api/thread-reads/route.ts +++ b/apps/web/src/app/api/thread-reads/route.ts @@ -3,7 +3,7 @@ import { NextResponse } from "next/server"; import { getServerSession } from "@/lib/auth-server"; import { getThreadReads, upsertThreadReads } from "@/lib/thread-read-store"; import { type ThreadReadContextType } from "@/lib/thread-read-states"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const VALID_CONTEXT_TYPES: ThreadReadContextType[] = [ "channel", diff --git a/apps/web/src/app/api/typing/route.ts b/apps/web/src/app/api/typing/route.ts index 0806300..9595618 100644 --- a/apps/web/src/app/api/typing/route.ts +++ b/apps/web/src/app/api/typing/route.ts @@ -3,7 +3,7 @@ import { Permission, Presences, Role } from "node-appwrite"; import { getServerSession } from "@/lib/auth-server"; import { getServerClient } from "@/lib/appwrite-server"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const DEFAULT_TYPING_EXPIRY_MS = 8000; diff --git a/apps/web/src/app/api/upload-emoji/route.ts b/apps/web/src/app/api/upload-emoji/route.ts index cf848e5..ea6689d 100644 --- a/apps/web/src/app/api/upload-emoji/route.ts +++ b/apps/web/src/app/api/upload-emoji/route.ts @@ -6,7 +6,7 @@ import { getServerClient } from "@/lib/appwrite-server"; import { getServerSession } from "@/lib/auth-server"; import { getEnvConfig } from "@/lib/appwrite-core"; import { checkRateLimit } from "@/lib/rate-limit"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const ALLOWED_ORIGINS = (process.env.ALLOWED_ORIGINS ?? "") .split(",") diff --git a/apps/web/src/app/api/upload-file/route.ts b/apps/web/src/app/api/upload-file/route.ts index 2b2299b..d758f24 100644 --- a/apps/web/src/app/api/upload-file/route.ts +++ b/apps/web/src/app/api/upload-file/route.ts @@ -16,11 +16,9 @@ import { checkRateLimit } from "@/lib/rate-limit"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, recordEvent, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; const ALLOWED_ORIGINS = (process.env.ALLOWED_ORIGINS ?? "") .split(",") @@ -514,8 +512,6 @@ export async function POST(request: NextRequest) { return respond({ error: "Origin is not allowed" }, { status: 403 }); } - setTransactionName("POST /api/upload-file"); - logger.info("Starting file upload"); const session = await getServerSession(); if (!session?.$id) { @@ -524,8 +520,6 @@ export async function POST(request: NextRequest) { } logger.info("Session verified", { userId: session.$id }); - addTransactionAttributes({ userId: session.$id }); - // Rate limiting: 10 uploads per 5 minutes const rateLimitResult = checkRateLimit(`upload:${session.$id}`, { maxRequests: 10, @@ -755,16 +749,12 @@ export async function DELETE(request: NextRequest) { return respond({ error: "Origin is not allowed" }, { status: 403 }); } - setTransactionName("DELETE /api/upload-file"); - const session = await getServerSession(); if (!session?.$id) { logger.warn("Unauthorized delete attempt"); return respond({ error: "Unauthorized" }, { status: 401 }); } - addTransactionAttributes({ userId: session.$id }); - const env = getEnvConfig(); const { searchParams } = new URL(request.url); @@ -775,8 +765,6 @@ export async function DELETE(request: NextRequest) { return respond({ error: "No fileId provided" }, { status: 400 }); } - addTransactionAttributes({ fileId }); - const deleteRateLimitResult = checkRateLimit( `upload-delete:${session.$id}`, { diff --git a/apps/web/src/app/api/upload-image/route.ts b/apps/web/src/app/api/upload-image/route.ts index 52a120d..36c21d4 100644 --- a/apps/web/src/app/api/upload-image/route.ts +++ b/apps/web/src/app/api/upload-image/route.ts @@ -9,11 +9,9 @@ import { checkRateLimit } from "@/lib/rate-limit"; import { logger, recordError, - setTransactionName, trackApiCall, - addTransactionAttributes, recordEvent, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; const ALLOWED_ORIGINS = (process.env.ALLOWED_ORIGINS ?? "") .split(",") @@ -179,8 +177,6 @@ export async function POST(request: NextRequest) { return respond({ error: "Origin is not allowed" }, { status: 403 }); } - setTransactionName("POST /api/upload-image"); - logger.info("Starting image upload"); const session = await getServerSession(); if (!session?.$id) { @@ -189,8 +185,6 @@ export async function POST(request: NextRequest) { } logger.info("Session verified", { userId: session.$id }); - addTransactionAttributes({ userId: session.$id }); - // Rate limiting: 10 uploads per 5 minutes const rateLimitResult = checkRateLimit(`upload-image:${session.$id}`, { maxRequests: 10, @@ -372,8 +366,6 @@ export async function DELETE(request: NextRequest) { return respond({ error: "Origin is not allowed" }, { status: 403 }); } - setTransactionName("DELETE /api/upload-image"); - const session = await getServerSession(); if (!session?.$id) { logger.warn("Unauthorized delete attempt"); @@ -396,8 +388,6 @@ export async function DELETE(request: NextRequest) { ); } - addTransactionAttributes({ userId: session.$id }); - const env = getEnvConfig(); const { searchParams } = new URL(request.url); @@ -413,8 +403,6 @@ export async function DELETE(request: NextRequest) { return respond({ error: "Invalid fileId" }, { status: 400 }); } - addTransactionAttributes({ fileId }); - const { storage } = getServerClient(); let filePermissions: unknown; diff --git a/apps/web/src/app/api/users/[userId]/profile/route.ts b/apps/web/src/app/api/users/[userId]/profile/route.ts index bca4931..b5f4ae4 100644 --- a/apps/web/src/app/api/users/[userId]/profile/route.ts +++ b/apps/web/src/app/api/users/[userId]/profile/route.ts @@ -9,7 +9,7 @@ import { getUserStatus } from "@/lib/appwrite-status"; import { logger, returnUnauthorized, returnForbidden, -} from "@/lib/newrelic-utils"; +} from "@/lib/posthog-utils"; export async function GET( _request: Request, diff --git a/apps/web/src/app/api/users/search/route.ts b/apps/web/src/app/api/users/search/route.ts index 3650a36..dc9a762 100644 --- a/apps/web/src/app/api/users/search/route.ts +++ b/apps/web/src/app/api/users/search/route.ts @@ -6,7 +6,7 @@ import { getAvatarUrl } from "@/lib/appwrite-profiles"; import { getServerSession } from "@/lib/auth-server"; import { getRelationshipMap } from "@/lib/appwrite-friendships"; import { apiCache } from "@/lib/cache-utils"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const USERS_SEARCH_CACHE_TTL_MS = 10 * 1000; diff --git a/apps/web/src/app/chat/hooks/useActivityTracking.ts b/apps/web/src/app/chat/hooks/useActivityTracking.ts index 6209356..051f6c7 100644 --- a/apps/web/src/app/chat/hooks/useActivityTracking.ts +++ b/apps/web/src/app/chat/hooks/useActivityTracking.ts @@ -13,16 +13,16 @@ type UseActivityTrackingProps = { /** * Hook to track user activity and update status - * + * * NOTE: This hook is currently NOT in use to preserve manual status settings. * Users can manually set their status via the profile/settings UI. - * + * * If enabled, this hook would: * - Set status to "online" when active * - Set status to "away" after 5 minutes of inactivity * - Update lastSeen every 60 seconds * - Set status to "offline" on unmount/logout - * + * * @deprecated Automatic status tracking disabled to preserve manual statuses */ export function useActivityTracking({ userId, enabled = true }: UseActivityTrackingProps) { diff --git a/apps/web/src/app/chat/hooks/useDirectMessages.ts b/apps/web/src/app/chat/hooks/useDirectMessages.ts index b0ecf69..4833f69 100644 --- a/apps/web/src/app/chat/hooks/useDirectMessages.ts +++ b/apps/web/src/app/chat/hooks/useDirectMessages.ts @@ -1086,7 +1086,6 @@ export function useDirectMessages({ [Query.equal("conversationId", conversationId)], ); - messageSubscriptionRef.current = subscription; if (cancelled) { diff --git a/apps/web/src/app/chat/hooks/useServers.ts b/apps/web/src/app/chat/hooks/useServers.ts index d614552..c0d89af 100644 --- a/apps/web/src/app/chat/hooks/useServers.ts +++ b/apps/web/src/app/chat/hooks/useServers.ts @@ -74,7 +74,7 @@ export function useServers({ userId, membershipEnabled }: UseServersOptions) { (async () => { try { setInitialLoading(true); - + // Use SWR (stale-while-revalidate) to serve cached data instantly while revalidating const serverReq = apiCache.swr( `servers:initial:${userId}`, @@ -83,7 +83,7 @@ export function useServers({ userId, membershipEnabled }: UseServersOptions) { .then((data) => data as { servers: Server[]; nextCursor: string | null }), CACHE_TTL.SERVERS ); - + const membershipReq = membershipEnabled ? apiCache.swr( `memberships:${userId}`, @@ -93,7 +93,7 @@ export function useServers({ userId, membershipEnabled }: UseServersOptions) { CACHE_TTL.MEMBERSHIPS ) : Promise.resolve([]); - + const [{ servers: first, nextCursor }, mems] = await Promise.all([ serverReq, membershipReq, @@ -301,22 +301,22 @@ export function useServers({ userId, membershipEnabled }: UseServersOptions) { if (membershipEnabled) { apiCache.clear(`memberships:${userId}`); } - + const serverReq = fetch("/api/servers?limit=25") .then((res) => res.json()) .then((data) => data as { servers: Server[]; nextCursor: string | null }); - + const membershipReq = membershipEnabled ? fetch("/api/memberships") .then((res) => res.json()) .then((data) => data.memberships as Membership[]) : Promise.resolve([]); - + const [{ servers: first, nextCursor }, mems] = await Promise.all([ serverReq, membershipReq, ]); - + setCursor(nextCursor); setMemberships(mems); setServers(filterAllowedServers(first, mems)); diff --git a/apps/web/src/app/notifications/page.tsx b/apps/web/src/app/notifications/page.tsx index da3987c..ee87f47 100644 --- a/apps/web/src/app/notifications/page.tsx +++ b/apps/web/src/app/notifications/page.tsx @@ -2,7 +2,7 @@ import { redirect } from "next/navigation"; import { NotificationsCenter } from "./notifications-center"; import { AuthError, requireAuth } from "@/lib/auth-server"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const AUTH_ERROR_REGEX = /\b(?:not authenticated|not authorized|unauthenticated|authentication|auth)\b/i; diff --git a/apps/web/src/app/onboarding/actions.ts b/apps/web/src/app/onboarding/actions.ts index bf7a359..9ca9d56 100644 --- a/apps/web/src/app/onboarding/actions.ts +++ b/apps/web/src/app/onboarding/actions.ts @@ -15,7 +15,7 @@ import { DIRECT_MESSAGE_PRIVACY_VALUES, NOTIFICATION_LEVEL_VALUES, } from "@/lib/types"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; function isNotificationLevel( value: FormDataEntryValue | null, diff --git a/apps/web/src/app/reports/actions.ts b/apps/web/src/app/reports/actions.ts index ac0accf..ce46eca 100644 --- a/apps/web/src/app/reports/actions.ts +++ b/apps/web/src/app/reports/actions.ts @@ -10,7 +10,7 @@ import { DuplicateReportError, type Report, } from "@/lib/appwrite-reports"; -import { logger } from "@/lib/newrelic-utils"; +import { logger } from "@/lib/posthog-utils"; const RATE_LIMIT_MAX = 5; const RATE_LIMIT_WINDOW_MS = 60 * 60 * 1000; // 1 hour diff --git a/apps/web/src/app/settings/actions.ts b/apps/web/src/app/settings/actions.ts index 019d9bb..fbdf115 100644 --- a/apps/web/src/app/settings/actions.ts +++ b/apps/web/src/app/settings/actions.ts @@ -1,18 +1,25 @@ "use server"; import { revalidatePath } from "next/cache"; -import { ID } from "node-appwrite"; -import { requireAuth } from "@/lib/auth-server"; +import { cookies } from "next/headers"; +import { ID, Account, Client, Users } from "node-appwrite"; +import { + getSessionTokenFromCookie, + invalidateSessionCacheForToken, + requireAuth, +} from "@/lib/auth-server"; import { deleteAvatarFile, deleteProfileBackgroundFile, getOrCreateUserProfile, + tombstoneUserProfile, updateProfileBackgroundImageState, updateUserProfile, } from "@/lib/appwrite-profiles"; import { getAdminClient } from "@/lib/appwrite-admin"; import { getEnvConfig } from "@/lib/appwrite-core"; -import { logger } from "@/lib/newrelic-utils"; +import { FEATURE_FLAGS, getFeatureFlag } from "@/lib/feature-flags"; +import { logger } from "@/lib/posthog-utils"; import { getEligibleFramesForUser, isUserEligibleForFrame, @@ -455,3 +462,326 @@ export async function getAvailableFramesAction() { eligibilityKnown: accountCreatedAt !== null, }; } + +const EMAIL_ADDRESS_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; + +function getVerificationRedirectUrl(): string { + const configuredBaseUrl = + process.env.SERVER_URL?.trim() || + process.env.NEXT_PUBLIC_BASE_URL?.trim() || + "http://localhost:3000"; + + const normalizedBaseUrl = configuredBaseUrl.replace(/\/$/, ""); + return `${normalizedBaseUrl}/api/auth/verify-email`; +} + +/** + * Creates a short-lived session from the current password to confirm the + * caller really owns the account. The temp session is always deleted in the + * caller's finally block. + */ +async function verifyCurrentPassword(userId: string, password: string): + Promise<{ account: Account; users: Users; sessionSecret: string } | null> { + const env = getEnvConfig(); + const apiKey = process.env.APPWRITE_API_KEY; + + if (!apiKey) { + throw new Error("Server API key not configured"); + } + + const client = new Client() + .setEndpoint(env.endpoint) + .setProject(env.project) + .setKey(apiKey); + const account = new Account(client); + const users = new Users(client); + + try { + const session = await account.createEmailPasswordSession({ + email: (await users.get(userId)).email, + password, + }); + + if (session.userId !== userId) { + return null; + } + + return { account, users, sessionSecret: session.secret ?? "" }; + } catch { + return null; + } +} + +async function isEmailVerificationEnabled(): Promise { + try { + return await getFeatureFlag(FEATURE_FLAGS.ENABLE_EMAIL_VERIFICATION); + } catch { + return false; + } +} + +export type AccountActionResult = + | { success: true; message: string; verificationSent?: boolean } + | { success: false; error: string }; + +/** + * Changes the account email. Requires the current password; after the change + * a verification email is sent when email verification is enabled. + */ +export async function changeEmailAction( + formData: FormData, +): Promise { + const user = await requireAuth(); + const newEmail = (formData.get("email") as string)?.trim().toLowerCase(); + const password = formData.get("password") as string; + + if (!newEmail || !password) { + return { success: false, error: "New email and password are required" }; + } + + if (!EMAIL_ADDRESS_PATTERN.test(newEmail)) { + return { success: false, error: "Invalid email address" }; + } + + if (newEmail === user.email) { + return { success: false, error: "That is already your email address" }; + } + + const verified = await verifyCurrentPassword(user.$id, password); + if (!verified) { + return { success: false, error: "Current password is incorrect" }; + } + + const env = getEnvConfig(); + try { + await verified.users.updateEmail({ + userId: user.$id, + email: newEmail, + }); + + let verificationSent = false; + if (await isEmailVerificationEnabled()) { + try { + await verified.account.createVerification({ + url: getVerificationRedirectUrl(), + }); + verificationSent = true; + } catch (verificationError) { + logger.warn("Failed to send email-change verification", { + error: + verificationError instanceof Error + ? verificationError.message + : String(verificationError), + }); + } + } + + if (verified.sessionSecret) { + invalidateSessionCacheForToken( + env.endpoint, + env.project, + verified.sessionSecret, + ); + } + + revalidatePath("/settings"); + + return { + success: true, + message: verificationSent + ? "Email updated. Check your inbox for a verification link." + : "Email updated.", + verificationSent, + }; + } catch (error) { + logger.error("Email change failed", { + error: error instanceof Error ? error.message : String(error), + }); + return { + success: false, + error: "Email change failed. That address may already be in use.", + }; + } finally { + try { + await verified.users.deleteSession({ + userId: user.$id, + sessionId: "current", + }); + } catch { + // Best-effort temp session cleanup. + } + } +} + +/** + * Re-sends the email-change verification link using the caller's active + * session, so a settings user doesn't have to re-enter their password. + */ +export async function resendEmailVerificationAction(): Promise { + const user = await requireAuth(); + const env = getEnvConfig(); + const token = await getSessionTokenFromCookie(); + + try { + if (!token) { + return { + success: false, + error: "No active session found. Sign in and try again.", + }; + } + + if (!(await isEmailVerificationEnabled())) { + return { + success: false, + error: "Email verification is not enabled on this instance.", + }; + } + + const client = new Client() + .setEndpoint(env.endpoint) + .setProject(env.project); + + if (token.startsWith("eyJ")) { + client.setJWT(token); + } else { + client.setSession(token); + } + + await new Account(client).createVerification({ + url: getVerificationRedirectUrl(), + }); + + return { + success: true, + message: "Verification email sent. Check your inbox.", + verificationSent: true, + }; + } catch (error) { + logger.error("Email verification resend failed", { + userId: user.$id, + error: error instanceof Error ? error.message : String(error), + }); + return { + success: false, + error: "Could not send the verification email. Try again in a moment.", + }; + } +} + +/** + * Deactivates the account. Marked in Appwrite prefs so the login gate can + * reactivate automatically on the next successful sign-in ("take a break"). + */ +export async function deactivateAccountAction( + formData: FormData, +): Promise { + const user = await requireAuth(); + const password = formData.get("password") as string; + + if (!password) { + return { success: false, error: "Password is required" }; + } + + const verified = await verifyCurrentPassword(user.$id, password); + if (!verified) { + return { success: false, error: "Current password is incorrect" }; + } + + const env = getEnvConfig(); + try { + await verified.users.updatePrefs({ + userId: user.$id, + prefs: { disabled: true, disabledAt: new Date().toISOString() }, + }); + await verified.users.deleteSessions({ userId: user.$id }); + + const cookieStore = await cookies(); + cookieStore.delete(`a_session_${env.project}`); + + if (verified.sessionSecret) { + invalidateSessionCacheForToken( + env.endpoint, + env.project, + verified.sessionSecret, + ); + } + + return { + success: true, + message: + "Your account is deactivated. Sign back in anytime to reactivate it.", + }; + } catch (error) { + logger.error("Account deactivation failed", { + error: error instanceof Error ? error.message : String(error), + }); + return { success: false, error: "Deactivation failed. Try again." }; + } +} + +/** + * Permanently deletes the account: wipes custom files (avatar, background), + * hard-deletes the Appwrite user, and replaces the profile with a permanent + * "Deleted User" tombstone so the userId can never be reused. + */ +export async function deleteAccountAction( + formData: FormData, +): Promise { + const user = await requireAuth(); + const password = formData.get("password") as string; + + if (!password) { + return { success: false, error: "Password is required" }; + } + + const verified = await verifyCurrentPassword(user.$id, password); + if (!verified) { + return { success: false, error: "Current password is incorrect" }; + } + + const env = getEnvConfig(); + const sessionSecret = + (await getSessionTokenFromCookie()) ?? verified.sessionSecret; + + try { + const profile = await getOrCreateUserProfile(user.$id, user.name); + + if (profile.avatarFileId) { + await deleteAvatarFile(profile.avatarFileId).catch(() => {}); + } + if (profile.profileBackgroundImageFileId) { + await deleteProfileBackgroundFile( + profile.profileBackgroundImageFileId, + ).catch(() => {}); + } + + await tombstoneUserProfile(profile, user.$id, user.email); + + await verified.users.delete({ userId: user.$id }); + + const cookieStore = await cookies(); + cookieStore.delete(`a_session_${env.project}`); + + if (sessionSecret) { + invalidateSessionCacheForToken( + env.endpoint, + env.project, + sessionSecret, + ); + } + + return { + success: true, + message: "Your account has been deleted.", + }; + } catch (error) { + logger.error("Account deletion failed", { + error: error instanceof Error ? error.message : String(error), + }); + return { + success: false, + error: + "Account deletion failed. Try again or contact your administrator.", + }; + } +} diff --git a/apps/web/src/app/settings/danger-zone.tsx b/apps/web/src/app/settings/danger-zone.tsx new file mode 100644 index 0000000..6ae7d41 --- /dev/null +++ b/apps/web/src/app/settings/danger-zone.tsx @@ -0,0 +1,206 @@ +"use client"; + +import { useState } from "react"; +import { useRouter } from "next/navigation"; +import { toast } from "sonner"; + +import { Button } from "@/components/ui/button"; +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, + DialogTrigger, +} from "@/components/ui/dialog"; +import { Input } from "@/components/ui/input"; +import { Label } from "@/components/ui/label"; + +import { deactivateAccountAction, deleteAccountAction } from "./actions"; + +export function DangerZone() { + const router = useRouter(); + const [password, setPassword] = useState(""); + const [busy, setBusy] = useState<"deactivate" | "delete" | null>(null); + const [confirmDelete, setConfirmDelete] = useState(false); + const [deletePassword, setDeletePassword] = useState(""); + const [deleteDialogOpen, setDeleteDialogOpen] = useState(false); + + const runAction = async ( + kind: "deactivate" | "delete", + action: (formData: FormData) => Promise< + { success: true; message: string } | { success: false; error: string } + >, + ) => { + setBusy(kind); + try { + const formData = new FormData(); + formData.set( + "password", + kind === "delete" ? deletePassword : password, + ); + const result = await action(formData); + if (result.success) { + toast.success(result.message); + if (kind === "delete") { + setDeleteDialogOpen(false); + } + router.push("/login"); + } else { + toast.error(result.error); + } + } catch (err) { + toast.error(err instanceof Error ? err.message : "Action failed."); + } finally { + setBusy(null); + } + }; + + return ( +
+
+
+

+ Deactivate account +

+

+ Take a break. Your account is hidden until you sign in + again, which reactivates it automatically. +

+
+ +
+ +
+
+
+

+ Delete account +

+

+ Permanently deletes your account. This cannot be + undone. +

+
+
+
+ + + + + + + + Permanently delete your account? + + + This wipes your profile, posts, direct + messages, attachments, uploads, and all + server data. Your user ID is reserved + forever as a "Deleted User" + record and can never be reused. There is no + way to undo this. + + +
+
+ + + setConfirmDelete( + e.target.value === "DELETE", + ) + } + placeholder="DELETE" + type="text" + /> +
+
+ + + setDeletePassword(e.target.value) + } + required + type="password" + /> +
+
+ + + + + + +
+
+ +
+ + setPassword(e.target.value)} + required + type="password" + value={password} + /> +
+
+ ); +} \ No newline at end of file diff --git a/apps/web/src/app/settings/email-change-form.tsx b/apps/web/src/app/settings/email-change-form.tsx new file mode 100644 index 0000000..4d5b47c --- /dev/null +++ b/apps/web/src/app/settings/email-change-form.tsx @@ -0,0 +1,121 @@ +"use client"; + +import { useState } from "react"; +import { toast } from "sonner"; + +import { Button } from "@/components/ui/button"; +import { Input } from "@/components/ui/input"; +import { Label } from "@/components/ui/label"; + +import { changeEmailAction, resendEmailVerificationAction } from "./actions"; + +export function EmailChangeForm() { + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); + const [loading, setLoading] = useState(false); + const [verificationSent, setVerificationSent] = useState(false); + const [resending, setResending] = useState(false); + + const onSubmit = async (e: React.FormEvent) => { + e.preventDefault(); + setLoading(true); + try { + const formData = new FormData(); + formData.set("email", email); + formData.set("password", password); + const result = await changeEmailAction(formData); + if (result.success) { + toast.success(result.message); + setEmail(""); + setPassword(""); + setVerificationSent(Boolean(result.verificationSent)); + } else { + toast.error(result.error); + } + } catch (err) { + toast.error( + err instanceof Error ? err.message : "Email change failed.", + ); + } finally { + setLoading(false); + } + }; + + const onResend = async () => { + setResending(true); + try { + const result = await resendEmailVerificationAction(); + if (result.success) { + toast.success(result.message); + } else { + toast.error(result.error); + } + } catch (err) { + toast.error( + err instanceof Error + ? err.message + : "Failed to resend verification email.", + ); + } finally { + setResending(false); + } + }; + + return ( +
+
+
+ + setEmail(e.target.value)} + placeholder="you@example.com" + required + type="email" + value={email} + /> +
+
+ + setPassword(e.target.value)} + required + type="password" + value={password} + /> +
+ +
+ + {verificationSent && ( +
+

+ A verification link is on its way to your new address. + Confirm it before you sign out, or you will not be able + to sign back in until it is verified. +

+ +
+ )} +
+ ); +} \ No newline at end of file diff --git a/apps/web/src/app/settings/page.tsx b/apps/web/src/app/settings/page.tsx index d8351ed..bd1809b 100644 --- a/apps/web/src/app/settings/page.tsx +++ b/apps/web/src/app/settings/page.tsx @@ -38,6 +38,9 @@ import { PendingFriendRequestsBadge } from "@/components/pending-friend-requests import { SettingsSectionNav } from "@/components/settings-section-nav"; import { TelemetrySettings } from "@/components/telemetry-settings"; import { FlushCaches } from "./FlushCaches"; +import { SessionManager } from "./session-manager"; +import { EmailChangeForm } from "./email-change-form"; +import { DangerZone } from "./danger-zone"; export default async function SettingsPage() { const user = await requireAuth().catch(() => { @@ -70,6 +73,11 @@ export default async function SettingsPage() { href: "#profile-appearance", title: "Appearance", }, + { + description: "Email, sign-in sessions, and account security.", + href: "#account-security", + title: "Security", + }, { description: "How and when Firepit reaches you.", href: "#notification-preferences", @@ -95,6 +103,11 @@ export default async function SettingsPage() { href: "#troubleshooting", title: "Troubleshooting", }, + { + description: "Delete or temporarily deactivate your account.", + href: "#danger-zone", + title: "Danger zone", + }, ] as const; return ( @@ -436,6 +449,37 @@ export default async function SettingsPage() { +
+ + + + Email & sign-in security + + + Change your email address or review + the devices signed in to your account. + + + +
+

+ Change email +

+ +
+
+

+ Active sessions +

+ +
+ + +
+
+ +
+ + + Danger zone + + Deactivate or permanently delete your + account. Both actions require your + current password. + + + + + + +