generated from coulomb/repo-seed
fix(WP-0014): pre-flight compilation fixes, Tailwind pipeline, and admin seed
A2 — Compilation fixes: - Remove inline FK constraints from Schema.sql; IHP schema compiler cannot parse them. Add 1744329600-restore-fk-constraints.sql migration to restore referential integrity at the DB level. - Rename `#label` → `#label_` throughout to avoid clash with Haskell built-in. - Fix `hub.id == hid` UUID comparisons to use `toUUID hub.id`. - Replace non-existent `setStatus`/`respondJson` calls with `renderJsonWithStatusCode` throughout Api controllers. - Fix qualified package import for `cryptohash-sha256` in Auth.hs. - Add `CanSelect (Text, Text)` instance in Helper.View. - Refactor HSX inline lambdas to named helper functions in 100+ views (GHC cannot infer types for anonymous functions inside quasi-quoted HSX). - Fix missing imports (IHP.QueryBuilder, IHP.Fetch, Web.Routes, Only, etc.) across helpers and controllers. - Remove duplicate `diffUTCTime` definition in BottleneckDetector. - Change `createEventForHub` return type from `IO ResponseReceived` to `IO ()`. - Seed type-registry vocabulary via 1744502400-seed-type-registries.sql (moved from Schema.sql where IHP does not execute INSERT statements). A3 — Tailwind build pipeline: - Add `tailwindcss` to flake.nix native packages. - Uncomment `tailwind.exec` process in devenv shell config. - Add tailwind/tailwind.config.js (scans Web/View/**/*.hs). - Add tailwind/app.css with @tailwind directives. A4 — Admin user seed: - Add 1744416000-seed-admin-user.sql: inserts admin@inter-hub.local with bcrypt-hashed password admin1234! (cost 10). - Add .env.example documenting all required environment variables and default admin credentials. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -6,7 +6,9 @@ import IHP.Prelude
|
||||
import IHP.ControllerPrelude
|
||||
import Data.Aeson (object, (.=))
|
||||
import qualified Data.Text as T
|
||||
import Network.Wai (requestMethod, requestHeaders)
|
||||
import Network.Wai (requestMethod, requestHeaders, responseLBS, ResponseReceived)
|
||||
import Network.HTTP.Types (status201, status401, status403, status405, status422)
|
||||
import IHP.Controller.Render (renderJson, renderJsonWithStatusCode)
|
||||
import Application.Helper.TypeRegistry (validateEventType)
|
||||
|
||||
instance Controller ApiInteractionEventsController where
|
||||
@@ -14,8 +16,7 @@ instance Controller ApiInteractionEventsController where
|
||||
action CreateApiInteractionEventAction = do
|
||||
-- Method guard — only POST accepted.
|
||||
when (requestMethod ?request /= "POST") do
|
||||
setStatus 405
|
||||
respondJson (object ["error" .= ("Method not allowed" :: Text)])
|
||||
renderJsonWithStatusCode status405 (object ["error" .= ("Method not allowed" :: Text)])
|
||||
|
||||
-- Bearer token auth — validate against hub.api_key.
|
||||
let authHeader = lookup "Authorization" (requestHeaders ?request)
|
||||
@@ -27,19 +28,17 @@ instance Controller ApiInteractionEventsController where
|
||||
|
||||
case mApiKey of
|
||||
Nothing -> do
|
||||
setStatus 401
|
||||
respondJson (object ["error" .= ("Authorization: Bearer <hub-api-key> required" :: Text)])
|
||||
renderJsonWithStatusCode status401 (object ["error" .= ("Authorization: Bearer <hub-api-key> required" :: Text)])
|
||||
Just apiKey -> do
|
||||
mHub <- query @Hub
|
||||
|> filterWhere (#apiKey, Just apiKey)
|
||||
|> fetchOneOrNothing
|
||||
case mHub of
|
||||
Nothing -> do
|
||||
setStatus 401
|
||||
respondJson (object ["error" .= ("Invalid or unknown API key" :: Text)])
|
||||
renderJsonWithStatusCode status401 (object ["error" .= ("Invalid or unknown API key" :: Text)])
|
||||
Just hub -> createEventForHub hub
|
||||
|
||||
createEventForHub :: (?context :: ControllerContext, ?modelContext :: ModelContext, ?respond :: Respond, ?request :: Request) => Hub -> IO ResponseReceived
|
||||
createEventForHub :: (?context :: ControllerContext, ?modelContext :: ModelContext, ?respond :: Respond, ?request :: Request) => Hub -> IO ()
|
||||
createEventForHub hub = do
|
||||
-- Validate required fields per contract v1.0
|
||||
widgetIdText <- paramOrNothing @Text "widget_id"
|
||||
@@ -53,8 +52,7 @@ createEventForHub hub = do
|
||||
]
|
||||
|
||||
unless (null missing) do
|
||||
setStatus 422
|
||||
respondJson (object
|
||||
renderJsonWithStatusCode status422 (object
|
||||
[ "error" .= ("Missing required fields" :: Text)
|
||||
, "missing" .= missing
|
||||
])
|
||||
@@ -65,8 +63,7 @@ createEventForHub hub = do
|
||||
evTypeResult <- liftIO $ validateEventType evType
|
||||
case evTypeResult of
|
||||
Left _ -> do
|
||||
setStatus 422
|
||||
respondJson (object
|
||||
renderJsonWithStatusCode status422 (object
|
||||
[ "error" .= ("Unacceptable event_type" :: Text)
|
||||
, "hint" .= ("Register the event type in the Type Registry before submitting" :: Text)
|
||||
])
|
||||
@@ -75,19 +72,16 @@ createEventForHub hub = do
|
||||
-- Resolve widget — must belong to this hub.
|
||||
case readMay wIdText of
|
||||
Nothing -> do
|
||||
setStatus 422
|
||||
respondJson (object ["error" .= ("widget_id must be a valid UUID" :: Text)])
|
||||
renderJsonWithStatusCode status422 (object ["error" .= ("widget_id must be a valid UUID" :: Text)])
|
||||
Just rawId -> do
|
||||
let wId = Id rawId :: Id Widget
|
||||
mWidget <- fetchOneOrNothing wId
|
||||
case mWidget of
|
||||
Nothing -> do
|
||||
setStatus 422
|
||||
respondJson (object ["error" .= ("Widget not found" :: Text)])
|
||||
renderJsonWithStatusCode status422 (object ["error" .= ("Widget not found" :: Text)])
|
||||
Just widget -> do
|
||||
when (widget.hubId /= hub.id) do
|
||||
setStatus 403
|
||||
respondJson (object ["error" .= ("Widget does not belong to this hub" :: Text)])
|
||||
when (widget.hubId /= toUUID hub.id) do
|
||||
renderJsonWithStatusCode status403 (object ["error" .= ("Widget does not belong to this hub" :: Text)])
|
||||
|
||||
event <- newRecord @InteractionEvent
|
||||
|> set #widgetId widget.id
|
||||
@@ -95,8 +89,7 @@ createEventForHub hub = do
|
||||
|> set #actorType "external_adapter"
|
||||
|> createRecord
|
||||
|
||||
setStatus 201
|
||||
respondJson (object
|
||||
renderJsonWithStatusCode status201 (object
|
||||
[ "id" .= event.id
|
||||
, "widget_id" .= event.widgetId
|
||||
, "event_type" .= event.eventType
|
||||
|
||||
Reference in New Issue
Block a user