kempo 4.2.10 → 4.2.12

package/app-public/.config.json

@@ -4,14 +4,11 @@
     "/kempo-ui/icons/**": "../node_modules/kempo-ui/icons/**",
     "/kempo-ui/**": "../node_modules/kempo-ui/dist/**",
     "/monaco-editor/**": "../node_modules/monaco-editor/min/**",
-    "/kempo/**": "../node_modules/kempo/dist/kempo/**",
-    "/admin": "../node_modules/kempo/dist/admin/",
-    "/admin/**": "../node_modules/kempo/dist/admin/**"
+    "/kempo/**": "../node_modules/kempo/dist/kempo/**"
   },
   "middleware": {
     "custom": [
-      "../middleware/kempo-auth.js",
-      "../middleware/extension-scope-router.js"
+      "../node_modules/kempo/middleware/kempo.js"
     ]
   },
   "templating": {

package/bin/cli.js

@@ -117,13 +117,13 @@ if(existsSync(join(projectDir, 'public'))){
   const { confirm } = await inquirer.prompt([{
     type: 'confirm',
     name: 'confirm',
-    message: 'This will delete public/, server/, templates/, extensions/, .env, drizzle.config.js, and docker-compose.yml. Are you sure?',
+    message: 'This will delete public/, server/, templates/, .env, drizzle.config.js, and docker-compose.yml. Are you sure?',
     default: false
   }]);
 
   if(!confirm) process.exit(0);
 
-  for(const item of ['public', 'server', 'templates', 'extensions', '.env', 'docker-compose.yml', 'drizzle.config.js']){
+  for(const item of ['public', 'server', 'templates', '.env', 'docker-compose.yml', 'drizzle.config.js']){
     const p = join(projectDir, item);
     if(existsSync(p)) rmSync(p, { recursive: true, force: true });
   }
@@ -180,17 +180,44 @@ if(existingContainers.length > 0 && !useDefaults){
   }
 }
 
+let dbName = 'kempo';
+let dbPassword = generatePassword();
+
 if(containerMode === 'new' && !useDefaults){
   const { name } = await inquirer.prompt([{
     type: 'input',
     name: 'name',
-    message: 'Container name:',
-    default: 'kempo-postgres'
+    message: 'Database name (used for container and database):',
+    default: projectName
   }]);
+  dbName = name;
   containerName = name;
+
+  const { passwordChoice } = await inquirer.prompt([{
+    type: 'list',
+    name: 'passwordChoice',
+    message: 'Database password:',
+    choices: [
+      { name: 'Generate a random password', value: 'generate' },
+      { name: 'Enter a password manually', value: 'manual' }
+    ]
+  }]);
+
+  if(passwordChoice === 'manual'){
+    const { manualPassword } = await inquirer.prompt([{
+      type: 'password',
+      name: 'manualPassword',
+      message: 'Enter database password:',
+      mask: '*'
+    }]);
+    dbPassword = manualPassword;
+  }
+} else if(containerMode === 'new' && useDefaults){
+  dbName = projectName;
+  containerName = projectName;
 }
 
-const databaseUrl = customDatabaseUrl || `postgresql://kempo:kempo_dev_password@localhost:5433/kempo`;
+const databaseUrl = customDatabaseUrl || `postgresql://kempo:${dbPassword}@localhost:5433/${dbName}`;
 
 const generatedAdminPassword = generatePassword();
 let adminName, adminEmail, adminPassword;
@@ -312,12 +339,6 @@ if(!existsSync(templatesDir) && existsSync(templatesSource)){
   console.log('Scaffolded templates/');
 }
 
-const extensionsDir = join(projectDir, 'extensions');
-if(!existsSync(extensionsDir)){
-  mkdirSync(extensionsDir);
-  console.log('Created extensions/');
-}
-
 const drizzleConfigPath = join(projectDir, 'drizzle.config.js');
 const scaffoldDrizzle = join(moduleRoot, 'app-drizzle.config.js');
 if(!existsSync(drizzleConfigPath) && existsSync(scaffoldDrizzle)){
@@ -340,8 +361,8 @@ if(containerMode === 'new'){
     restart: unless-stopped
     environment:
       POSTGRES_USER: kempo
-      POSTGRES_PASSWORD: kempo_dev_password
-      POSTGRES_DB: kempo
+      POSTGRES_PASSWORD: ${dbPassword}
+      POSTGRES_DB: ${dbName}
     ports:
       - "5433:5432"
     volumes:
@@ -352,7 +373,7 @@ volumes:
     );
     console.log('Created docker-compose.yml');
   }
-}
+
 
 writeFileSync(join(projectDir, '.env'),
 `# Database

package/dist/admin/accounts/groups/[name]/index.html

@@ -0,0 +1,518 @@
+<!--
+	owner: system
+	locked: true
+	name: 
+	author: 
+	created: 
+	updated: 
+-->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<link rel="icon" type="image/png" sizes="48x48" href="/media/icon48.png">
+	<link rel="manifest" href="/manifest.json">
+	<title>Group - Admin</title>
+	<link rel="stylesheet" href="/kempo-css/kempo.min.css">
+	<script src="/admin/init.js"></script>
+	
+</head>
+<body>
+	<!--
+	locked: true
+-->
+
+	<k-aside
+		main="push"
+		state="expanded"
+		style="--aside_padding: 0;"
+		persistent-id="admin-nav"
+	>
+		<k-aside-toggle>
+			<h3 class="m0">Kempo Admin</h3>
+		</k-aside-toggle>
+		<k-aside-item
+			icon="preview"
+			href="/"
+			no-expand
+		>Site</k-aside-item>
+		<k-aside-item
+			icon="cards"
+			href="/admin"
+			no-expand
+		>Dashboard</k-aside-item>
+		<k-aside-menu
+			icon="manage-accounts"
+			label="Accounts"
+		>
+			<k-aside-item
+				icon="person"
+				href="/admin/accounts/users"
+				no-expand
+			>Users</k-aside-item>
+			<k-aside-item
+				icon="group"
+				href="/admin/accounts/groups"
+				no-expand
+			>Groups</k-aside-item>
+			<k-aside-item
+				icon="lock"
+				href="/admin/accounts/permissions"
+				no-expand
+			>Permissions</k-aside-item>
+		</k-aside-menu>
+		<k-aside-menu
+			icon="cards_stack"
+			label="Content"
+		>
+			<k-aside-item
+				icon="browse"
+				href="/admin/content/templates"
+			>Templates</k-aside-item>
+			<k-aside-item
+				icon="docs"
+				href="/admin/content/pages"
+			>Pages</k-aside-item>
+			<k-aside-item
+				icon="content"
+				href="/admin/content/fragments"
+			>Fragments</k-aside-item>
+			<k-aside-item
+				icon="globe"
+				href="/admin/content/globals"
+			>Global Content</k-aside-item>
+		</k-aside-menu>
+		<k-aside-item
+			icon="settings"
+			href="/admin/settings"
+			no-expand
+		>Settings</k-aside-item>
+		<k-aside-item
+			icon="extension"
+			href="/admin/extensions"
+			no-expand
+		>Extensions</k-aside-item>
+		<hr>
+		<k-aside-spacer></k-aside-spacer>
+		<k-theme-switcher
+			labels
+			style="--padding:var(--spacer_h);margin:var(--spacer_h) auto"
+		></k-theme-switcher>
+	</k-aside>
+	<script type="module">
+		import '/kempo-ui/components/ThemeSwitcher.js';
+		const items = document.querySelectorAll('k-aside-item');
+		const currentPath = window.location.pathname;
+
+		items.forEach(item => {
+			const href = item.getAttribute('href');
+			if (!href) return;
+			const isExact = href === '/admin' || href === '/';
+			const match = isExact
+				? (currentPath === href || currentPath === href + '/')
+				: (currentPath === href || currentPath.startsWith(href + '/'));
+			if (match) {
+				item.setAttribute('active', '');
+				const menu = item.closest('k-aside-menu');
+				if (menu) menu.setAttribute('open', '');
+			}
+		});
+	</script>
+
+	<k-main>
+		
+<script type="module" src="/kempo-ui/components/Icon.js"></script>
+<script type="module" src="/kempo-ui/components/Table.js"></script>
+<script type="module" src="/kempo-ui/components/tableControls/FirstPage.js"></script>
+<script type="module" src="/kempo-ui/components/tableControls/PrevPage.js"></script>
+<script type="module" src="/kempo-ui/components/tableControls/NextPage.js"></script>
+<script type="module" src="/kempo-ui/components/tableControls/LastPage.js"></script>
+<script type="module" src="/kempo-ui/components/tableControls/PageSelect.js"></script>
+<script type="module" src="/kempo-ui/components/tableControls/PageSize.js"></script>
+<script type="module" src="/kempo-ui/components/tableControls/DeleteRecord.js"></script>
+<script type="module" src="/kempo-ui/components/tableControls/DeleteSelected.js"></script>
+<script type="module" src="/admin/components/tableControls/AddMember.js"></script>
+<script type="module" src="/admin/components/tableControls/AddPermission.js"></script>
+<script type="module" src="/admin/components/TableRowLink.js"></script>
+
+		<div class="mb d-f" style="align-items: flex-start; justify-content: space-between;">
+			<div>
+				<a href="/admin/accounts/groups" class="no-link">
+					<button class="mbh"><k-icon name="arrow" direction="left"></k-icon> Groups</button>
+				</a>
+				<h1 class="mb0" id="pageTitle">Group</h1>
+			</div>
+			<button id="saveBtn" class="primary" disabled style="display:none;"><k-icon name="save"></k-icon> Save</button>
+		</div>
+
+		<div id="loading">Loading group...</div>
+		<div id="notFound" style="display: none;">
+			<p>Group not found.</p>
+			<a href="/admin/accounts/groups">Back to Groups</a>
+		</div>
+		<div id="content" style="display: none;">
+
+			<!-- Group Information -->
+			<div class="card">
+				<h2>Information</h2>
+				<div class="d-f mb">
+					<label style="min-width: 120px;"><strong>Owner</strong></label>
+					<span id="groupOwner"></span>
+				</div>
+				<div class="d-f mb">
+					<label for="groupNameInput" style="min-width: 120px;"><strong>Name</strong></label>
+					<input type="text" id="groupNameInput" style="max-width: 400px;">
+				</div>
+				<div class="d-f mb">
+					<label for="groupDescription" style="min-width: 120px;"><strong>Description</strong></label>
+					<input type="text" id="groupDescription" style="max-width: 400px;">
+				</div>
+				<div class="d-f mb">
+					<label style="min-width: 120px;"><strong>Created</strong></label>
+					<span id="groupCreatedAt"></span>
+				</div>
+				<div class="d-f mb">
+					<label style="min-width: 120px;"><strong>Updated</strong></label>
+					<span id="groupUpdatedAt"></span>
+				</div>
+			</div>
+
+			<!-- Members -->
+			<div class="card">
+				<h2>Members</h2>
+				<p id="usersMembersMsg" style="display:none">All users are automatically members of this group.</p>
+				<k-table id="membersTable" enable-pages page-size="10" page-size-options="[10,25,50]" placeholder="This group has no members.">
+					<admin-table-row-link slot="before" url-pattern="/admin/accounts/users/{id}" field-name="id"></admin-table-row-link>
+					<k-tc-delete-selected id="tcDeleteSelected" slot="top" style="display:none;"></k-tc-delete-selected>
+					<admin-add-member id="tcAddMember" slot="top" style="display:none;"></admin-add-member>
+					<div class="d-f full" style="align-items: center;">
+						<div>
+							<k-tc-first-page></k-tc-first-page>
+							<k-tc-prev-page></k-tc-prev-page>
+							<k-tc-next-page></k-tc-next-page>
+							<k-tc-last-page></k-tc-last-page>
+						</div>
+						<div class="flex"></div>
+						<div><k-tc-page-select></k-tc-page-select></div>
+						<div class="flex"></div>
+						<div><k-tc-page-size></k-tc-page-size></div>
+					</div>
+				</k-table>
+			</div>
+
+			<!-- Permissions -->
+			<div class="card">
+				<h2>Permissions</h2>
+				<p id="adminPermsMsg" style="display:none">Members of this group automatically have all permissions.</p>
+				<k-table id="permissionsTable" enable-pages page-size="10" page-size-options="[10,25,50]" placeholder="No permissions assigned to this group.">
+					<k-tc-delete-selected id="tcDeleteSelectedPerm" slot="top" style="display:none;"></k-tc-delete-selected>
+					<admin-add-permission id="tcAddPermission" slot="top" style="display:none;"></admin-add-permission>
+					<div class="d-f full" style="align-items: center;">
+						<div>
+							<k-tc-first-page></k-tc-first-page>
+							<k-tc-prev-page></k-tc-prev-page>
+							<k-tc-next-page></k-tc-next-page>
+							<k-tc-last-page></k-tc-last-page>
+						</div>
+						<div class="flex"></div>
+						<div><k-tc-page-select></k-tc-page-select></div>
+						<div class="flex"></div>
+						<div><k-tc-page-size></k-tc-page-size></div>
+					</div>
+				</k-table>
+			</div>
+
+		</div>
+
+		<script type="module">
+			import {
+				getGroup, updateGroup, deleteGroups, getGroupMembers,
+					removeMemberFromGroup, getGroupPermissions, removePermissionFromGroup,
+				getAllCurrentUserPermissions
+			} from '/kempo/sdk.js';
+			import Toast from '/kempo-ui/components/Toast.js';
+			import Dialog from '/kempo-ui/components/Dialog.js';
+
+			const groupName = decodeURIComponent(
+				window.location.pathname.split('/admin/accounts/groups/')[1]?.replace(/\/$/, '') || ''
+			);
+
+			if(!groupName){
+				document.getElementById('loading').style.display = 'none';
+				document.getElementById('notFound').style.display = '';
+			}
+
+			/*
+				Permission checks
+			*/
+
+			const [, permResult] = await getAllCurrentUserPermissions();
+			const myPerms = new Set(permResult?.permissions ?? []);
+			const canEdit = myPerms.has('system:group:update');
+			const canDelete = myPerms.has('system:group:delete');
+			const canReadPerms = myPerms.has('system:permissions:read');
+
+			/*
+				Load group
+			*/
+
+			const [groupError, groupData] = await getGroup(groupName);
+
+			document.getElementById('loading').style.display = 'none';
+
+			if(groupError){
+				document.getElementById('notFound').style.display = '';
+			} else {
+				document.getElementById('content').style.display = '';
+				const displayName = groupName.includes(':') ? groupName.split(':').slice(1).join(':') : groupName;
+				document.getElementById('pageTitle').textContent = `Group: ${displayName}`;
+				document.title = `${displayName} - Admin`;
+
+				const owner = groupName.includes(':') ? groupName.split(':')[0] : '';
+				const isAdmin = owner === 'admin' || !owner;
+
+				await customElements.whenDefined('k-table');
+
+				/*
+					Group Information
+				*/
+
+				const isCustom = owner === 'custom';
+				const $saveBtn = document.getElementById('saveBtn');
+				const $groupOwner = document.getElementById('groupOwner');
+				const $groupNameInput = document.getElementById('groupNameInput');
+				const $groupDescription = document.getElementById('groupDescription');
+
+					$groupOwner.textContent = owner || '(none)';
+				$groupNameInput.value = displayName;
+				$groupDescription.value = groupData.description || '';
+				document.getElementById('groupCreatedAt').textContent = new Date(groupData.createdAt).toLocaleString();
+					document.getElementById('groupUpdatedAt').textContent = groupData.updatedAt ? new Date(groupData.updatedAt).toLocaleString() : 'Never';
+				if(!canEdit || !isCustom){
+					$groupNameInput.readOnly = true;
+					$groupDescription.readOnly = true;
+				} else {
+					$saveBtn.style.display = '';
+
+					const origName = displayName;
+					const origDescription = groupData.description || '';
+
+					const handleBeforeUnload = e => { e.preventDefault(); e.returnValue = ''; };
+
+					const checkDirty = () => {
+						const dirty = $groupNameInput.value !== origName || $groupDescription.value !== origDescription;
+						$saveBtn.disabled = !dirty;
+						if(dirty){
+							window.addEventListener('beforeunload', handleBeforeUnload);
+						} else {
+							window.removeEventListener('beforeunload', handleBeforeUnload);
+						}
+					};
+
+					$groupNameInput.addEventListener('input', checkDirty);
+					$groupDescription.addEventListener('input', checkDirty);
+
+					$saveBtn.addEventListener('click', async () => {
+						const newDisplayName = $groupNameInput.value.trim();
+						if(!newDisplayName){
+							Toast.error('Name is required');
+							return;
+						}
+						const newFullName = `${owner}:${newDisplayName}`;
+						const patch = { name: groupName, description: $groupDescription.value };
+						if(newFullName !== groupName) patch.newName = newFullName;
+						const [error] = await updateGroup(patch);
+						if(error){
+							Toast.error(error.msg || 'Failed to save group');
+							return;
+						}
+						window.removeEventListener('beforeunload', handleBeforeUnload);
+						Toast.success('Group saved');
+						if(newFullName !== groupName){
+							window.location.href = `/admin/accounts/groups/${encodeURIComponent(newFullName)}`;
+						} else {
+							$saveBtn.disabled = true;
+							document.getElementById('groupUpdatedAt').textContent = new Date().toLocaleString();
+						}
+					});
+				}
+
+				/*
+					Members
+				*/
+
+				const $membersTable = document.getElementById('membersTable');
+
+				if(groupName === 'system:Users'){
+					document.getElementById('usersMembersMsg').style.display = '';
+					$membersTable.style.display = 'none';
+				} else {
+					const $tcDeleteSelected = document.getElementById('tcDeleteSelected');
+					const $tcAddMember = document.getElementById('tcAddMember');
+					$tcAddMember.groupName = groupName;
+
+					if(canEdit){
+						$membersTable.setAttribute('request-delete', '');
+						$membersTable.setAttribute('enable-selection', '');
+						$tcDeleteSelected.style.display = '';
+						$tcAddMember.style.display = '';
+
+						const del = document.createElement('k-tc-delete-record');
+						del.setAttribute('slot', 'after');
+						$membersTable.appendChild(del);
+					}
+
+					$membersTable.addEventListener('memberAdded', e => loadMembers());
+
+					$membersTable.addEventListener('requestDelete', ({ detail: { records, approve, reject } }) => {
+						const count = records.length;
+						const msg = count === 1
+							? `<div class="p"><p>Remove "${records[0].name}" from this group?</p></div>`
+							: `<div class="p"><p>Remove ${count} members from this group?</p></div>`;
+						Dialog.confirm(msg, async (confirmed) => {
+							if(!confirmed){ reject(); return; }
+							const errors = [];
+							for(const record of records){
+								const [error] = await removeMemberFromGroup(groupName, record.id);
+								if(error) errors.push(error.msg);
+							}
+							if(errors.length){
+								reject();
+								Toast.error(errors[0] || 'Failed to remove member');
+								return;
+							}
+							approve();
+							Toast.success(count === 1 ? 'Member removed' : `${count} members removed`);
+							loadMembers();
+						});
+					});
+
+					const loadMembers = async () => {
+						const [error, data] = await getGroupMembers(groupName);
+						if(error){
+							Toast.error(error.msg || 'Failed to load members');
+							return;
+						}
+						$membersTable.setData({
+							records: data.members,
+							fields: [
+								{ name: 'name', label: 'Name' },
+								{ name: 'email', label: 'Email' },
+								{
+									name: 'createdAt',
+									label: 'Joined',
+									formatter: v => new Date(v).toLocaleString()
+								}
+							]
+						});
+						$membersTable.setupFetchRecords(data.total, async (start, count) => {
+							const [err, d] = await getGroupMembers(groupName, { limit: count, offset: start });
+							if(err) return [];
+							return d.members;
+						});
+					};
+
+					loadMembers();
+				}
+
+				/*
+					Permissions
+				*/
+
+				const $permissionsTable = document.getElementById('permissionsTable');
+
+				if(groupName === 'system:Administrators'){
+					document.getElementById('adminPermsMsg').style.display = '';
+					$permissionsTable.style.display = 'none';
+				} else if(canReadPerms){
+					if(canEdit){
+						$permissionsTable.setAttribute('request-delete', '');
+						$permissionsTable.setAttribute('enable-selection', '');
+
+						const $tcDeleteSelectedPerm = document.getElementById('tcDeleteSelectedPerm');
+						$tcDeleteSelectedPerm.style.display = '';
+
+						const $tcAddPermission = document.getElementById('tcAddPermission');
+						$tcAddPermission.groupName = groupName;
+						$tcAddPermission.style.display = '';
+
+						const delPerm = document.createElement('k-tc-delete-record');
+						delPerm.setAttribute('slot', 'after');
+						$permissionsTable.appendChild(delPerm);
+
+						$permissionsTable.addEventListener('permissionAdded', e => loadPermissions());
+
+						$permissionsTable.addEventListener('requestDelete', ({ detail: { records, approve, reject } }) => {
+							const count = records.length;
+							const msg = count === 1
+								? `<div class="p"><p>Remove permission "${records[0].name}" from this group?</p></div>`
+								: `<div class="p"><p>Remove ${count} permissions from this group?</p></div>`;
+							Dialog.confirm(msg, async (confirmed) => {
+								if(!confirmed){ reject(); return; }
+								const errors = [];
+								for(const record of records){
+									const [error] = await removePermissionFromGroup(groupName, record.name);
+									if(error) errors.push(error.msg);
+								}
+								if(errors.length){
+									reject();
+									Toast.error(errors[0] || 'Failed to remove permission');
+									return;
+								}
+								approve();
+								Toast.success(count === 1 ? 'Permission removed' : `${count} permissions removed`);
+								loadPermissions();
+							});
+						});
+					}
+
+					const loadPermissions = async () => {
+						const [error, data] = await getGroupPermissions(groupName);
+						if(error){
+							Toast.error(error.msg || 'Failed to load permissions');
+							return;
+						}
+						$permissionsTable.setData({
+							records: data.permissions.map(name => ({ name })),
+							fields: [
+								{
+									name: 'owner',
+									label: 'Owner',
+									size: 120,
+									calculator: r => r.name.includes(':') ? r.name.split(':')[0] : ''
+								},
+								{
+									name: 'resource',
+									label: 'Resource',
+									size: 180,
+									calculator: r => {
+										const parts = r.name.split(':');
+										return parts.length >= 3 ? parts[1] : parts.length === 2 ? parts[1] : '';
+									}
+								},
+								{
+									name: 'action',
+									label: 'Action',
+									size: 140,
+									calculator: r => {
+										const parts = r.name.split(':');
+										return parts.length >= 3 ? parts.slice(2).join(':') : '';
+									}
+								}
+							]
+						});
+					};
+
+					loadPermissions();
+				} else {
+					$permissionsTable.closest('.card').style.display = 'none';
+				}
+			}
+		</script>
+
+
+	</k-main>
+	
+</body>
+</html>