generated from coulomb/repo-seed
fix: registry list crash and logout 405
Some checks failed
Build and Deploy / build-push-deploy (push) Has been cancelled
Some checks failed
Build and Deploy / build-push-deploy (push) Has been cancelled
IHP NameSupport cannot parse trailing-underscore field names at runtime.
orderByAsc #label_ in all four registry list actions (and the API V2
equivalents) crashed the page with ParseErrorBundle. Changed to orderByAsc
#name which avoids the NameSupport conversion path entirely.
textField #label_ in the four registry form views has the same issue.
Replaced with a plain <input> element that reads entry.label_ directly.
Logout <a href={DeleteSessionAction}> sent GET but IHP requires DELETE.
IHP includes methodOverridePost middleware, so a POST form with
_method=DELETE handles this correctly.
Also corrected the seed admin-user migration hash from bcrypt to the
pwstore-fast format (sha256|17|...) that IHP actually uses.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
-- Seed default admin user for initial local deployment.
|
-- Seed default admin user for initial local deployment.
|
||||||
-- Password: admin1234!
|
-- Password: admin1234!
|
||||||
-- Hash generated with bcrypt cost 10 (compatible with IHP's authenticate @User).
|
-- Hash generated with pwstore-fast (Crypto.PasswordStore.makePassword, strength 17)
|
||||||
|
-- which is the format IHP's verifyPassword uses. NOT bcrypt.
|
||||||
-- IMPORTANT: Change this password immediately after first login via the profile settings.
|
-- IMPORTANT: Change this password immediately after first login via the profile settings.
|
||||||
-- Workplan: IHUB-WP-0014 (A4 — admin user seeding)
|
-- Workplan: IHUB-WP-0014 (A4 — admin user seeding)
|
||||||
|
|
||||||
@@ -8,7 +9,7 @@ INSERT INTO users (id, email, password_hash, name, failed_login_attempts, create
|
|||||||
VALUES (
|
VALUES (
|
||||||
uuid_generate_v4(),
|
uuid_generate_v4(),
|
||||||
'admin@inter-hub.local',
|
'admin@inter-hub.local',
|
||||||
'$2b$10$c3imjL8nLkR1TSbBifvR3eFzlCUurGPXsN7K5trDjmZL6Af3zLqH.',
|
'sha256|17|hyVUQpp0hhegCg2oM0lUHQ==|jSwCi+tJUlKCW6sT6nn23/r71fd0GSiVOo48JSrXyWc=',
|
||||||
'Admin',
|
'Admin',
|
||||||
0,
|
0,
|
||||||
now()
|
now()
|
||||||
|
|||||||
@@ -16,21 +16,21 @@ instance Controller ApiV2RegistriesController where
|
|||||||
action ApiV2ListWidgetTypesAction = do
|
action ApiV2ListWidgetTypesAction = do
|
||||||
types <- query @WidgetTypeRegistry
|
types <- query @WidgetTypeRegistry
|
||||||
|> filterWhere (#status, "active")
|
|> filterWhere (#status, "active")
|
||||||
|> orderByAsc #label_
|
|> orderByAsc #name
|
||||||
|> fetch
|
|> fetch
|
||||||
renderJson $ map wtToJson types
|
renderJson $ map wtToJson types
|
||||||
|
|
||||||
action ApiV2ListEventTypesAction = do
|
action ApiV2ListEventTypesAction = do
|
||||||
types <- query @EventTypeRegistry
|
types <- query @EventTypeRegistry
|
||||||
|> filterWhere (#status, "active")
|
|> filterWhere (#status, "active")
|
||||||
|> orderByAsc #label_
|
|> orderByAsc #name
|
||||||
|> fetch
|
|> fetch
|
||||||
renderJson $ map etToJson types
|
renderJson $ map etToJson types
|
||||||
|
|
||||||
action ApiV2ListAnnotationCategoriesAction = do
|
action ApiV2ListAnnotationCategoriesAction = do
|
||||||
cats <- query @AnnotationCategoryRegistry
|
cats <- query @AnnotationCategoryRegistry
|
||||||
|> filterWhere (#status, "active")
|
|> filterWhere (#status, "active")
|
||||||
|> orderByAsc #label_
|
|> orderByAsc #name
|
||||||
|> fetch
|
|> fetch
|
||||||
renderJson $ map acToJson cats
|
renderJson $ map acToJson cats
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ instance Controller TypeRegistriesController where
|
|||||||
|
|
||||||
action WidgetTypeRegistryAction = do
|
action WidgetTypeRegistryAction = do
|
||||||
entries <- query @WidgetTypeRegistry
|
entries <- query @WidgetTypeRegistry
|
||||||
|> orderByAsc #label_
|
|> orderByAsc #name
|
||||||
|> fetch
|
|> fetch
|
||||||
hubs <- query @Hub |> fetch
|
hubs <- query @Hub |> fetch
|
||||||
render WidgetTypesView { entries, hubs }
|
render WidgetTypesView { entries, hubs }
|
||||||
@@ -83,7 +83,7 @@ instance Controller TypeRegistriesController where
|
|||||||
|
|
||||||
action EventTypeRegistryAction = do
|
action EventTypeRegistryAction = do
|
||||||
entries <- query @EventTypeRegistry
|
entries <- query @EventTypeRegistry
|
||||||
|> orderByAsc #label_
|
|> orderByAsc #name
|
||||||
|> fetch
|
|> fetch
|
||||||
hubs <- query @Hub |> fetch
|
hubs <- query @Hub |> fetch
|
||||||
render EventTypesView { entries, hubs }
|
render EventTypesView { entries, hubs }
|
||||||
@@ -149,7 +149,7 @@ instance Controller TypeRegistriesController where
|
|||||||
|
|
||||||
action AnnotationCategoryRegistryAction = do
|
action AnnotationCategoryRegistryAction = do
|
||||||
entries <- query @AnnotationCategoryRegistry
|
entries <- query @AnnotationCategoryRegistry
|
||||||
|> orderByAsc #label_
|
|> orderByAsc #name
|
||||||
|> fetch
|
|> fetch
|
||||||
hubs <- query @Hub |> fetch
|
hubs <- query @Hub |> fetch
|
||||||
render AnnotationCategoriesView { entries, hubs }
|
render AnnotationCategoriesView { entries, hubs }
|
||||||
@@ -215,7 +215,7 @@ instance Controller TypeRegistriesController where
|
|||||||
|
|
||||||
action PolicyScopeRegistryAction = do
|
action PolicyScopeRegistryAction = do
|
||||||
entries <- query @PolicyScopeRegistry
|
entries <- query @PolicyScopeRegistry
|
||||||
|> orderByAsc #label_
|
|> orderByAsc #name
|
||||||
|> fetch
|
|> fetch
|
||||||
hubs <- query @Hub |> fetch
|
hubs <- query @Hub |> fetch
|
||||||
render PolicyScopesView { entries, hubs }
|
render PolicyScopesView { entries, hubs }
|
||||||
|
|||||||
@@ -192,7 +192,10 @@ defaultLayout inner = [hsx|
|
|||||||
<a href={AiGovernancePoliciesAction} class="text-sm text-gray-600 hover:text-gray-900">AI Gov</a>
|
<a href={AiGovernancePoliciesAction} class="text-sm text-gray-600 hover:text-gray-900">AI Gov</a>
|
||||||
<a href={LearningDashboardAction} class="text-sm text-gray-600 hover:text-gray-900">Learning</a>
|
<a href={LearningDashboardAction} class="text-sm text-gray-600 hover:text-gray-900">Learning</a>
|
||||||
<div class="ml-auto">
|
<div class="ml-auto">
|
||||||
<a href={DeleteSessionAction} class="text-sm text-gray-500 hover:text-gray-700">Sign out</a>
|
<form method="POST" action={DeleteSessionAction} style="display:inline">
|
||||||
|
<input type="hidden" name="_method" value="DELETE" />
|
||||||
|
<button type="submit" class="text-sm text-gray-500 hover:text-gray-700 bg-transparent border-0 p-0 cursor-pointer">Sign out</button>
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
<main class="max-w-5xl mx-auto px-6 py-8">
|
<main class="max-w-5xl mx-auto px-6 py-8">
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ typeForm entry hubs isNew = [hsx|
|
|||||||
{renderNameField isNew entry.name}
|
{renderNameField isNew entry.name}
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Label</label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Label</label>
|
||||||
{(textField #label_) { fieldClass = "w-full border border-gray-300 rounded px-3 py-2 text-sm" }}
|
<input type="text" name="label_" value={entry.label_} required="required" class="w-full border border-gray-300 rounded px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500" />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Description <span class="text-gray-400 text-xs">(optional)</span></label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Description <span class="text-gray-400 text-xs">(optional)</span></label>
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ typeForm entry hubs isNew = [hsx|
|
|||||||
{renderNameField isNew entry.name}
|
{renderNameField isNew entry.name}
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Label</label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Label</label>
|
||||||
{(textField #label_) { fieldClass = "w-full border border-gray-300 rounded px-3 py-2 text-sm" }}
|
<input type="text" name="label_" value={entry.label_} required="required" class="w-full border border-gray-300 rounded px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500" />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Description <span class="text-gray-400 text-xs">(optional)</span></label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Description <span class="text-gray-400 text-xs">(optional)</span></label>
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ typeForm entry hubs isNew = [hsx|
|
|||||||
{renderNameField isNew entry.name}
|
{renderNameField isNew entry.name}
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Label</label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Label</label>
|
||||||
{(textField #label_) { fieldClass = "w-full border border-gray-300 rounded px-3 py-2 text-sm" }}
|
<input type="text" name="label_" value={entry.label_} required="required" class="w-full border border-gray-300 rounded px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500" />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Description <span class="text-gray-400 text-xs">(optional)</span></label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Description <span class="text-gray-400 text-xs">(optional)</span></label>
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ typeForm entry hubs isNew = [hsx|
|
|||||||
{renderNameField isNew entry.name}
|
{renderNameField isNew entry.name}
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Label</label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Label</label>
|
||||||
{(textField #label_) { fieldClass = "w-full border border-gray-300 rounded px-3 py-2 text-sm" }}
|
<input type="text" name="label_" value={entry.label_} required="required" class="w-full border border-gray-300 rounded px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500" />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Description <span class="text-gray-400 text-xs">(optional)</span></label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Description <span class="text-gray-400 text-xs">(optional)</span></label>
|
||||||
|
|||||||
@@ -124,9 +124,30 @@ curl -H "Authorization: Bearer <api-key>" https://hub.coulomb.social/api/v2/hubs
|
|||||||
|
|
||||||
## Database Connection Check
|
## Database Connection Check
|
||||||
|
|
||||||
|
The IHP Nix image has no `/bin/sh`. Connect via the CNPG pod instead:
|
||||||
```bash
|
```bash
|
||||||
kubectl exec -n inter-hub deploy/inter-hub -- \
|
kubectl exec -n databases net-kingdom-pg-1 -- psql -U postgres -d interhub -c "SELECT version();"
|
||||||
/bin/sh -c 'psql $DATABASE_URL -c "SELECT version();"'
|
```
|
||||||
|
|
||||||
|
## Password Hashing
|
||||||
|
|
||||||
|
IHP uses `pwstore-fast` (`Crypto.PasswordStore`) — **not bcrypt**. Hash format:
|
||||||
|
```
|
||||||
|
sha256|17|<base64-salt>|<base64-hash>
|
||||||
|
```
|
||||||
|
|
||||||
|
To generate a correct hash (requires GHC with pwstore-fast available on haskelseed):
|
||||||
|
```bash
|
||||||
|
ssh root@192.168.178.135
|
||||||
|
cat > /tmp/genhash.hs << 'EOF'
|
||||||
|
import qualified Crypto.PasswordStore as PS
|
||||||
|
import qualified Data.ByteString.Char8 as B8
|
||||||
|
main :: IO ()
|
||||||
|
main = do
|
||||||
|
h <- PS.makePassword (B8.pack "yourpassword") 17
|
||||||
|
B8.putStrLn h
|
||||||
|
EOF
|
||||||
|
/nix/store/yp23474ys67f1fd2z2ff1nn3q5wrmjng-ghc-9.10.3-with-packages/bin/runghc /tmp/genhash.hs
|
||||||
```
|
```
|
||||||
|
|
||||||
## haskelseed Build VM
|
## haskelseed Build VM
|
||||||
|
|||||||
Reference in New Issue
Block a user