@kywi-software/core 0.13.0 → 0.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENT-PATTERNS.md +153 -17
- package/README.md +38 -12
- package/dist/admin/chrome.d.ts.map +1 -1
- package/dist/admin/chrome.js +57 -8
- package/dist/admin/chrome.js.map +1 -1
- package/dist/admin/field-components.d.ts.map +1 -1
- package/dist/admin/field-components.js +27 -1
- package/dist/admin/field-components.js.map +1 -1
- package/dist/admin/form-helpers.d.ts.map +1 -1
- package/dist/admin/form-helpers.js +6 -1
- package/dist/admin/form-helpers.js.map +1 -1
- package/dist/admin/index.d.ts +1 -1
- package/dist/admin/index.d.ts.map +1 -1
- package/dist/admin/index.js +1 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/layout-editor/chrome-env.d.ts +35 -0
- package/dist/admin/layout-editor/chrome-env.d.ts.map +1 -0
- package/dist/admin/layout-editor/chrome-env.js +13 -0
- package/dist/admin/layout-editor/chrome-env.js.map +1 -0
- package/dist/admin/layout-editor/component-actions.d.ts +58 -7
- package/dist/admin/layout-editor/component-actions.d.ts.map +1 -1
- package/dist/admin/layout-editor/component-actions.js +131 -5
- package/dist/admin/layout-editor/component-actions.js.map +1 -1
- package/dist/admin/layout-editor/component-fork.d.ts +4 -4
- package/dist/admin/layout-editor/component-fork.d.ts.map +1 -1
- package/dist/admin/layout-editor/component-fork.js +76 -10
- package/dist/admin/layout-editor/component-fork.js.map +1 -1
- package/dist/admin/layout-editor/component-picker-field.d.ts +17 -3
- package/dist/admin/layout-editor/component-picker-field.d.ts.map +1 -1
- package/dist/admin/layout-editor/component-picker-field.js +5 -2
- package/dist/admin/layout-editor/component-picker-field.js.map +1 -1
- package/dist/admin/layout-editor/drag-feedback.d.ts +25 -1
- package/dist/admin/layout-editor/drag-feedback.d.ts.map +1 -1
- package/dist/admin/layout-editor/drag-feedback.js +9 -0
- package/dist/admin/layout-editor/drag-feedback.js.map +1 -1
- package/dist/admin/layout-editor/drag-utils.d.ts +103 -5
- package/dist/admin/layout-editor/drag-utils.d.ts.map +1 -1
- package/dist/admin/layout-editor/drag-utils.js +131 -4
- package/dist/admin/layout-editor/drag-utils.js.map +1 -1
- package/dist/admin/layout-editor/editor-canvas.d.ts +11 -0
- package/dist/admin/layout-editor/editor-canvas.d.ts.map +1 -1
- package/dist/admin/layout-editor/editor-canvas.js +134 -20
- package/dist/admin/layout-editor/editor-canvas.js.map +1 -1
- package/dist/admin/layout-editor/editor-dialog.d.ts +58 -3
- package/dist/admin/layout-editor/editor-dialog.d.ts.map +1 -1
- package/dist/admin/layout-editor/editor-dialog.js +71 -9
- package/dist/admin/layout-editor/editor-dialog.js.map +1 -1
- package/dist/admin/layout-editor/editor-state.d.ts +119 -0
- package/dist/admin/layout-editor/editor-state.d.ts.map +1 -1
- package/dist/admin/layout-editor/editor-state.js +188 -6
- package/dist/admin/layout-editor/editor-state.js.map +1 -1
- package/dist/admin/layout-editor/editor-toolbar.d.ts +10 -1
- package/dist/admin/layout-editor/editor-toolbar.d.ts.map +1 -1
- package/dist/admin/layout-editor/editor-toolbar.js +2 -2
- package/dist/admin/layout-editor/editor-toolbar.js.map +1 -1
- package/dist/admin/layout-editor/editor.css +216 -8
- package/dist/admin/layout-editor/inline-text.d.ts +15 -1
- package/dist/admin/layout-editor/inline-text.d.ts.map +1 -1
- package/dist/admin/layout-editor/inline-text.js +30 -2
- package/dist/admin/layout-editor/inline-text.js.map +1 -1
- package/dist/admin/layout-editor/layout-editor.d.ts +21 -16
- package/dist/admin/layout-editor/layout-editor.d.ts.map +1 -1
- package/dist/admin/layout-editor/layout-editor.js +40 -17
- package/dist/admin/layout-editor/layout-editor.js.map +1 -1
- package/dist/admin/layout-editor/linked-component-notes.d.ts +88 -0
- package/dist/admin/layout-editor/linked-component-notes.d.ts.map +1 -0
- package/dist/admin/layout-editor/linked-component-notes.js +88 -0
- package/dist/admin/layout-editor/linked-component-notes.js.map +1 -0
- package/dist/admin/layout-editor/module-overlay.d.ts +23 -4
- package/dist/admin/layout-editor/module-overlay.d.ts.map +1 -1
- package/dist/admin/layout-editor/module-overlay.js +56 -10
- package/dist/admin/layout-editor/module-overlay.js.map +1 -1
- package/dist/admin/layout-editor/module-variant-container-config.d.ts.map +1 -1
- package/dist/admin/layout-editor/module-variant-container-config.js +9 -2
- package/dist/admin/layout-editor/module-variant-container-config.js.map +1 -1
- package/dist/admin/layout-editor/module-variant-container-panel.d.ts +75 -0
- package/dist/admin/layout-editor/module-variant-container-panel.d.ts.map +1 -0
- package/dist/admin/layout-editor/module-variant-container-panel.js +29 -0
- package/dist/admin/layout-editor/module-variant-container-panel.js.map +1 -0
- package/dist/admin/layout-editor/node-lookup.d.ts.map +1 -1
- package/dist/admin/layout-editor/node-lookup.js +33 -3
- package/dist/admin/layout-editor/node-lookup.js.map +1 -1
- package/dist/admin/layout-editor/overlay-shell.d.ts.map +1 -1
- package/dist/admin/layout-editor/overlay-shell.js +19 -4
- package/dist/admin/layout-editor/overlay-shell.js.map +1 -1
- package/dist/admin/layout-editor/props-panel.d.ts +28 -11
- package/dist/admin/layout-editor/props-panel.d.ts.map +1 -1
- package/dist/admin/layout-editor/props-panel.js +75 -125
- package/dist/admin/layout-editor/props-panel.js.map +1 -1
- package/dist/admin/layout-editor/section-variant-container-config.d.ts.map +1 -1
- package/dist/admin/layout-editor/section-variant-container-config.js +11 -2
- package/dist/admin/layout-editor/section-variant-container-config.js.map +1 -1
- package/dist/admin/layout-editor/use-chrome-flip.d.ts +99 -11
- package/dist/admin/layout-editor/use-chrome-flip.d.ts.map +1 -1
- package/dist/admin/layout-editor/use-chrome-flip.js +268 -97
- package/dist/admin/layout-editor/use-chrome-flip.js.map +1 -1
- package/dist/admin/layout-editor/use-component-connect.d.ts +13 -0
- package/dist/admin/layout-editor/use-component-connect.d.ts.map +1 -1
- package/dist/admin/layout-editor/use-component-connect.js +116 -20
- package/dist/admin/layout-editor/use-component-connect.js.map +1 -1
- package/dist/admin/layout-editor/use-component-fork.d.ts +49 -19
- package/dist/admin/layout-editor/use-component-fork.d.ts.map +1 -1
- package/dist/admin/layout-editor/use-component-fork.js +28 -19
- package/dist/admin/layout-editor/use-component-fork.js.map +1 -1
- package/dist/admin/layout-editor/use-component-library.d.ts +4 -4
- package/dist/admin/layout-editor/use-component-library.d.ts.map +1 -1
- package/dist/admin/layout-editor/use-component-library.js +1 -1
- package/dist/admin/layout-editor/use-component-library.js.map +1 -1
- package/dist/admin/layout-editor/use-editor-dnd.d.ts +10 -0
- package/dist/admin/layout-editor/use-editor-dnd.d.ts.map +1 -1
- package/dist/admin/layout-editor/use-editor-dnd.js +234 -14
- package/dist/admin/layout-editor/use-editor-dnd.js.map +1 -1
- package/dist/admin/layout-editor/variant-container-config.d.ts.map +1 -1
- package/dist/admin/layout-editor/variant-container-config.js +1 -1
- package/dist/admin/layout-editor/variant-container-config.js.map +1 -1
- package/dist/admin/layout-editor/variant-editor.d.ts +16 -15
- package/dist/admin/layout-editor/variant-editor.d.ts.map +1 -1
- package/dist/admin/layout-editor/variant-editor.js +16 -5
- package/dist/admin/layout-editor/variant-editor.js.map +1 -1
- package/dist/admin/primitives.d.ts.map +1 -1
- package/dist/admin/primitives.js +1 -1
- package/dist/admin/primitives.js.map +1 -1
- package/dist/admin/registry.d.ts +24 -2
- package/dist/admin/registry.d.ts.map +1 -1
- package/dist/admin/registry.js +27 -0
- package/dist/admin/registry.js.map +1 -1
- package/dist/admin/server.d.ts +10 -1
- package/dist/admin/server.d.ts.map +1 -1
- package/dist/admin/server.js +4 -1
- package/dist/admin/server.js.map +1 -1
- package/dist/admin/site-switcher.d.ts +16 -3
- package/dist/admin/site-switcher.d.ts.map +1 -1
- package/dist/admin/site-switcher.js +18 -3
- package/dist/admin/site-switcher.js.map +1 -1
- package/dist/admin/styles/admin.css +0 -3
- package/dist/admin/surface-matcher.d.ts +6 -2
- package/dist/admin/surface-matcher.d.ts.map +1 -1
- package/dist/admin/surface-matcher.js +42 -5
- package/dist/admin/surface-matcher.js.map +1 -1
- package/dist/admin/surfaces/account/account-password.d.ts +3 -0
- package/dist/admin/surfaces/account/account-password.d.ts.map +1 -0
- package/dist/admin/surfaces/account/account-password.js +58 -0
- package/dist/admin/surfaces/account/account-password.js.map +1 -0
- package/dist/admin/surfaces/components/components-data.d.ts +31 -11
- package/dist/admin/surfaces/components/components-data.d.ts.map +1 -1
- package/dist/admin/surfaces/components/components-data.js +17 -4
- package/dist/admin/surfaces/components/components-data.js.map +1 -1
- package/dist/admin/surfaces/components/components-list.d.ts.map +1 -1
- package/dist/admin/surfaces/components/components-list.js +20 -7
- package/dist/admin/surfaces/components/components-list.js.map +1 -1
- package/dist/admin/surfaces/components/definition-canvas.d.ts +11 -3
- package/dist/admin/surfaces/components/definition-canvas.d.ts.map +1 -1
- package/dist/admin/surfaces/components/definition-canvas.js +138 -17
- package/dist/admin/surfaces/components/definition-canvas.js.map +1 -1
- package/dist/admin/surfaces/dashboard/dashboard-index.d.ts.map +1 -1
- package/dist/admin/surfaces/dashboard/dashboard-index.js +2 -2
- package/dist/admin/surfaces/dashboard/dashboard-index.js.map +1 -1
- package/dist/admin/surfaces/layouts/layout-editor-client.d.ts.map +1 -1
- package/dist/admin/surfaces/layouts/layout-editor-client.js +12 -11
- package/dist/admin/surfaces/layouts/layout-editor-client.js.map +1 -1
- package/dist/admin/surfaces/login.d.ts.map +1 -1
- package/dist/admin/surfaces/login.js +13 -1
- package/dist/admin/surfaces/login.js.map +1 -1
- package/dist/admin/surfaces/menus/menu-editor.d.ts.map +1 -1
- package/dist/admin/surfaces/menus/menu-editor.js +17 -4
- package/dist/admin/surfaces/menus/menu-editor.js.map +1 -1
- package/dist/admin/surfaces/menus/menu-tree.d.ts +18 -4
- package/dist/admin/surfaces/menus/menu-tree.d.ts.map +1 -1
- package/dist/admin/surfaces/menus/menu-tree.js +18 -3
- package/dist/admin/surfaces/menus/menu-tree.js.map +1 -1
- package/dist/admin/surfaces/menus/menus-data.d.ts +18 -0
- package/dist/admin/surfaces/menus/menus-data.d.ts.map +1 -1
- package/dist/admin/surfaces/menus/menus-data.js +4 -0
- package/dist/admin/surfaces/menus/menus-data.js.map +1 -1
- package/dist/admin/surfaces/menus/menus-list.d.ts.map +1 -1
- package/dist/admin/surfaces/menus/menus-list.js +2 -12
- package/dist/admin/surfaces/menus/menus-list.js.map +1 -1
- package/dist/admin/surfaces/settings/admin-features.d.ts.map +1 -1
- package/dist/admin/surfaces/settings/admin-features.js +12 -1
- package/dist/admin/surfaces/settings/admin-features.js.map +1 -1
- package/dist/admin/surfaces/users/users-data.d.ts +16 -0
- package/dist/admin/surfaces/users/users-data.d.ts.map +1 -1
- package/dist/admin/surfaces/users/users-data.js +19 -0
- package/dist/admin/surfaces/users/users-data.js.map +1 -1
- package/dist/admin/surfaces/users/users-detail.d.ts.map +1 -1
- package/dist/admin/surfaces/users/users-detail.js +87 -6
- package/dist/admin/surfaces/users/users-detail.js.map +1 -1
- package/dist/admin/surfaces/users/users-new.d.ts.map +1 -1
- package/dist/admin/surfaces/users/users-new.js +9 -5
- package/dist/admin/surfaces/users/users-new.js.map +1 -1
- package/dist/admin/user-form.d.ts +13 -2
- package/dist/admin/user-form.d.ts.map +1 -1
- package/dist/admin/user-form.js +3 -2
- package/dist/admin/user-form.js.map +1 -1
- package/dist/api/admin-features-routes.js +2 -2
- package/dist/api/admin-features-routes.js.map +1 -1
- package/dist/api/audience-preview-routes.d.ts +7 -0
- package/dist/api/audience-preview-routes.d.ts.map +1 -1
- package/dist/api/audience-preview-routes.js +4 -4
- package/dist/api/audience-preview-routes.js.map +1 -1
- package/dist/api/audience-routes.d.ts +7 -0
- package/dist/api/audience-routes.d.ts.map +1 -1
- package/dist/api/audience-routes.js +21 -15
- package/dist/api/audience-routes.js.map +1 -1
- package/dist/api/audience-runtime-routes.d.ts +6 -0
- package/dist/api/audience-runtime-routes.d.ts.map +1 -1
- package/dist/api/audience-runtime-routes.js +38 -3
- package/dist/api/audience-runtime-routes.js.map +1 -1
- package/dist/api/auth-routes.d.ts.map +1 -1
- package/dist/api/auth-routes.js +33 -4
- package/dist/api/auth-routes.js.map +1 -1
- package/dist/api/auth.d.ts +1 -0
- package/dist/api/auth.d.ts.map +1 -1
- package/dist/api/auth.js +43 -3
- package/dist/api/auth.js.map +1 -1
- package/dist/api/bulk-routes.d.ts.map +1 -1
- package/dist/api/bulk-routes.js +7 -7
- package/dist/api/bulk-routes.js.map +1 -1
- package/dist/api/category-routes.js +3 -3
- package/dist/api/category-routes.js.map +1 -1
- package/dist/api/comment-routes.js +8 -8
- package/dist/api/comment-routes.js.map +1 -1
- package/dist/api/component-routes.d.ts +25 -0
- package/dist/api/component-routes.d.ts.map +1 -1
- package/dist/api/component-routes.js +41 -16
- package/dist/api/component-routes.js.map +1 -1
- package/dist/api/content-routes.js +13 -13
- package/dist/api/content-routes.js.map +1 -1
- package/dist/api/dashboard-routes.js +1 -1
- package/dist/api/dashboard-routes.js.map +1 -1
- package/dist/api/experiment-routes.d.ts +7 -0
- package/dist/api/experiment-routes.d.ts.map +1 -1
- package/dist/api/experiment-routes.js +8 -8
- package/dist/api/experiment-routes.js.map +1 -1
- package/dist/api/experiment-runtime-routes.d.ts +6 -0
- package/dist/api/experiment-runtime-routes.d.ts.map +1 -1
- package/dist/api/experiment-runtime-routes.js +47 -11
- package/dist/api/experiment-runtime-routes.js.map +1 -1
- package/dist/api/feed-routes.d.ts +2 -2
- package/dist/api/feed-routes.js +3 -3
- package/dist/api/feed-routes.js.map +1 -1
- package/dist/api/form-routes.js +4 -4
- package/dist/api/form-routes.js.map +1 -1
- package/dist/api/graphql/resolvers.d.ts +1 -1
- package/dist/api/graphql/resolvers.d.ts.map +1 -1
- package/dist/api/graphql/resolvers.js +68 -33
- package/dist/api/graphql/resolvers.js.map +1 -1
- package/dist/api/group-routes.js +6 -6
- package/dist/api/group-routes.js.map +1 -1
- package/dist/api/index.d.ts +10 -0
- package/dist/api/index.d.ts.map +1 -1
- package/dist/api/index.js +97 -7
- package/dist/api/index.js.map +1 -1
- package/dist/api/layout-routes.d.ts.map +1 -1
- package/dist/api/layout-routes.js +27 -3
- package/dist/api/layout-routes.js.map +1 -1
- package/dist/api/media-routes.d.ts.map +1 -1
- package/dist/api/media-routes.js +50 -26
- package/dist/api/media-routes.js.map +1 -1
- package/dist/api/menu-routes.d.ts +9 -1
- package/dist/api/menu-routes.d.ts.map +1 -1
- package/dist/api/menu-routes.js +44 -10
- package/dist/api/menu-routes.js.map +1 -1
- package/dist/api/nav-routes.d.ts +6 -0
- package/dist/api/nav-routes.d.ts.map +1 -1
- package/dist/api/nav-routes.js +24 -3
- package/dist/api/nav-routes.js.map +1 -1
- package/dist/api/openapi.d.ts.map +1 -1
- package/dist/api/openapi.js +68 -33
- package/dist/api/openapi.js.map +1 -1
- package/dist/api/password-gate.d.ts +23 -0
- package/dist/api/password-gate.d.ts.map +1 -0
- package/dist/api/password-gate.js +41 -0
- package/dist/api/password-gate.js.map +1 -0
- package/dist/api/password-reset-routes.d.ts.map +1 -1
- package/dist/api/password-reset-routes.js +13 -6
- package/dist/api/password-reset-routes.js.map +1 -1
- package/dist/api/search-routes.js +2 -2
- package/dist/api/search-routes.js.map +1 -1
- package/dist/api/section-template-routes.d.ts.map +1 -1
- package/dist/api/section-template-routes.js +35 -18
- package/dist/api/section-template-routes.js.map +1 -1
- package/dist/api/site-admin-routes.d.ts +10 -1
- package/dist/api/site-admin-routes.d.ts.map +1 -1
- package/dist/api/site-admin-routes.js +21 -1
- package/dist/api/site-admin-routes.js.map +1 -1
- package/dist/api/site-context.d.ts +35 -5
- package/dist/api/site-context.d.ts.map +1 -1
- package/dist/api/site-context.js +21 -6
- package/dist/api/site-context.js.map +1 -1
- package/dist/api/tag-routes.js +3 -3
- package/dist/api/tag-routes.js.map +1 -1
- package/dist/api/translation-routes.js +5 -5
- package/dist/api/translation-routes.js.map +1 -1
- package/dist/api/user-routes.d.ts +4 -0
- package/dist/api/user-routes.d.ts.map +1 -1
- package/dist/api/user-routes.js +240 -17
- package/dist/api/user-routes.js.map +1 -1
- package/dist/api/webhook-routes.js +5 -5
- package/dist/api/webhook-routes.js.map +1 -1
- package/dist/api/workflow-routes.js +8 -8
- package/dist/api/workflow-routes.js.map +1 -1
- package/dist/audiences/collectors/identity.d.ts +14 -1
- package/dist/audiences/collectors/identity.d.ts.map +1 -1
- package/dist/audiences/collectors/identity.js +16 -3
- package/dist/audiences/collectors/identity.js.map +1 -1
- package/dist/audiences/collectors/index.d.ts +12 -2
- package/dist/audiences/collectors/index.d.ts.map +1 -1
- package/dist/audiences/collectors/index.js +16 -5
- package/dist/audiences/collectors/index.js.map +1 -1
- package/dist/audiences/collectors/pinned-audience.d.ts +28 -2
- package/dist/audiences/collectors/pinned-audience.d.ts.map +1 -1
- package/dist/audiences/collectors/pinned-audience.js +35 -5
- package/dist/audiences/collectors/pinned-audience.js.map +1 -1
- package/dist/audiences/collectors/utm.d.ts +15 -1
- package/dist/audiences/collectors/utm.d.ts.map +1 -1
- package/dist/audiences/collectors/utm.js +16 -2
- package/dist/audiences/collectors/utm.js.map +1 -1
- package/dist/audiences/consent-config.d.ts +21 -0
- package/dist/audiences/consent-config.d.ts.map +1 -0
- package/dist/audiences/consent-config.js +15 -0
- package/dist/audiences/consent-config.js.map +1 -0
- package/dist/audiences/consent-startup.d.ts +39 -0
- package/dist/audiences/consent-startup.d.ts.map +1 -0
- package/dist/audiences/consent-startup.js +105 -0
- package/dist/audiences/consent-startup.js.map +1 -0
- package/dist/audiences/consent.d.ts +192 -0
- package/dist/audiences/consent.d.ts.map +1 -0
- package/dist/audiences/consent.js +322 -0
- package/dist/audiences/consent.js.map +1 -0
- package/dist/audiences/engine.d.ts +7 -0
- package/dist/audiences/engine.d.ts.map +1 -1
- package/dist/audiences/engine.js +6 -2
- package/dist/audiences/engine.js.map +1 -1
- package/dist/audiences/index.d.ts +3 -0
- package/dist/audiences/index.d.ts.map +1 -1
- package/dist/audiences/index.js +6 -0
- package/dist/audiences/index.js.map +1 -1
- package/dist/audiences/server-eval.d.ts +13 -1
- package/dist/audiences/server-eval.d.ts.map +1 -1
- package/dist/audiences/server-eval.js +18 -2
- package/dist/audiences/server-eval.js.map +1 -1
- package/dist/audiences/ssr.d.ts +18 -1
- package/dist/audiences/ssr.d.ts.map +1 -1
- package/dist/audiences/ssr.js +18 -1
- package/dist/audiences/ssr.js.map +1 -1
- package/dist/audiences/utm-persistence.d.ts +20 -7
- package/dist/audiences/utm-persistence.d.ts.map +1 -1
- package/dist/audiences/utm-persistence.js +20 -7
- package/dist/audiences/utm-persistence.js.map +1 -1
- package/dist/auth/roles.d.ts +11 -0
- package/dist/auth/roles.d.ts.map +1 -1
- package/dist/auth/roles.js +13 -0
- package/dist/auth/roles.js.map +1 -1
- package/dist/auth/tokens.d.ts +7 -0
- package/dist/auth/tokens.d.ts.map +1 -1
- package/dist/auth/tokens.js +24 -2
- package/dist/auth/tokens.js.map +1 -1
- package/dist/config/types.d.ts +50 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config/types.js.map +1 -1
- package/dist/config/validate.d.ts.map +1 -1
- package/dist/config/validate.js +3 -0
- package/dist/config/validate.js.map +1 -1
- package/dist/db/apply-snapshot.d.ts +18 -0
- package/dist/db/apply-snapshot.d.ts.map +1 -1
- package/dist/db/apply-snapshot.js +41 -16
- package/dist/db/apply-snapshot.js.map +1 -1
- package/dist/db/component-instance-queries.d.ts +79 -19
- package/dist/db/component-instance-queries.d.ts.map +1 -1
- package/dist/db/component-instance-queries.js +266 -83
- package/dist/db/component-instance-queries.js.map +1 -1
- package/dist/db/component-queries.d.ts +1 -16
- package/dist/db/component-queries.d.ts.map +1 -1
- package/dist/db/component-queries.js +7 -56
- package/dist/db/component-queries.js.map +1 -1
- package/dist/db/content-queries.d.ts.map +1 -1
- package/dist/db/content-queries.js +1 -2
- package/dist/db/content-queries.js.map +1 -1
- package/dist/db/extension-queries.d.ts +2 -2
- package/dist/db/feed-queries.d.ts +3 -3
- package/dist/db/index.d.ts +1 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +1 -0
- package/dist/db/index.js.map +1 -1
- package/dist/db/layout-queries.d.ts +2 -1
- package/dist/db/layout-queries.d.ts.map +1 -1
- package/dist/db/layout-queries.js +3 -3
- package/dist/db/layout-queries.js.map +1 -1
- package/dist/db/menu-queries.d.ts +69 -5
- package/dist/db/menu-queries.d.ts.map +1 -1
- package/dist/db/menu-queries.js +120 -13
- package/dist/db/menu-queries.js.map +1 -1
- package/dist/db/section-template-queries.d.ts +62 -0
- package/dist/db/section-template-queries.d.ts.map +1 -0
- package/dist/db/section-template-queries.js +178 -0
- package/dist/db/section-template-queries.js.map +1 -0
- package/dist/db/site-plugin-queries.d.ts +2 -2
- package/dist/db/tree-queries.d.ts.map +1 -1
- package/dist/db/tree-queries.js +5 -0
- package/dist/db/tree-queries.js.map +1 -1
- package/dist/db/user-queries.d.ts +28 -1
- package/dist/db/user-queries.d.ts.map +1 -1
- package/dist/db/user-queries.js +49 -1
- package/dist/db/user-queries.js.map +1 -1
- package/dist/db/webhook-queries.d.ts +3 -3
- package/dist/db/workflow-queries.d.ts.map +1 -1
- package/dist/db/workflow-queries.js +5 -20
- package/dist/db/workflow-queries.js.map +1 -1
- package/dist/experiments/runtime.d.ts +21 -3
- package/dist/experiments/runtime.d.ts.map +1 -1
- package/dist/experiments/runtime.js +21 -3
- package/dist/experiments/runtime.js.map +1 -1
- package/dist/host/index.d.ts +1 -0
- package/dist/host/index.d.ts.map +1 -1
- package/dist/host/index.js +12 -0
- package/dist/host/index.js.map +1 -1
- package/dist/layout/component-refs.d.ts +90 -2
- package/dist/layout/component-refs.d.ts.map +1 -1
- package/dist/layout/component-refs.js +293 -16
- package/dist/layout/component-refs.js.map +1 -1
- package/dist/layout/index.d.ts +4 -3
- package/dist/layout/index.d.ts.map +1 -1
- package/dist/layout/index.js +3 -2
- package/dist/layout/index.js.map +1 -1
- package/dist/layout/legacy-variant-container.d.ts +123 -0
- package/dist/layout/legacy-variant-container.d.ts.map +1 -0
- package/dist/layout/legacy-variant-container.js +397 -0
- package/dist/layout/legacy-variant-container.js.map +1 -0
- package/dist/layout/module-permissions.d.ts.map +1 -1
- package/dist/layout/module-permissions.js +25 -1
- package/dist/layout/module-permissions.js.map +1 -1
- package/dist/layout/modules-extended.d.ts +28 -1
- package/dist/layout/modules-extended.d.ts.map +1 -1
- package/dist/layout/modules-extended.js +73 -1
- package/dist/layout/modules-extended.js.map +1 -1
- package/dist/layout/modules.d.ts.map +1 -1
- package/dist/layout/modules.js +9 -1
- package/dist/layout/modules.js.map +1 -1
- package/dist/layout/personalization.d.ts +83 -0
- package/dist/layout/personalization.d.ts.map +1 -1
- package/dist/layout/personalization.js +250 -4
- package/dist/layout/personalization.js.map +1 -1
- package/dist/layout/registry.d.ts.map +1 -1
- package/dist/layout/registry.js +20 -0
- package/dist/layout/registry.js.map +1 -1
- package/dist/layout/renderer.d.ts +29 -2
- package/dist/layout/renderer.d.ts.map +1 -1
- package/dist/layout/renderer.js +23 -6
- package/dist/layout/renderer.js.map +1 -1
- package/dist/layout/types.d.ts +17 -0
- package/dist/layout/types.d.ts.map +1 -1
- package/dist/layout/types.js +7 -0
- package/dist/layout/types.js.map +1 -1
- package/dist/media/inline-risk.d.ts +26 -0
- package/dist/media/inline-risk.d.ts.map +1 -0
- package/dist/media/inline-risk.js +142 -0
- package/dist/media/inline-risk.js.map +1 -0
- package/dist/nav/builder.d.ts.map +1 -1
- package/dist/nav/builder.js +15 -3
- package/dist/nav/builder.js.map +1 -1
- package/dist/nav/index.d.ts +1 -1
- package/dist/nav/index.d.ts.map +1 -1
- package/dist/nav/index.js +1 -1
- package/dist/nav/index.js.map +1 -1
- package/dist/nav/menu-resolver.d.ts +11 -0
- package/dist/nav/menu-resolver.d.ts.map +1 -1
- package/dist/nav/menu-resolver.js +49 -9
- package/dist/nav/menu-resolver.js.map +1 -1
- package/dist/nav/paths.d.ts +37 -0
- package/dist/nav/paths.d.ts.map +1 -0
- package/dist/nav/paths.js +48 -0
- package/dist/nav/paths.js.map +1 -0
- package/dist/nav/types.d.ts +6 -0
- package/dist/nav/types.d.ts.map +1 -1
- package/dist/nav/url-resolver.d.ts +1 -5
- package/dist/nav/url-resolver.d.ts.map +1 -1
- package/dist/nav/url-resolver.js +6 -12
- package/dist/nav/url-resolver.js.map +1 -1
- package/dist/schema/base.d.ts +41 -4
- package/dist/schema/base.d.ts.map +1 -1
- package/dist/schema/base.js +23 -4
- package/dist/schema/base.js.map +1 -1
- package/dist/schema/components.d.ts +90 -9
- package/dist/schema/components.d.ts.map +1 -1
- package/dist/schema/components.js +113 -22
- package/dist/schema/components.js.map +1 -1
- package/dist/schema/mysql-tables.d.ts +5775 -48
- package/dist/schema/mysql-tables.d.ts.map +1 -1
- package/dist/schema/mysql-tables.js +621 -46
- package/dist/schema/mysql-tables.js.map +1 -1
- package/dist/scope/kywi-form.d.ts +11 -0
- package/dist/scope/kywi-form.d.ts.map +1 -1
- package/dist/scope/kywi-form.js +11 -1
- package/dist/scope/kywi-form.js.map +1 -1
- package/dist/scope/kywi-wizard-form.d.ts.map +1 -1
- package/dist/scope/kywi-wizard-form.js +76 -2
- package/dist/scope/kywi-wizard-form.js.map +1 -1
- package/dist/scope/sticky-offset.d.ts +34 -13
- package/dist/scope/sticky-offset.d.ts.map +1 -1
- package/dist/scope/sticky-offset.js +236 -43
- package/dist/scope/sticky-offset.js.map +1 -1
- package/dist/site/styles.css +61 -15
- package/dist/versioning/scheduler.d.ts +28 -0
- package/dist/versioning/scheduler.d.ts.map +1 -1
- package/dist/versioning/scheduler.js +50 -3
- package/dist/versioning/scheduler.js.map +1 -1
- package/package.json +7 -2
|
@@ -14,8 +14,34 @@ import { useCallback, useEffect, useState } from 'react';
|
|
|
14
14
|
import { useAdminContext } from '../../context.js';
|
|
15
15
|
import { UserForm } from '../../user-form.js';
|
|
16
16
|
import { LoadingState, ErrorState } from '../../primitives.js';
|
|
17
|
-
import { fetchData, loadGroupsWithMembers, loadSites, fullName,
|
|
18
|
-
|
|
17
|
+
import { fetchData, loadGroupsWithMembers, loadSites, fullName, assignableRoles, } from './users-data.js';
|
|
18
|
+
/**
|
|
19
|
+
* What the role control offers for this target, and why it might be locked
|
|
20
|
+
* (kywi-cms#175).
|
|
21
|
+
*
|
|
22
|
+
* The server lets an admin grant up to their own rank and no further, so the
|
|
23
|
+
* dropdown offers exactly that. The awkward case is a target who ALREADY
|
|
24
|
+
* outranks the caller: their current role is not in the caller's list, so
|
|
25
|
+
* rendering the list alone would show the wrong role and invite a save that
|
|
26
|
+
* reads as a demotion. Show that account's real role, alone and locked,
|
|
27
|
+
* instead — the API refuses the whole edit anyway (`You cannot edit a user
|
|
28
|
+
* above your own role`), so there is nothing to offer here but the truth.
|
|
29
|
+
*/
|
|
30
|
+
function roleOptionsFor(callerRole, targetRole) {
|
|
31
|
+
const grantable = assignableRoles(callerRole);
|
|
32
|
+
if (grantable.includes(targetRole))
|
|
33
|
+
return { roles: grantable };
|
|
34
|
+
return {
|
|
35
|
+
roles: [targetRole],
|
|
36
|
+
lockedRoleReason: `This account's role is above your own, so you cannot change it.`,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
/** Set-equality on two id lists — order and duplicates are not meaningful here. */
|
|
40
|
+
function sameMembership(next, prev) {
|
|
41
|
+
const a = new Set(next);
|
|
42
|
+
const b = new Set(prev);
|
|
43
|
+
return a.size === b.size && [...a].every(id => b.has(id));
|
|
44
|
+
}
|
|
19
45
|
export default function UsersDetailSurface({ params }) {
|
|
20
46
|
const { fetch: adminFetch, user: currentUser, navigate } = useAdminContext();
|
|
21
47
|
const userId = params.id ?? '';
|
|
@@ -25,6 +51,10 @@ export default function UsersDetailSurface({ params }) {
|
|
|
25
51
|
const [loading, setLoading] = useState(true);
|
|
26
52
|
const [loadError, setLoadError] = useState(null);
|
|
27
53
|
const [submitError, setSubmitError] = useState(null);
|
|
54
|
+
const [notice, setNotice] = useState(null);
|
|
55
|
+
// Bumped after a successful password change so the form remounts with fresh
|
|
56
|
+
// initial values — otherwise the typed password stays sitting in the field.
|
|
57
|
+
const [formEpoch, setFormEpoch] = useState(0);
|
|
28
58
|
const [submitting, setSubmitting] = useState(false);
|
|
29
59
|
const load = useCallback(async () => {
|
|
30
60
|
setLoading(true);
|
|
@@ -60,6 +90,8 @@ export default function UsersDetailSurface({ params }) {
|
|
|
60
90
|
return;
|
|
61
91
|
setSubmitting(true);
|
|
62
92
|
setSubmitError(null);
|
|
93
|
+
setNotice(null);
|
|
94
|
+
let passwordChanged = false;
|
|
63
95
|
try {
|
|
64
96
|
const patch = {
|
|
65
97
|
email: values.email,
|
|
@@ -71,6 +103,7 @@ export default function UsersDetailSurface({ params }) {
|
|
|
71
103
|
if (!isSelf) {
|
|
72
104
|
patch.role = values.role;
|
|
73
105
|
patch.isActive = values.isActive;
|
|
106
|
+
patch.passwordResetRequired = values.forcePasswordReset;
|
|
74
107
|
}
|
|
75
108
|
const res = await adminFetch(`/api/v1/users/${userId}`, {
|
|
76
109
|
method: 'PUT',
|
|
@@ -81,6 +114,44 @@ export default function UsersDetailSurface({ params }) {
|
|
|
81
114
|
const body = await res.json().catch(() => null);
|
|
82
115
|
throw new Error(body?.error?.message ?? `Save failed (${res.status})`);
|
|
83
116
|
}
|
|
117
|
+
// Membership reconciliation runs AFTER the password step, so a password
|
|
118
|
+
// failure drops any pending group/site edits with it (kywi-cms#177). The
|
|
119
|
+
// work is retry-safe — the sets are recomputed from the form on the next
|
|
120
|
+
// save — but the partial-failure message has to say so rather than imply
|
|
121
|
+
// everything but the password landed. Compute it here, before the early
|
|
122
|
+
// return, so the message can name what was actually skipped.
|
|
123
|
+
const membershipEditsPending = !sameMembership(values.groupIds, data.currentGroupIds) ||
|
|
124
|
+
!sameMembership(values.siteIds, data.currentSiteIds);
|
|
125
|
+
// Password is a SEPARATE endpoint — `password` is never accepted on PUT.
|
|
126
|
+
// Run it only when a new password was actually typed, and treat a failure
|
|
127
|
+
// as partial success: the profile save stands and we say exactly that.
|
|
128
|
+
if (values.password !== '') {
|
|
129
|
+
const pwdBody = { newPassword: values.password };
|
|
130
|
+
if (isSelf)
|
|
131
|
+
pwdBody.currentPassword = values.currentPassword;
|
|
132
|
+
const pwdRes = await adminFetch(`/api/v1/users/${userId}/password`, {
|
|
133
|
+
method: 'POST',
|
|
134
|
+
headers: { 'Content-Type': 'application/json' },
|
|
135
|
+
body: JSON.stringify(pwdBody),
|
|
136
|
+
});
|
|
137
|
+
// A self-change returns a fresh { accessToken, refreshToken } pair,
|
|
138
|
+
// deliberately ignored here: `adminFetch` authenticates with the
|
|
139
|
+
// httpOnly session cookie (host-client `adminFetch` sets no
|
|
140
|
+
// Authorization header), and the host proxy lifts that pair into the
|
|
141
|
+
// cookies for this path (`isTokenIssuingPath`), so the session already
|
|
142
|
+
// survives without the UI touching a token.
|
|
143
|
+
if (!pwdRes.ok) {
|
|
144
|
+
const body = await pwdRes.json().catch(() => null);
|
|
145
|
+
const detail = body?.error?.message ?? `Password change failed (${pwdRes.status})`;
|
|
146
|
+
setNotice(null);
|
|
147
|
+
setSubmitError(membershipEditsPending
|
|
148
|
+
? `Name, email and role were saved. The password was not changed — ${detail} — and the group/site membership changes were not applied. Fix the password and save again, or clear the password field to save the memberships on their own.`
|
|
149
|
+
: `Name, email and role were saved, but the password was not changed — ${detail}`);
|
|
150
|
+
setSubmitting(false);
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
passwordChanged = true;
|
|
154
|
+
}
|
|
84
155
|
// Reconcile group memberships
|
|
85
156
|
const nextGroups = new Set(values.groupIds);
|
|
86
157
|
const prevGroups = new Set(data.currentGroupIds);
|
|
@@ -106,13 +177,23 @@ export default function UsersDetailSurface({ params }) {
|
|
|
106
177
|
siteOps.push(adminFetch(`/api/v1/users/${userId}/sites/${sid}`, { method: 'DELETE' }));
|
|
107
178
|
}
|
|
108
179
|
await Promise.all([...groupOps, ...siteOps]);
|
|
180
|
+
if (passwordChanged) {
|
|
181
|
+
// A password change is worth confirming in place rather than dropping
|
|
182
|
+
// the admin back on the list with no word about it. Reloading clears
|
|
183
|
+
// the password fields and refreshes the membership baseline.
|
|
184
|
+
setNotice('Profile saved and password changed.');
|
|
185
|
+
setFormEpoch(n => n + 1);
|
|
186
|
+
setSubmitting(false);
|
|
187
|
+
await load();
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
109
190
|
navigate('/admin/users');
|
|
110
191
|
}
|
|
111
192
|
catch (e) {
|
|
112
193
|
setSubmitError(e instanceof Error ? e.message : 'Failed to save user');
|
|
113
194
|
setSubmitting(false);
|
|
114
195
|
}
|
|
115
|
-
}, [data, isSelf, navigate, userId, adminFetch]);
|
|
196
|
+
}, [data, isSelf, navigate, userId, adminFetch, load]);
|
|
116
197
|
const handleDelete = useCallback(async () => {
|
|
117
198
|
if (!data)
|
|
118
199
|
return;
|
|
@@ -133,7 +214,7 @@ export default function UsersDetailSurface({ params }) {
|
|
|
133
214
|
setSubmitting(false);
|
|
134
215
|
}
|
|
135
216
|
}, [data, navigate, userId, adminFetch]);
|
|
136
|
-
return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "kywi-admin-page-header", children: [_jsx("h1", { children: data ? `Edit ${fullName(data.user)}` : 'Edit User' }), data && !isSelf && (_jsx("button", { type: "button", className: "kywi-btn kywi-btn-danger", onClick: handleDelete, disabled: submitting, children: "Delete User" }))] }), loading ? (_jsx(LoadingState, { label: "Loading user\u2026" })) : loadError ? (_jsx(ErrorState, { message: loadError, onRetry: load })) : data ? (_jsxs(_Fragment, { children: [isSelf && (_jsx("div", { className: "kywi-admin-callout kywi-admin-callout-info", children: _jsx("p", { children: "This is your own account. You cannot change your role, deactivate, or delete yourself." }) })), submitError && _jsx(ErrorState, { message: submitError }), _jsx(UserForm, {
|
|
217
|
+
return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "kywi-admin-page-header", children: [_jsx("h1", { children: data ? `Edit ${fullName(data.user)}` : 'Edit User' }), data && !isSelf && (_jsx("button", { type: "button", className: "kywi-btn kywi-btn-danger", onClick: handleDelete, disabled: submitting, children: "Delete User" }))] }), loading ? (_jsx(LoadingState, { label: "Loading user\u2026" })) : loadError ? (_jsx(ErrorState, { message: loadError, onRetry: load })) : data ? (_jsxs(_Fragment, { children: [isSelf && (_jsx("div", { className: "kywi-admin-callout kywi-admin-callout-info", children: _jsx("p", { children: "This is your own account. You cannot change your role, deactivate, or delete yourself." }) })), notice && (_jsx("div", { className: "kywi-admin-callout kywi-admin-callout-success", role: "status", children: notice })), submitError && _jsx(ErrorState, { message: submitError }), _jsx(UserForm, { ...roleOptionsFor(currentUser?.role, data.user.role), groups: data.groups, sites: data.sites, selfEdit: isSelf, user: {
|
|
137
218
|
id: data.user.id,
|
|
138
219
|
email: data.user.email,
|
|
139
220
|
firstName: data.user.firstName,
|
|
@@ -142,7 +223,7 @@ export default function UsersDetailSurface({ params }) {
|
|
|
142
223
|
isActive: data.user.isActive,
|
|
143
224
|
groupIds: data.currentGroupIds,
|
|
144
225
|
siteIds: data.currentSiteIds,
|
|
145
|
-
forcePasswordReset: false,
|
|
146
|
-
}, onSubmit: handleSubmit, onCancel: () => navigate('/admin/users'), isSubmitting: submitting })] })) : null] }));
|
|
226
|
+
forcePasswordReset: data.user.passwordResetRequired ?? false,
|
|
227
|
+
}, onSubmit: handleSubmit, onCancel: () => navigate('/admin/users'), isSubmitting: submitting }, formEpoch)] })) : null] }));
|
|
147
228
|
}
|
|
148
229
|
//# sourceMappingURL=users-detail.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-detail.js","sourceRoot":"","sources":["../../../../src/admin/surfaces/users/users-detail.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AAEZ;;;;;;;;;GASG;AAEH,OAAc,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAA8D,MAAM,oBAAoB,CAAA;AACzG,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EACL,SAAS,EACT,qBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"users-detail.js","sourceRoot":"","sources":["../../../../src/admin/surfaces/users/users-detail.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-new.d.ts","sourceRoot":"","sources":["../../../../src/admin/surfaces/users/users-new.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"users-new.d.ts","sourceRoot":"","sources":["../../../../src/admin/surfaces/users/users-new.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAMrD,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,MAAM,EAAE,YAAY,2CAgG3D"}
|
|
@@ -13,11 +13,14 @@ import { useCallback, useEffect, useState } from 'react';
|
|
|
13
13
|
import { useAdminContext } from '../../context.js';
|
|
14
14
|
import { UserForm } from '../../user-form.js';
|
|
15
15
|
import { LoadingState, ErrorState } from '../../primitives.js';
|
|
16
|
-
import { loadGroups, loadSites } from './users-data.js';
|
|
17
|
-
// Least-privilege first, so a new user defaults to the safest role.
|
|
18
|
-
const CREATE_ROLES = ['reader', 'author', 'editor', 'siteAdmin', 'superAdmin'];
|
|
16
|
+
import { loadGroups, loadSites, assignableRoles } from './users-data.js';
|
|
19
17
|
export default function UsersNewSurface(_props) {
|
|
20
|
-
const { fetch: adminFetch, navigate } = useAdminContext();
|
|
18
|
+
const { fetch: adminFetch, user: currentUser, navigate } = useAdminContext();
|
|
19
|
+
// Only the roles this admin may actually grant (kywi-cms#175) — the server
|
|
20
|
+
// refuses anything above their own rank, so offering it would just be a 403
|
|
21
|
+
// in a dropdown. Reversed to least-privilege-FIRST: `UserForm` defaults to
|
|
22
|
+
// `roles[0]`, so a new user starts at the safest role available.
|
|
23
|
+
const createRoles = assignableRoles(currentUser?.role).slice().reverse();
|
|
21
24
|
const [groups, setGroups] = useState([]);
|
|
22
25
|
const [sites, setSites] = useState([]);
|
|
23
26
|
const [loading, setLoading] = useState(true);
|
|
@@ -53,6 +56,7 @@ export default function UsersNewSurface(_props) {
|
|
|
53
56
|
firstName: values.firstName,
|
|
54
57
|
lastName: values.lastName,
|
|
55
58
|
role: values.role,
|
|
59
|
+
passwordResetRequired: values.forcePasswordReset,
|
|
56
60
|
}),
|
|
57
61
|
});
|
|
58
62
|
if (!res.ok) {
|
|
@@ -73,6 +77,6 @@ export default function UsersNewSurface(_props) {
|
|
|
73
77
|
setSubmitting(false);
|
|
74
78
|
}
|
|
75
79
|
}, [adminFetch, navigate]);
|
|
76
|
-
return (_jsxs(_Fragment, { children: [_jsx("div", { className: "kywi-admin-page-header", children: _jsx("h1", { children: "New User" }) }), loading ? (_jsx(LoadingState, { label: "Preparing form\u2026" })) : loadError ? (_jsx(ErrorState, { message: loadError, onRetry: load })) : (_jsxs(_Fragment, { children: [submitError && _jsx(ErrorState, { message: submitError }), _jsx(UserForm, { roles:
|
|
80
|
+
return (_jsxs(_Fragment, { children: [_jsx("div", { className: "kywi-admin-page-header", children: _jsx("h1", { children: "New User" }) }), loading ? (_jsx(LoadingState, { label: "Preparing form\u2026" })) : loadError ? (_jsx(ErrorState, { message: loadError, onRetry: load })) : (_jsxs(_Fragment, { children: [submitError && _jsx(ErrorState, { message: submitError }), _jsx(UserForm, { roles: createRoles, groups: groups, sites: sites, onSubmit: handleSubmit, onCancel: () => navigate('/admin/users'), isSubmitting: submitting })] }))] }));
|
|
77
81
|
}
|
|
78
82
|
//# sourceMappingURL=users-new.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-new.js","sourceRoot":"","sources":["../../../../src/admin/surfaces/users/users-new.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AAEZ;;;;;;;;GAQG;AAEH,OAAc,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAA8D,MAAM,oBAAoB,CAAA;AACzG,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"users-new.js","sourceRoot":"","sources":["../../../../src/admin/surfaces/users/users-new.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,10 @@ export interface UserFormSite {
|
|
|
9
9
|
export interface UserFormValues {
|
|
10
10
|
id?: string;
|
|
11
11
|
email: string;
|
|
12
|
-
/**
|
|
12
|
+
/** Create mode: the initial password (required). Edit mode: the NEW password, '' = leave unchanged. */
|
|
13
13
|
password: string;
|
|
14
|
+
/** Only collected when you are editing YOUR OWN account and set a new password. */
|
|
15
|
+
currentPassword: string;
|
|
14
16
|
firstName: string;
|
|
15
17
|
lastName: string;
|
|
16
18
|
role: string;
|
|
@@ -34,9 +36,18 @@ export interface UserFormProps {
|
|
|
34
36
|
* (mirrors the server-side safety rails).
|
|
35
37
|
*/
|
|
36
38
|
selfEdit?: boolean;
|
|
39
|
+
/**
|
|
40
|
+
* When set, the role control is locked and this explains why.
|
|
41
|
+
*
|
|
42
|
+
* Used when the target OUTRANKS the signed-in admin: `roles` is then the
|
|
43
|
+
* target's own current role alone, so the form shows what the account
|
|
44
|
+
* actually is instead of silently offering to demote it to whatever the
|
|
45
|
+
* caller's ceiling allows.
|
|
46
|
+
*/
|
|
47
|
+
lockedRoleReason?: string;
|
|
37
48
|
onSubmit?: (values: UserFormValues) => void | Promise<void>;
|
|
38
49
|
onCancel?: () => void;
|
|
39
50
|
isSubmitting?: boolean;
|
|
40
51
|
}
|
|
41
|
-
export declare function UserForm({ roles, groups, sites, user, selfEdit, onSubmit, onCancel, isSubmitting, }: UserFormProps): import("react/jsx-runtime").JSX.Element;
|
|
52
|
+
export declare function UserForm({ roles, groups, sites, user, selfEdit, lockedRoleReason, onSubmit, onCancel, isSubmitting, }: UserFormProps): import("react/jsx-runtime").JSX.Element;
|
|
42
53
|
//# sourceMappingURL=user-form.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-form.d.ts","sourceRoot":"","sources":["../../src/admin/user-form.tsx"],"names":[],"mappings":"AAGA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb
|
|
1
|
+
{"version":3,"file":"user-form.d.ts","sourceRoot":"","sources":["../../src/admin/user-form.tsx"],"names":[],"mappings":"AAGA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,uGAAuG;IACvG,QAAQ,EAAE,MAAM,CAAA;IAChB,mFAAmF;IACnF,eAAe,EAAE,MAAM,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,kBAAkB,EAAE,OAAO,CAAA;CAC5B;AAED,MAAM,WAAW,aAAa;IAC5B,0CAA0C;IAC1C,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,0CAA0C;IAC1C,MAAM,EAAE,aAAa,EAAE,CAAA;IACvB,mDAAmD;IACnD,KAAK,EAAE,YAAY,EAAE,CAAA;IACrB,6EAA6E;IAC7E,IAAI,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3D,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,wBAAgB,QAAQ,CAAC,EACvB,KAAK,EACL,MAAM,EACN,KAAK,EACL,IAAI,EACJ,QAAgB,EAChB,gBAAgB,EAChB,QAAQ,EACR,QAAQ,EACR,YAAoB,GACrB,EAAE,aAAa,2CAgNf"}
|
package/dist/admin/user-form.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
3
|
import { useState } from 'react';
|
|
4
|
-
export function UserForm({ roles, groups, sites, user, selfEdit = false, onSubmit, onCancel, isSubmitting = false, }) {
|
|
4
|
+
export function UserForm({ roles, groups, sites, user, selfEdit = false, lockedRoleReason, onSubmit, onCancel, isSubmitting = false, }) {
|
|
5
5
|
const isEdit = user != null;
|
|
6
6
|
const [values, setValues] = useState(() => ({
|
|
7
7
|
email: user?.email ?? '',
|
|
8
8
|
password: '',
|
|
9
|
+
currentPassword: '',
|
|
9
10
|
firstName: user?.firstName ?? '',
|
|
10
11
|
lastName: user?.lastName ?? '',
|
|
11
12
|
role: user?.role ?? roles[0] ?? '',
|
|
@@ -33,6 +34,6 @@ export function UserForm({ roles, groups, sites, user, selfEdit = false, onSubmi
|
|
|
33
34
|
e.preventDefault();
|
|
34
35
|
onSubmit?.(values);
|
|
35
36
|
}
|
|
36
|
-
return (_jsxs("form", { className: "kywi-user-form", onSubmit: handleSubmit, children: [_jsxs("div", { className: "kywi-field kywi-field-email", children: [_jsx("label", { htmlFor: "kywi-user-email", className: "kywi-field-label", children: "Email" }), _jsx("input", { id: "kywi-user-email", type: "email", name: "email", className: "kywi-input", value: values.email, onChange: e => setField('email', e.target.value), required: true })] }),
|
|
37
|
+
return (_jsxs("form", { className: "kywi-user-form", onSubmit: handleSubmit, children: [_jsxs("div", { className: "kywi-field kywi-field-email", children: [_jsx("label", { htmlFor: "kywi-user-email", className: "kywi-field-label", children: "Email" }), _jsx("input", { id: "kywi-user-email", type: "email", name: "email", className: "kywi-input", value: values.email, onChange: e => setField('email', e.target.value), required: true })] }), isEdit && selfEdit && (_jsxs("div", { className: "kywi-field kywi-field-currentPassword", children: [_jsx("label", { htmlFor: "kywi-user-currentPassword", className: "kywi-field-label", children: "Current password" }), _jsx("input", { id: "kywi-user-currentPassword", type: "password", name: "currentPassword", className: "kywi-input", value: values.currentPassword, onChange: e => setField('currentPassword', e.target.value), autoComplete: "current-password", required: values.password !== '' }), _jsx("p", { className: "kywi-field-hint", children: "Required to change your own password." })] })), _jsxs("div", { className: "kywi-field kywi-field-password", children: [_jsx("label", { htmlFor: "kywi-user-password", className: "kywi-field-label", children: isEdit ? 'New password (leave blank to keep)' : 'Password' }), _jsx("input", { id: "kywi-user-password", type: "password", name: "password", className: "kywi-input", value: values.password, onChange: e => setField('password', e.target.value), minLength: 8, autoComplete: "new-password", required: !isEdit }), _jsx("p", { className: "kywi-field-hint", children: "At least 8 characters." })] }), _jsxs("div", { className: "kywi-field kywi-field-firstName", children: [_jsx("label", { htmlFor: "kywi-user-firstName", className: "kywi-field-label", children: "First Name" }), _jsx("input", { id: "kywi-user-firstName", type: "text", name: "firstName", className: "kywi-input", value: values.firstName, onChange: e => setField('firstName', e.target.value) })] }), _jsxs("div", { className: "kywi-field kywi-field-lastName", children: [_jsx("label", { htmlFor: "kywi-user-lastName", className: "kywi-field-label", children: "Last Name" }), _jsx("input", { id: "kywi-user-lastName", type: "text", name: "lastName", className: "kywi-input", value: values.lastName, onChange: e => setField('lastName', e.target.value) })] }), _jsxs("div", { className: "kywi-field kywi-field-role", children: [_jsx("label", { htmlFor: "kywi-user-role", className: "kywi-field-label", children: "Role" }), _jsx("select", { id: "kywi-user-role", name: "role", className: "kywi-select", value: values.role, onChange: e => setField('role', e.target.value), disabled: selfEdit || lockedRoleReason !== undefined, children: roles.map(role => (_jsx("option", { value: role, children: role }, role))) }), selfEdit ? (_jsx("p", { className: "kywi-field-hint", children: "You cannot change your own role." })) : lockedRoleReason !== undefined ? (_jsx("p", { className: "kywi-field-hint", children: lockedRoleReason })) : null] }), _jsxs("fieldset", { className: "kywi-field kywi-field-groups", children: [_jsx("legend", { className: "kywi-field-label", children: "Groups" }), groups.map(group => (_jsxs("label", { className: "kywi-checkbox-label", children: [_jsx("input", { type: "checkbox", className: "kywi-checkbox", checked: values.groupIds.includes(group.id), onChange: e => toggleMembership('groupIds', group.id, e.target.checked) }), ' ', group.name] }, group.id)))] }), _jsxs("fieldset", { className: "kywi-field kywi-field-sites", children: [_jsx("legend", { className: "kywi-field-label", children: "Sites" }), sites.map(site => (_jsxs("label", { className: "kywi-checkbox-label", children: [_jsx("input", { type: "checkbox", className: "kywi-checkbox", checked: values.siteIds.includes(site.id), onChange: e => toggleMembership('siteIds', site.id, e.target.checked) }), ' ', site.name] }, site.id)))] }), _jsxs("div", { className: "kywi-field kywi-field-isActive kywi-field-checkbox", children: [_jsxs("label", { className: "kywi-checkbox-label", children: [_jsx("input", { type: "checkbox", name: "isActive", className: "kywi-checkbox", checked: values.isActive, onChange: e => setField('isActive', e.target.checked), disabled: selfEdit }), ' ', "Active"] }), selfEdit && (_jsx("p", { className: "kywi-field-hint", children: "You cannot deactivate your own account." }))] }), !selfEdit && (_jsx("div", { className: "kywi-field kywi-field-forcePasswordReset kywi-field-checkbox", children: _jsxs("label", { className: "kywi-checkbox-label", children: [_jsx("input", { type: "checkbox", name: "forcePasswordReset", className: "kywi-checkbox", checked: values.forcePasswordReset, onChange: e => setField('forcePasswordReset', e.target.checked) }), ' ', "Force password reset on next login"] }) })), _jsxs("div", { className: "kywi-form-actions", children: [_jsx("button", { type: "submit", className: "kywi-btn kywi-btn-primary", disabled: isSubmitting, children: isEdit ? 'Save User' : 'Create User' }), onCancel && (_jsx("button", { type: "button", className: "kywi-btn kywi-btn-secondary", onClick: onCancel, children: "Cancel" }))] })] }));
|
|
37
38
|
}
|
|
38
39
|
//# sourceMappingURL=user-form.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-form.js","sourceRoot":"","sources":["../../src/admin/user-form.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"user-form.js","sourceRoot":"","sources":["../../src/admin/user-form.tsx"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ export function registerAdminFeaturesRoutes(router, ctx) {
|
|
|
49
49
|
return unauthorized();
|
|
50
50
|
const url = new URL(req.url);
|
|
51
51
|
const siteId = await toSiteUuid(db, url.searchParams.get('siteId'), config);
|
|
52
|
-
const siteDenied = assertSiteAccess(auth.user, siteId);
|
|
52
|
+
const siteDenied = assertSiteAccess(auth.user, siteId, config.auth);
|
|
53
53
|
if (siteDenied)
|
|
54
54
|
return siteDenied;
|
|
55
55
|
const flags = await getAdminFeatureFlags(db, siteId);
|
|
@@ -87,7 +87,7 @@ export function registerAdminFeaturesRoutes(router, ctx) {
|
|
|
87
87
|
}
|
|
88
88
|
const url = new URL(req.url);
|
|
89
89
|
const siteId = await toSiteUuid(db, url.searchParams.get('siteId'), config);
|
|
90
|
-
const siteDenied = assertSiteAccess(auth.user, siteId);
|
|
90
|
+
const siteDenied = assertSiteAccess(auth.user, siteId, config.auth);
|
|
91
91
|
if (siteDenied)
|
|
92
92
|
return siteDenied;
|
|
93
93
|
const flags = await setAdminFeatureFlags(db, siteId, parsed.data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-features-routes.js","sourceRoot":"","sources":["../../src/api/admin-features-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAA;AAE5F;;;;;;;GAOG;AACH,SAAS,cAAc,CAAC,OAA4B,EAAE,GAAW;IAC/D,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK;QAAE,OAAO,IAAI,CAAA;IAC1C,IAAK,OAAO,CAAC,QAAoC,CAAC,GAAG,CAAC,KAAK,KAAK;QAAE,OAAO,IAAI,CAAA;IAC7E,IAAI,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAA;IACtD,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;AAQzC,MAAM,UAAU,2BAA2B,CAAC,MAAc,EAAE,GAA8B;IACxF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,GAAG,CAAA;IAEtC,gFAAgF;IAChF,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC,CAAA;QAChF,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,YAAY,EAAE,CAAA;QAErC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC5B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAA;QAC3E,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"admin-features-routes.js","sourceRoot":"","sources":["../../src/api/admin-features-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
import type { Router } from './router.js';
|
|
2
2
|
import type { KywiDb } from '../db/client.js';
|
|
3
|
+
import type { SiteAccessPolicy } from './site-context.js';
|
|
3
4
|
interface PreviewRouteContext {
|
|
4
5
|
db: KywiDb;
|
|
5
6
|
authSecret: string;
|
|
6
7
|
previewSecret: string;
|
|
7
8
|
defaultSiteId: string;
|
|
9
|
+
/**
|
|
10
|
+
* Per-site authorization policy (kywi-cms#74). This context carries no
|
|
11
|
+
* `KywiConfig` — routes that have one pass `config.auth` directly — so the
|
|
12
|
+
* policy is threaded in explicitly. Pass `config.auth`.
|
|
13
|
+
*/
|
|
14
|
+
siteAuth: SiteAccessPolicy;
|
|
8
15
|
}
|
|
9
16
|
export declare function registerAudiencePreviewRoutes(router: Router, ctx: PreviewRouteContext): void;
|
|
10
17
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audience-preview-routes.d.ts","sourceRoot":"","sources":["../../src/api/audience-preview-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"audience-preview-routes.d.ts","sourceRoot":"","sources":["../../src/api/audience-preview-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAI7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAOzD,UAAU,mBAAmB;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB;;;;OAIG;IACH,QAAQ,EAAE,gBAAgB,CAAA;CAC3B;AAMD,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,mBAAmB,GAAG,IAAI,CA2E5F"}
|
|
@@ -9,7 +9,7 @@ function createDbDenylist(_db) {
|
|
|
9
9
|
return { isRevoked(_jti) { return false; }, revoke(_jti) { } };
|
|
10
10
|
}
|
|
11
11
|
export function registerAudiencePreviewRoutes(router, ctx) {
|
|
12
|
-
const { db, authSecret, previewSecret, defaultSiteId } = ctx;
|
|
12
|
+
const { db, authSecret, previewSecret, defaultSiteId, siteAuth } = ctx;
|
|
13
13
|
async function authenticate(req) {
|
|
14
14
|
return resolveAuth(req.headers.get('authorization'), authSecret, db);
|
|
15
15
|
}
|
|
@@ -22,7 +22,7 @@ export function registerAudiencePreviewRoutes(router, ctx) {
|
|
|
22
22
|
return forbidden();
|
|
23
23
|
const url = new URL(req.url);
|
|
24
24
|
const siteId = await toSiteUuid(db, url.searchParams.get('siteId'), defaultSiteId);
|
|
25
|
-
const siteDenied = assertSiteAccess(user, siteId);
|
|
25
|
+
const siteDenied = assertSiteAccess(user, siteId, siteAuth);
|
|
26
26
|
if (siteDenied)
|
|
27
27
|
return siteDenied;
|
|
28
28
|
const audience = await getAudienceById(db, params.id, siteId);
|
|
@@ -46,7 +46,7 @@ export function registerAudiencePreviewRoutes(router, ctx) {
|
|
|
46
46
|
if (audienceId) {
|
|
47
47
|
const audience = await getAudienceById(db, audienceId);
|
|
48
48
|
if (audience) {
|
|
49
|
-
const siteDenied = assertSiteAccess(user, audience.siteId);
|
|
49
|
+
const siteDenied = assertSiteAccess(user, audience.siteId, siteAuth);
|
|
50
50
|
if (siteDenied)
|
|
51
51
|
return siteDenied;
|
|
52
52
|
}
|
|
@@ -80,7 +80,7 @@ export function registerAudiencePreviewRoutes(router, ctx) {
|
|
|
80
80
|
const body = await req.json();
|
|
81
81
|
const url = new URL(req.url);
|
|
82
82
|
const siteId = await toSiteUuid(db, url.searchParams.get('siteId'), defaultSiteId);
|
|
83
|
-
const siteDenied = assertSiteAccess(user, siteId);
|
|
83
|
+
const siteDenied = assertSiteAccess(user, siteId, siteAuth);
|
|
84
84
|
if (siteDenied)
|
|
85
85
|
return siteDenied;
|
|
86
86
|
const audience = await getAudienceById(db, body.audienceId, siteId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audience-preview-routes.js","sourceRoot":"","sources":["../../src/api/audience-preview-routes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"audience-preview-routes.js","sourceRoot":"","sources":["../../src/api/audience-preview-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
import type { Router } from './router.js';
|
|
2
2
|
import type { KywiDb } from '../db/client.js';
|
|
3
|
+
import type { SiteAccessPolicy } from './site-context.js';
|
|
3
4
|
interface AudienceRouteContext {
|
|
4
5
|
db: KywiDb;
|
|
5
6
|
authSecret: string;
|
|
6
7
|
defaultSiteId: string;
|
|
8
|
+
/**
|
|
9
|
+
* Per-site authorization policy (kywi-cms#74). This context carries no
|
|
10
|
+
* `KywiConfig` — routes that have one pass `config.auth` directly — so the
|
|
11
|
+
* policy is threaded in explicitly. Pass `config.auth`.
|
|
12
|
+
*/
|
|
13
|
+
siteAuth: SiteAccessPolicy;
|
|
7
14
|
/** Field names declared by the site's registered signal adapters (e.g. `crm.leadScore`). */
|
|
8
15
|
adapterFields?: string[];
|
|
9
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audience-routes.d.ts","sourceRoot":"","sources":["../../src/api/audience-routes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"audience-routes.d.ts","sourceRoot":"","sources":["../../src/api/audience-routes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAI7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAuBzD,UAAU,oBAAoB;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB;;;;OAIG;IACH,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,4FAA4F;IAC5F,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CACzB;AAqID,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,IAAI,CA4XtF"}
|