Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9230344eb5 | ||
|
|
8992cff473 | ||
|
|
1e91b84d3d | ||
|
|
851b17f45c | ||
|
|
cdb9691b59 | ||
|
|
720d875eb5 | ||
|
|
ac560172ff | ||
|
|
091f20a666 | ||
|
|
9930608359 | ||
|
|
4a753ca29b | ||
|
|
2d797454de | ||
|
|
a8ffd629ff | ||
|
|
3f0de04a49 | ||
|
|
460094e4dd | ||
|
|
cff62a1904 | ||
|
|
ea63b7236c | ||
|
|
8bb00f01c4 | ||
|
|
ca73febe2f | ||
|
|
7f47f44039 | ||
|
|
f6c315d0dc | ||
|
|
504e1d0fc5 | ||
|
|
a8269df0b4 | ||
|
|
d58a88c43a | ||
|
|
087b24388c | ||
|
|
9b491164fd | ||
|
|
bb34e52997 | ||
|
|
b9897b62b8 | ||
|
|
8a21edf367 | ||
|
|
03368b1b84 | ||
|
|
bfc5b11cc2 |
@@ -13,6 +13,7 @@ import AdminDialogs from '@/admin/AdminDialogs.vue'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import { getSettings, adminUiPath, makeUiHref } from '@/utils/settings'
|
||||
import { apiJson } from '@/utils/api'
|
||||
import { getDirection } from '@/utils/keynav'
|
||||
|
||||
const info = ref(null)
|
||||
const loading = ref(true)
|
||||
@@ -25,8 +26,6 @@ const permissions = ref([])
|
||||
const currentOrgId = ref(null) // UUID of selected org for detail view
|
||||
const currentUserId = ref(null) // UUID for user detail view
|
||||
const userDetail = ref(null) // cached user detail object
|
||||
const userLink = ref(null) // latest generated registration link
|
||||
const userLinkExpires = ref(null)
|
||||
const authStore = useAuthStore()
|
||||
const addingOrgForPermission = ref(null)
|
||||
const PERMISSION_ID_PATTERN = '^[A-Za-z0-9:._~-]+$'
|
||||
@@ -35,8 +34,18 @@ const renameIdValue = ref('')
|
||||
const editingPermDisplay = ref(null)
|
||||
const renameDisplayValue = ref('')
|
||||
const dialog = ref({ type: null, data: null, busy: false, error: '' })
|
||||
const dialogPreviousFocus = ref(null) // Track element that had focus before dialog opened
|
||||
const safeIdRegex = /[^A-Za-z0-9:._~-]/g
|
||||
|
||||
// Template refs for navigation
|
||||
const breadcrumbsRef = ref(null)
|
||||
const adminOverviewRef = ref(null)
|
||||
const adminOrgDetailRef = ref(null)
|
||||
const adminUserDetailRef = ref(null)
|
||||
|
||||
// Check if any modal/dialog is open (blocks arrow key navigation)
|
||||
const hasActiveModal = computed(() => dialog.value.type !== null || showRegModal.value)
|
||||
|
||||
function sanitizeRenameId() { if (renameIdValue.value) renameIdValue.value = renameIdValue.value.replace(safeIdRegex, '') }
|
||||
|
||||
function handleGlobalClick(e) {
|
||||
@@ -101,33 +110,6 @@ const permissionSummary = computed(() => {
|
||||
|
||||
function renamePermissionDisplay(p) { openDialog('perm-display', { permission: p, id: p.id, display_name: p.display_name }) }
|
||||
|
||||
async function refreshPermissionsContext() {
|
||||
// Reload both lists so All Permissions table shows new associations promptly.
|
||||
await Promise.all([loadPermissions(), loadOrgs()])
|
||||
}
|
||||
|
||||
async function attachPermissionToOrg(pid, orgUuid) {
|
||||
if (!orgUuid) return
|
||||
try {
|
||||
const params = new URLSearchParams({ permission_id: pid })
|
||||
await apiJson(`/auth/api/admin/orgs/${orgUuid}/permission?${params.toString()}`, { method: 'POST' })
|
||||
await loadOrgs()
|
||||
} catch (e) {
|
||||
authStore.showMessage(e.message || 'Failed to add permission to org')
|
||||
}
|
||||
}
|
||||
|
||||
async function detachPermissionFromOrg(pid, orgUuid) {
|
||||
openDialog('confirm', { message: 'Remove permission from this org?', action: async () => {
|
||||
try {
|
||||
const params = new URLSearchParams({ permission_id: pid })
|
||||
await apiJson(`/auth/api/admin/orgs/${orgUuid}/permission?${params.toString()}`, { method: 'DELETE' })
|
||||
await loadOrgs()
|
||||
} catch (e) {
|
||||
authStore.showMessage(e.message || 'Failed to remove permission from org')
|
||||
}
|
||||
} })
|
||||
}
|
||||
|
||||
function parseHash() {
|
||||
const h = window.location.hash || ''
|
||||
@@ -198,11 +180,37 @@ function updateOrg(org) { openDialog('org-update', { org, name: org.display_name
|
||||
|
||||
function editUserName(user) { openDialog('user-update-name', { user, name: user.display_name }) }
|
||||
|
||||
async function performOrgDeletion(orgUuid) {
|
||||
await apiJson(`/auth/api/admin/orgs/${orgUuid}`, { method: 'DELETE' })
|
||||
await Promise.all([loadOrgs(), loadPermissions()])
|
||||
}
|
||||
|
||||
function deleteOrg(org) {
|
||||
if (!info.value?.is_global_admin) { authStore.showMessage('Global admin only'); return }
|
||||
openDialog('confirm', { message: `Delete organization ${org.display_name}?`, action: async () => {
|
||||
await apiJson(`/auth/api/admin/orgs/${org.uuid}`, { method: 'DELETE' })
|
||||
await Promise.all([loadOrgs(), loadPermissions()])
|
||||
|
||||
const userCount = org.roles.reduce((acc, r) => acc + r.users.length, 0)
|
||||
|
||||
if (userCount === 0) {
|
||||
// No users in the organization, safe to delete directly
|
||||
performOrgDeletion(org.uuid)
|
||||
.then(() => {
|
||||
authStore.showMessage(`Organization "${org.display_name}" deleted.`, 'success', 2500)
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to delete organization', 'error')
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// Build detailed breakdown of users by role
|
||||
const roleParts = org.roles
|
||||
.filter(r => r.users.length > 0)
|
||||
.map(r => `${r.users.length} ${r.display_name}`)
|
||||
|
||||
const affects = roleParts.join(', ')
|
||||
|
||||
openDialog('confirm', { message: `Delete organization "${org.display_name}", including accounts of ${affects})?`, action: async () => {
|
||||
await performOrgDeletion(org.uuid)
|
||||
} })
|
||||
}
|
||||
|
||||
@@ -241,21 +249,21 @@ function onRoleDrop(e, org, role) {
|
||||
} catch (_) { /* ignore */ }
|
||||
}
|
||||
|
||||
// (legacy function retained but unused in UI)
|
||||
async function addOrgPermission() { /* obsolete */ }
|
||||
|
||||
async function removeOrgPermission() { /* obsolete */ }
|
||||
|
||||
// Role actions
|
||||
function createRole(org) { openDialog('role-create', { org }) }
|
||||
|
||||
function updateRole(role) { openDialog('role-update', { role, name: role.display_name }) }
|
||||
|
||||
function deleteRole(role) {
|
||||
openDialog('confirm', { message: `Delete role ${role.display_name}?`, action: async () => {
|
||||
await apiJson(`/auth/api/admin/orgs/${role.org_uuid}/roles/${role.uuid}`, { method: 'DELETE' })
|
||||
await loadOrgs()
|
||||
} })
|
||||
// UI only allows deleting empty roles, so no confirmation needed
|
||||
apiJson(`/auth/api/admin/orgs/${role.org_uuid}/roles/${role.uuid}`, { method: 'DELETE' })
|
||||
.then(() => {
|
||||
authStore.showMessage(`Role "${role.display_name}" deleted.`, 'success', 2500)
|
||||
loadOrgs()
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to delete role', 'error')
|
||||
})
|
||||
}
|
||||
|
||||
async function toggleRolePermission(role, pid, checked) {
|
||||
@@ -281,13 +289,44 @@ async function toggleRolePermission(role, pid, checked) {
|
||||
}
|
||||
|
||||
// Permission actions
|
||||
function updatePermission(p) { openDialog('perm-display', { permission: p }) }
|
||||
async function performPermissionDeletion(permissionId) {
|
||||
const params = new URLSearchParams({ permission_id: permissionId })
|
||||
await apiJson(`/auth/api/admin/permission?${params.toString()}`, { method: 'DELETE' })
|
||||
await loadPermissions()
|
||||
}
|
||||
|
||||
function deletePermission(p) {
|
||||
openDialog('confirm', { message: `Delete permission ${p.id}?`, action: async () => {
|
||||
const params = new URLSearchParams({ permission_id: p.id })
|
||||
await apiJson(`/auth/api/admin/permission?${params.toString()}`, { method: 'DELETE' })
|
||||
await loadPermissions()
|
||||
const userCount = permissionSummary.value[p.id]?.userCount || 0
|
||||
|
||||
// Count roles that have this permission
|
||||
let roleCount = 0
|
||||
for (const org of orgs.value) {
|
||||
for (const role of org.roles) {
|
||||
if (role.permissions.includes(p.id)) {
|
||||
roleCount++
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (roleCount === 0) {
|
||||
// No roles have this permission, safe to delete directly
|
||||
performPermissionDeletion(p.id)
|
||||
.then(() => {
|
||||
authStore.showMessage(`Permission "${p.display_name}" deleted.`, 'success', 2500)
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to delete permission', 'error')
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
const parts = []
|
||||
if (roleCount > 0) parts.push(`${roleCount} role${roleCount !== 1 ? 's' : ''}`)
|
||||
if (userCount > 0) parts.push(`${userCount} user${userCount !== 1 ? 's' : ''}`)
|
||||
const affects = parts.join(', ')
|
||||
|
||||
openDialog('confirm', { message: `Delete permission "${p.display_name}" (${affects})?`, action: async () => {
|
||||
await performPermissionDeletion(p.id)
|
||||
} })
|
||||
}
|
||||
|
||||
@@ -361,20 +400,6 @@ function generateUserRegistrationLink(u) {
|
||||
showRegModal.value = true
|
||||
}
|
||||
|
||||
function onLinkCopied() {
|
||||
authStore.showMessage('Link copied to clipboard!')
|
||||
}
|
||||
|
||||
function copy(text) {
|
||||
if (!text) return
|
||||
navigator.clipboard.writeText(text)
|
||||
.catch(()=>{})
|
||||
}
|
||||
|
||||
function permissionDisplayName(id) {
|
||||
return permissions.value.find(p => p.id === id)?.display_name || id
|
||||
}
|
||||
|
||||
async function toggleOrgPermission(org, permId, checked) {
|
||||
// Build next permission list
|
||||
const has = org.permissions.includes(permId)
|
||||
@@ -394,8 +419,107 @@ async function toggleOrgPermission(org, permId, checked) {
|
||||
}
|
||||
}
|
||||
|
||||
function openDialog(type, data) { dialog.value = { type, data, busy: false, error: '' } }
|
||||
function closeDialog() { dialog.value = { type: null, data: null, busy: false, error: '' } }
|
||||
function openDialog(type, data) {
|
||||
const focused = document.activeElement
|
||||
dialogPreviousFocus.value = focused
|
||||
|
||||
// For delete operations, store sibling info to help restore focus after deletion
|
||||
if (type === 'confirm' && focused) {
|
||||
const row = focused.closest('tr')
|
||||
if (row) {
|
||||
const tbody = row.closest('tbody')
|
||||
if (tbody) {
|
||||
const rows = Array.from(tbody.querySelectorAll('tr'))
|
||||
const idx = rows.indexOf(row)
|
||||
// Store context to find next/prev row after deletion
|
||||
dialog.value.focusContext = {
|
||||
tbody,
|
||||
index: idx,
|
||||
total: rows.length,
|
||||
selector: 'button:not([disabled]), a'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dialog.value = { ...dialog.value, type, data, busy: false, error: '' }
|
||||
}
|
||||
|
||||
function closeDialog() {
|
||||
const prev = dialogPreviousFocus.value
|
||||
const context = dialog.value.focusContext
|
||||
dialog.value = { type: null, data: null, busy: false, error: '' }
|
||||
// Restore focus after dialog closes
|
||||
restoreFocusAfterDialog(prev, context)
|
||||
dialogPreviousFocus.value = null
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore focus to the previously focused element, or find a sibling if deleted.
|
||||
*/
|
||||
function restoreFocusAfterDialog(prev, context) {
|
||||
if (!prev) return
|
||||
|
||||
// Check if the original element still exists in DOM and is focusable
|
||||
if (document.body.contains(prev) && !prev.disabled) {
|
||||
prev.focus()
|
||||
return
|
||||
}
|
||||
|
||||
// Element was deleted - try to find a sibling using stored context
|
||||
if (context?.tbody && context.selector) {
|
||||
const rows = Array.from(context.tbody.querySelectorAll('tr'))
|
||||
if (rows.length > 0) {
|
||||
// Try the same index (next row moved up) or the last row
|
||||
const targetIdx = Math.min(context.index, rows.length - 1)
|
||||
const targetRow = rows[targetIdx]
|
||||
const focusable = targetRow?.querySelector(context.selector)
|
||||
if (focusable) {
|
||||
focusable.focus()
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback: try to find any focusable element in the admin panels
|
||||
const container = document.querySelector('.admin-panels')
|
||||
if (!container) return
|
||||
|
||||
const focusable = container.querySelector('button:not([disabled]), a, input:not([disabled]), [tabindex="0"]')
|
||||
if (focusable) {
|
||||
focusable.focus()
|
||||
}
|
||||
}
|
||||
|
||||
// Keyboard navigation handlers
|
||||
function handleBreadcrumbKeydown(event) {
|
||||
if (hasActiveModal.value) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
// Left/right handled internally by Breadcrumbs component
|
||||
if (direction === 'down') {
|
||||
event.preventDefault()
|
||||
// Move to admin panel content
|
||||
if (adminOverviewRef.value) {
|
||||
adminOverviewRef.value.focusFirstElement?.()
|
||||
} else if (adminOrgDetailRef.value) {
|
||||
adminOrgDetailRef.value.focusFirstElement?.()
|
||||
} else if (adminUserDetailRef.value) {
|
||||
adminUserDetailRef.value.focusFirstElement?.()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function handlePanelNavigateOut(direction) {
|
||||
if (hasActiveModal.value) return
|
||||
|
||||
if (direction === 'up') {
|
||||
// Focus breadcrumbs - focus the current page's crumb
|
||||
breadcrumbsRef.value?.focusCurrent?.()
|
||||
}
|
||||
}
|
||||
|
||||
async function refreshUserDetail() {
|
||||
await loadOrgs()
|
||||
@@ -418,28 +542,88 @@ async function submitDialog() {
|
||||
const t = dialog.value.type
|
||||
if (t === 'org-create') {
|
||||
const name = dialog.value.data.name?.trim(); if (!name) throw new Error('Name required')
|
||||
await apiJson('/auth/api/admin/orgs', { method: 'POST', body: { display_name: name, permissions: [] } })
|
||||
await Promise.all([loadOrgs(), loadPermissions()])
|
||||
|
||||
// Close dialog immediately, then perform async operation
|
||||
closeDialog()
|
||||
apiJson('/auth/api/admin/orgs', { method: 'POST', body: { display_name: name, permissions: [] } })
|
||||
.then(() => {
|
||||
authStore.showMessage(`Organization "${name}" created.`, 'success', 2500)
|
||||
Promise.all([loadOrgs(), loadPermissions()])
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to create organization', 'error')
|
||||
})
|
||||
return // Don't call closeDialog() again
|
||||
} else if (t === 'org-update') {
|
||||
const { org } = dialog.value.data; const name = dialog.value.data.name?.trim(); if (!name) throw new Error('Name required')
|
||||
await apiJson(`/auth/api/admin/orgs/${org.uuid}`, { method: 'PUT', body: { display_name: name, permissions: org.permissions } })
|
||||
await loadOrgs()
|
||||
|
||||
// Close dialog immediately, then perform async operation
|
||||
closeDialog()
|
||||
apiJson(`/auth/api/admin/orgs/${org.uuid}`, { method: 'PUT', body: { display_name: name, permissions: org.permissions } })
|
||||
.then(() => {
|
||||
authStore.showMessage(`Organization renamed to "${name}".`, 'success', 2500)
|
||||
loadOrgs()
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to update organization', 'error')
|
||||
})
|
||||
return // Don't call closeDialog() again
|
||||
} else if (t === 'role-create') {
|
||||
const { org } = dialog.value.data; const name = dialog.value.data.name?.trim(); if (!name) throw new Error('Name required')
|
||||
await apiJson(`/auth/api/admin/orgs/${org.uuid}/roles`, { method: 'POST', body: { display_name: name, permissions: [] } })
|
||||
await loadOrgs()
|
||||
|
||||
// Close dialog immediately, then perform async operation
|
||||
closeDialog()
|
||||
apiJson(`/auth/api/admin/orgs/${org.uuid}/roles`, { method: 'POST', body: { display_name: name, permissions: [] } })
|
||||
.then(() => {
|
||||
authStore.showMessage(`Role "${name}" created.`, 'success', 2500)
|
||||
loadOrgs()
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to create role', 'error')
|
||||
})
|
||||
return // Don't call closeDialog() again
|
||||
} else if (t === 'role-update') {
|
||||
const { role } = dialog.value.data; const name = dialog.value.data.name?.trim(); if (!name) throw new Error('Name required')
|
||||
await apiJson(`/auth/api/admin/orgs/${role.org_uuid}/roles/${role.uuid}`, { method: 'PUT', body: { display_name: name, permissions: role.permissions } })
|
||||
await loadOrgs()
|
||||
|
||||
// Close dialog immediately, then perform async operation
|
||||
closeDialog()
|
||||
apiJson(`/auth/api/admin/orgs/${role.org_uuid}/roles/${role.uuid}`, { method: 'PUT', body: { display_name: name, permissions: role.permissions } })
|
||||
.then(() => {
|
||||
authStore.showMessage(`Role renamed to "${name}".`, 'success', 2500)
|
||||
loadOrgs()
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to update role', 'error')
|
||||
})
|
||||
return // Don't call closeDialog() again
|
||||
} else if (t === 'user-create') {
|
||||
const { org, role } = dialog.value.data; const name = dialog.value.data.name?.trim(); if (!name) throw new Error('Name required')
|
||||
await apiJson(`/auth/api/admin/orgs/${org.uuid}/users`, { method: 'POST', body: { display_name: name, role: role.display_name } })
|
||||
await loadOrgs()
|
||||
|
||||
// Close dialog immediately, then perform async operation
|
||||
closeDialog()
|
||||
apiJson(`/auth/api/admin/orgs/${org.uuid}/users`, { method: 'POST', body: { display_name: name, role: role.display_name } })
|
||||
.then(() => {
|
||||
authStore.showMessage(`User "${name}" added to ${role.display_name} role.`, 'success', 2500)
|
||||
loadOrgs()
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to add user', 'error')
|
||||
})
|
||||
return // Don't call closeDialog() again
|
||||
} else if (t === 'user-update-name') {
|
||||
const { user } = dialog.value.data; const name = dialog.value.data.name?.trim(); if (!name) throw new Error('Name required')
|
||||
await apiJson(`/auth/api/admin/orgs/${user.org_uuid}/users/${user.uuid}/display-name`, { method: 'PUT', body: { display_name: name } })
|
||||
await onUserNameSaved()
|
||||
|
||||
// Close dialog immediately, then perform async operation
|
||||
closeDialog()
|
||||
apiJson(`/auth/api/admin/orgs/${user.org_uuid}/users/${user.uuid}/display-name`, { method: 'PUT', body: { display_name: name } })
|
||||
.then(() => {
|
||||
authStore.showMessage(`User renamed to "${name}".`, 'success', 2500)
|
||||
onUserNameSaved()
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to update user name', 'error')
|
||||
})
|
||||
return // Don't call closeDialog() again
|
||||
} else if (t === 'perm-display') {
|
||||
const { permission } = dialog.value.data
|
||||
const newId = dialog.value.data.id?.trim()
|
||||
@@ -447,20 +631,45 @@ async function submitDialog() {
|
||||
if (!newDisplay) throw new Error('Display name required')
|
||||
if (!newId) throw new Error('ID required')
|
||||
|
||||
// Close dialog immediately, then perform async operation
|
||||
closeDialog()
|
||||
|
||||
let apiCall;
|
||||
if (newId !== permission.id) {
|
||||
// ID changed, use rename endpoint
|
||||
await apiJson('/auth/api/admin/permission/rename', { method: 'POST', body: { old_id: permission.id, new_id: newId, display_name: newDisplay } })
|
||||
apiCall = apiJson('/auth/api/admin/permission/rename', { method: 'POST', body: { old_id: permission.id, new_id: newId, display_name: newDisplay } })
|
||||
} else if (newDisplay !== permission.display_name) {
|
||||
// Only display name changed
|
||||
const params = new URLSearchParams({ permission_id: permission.id, display_name: newDisplay })
|
||||
await apiJson(`/auth/api/admin/permission?${params.toString()}`, { method: 'PUT' })
|
||||
apiCall = apiJson(`/auth/api/admin/permission?${params.toString()}`, { method: 'PUT' })
|
||||
} else {
|
||||
// No changes
|
||||
return
|
||||
}
|
||||
await loadPermissions()
|
||||
} else if (t === 'perm-create') {
|
||||
|
||||
apiCall
|
||||
.then(() => {
|
||||
authStore.showMessage(`Permission "${newDisplay}" updated.`, 'success', 2500)
|
||||
loadPermissions()
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to update permission', 'error')
|
||||
})
|
||||
return // Don't call closeDialog() again else if (t === 'perm-create') {
|
||||
const id = dialog.value.data.id?.trim(); if (!id) throw new Error('ID required')
|
||||
const display_name = dialog.value.data.display_name?.trim(); if (!display_name) throw new Error('Display name required')
|
||||
await apiJson('/auth/api/admin/permissions', { method: 'POST', body: { id, display_name } })
|
||||
await loadPermissions(); dialog.value.data.display_name = ''; dialog.value.data.id = ''
|
||||
|
||||
// Close dialog immediately, then perform async operation
|
||||
closeDialog()
|
||||
apiJson('/auth/api/admin/permissions', { method: 'POST', body: { id, display_name } })
|
||||
.then(() => {
|
||||
authStore.showMessage(`Permission "${display_name}" created.`, 'success', 2500)
|
||||
loadPermissions()
|
||||
})
|
||||
.catch(e => {
|
||||
authStore.showMessage(e.message || 'Failed to create permission', 'error')
|
||||
})
|
||||
return // Don't call closeDialog() again
|
||||
} else if (t === 'confirm') {
|
||||
const action = dialog.value.data.action; if (action) await action()
|
||||
}
|
||||
@@ -483,7 +692,7 @@ async function submitDialog() {
|
||||
<section v-else-if="authenticated && (info?.is_global_admin || info?.is_org_admin)" class="view-root view-root--wide view-admin">
|
||||
<header class="view-header">
|
||||
<h1>{{ pageHeading }}</h1>
|
||||
<Breadcrumbs :entries="breadcrumbEntries" />
|
||||
<Breadcrumbs ref="breadcrumbsRef" :entries="breadcrumbEntries" @keydown="handleBreadcrumbKeydown" />
|
||||
</header>
|
||||
|
||||
<section class="section-block admin-section">
|
||||
@@ -492,9 +701,11 @@ async function submitDialog() {
|
||||
<div v-else class="admin-panels">
|
||||
<AdminOverview
|
||||
v-if="!selectedUser && !selectedOrg && (info.is_global_admin || info.is_org_admin)"
|
||||
ref="adminOverviewRef"
|
||||
:info="info"
|
||||
:orgs="orgs"
|
||||
:permissions="permissions"
|
||||
:navigation-disabled="hasActiveModal"
|
||||
:permission-summary="permissionSummary"
|
||||
@create-org="createOrg"
|
||||
@open-org="openOrg"
|
||||
@@ -504,15 +715,18 @@ async function submitDialog() {
|
||||
@open-dialog="openDialog"
|
||||
@delete-permission="deletePermission"
|
||||
@rename-permission-display="renamePermissionDisplay"
|
||||
@navigate-out="handlePanelNavigateOut"
|
||||
/>
|
||||
|
||||
<AdminUserDetail
|
||||
v-else-if="selectedUser"
|
||||
ref="adminUserDetailRef"
|
||||
:selected-user="selectedUser"
|
||||
:user-detail="userDetail"
|
||||
:selected-org="selectedOrg"
|
||||
:loading="loading"
|
||||
:show-reg-modal="showRegModal"
|
||||
:navigation-disabled="hasActiveModal"
|
||||
@generate-user-registration-link="generateUserRegistrationLink"
|
||||
@go-overview="goOverview"
|
||||
@open-org="openOrg"
|
||||
@@ -520,11 +734,14 @@ async function submitDialog() {
|
||||
@refresh-user-detail="refreshUserDetail"
|
||||
@edit-user-name="editUserName"
|
||||
@close-reg-modal="showRegModal = false"
|
||||
@navigate-out="handlePanelNavigateOut"
|
||||
/>
|
||||
<AdminOrgDetail
|
||||
v-else-if="selectedOrg"
|
||||
ref="adminOrgDetailRef"
|
||||
:selected-org="selectedOrg"
|
||||
:permissions="permissions"
|
||||
:navigation-disabled="hasActiveModal"
|
||||
@update-org="updateOrg"
|
||||
@create-role="createRole"
|
||||
@update-role="updateRole"
|
||||
@@ -533,6 +750,7 @@ async function submitDialog() {
|
||||
@open-user="openUser"
|
||||
@toggle-role-permission="toggleRolePermission"
|
||||
@on-role-drag-over="onRoleDragOver"
|
||||
@navigate-out="handlePanelNavigateOut"
|
||||
@on-role-drop="onRoleDrop"
|
||||
@on-user-drag-start="onUserDragStart"
|
||||
/>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="">
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
@@ -7,6 +7,6 @@
|
||||
</head>
|
||||
<body>
|
||||
<div id="admin-app"></div>
|
||||
<script type="module" src="./main.js"></script>
|
||||
<script type="module" src="/auth/admin/main.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -3,7 +3,9 @@ import '@/assets/style.css'
|
||||
import { createApp } from 'vue'
|
||||
import { createPinia } from 'pinia'
|
||||
import AdminApp from './AdminApp.vue'
|
||||
import { initKeyboardNavigation } from '@/utils/keynav'
|
||||
|
||||
const app = createApp(AdminApp)
|
||||
app.use(createPinia())
|
||||
app.mount('#admin-app')
|
||||
initKeyboardNavigation()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="">
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
@@ -7,6 +7,6 @@
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="main.js"></script>
|
||||
<script type="module" src="/auth/main.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -3,9 +3,11 @@ import '@/assets/style.css'
|
||||
import { createApp } from 'vue'
|
||||
import { createPinia } from 'pinia'
|
||||
import App from './App.vue'
|
||||
import { initKeyboardNavigation } from '@/utils/keynav'
|
||||
|
||||
const app = createApp(App)
|
||||
|
||||
app.use(createPinia())
|
||||
|
||||
app.mount('#app')
|
||||
initKeyboardNavigation()
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
<html style="background: transparent"><meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/auth/restricted/main.js"></script>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" style="background: transparent">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/auth/restricted/main.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import { createApp } from 'vue'
|
||||
import RestrictedApi from './RestrictedApi.vue'
|
||||
import '@/assets/style.css'
|
||||
import { initKeyboardNavigation } from '@/utils/keynav'
|
||||
|
||||
createApp(RestrictedApi).mount('#app')
|
||||
initKeyboardNavigation()
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import { createApp } from 'vue'
|
||||
import App from './RestrictedForward.vue'
|
||||
import '@/assets/style.css'
|
||||
import { initKeyboardNavigation } from '@/utils/keynav'
|
||||
|
||||
createApp(App).mount('#app')
|
||||
initKeyboardNavigation()
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import { createApp } from 'vue'
|
||||
import ResetApp from './ResetApp.vue'
|
||||
import '@/assets/style.css'
|
||||
import { initKeyboardNavigation } from '@/utils/keynav'
|
||||
|
||||
createApp(ResetApp).mount('#app')
|
||||
initKeyboardNavigation()
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<script setup>
|
||||
import { ref, watch, nextTick } from 'vue'
|
||||
import Modal from '@/components/Modal.vue'
|
||||
import NameEditForm from '@/components/NameEditForm.vue'
|
||||
|
||||
@@ -10,25 +9,7 @@ const props = defineProps({
|
||||
|
||||
const emit = defineEmits(['submitDialog', 'closeDialog'])
|
||||
|
||||
const nameInput = ref(null)
|
||||
const displayNameInput = ref(null)
|
||||
|
||||
const NAME_EDIT_TYPES = new Set(['org-update', 'role-update', 'user-update-name'])
|
||||
|
||||
watch(() => props.dialog.type, (newType) => {
|
||||
if (newType === 'org-create') {
|
||||
nextTick(() => {
|
||||
nameInput.value?.focus()
|
||||
})
|
||||
} else if (newType === 'perm-display' || newType === 'perm-create') {
|
||||
nextTick(() => {
|
||||
displayNameInput.value?.focus()
|
||||
if (newType === 'perm-display') {
|
||||
displayNameInput.value?.select()
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -92,7 +73,7 @@ watch(() => props.dialog.type, (newType) => {
|
||||
<input ref="displayNameInput" v-model="dialog.data.display_name" required />
|
||||
</label>
|
||||
<label>Permission ID
|
||||
<input v-model="dialog.data.id" :placeholder="dialog.type === 'perm-create' ? 'yourapp:login' : dialog.data.permission.id" required :pattern="PERMISSION_ID_PATTERN" title="Allowed: A-Za-z0-9:._~-" />
|
||||
<input v-model="dialog.data.id" :placeholder="dialog.type === 'perm-create' ? 'yourapp:permission' : dialog.data.permission.id" required :pattern="PERMISSION_ID_PATTERN" title="Allowed: A-Za-z0-9:._~-" data-form-type="other" />
|
||||
</label>
|
||||
<p class="small muted">The permission ID is used for permission checks in the application. Changing it may break deployed applications that reference this permission.</p>
|
||||
</template>
|
||||
@@ -125,4 +106,4 @@ watch(() => props.dialog.type, (newType) => {
|
||||
.error { color: var(--color-danger-text); }
|
||||
.small { font-size: 0.9rem; }
|
||||
.muted { color: var(--color-text-muted); }
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -1,12 +1,19 @@
|
||||
<script setup>
|
||||
import { computed } from 'vue'
|
||||
import { computed, ref } from 'vue'
|
||||
import { getDirection, navigateButtonRow, focusPreferred } from '@/utils/keynav'
|
||||
|
||||
const props = defineProps({
|
||||
selectedOrg: Object,
|
||||
permissions: Array
|
||||
permissions: Array,
|
||||
navigationDisabled: { type: Boolean, default: false }
|
||||
})
|
||||
|
||||
const emit = defineEmits(['updateOrg', 'createRole', 'updateRole', 'deleteRole', 'createUserInRole', 'openUser', 'toggleRolePermission', 'onRoleDragOver', 'onRoleDrop', 'onUserDragStart'])
|
||||
const emit = defineEmits(['updateOrg', 'createRole', 'updateRole', 'deleteRole', 'createUserInRole', 'openUser', 'toggleRolePermission', 'onRoleDragOver', 'onRoleDrop', 'onUserDragStart', 'navigateOut'])
|
||||
|
||||
// Template refs for navigation
|
||||
const orgTitleRef = ref(null)
|
||||
const permMatrixRef = ref(null)
|
||||
const rolesGridRef = ref(null)
|
||||
|
||||
const sortedRoles = computed(() => {
|
||||
return [...props.selectedOrg.roles].sort((a, b) => {
|
||||
@@ -26,15 +33,259 @@ function permissionDisplayName(id) {
|
||||
function toggleRolePermission(role, pid, checked) {
|
||||
emit('toggleRolePermission', role, pid, checked)
|
||||
}
|
||||
|
||||
// Handle org title header keynav
|
||||
function handleTitleKeydown(event) {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
navigateButtonRow(orgTitleRef.value, event.target, direction, { itemSelector: 'button' })
|
||||
} else if (direction === 'up') {
|
||||
emit('navigateOut', 'up')
|
||||
} else if (direction === 'down') {
|
||||
// Move to permission matrix
|
||||
const firstCheckbox = permMatrixRef.value?.querySelector('input[type="checkbox"]')
|
||||
if (firstCheckbox) {
|
||||
firstCheckbox.focus()
|
||||
} else {
|
||||
// No matrix, go to roles grid
|
||||
focusFirstRoleElement()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle permission matrix grid navigation
|
||||
function handleMatrixKeydown(event) {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
const target = event.target
|
||||
if (target.tagName !== 'INPUT') return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
const checkboxes = Array.from(permMatrixRef.value.querySelectorAll('input[type="checkbox"]'))
|
||||
const currentIndex = checkboxes.indexOf(target)
|
||||
if (currentIndex === -1) return
|
||||
|
||||
// Calculate grid dimensions
|
||||
const cols = sortedRoles.value.length
|
||||
const rows = props.selectedOrg.permissions.length
|
||||
|
||||
const currentRow = Math.floor(currentIndex / cols)
|
||||
const currentCol = currentIndex % cols
|
||||
|
||||
let newIndex = currentIndex
|
||||
if (direction === 'left' && currentCol > 0) {
|
||||
newIndex = currentIndex - 1
|
||||
} else if (direction === 'right' && currentCol < cols - 1) {
|
||||
newIndex = currentIndex + 1
|
||||
} else if (direction === 'up' && currentRow > 0) {
|
||||
newIndex = currentIndex - cols
|
||||
} else if (direction === 'down' && currentRow < rows - 1) {
|
||||
newIndex = currentIndex + cols
|
||||
} else if (direction === 'up' && currentRow === 0) {
|
||||
// Navigate up to title
|
||||
const titleButton = orgTitleRef.value?.querySelector('button')
|
||||
if (titleButton) titleButton.focus()
|
||||
return
|
||||
} else if (direction === 'down' && currentRow === rows - 1) {
|
||||
// Navigate down to roles grid
|
||||
focusFirstRoleElement()
|
||||
return
|
||||
}
|
||||
|
||||
if (newIndex !== currentIndex && checkboxes[newIndex]) {
|
||||
checkboxes[newIndex].focus()
|
||||
}
|
||||
}
|
||||
|
||||
// Handle navigation within user list
|
||||
function handleUserListKeydown(event) {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
const target = event.target
|
||||
if (!target.classList.contains('user-chip')) return
|
||||
|
||||
const list = target.closest('.user-list')
|
||||
if (!list) return
|
||||
|
||||
const items = Array.from(list.querySelectorAll('.user-chip'))
|
||||
const currentIndex = items.indexOf(target)
|
||||
if (currentIndex === -1) return
|
||||
|
||||
// For vertical navigation within the list
|
||||
if (direction === 'up' && currentIndex > 0) {
|
||||
event.preventDefault()
|
||||
items[currentIndex - 1].focus()
|
||||
return
|
||||
} else if (direction === 'down' && currentIndex < items.length - 1) {
|
||||
event.preventDefault()
|
||||
items[currentIndex + 1].focus()
|
||||
return
|
||||
}
|
||||
|
||||
// Handle boundary navigation
|
||||
if (direction === 'up' && currentIndex === 0) {
|
||||
event.preventDefault()
|
||||
// Go to role header buttons
|
||||
const roleColumn = list.closest('.role-column')
|
||||
const headerButton = roleColumn?.querySelector('.role-header button')
|
||||
if (headerButton) headerButton.focus()
|
||||
return
|
||||
}
|
||||
|
||||
if (direction === 'down' && currentIndex === items.length - 1) {
|
||||
// At bottom - nothing below
|
||||
return
|
||||
}
|
||||
|
||||
// Handle left/right to navigate between role columns
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
event.preventDefault()
|
||||
const roleColumns = Array.from(rolesGridRef.value?.querySelectorAll('.role-column') || [])
|
||||
const currentColumn = list.closest('.role-column')
|
||||
const colIndex = roleColumns.indexOf(currentColumn)
|
||||
|
||||
let targetColIndex = direction === 'left' ? colIndex - 1 : colIndex + 1
|
||||
if (targetColIndex >= 0 && targetColIndex < roleColumns.length) {
|
||||
const targetColumn = roleColumns[targetColIndex]
|
||||
const targetUsers = targetColumn.querySelectorAll('.user-chip')
|
||||
const targetIndex = Math.min(currentIndex, targetUsers.length - 1)
|
||||
if (targetUsers[targetIndex]) {
|
||||
targetUsers[targetIndex].focus()
|
||||
} else {
|
||||
// No users in target column, focus the add user button
|
||||
const addBtn = targetColumn.querySelector('.plus-btn')
|
||||
if (addBtn) addBtn.focus()
|
||||
}
|
||||
} else if (direction === 'left' && colIndex === 0) {
|
||||
// At leftmost column, go up to matrix
|
||||
const lastCheckbox = permMatrixRef.value?.querySelector('input[type="checkbox"]:last-of-type')
|
||||
if (lastCheckbox) lastCheckbox.focus()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle role header button navigation
|
||||
function handleRoleHeaderKeydown(event, roleIndex) {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
const roleColumns = Array.from(rolesGridRef.value?.querySelectorAll('.role-column') || [])
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
event.preventDefault()
|
||||
const buttons = event.currentTarget.querySelectorAll('button:not([disabled])')
|
||||
const btnIndex = Array.from(buttons).indexOf(event.target)
|
||||
|
||||
if (direction === 'left' && btnIndex > 0) {
|
||||
buttons[btnIndex - 1].focus()
|
||||
} else if (direction === 'right' && btnIndex < buttons.length - 1) {
|
||||
buttons[btnIndex + 1].focus()
|
||||
} else if (direction === 'left' && btnIndex === 0 && roleIndex > 0) {
|
||||
// Move to previous column's header
|
||||
const prevColumn = roleColumns[roleIndex - 1]
|
||||
const prevButtons = prevColumn?.querySelectorAll('.role-header button')
|
||||
if (prevButtons?.length) prevButtons[prevButtons.length - 1].focus()
|
||||
} else if (direction === 'right' && btnIndex === buttons.length - 1 && roleIndex < roleColumns.length - 1) {
|
||||
// Move to next column's header
|
||||
const nextColumn = roleColumns[roleIndex + 1]
|
||||
const nextButton = nextColumn?.querySelector('.role-header button')
|
||||
if (nextButton) nextButton.focus()
|
||||
}
|
||||
} else if (direction === 'up') {
|
||||
event.preventDefault()
|
||||
// Go to permission matrix
|
||||
const checkboxes = permMatrixRef.value?.querySelectorAll('input[type="checkbox"]')
|
||||
if (checkboxes?.length) {
|
||||
// Focus the checkbox in the corresponding column
|
||||
const cols = sortedRoles.value.length
|
||||
const rows = props.selectedOrg.permissions.length
|
||||
const targetIndex = (rows - 1) * cols + roleIndex
|
||||
if (checkboxes[targetIndex]) checkboxes[targetIndex].focus()
|
||||
else checkboxes[checkboxes.length - 1].focus()
|
||||
} else {
|
||||
const titleButton = orgTitleRef.value?.querySelector('button')
|
||||
if (titleButton) titleButton.focus()
|
||||
}
|
||||
} else if (direction === 'down') {
|
||||
event.preventDefault()
|
||||
// Go to first user in this column
|
||||
const roleColumn = roleColumns[roleIndex]
|
||||
const firstUser = roleColumn?.querySelector('.user-chip')
|
||||
if (firstUser) {
|
||||
firstUser.focus()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle empty role section keynav
|
||||
function handleEmptyRoleKeydown(event, roleIndex) {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
const roleColumns = Array.from(rolesGridRef.value?.querySelectorAll('.role-column') || [])
|
||||
|
||||
if (direction === 'up') {
|
||||
event.preventDefault()
|
||||
const roleColumn = roleColumns[roleIndex]
|
||||
const headerButton = roleColumn?.querySelector('.role-header button')
|
||||
if (headerButton) headerButton.focus()
|
||||
} else if (direction === 'left' && roleIndex > 0) {
|
||||
event.preventDefault()
|
||||
const prevColumn = roleColumns[roleIndex - 1]
|
||||
const prevEmpty = prevColumn?.querySelector('.empty-role button')
|
||||
const prevUser = prevColumn?.querySelector('.user-chip:last-child')
|
||||
if (prevEmpty) prevEmpty.focus()
|
||||
else if (prevUser) prevUser.focus()
|
||||
} else if (direction === 'right' && roleIndex < roleColumns.length - 1) {
|
||||
event.preventDefault()
|
||||
const nextColumn = roleColumns[roleIndex + 1]
|
||||
const nextEmpty = nextColumn?.querySelector('.empty-role button')
|
||||
const nextUser = nextColumn?.querySelector('.user-chip')
|
||||
if (nextEmpty) nextEmpty.focus()
|
||||
else if (nextUser) nextUser.focus()
|
||||
}
|
||||
}
|
||||
|
||||
// Helper to focus first element in roles grid
|
||||
function focusFirstRoleElement() {
|
||||
const firstRoleColumn = rolesGridRef.value?.querySelector('.role-column')
|
||||
const firstButton = firstRoleColumn?.querySelector('.role-header button')
|
||||
if (firstButton) firstButton.focus()
|
||||
}
|
||||
|
||||
// Focus helper for external navigation
|
||||
function focusFirstElement() {
|
||||
const titleButton = orgTitleRef.value?.querySelector('button')
|
||||
if (titleButton) titleButton.focus()
|
||||
}
|
||||
|
||||
defineExpose({ focusFirstElement })
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<h2 class="org-title" :title="selectedOrg.uuid">
|
||||
<h2 class="org-title" ref="orgTitleRef" @keydown="handleTitleKeydown" :title="selectedOrg.uuid">
|
||||
<span class="org-name">{{ selectedOrg.display_name }}</span>
|
||||
<button @click="$emit('updateOrg', selectedOrg)" class="icon-btn" aria-label="Rename organization" title="Rename organization">✏️</button>
|
||||
</h2>
|
||||
|
||||
<div class="matrix-wrapper">
|
||||
<div class="matrix-wrapper" ref="permMatrixRef" @keydown="handleMatrixKeydown">
|
||||
<div class="matrix-scroll">
|
||||
<div
|
||||
class="perm-matrix-grid"
|
||||
@@ -49,7 +300,7 @@ function toggleRolePermission(role, pid, checked) {
|
||||
>
|
||||
<span>{{ r.display_name }}</span>
|
||||
</div>
|
||||
<div class="grid-head role-head add-role-head" title="Add role" @click="$emit('createRole', selectedOrg)" role="button">➕</div>
|
||||
<div class="grid-head role-head add-role-head" title="Add role" @click="$emit('createRole', selectedOrg)" role="button" tabindex="0" @keydown.enter="$emit('createRole', selectedOrg)">➕</div>
|
||||
|
||||
<template v-for="pid in selectedOrg.permissions" :key="pid">
|
||||
<div class="perm-name" :title="pid">{{ permissionDisplayName(pid) }}</div>
|
||||
@@ -70,15 +321,15 @@ function toggleRolePermission(role, pid, checked) {
|
||||
</div>
|
||||
<p class="matrix-hint muted">Toggle which permissions each role grants.</p>
|
||||
</div>
|
||||
<div class="roles-grid">
|
||||
<div class="roles-grid" ref="rolesGridRef">
|
||||
<div
|
||||
v-for="r in sortedRoles"
|
||||
v-for="(r, roleIndex) in sortedRoles"
|
||||
:key="r.uuid"
|
||||
class="role-column"
|
||||
@dragover="$emit('onRoleDragOver', $event)"
|
||||
@drop="e => $emit('onRoleDrop', e, selectedOrg, r)"
|
||||
>
|
||||
<div class="role-header">
|
||||
<div class="role-header" @keydown="e => handleRoleHeaderKeydown(e, roleIndex)">
|
||||
<strong class="role-name" :title="r.uuid">
|
||||
<span>{{ r.display_name }}</span>
|
||||
<button @click="$emit('updateRole', r)" class="icon-btn" aria-label="Edit role" title="Edit role">✏️</button>
|
||||
@@ -88,7 +339,7 @@ function toggleRolePermission(role, pid, checked) {
|
||||
</div>
|
||||
</div>
|
||||
<template v-if="r.users.length > 0">
|
||||
<ul class="user-list">
|
||||
<ul class="user-list" @keydown="handleUserListKeydown">
|
||||
<li
|
||||
v-for="u in r.users.slice().sort((a, b) => {
|
||||
const nameA = a.display_name.toLowerCase()
|
||||
@@ -100,9 +351,11 @@ function toggleRolePermission(role, pid, checked) {
|
||||
})"
|
||||
:key="u.uuid"
|
||||
class="user-chip"
|
||||
tabindex="0"
|
||||
draggable="true"
|
||||
@dragstart="e => $emit('onUserDragStart', e, u, selectedOrg.uuid)"
|
||||
@click="$emit('openUser', u)"
|
||||
@keydown.enter="$emit('openUser', u)"
|
||||
:title="u.uuid"
|
||||
>
|
||||
<span class="name">{{ u.display_name }}</span>
|
||||
@@ -110,7 +363,7 @@ function toggleRolePermission(role, pid, checked) {
|
||||
</li>
|
||||
</ul>
|
||||
</template>
|
||||
<div v-else class="empty-role">
|
||||
<div v-else class="empty-role" @keydown="e => handleEmptyRoleKeydown(e, roleIndex)">
|
||||
<p class="empty-text muted">No members</p>
|
||||
<button @click="$emit('deleteRole', r)" class="icon-btn delete-icon" aria-label="Delete empty role" title="Delete role">❌</button>
|
||||
</div>
|
||||
@@ -144,6 +397,7 @@ function toggleRolePermission(role, pid, checked) {
|
||||
.plus-btn:hover { background: rgba(37, 99, 235, 0.18); }
|
||||
.user-list { list-style: none; padding: 0; margin: 0; display: flex; flex-direction: column; gap: var(--space-xs); }
|
||||
.user-chip { background: var(--color-surface); border: 1px solid var(--color-border); border-radius: var(--radius-md); padding: 0.45rem 0.6rem; display: flex; justify-content: space-between; gap: var(--space-sm); cursor: grab; }
|
||||
.user-chip:focus { outline: 2px solid var(--color-accent); outline-offset: 1px; }
|
||||
.user-chip .meta { font-size: 0.7rem; color: var(--color-text-muted); }
|
||||
.empty-role { border: 1px dashed var(--color-border-strong); border-radius: var(--radius-md); padding: var(--space-sm); display: flex; flex-direction: column; gap: var(--space-xs); align-items: flex-start; }
|
||||
.empty-text { margin: 0; }
|
||||
@@ -154,4 +408,4 @@ function toggleRolePermission(role, pid, checked) {
|
||||
@media (max-width: 720px) {
|
||||
.roles-grid { flex-direction: column; }
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -1,14 +1,24 @@
|
||||
<script setup>
|
||||
import { computed } from 'vue'
|
||||
import { computed, ref } from 'vue'
|
||||
import { getDirection, navigateButtonRow, focusPreferred, focusAtIndex } from '@/utils/keynav'
|
||||
|
||||
const props = defineProps({
|
||||
info: Object,
|
||||
orgs: Array,
|
||||
permissions: Array,
|
||||
permissionSummary: Object
|
||||
permissionSummary: Object,
|
||||
navigationDisabled: { type: Boolean, default: false }
|
||||
})
|
||||
|
||||
const emit = defineEmits(['createOrg', 'openOrg', 'updateOrg', 'deleteOrg', 'toggleOrgPermission', 'openDialog', 'deletePermission', 'renamePermissionDisplay'])
|
||||
const emit = defineEmits(['createOrg', 'openOrg', 'updateOrg', 'deleteOrg', 'toggleOrgPermission', 'openDialog', 'deletePermission', 'renamePermissionDisplay', 'navigateOut'])
|
||||
|
||||
// Template refs for navigation
|
||||
const orgSection = ref(null)
|
||||
const orgActionsRef = ref(null)
|
||||
const orgTableRef = ref(null)
|
||||
const permMatrixRef = ref(null)
|
||||
const permActionsRef = ref(null)
|
||||
const permTableRef = ref(null)
|
||||
|
||||
const sortedOrgs = computed(() => [...props.orgs].sort((a,b)=> {
|
||||
const nameCompare = a.display_name.localeCompare(b.display_name)
|
||||
@@ -27,15 +37,219 @@ function getRoleNames(org) {
|
||||
.map(r => r.display_name)
|
||||
.join(', ')
|
||||
}
|
||||
|
||||
// Table navigation for both org and permissions tables
|
||||
function handleTableKeydown(event, tableType) {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
const target = event.target
|
||||
const row = target.closest('tr')
|
||||
if (!row) return
|
||||
|
||||
const tbody = row.closest('tbody')
|
||||
if (!tbody) return
|
||||
|
||||
const rows = Array.from(tbody.querySelectorAll('tr'))
|
||||
const currentIndex = rows.indexOf(row)
|
||||
if (currentIndex === -1) return
|
||||
|
||||
// Handle left/right navigation within the row
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
event.preventDefault()
|
||||
const focusables = Array.from(row.querySelectorAll('a, button:not([disabled])'))
|
||||
const currentFocusIndex = focusables.indexOf(target)
|
||||
if (currentFocusIndex === -1) return
|
||||
|
||||
if (direction === 'left' && currentFocusIndex > 0) {
|
||||
focusables[currentFocusIndex - 1].focus()
|
||||
} else if (direction === 'right' && currentFocusIndex < focusables.length - 1) {
|
||||
focusables[currentFocusIndex + 1].focus()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Handle up/down navigation between rows
|
||||
let newIndex = currentIndex
|
||||
if (direction === 'up' && currentIndex > 0) {
|
||||
newIndex = currentIndex - 1
|
||||
} else if (direction === 'down' && currentIndex < rows.length - 1) {
|
||||
newIndex = currentIndex + 1
|
||||
} else if (direction === 'up' && currentIndex === 0) {
|
||||
// At top of table, navigate to actions above
|
||||
event.preventDefault()
|
||||
if (tableType === 'org') {
|
||||
focusPreferred(orgActionsRef.value, { itemSelector: 'button' })
|
||||
} else if (tableType === 'perm') {
|
||||
focusPreferred(permActionsRef.value, { itemSelector: 'button' })
|
||||
}
|
||||
return
|
||||
} else if (direction === 'down' && currentIndex === rows.length - 1) {
|
||||
// At bottom of org table, navigate to permissions section
|
||||
event.preventDefault()
|
||||
if (tableType === 'org' && props.info.is_global_admin) {
|
||||
// Navigate to permissions matrix or actions
|
||||
if (permMatrixRef.value) {
|
||||
const firstCheckbox = permMatrixRef.value.querySelector('input[type="checkbox"]')
|
||||
if (firstCheckbox) firstCheckbox.focus()
|
||||
else focusPreferred(permActionsRef.value, { itemSelector: 'button' })
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if (newIndex !== currentIndex) {
|
||||
event.preventDefault()
|
||||
const newRow = rows[newIndex]
|
||||
const focusable = newRow.querySelector('a, button:not([disabled])')
|
||||
if (focusable) focusable.focus()
|
||||
}
|
||||
}
|
||||
|
||||
// Handle org actions button keynav
|
||||
function handleOrgActionsKeydown(event) {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
navigateButtonRow(orgActionsRef.value, event.target, direction, { itemSelector: 'button' })
|
||||
} else if (direction === 'up') {
|
||||
emit('navigateOut', 'up')
|
||||
} else if (direction === 'down') {
|
||||
// Move to org table
|
||||
const firstFocusable = orgTableRef.value?.querySelector('tbody tr a, tbody tr button:not([disabled])')
|
||||
if (firstFocusable) firstFocusable.focus()
|
||||
}
|
||||
}
|
||||
|
||||
// Handle permission matrix grid navigation
|
||||
function handleMatrixKeydown(event) {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
const target = event.target
|
||||
if (target.tagName !== 'INPUT') return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
const checkboxes = Array.from(permMatrixRef.value.querySelectorAll('input[type="checkbox"]'))
|
||||
const currentIndex = checkboxes.indexOf(target)
|
||||
if (currentIndex === -1) return
|
||||
|
||||
// Calculate grid dimensions
|
||||
const cols = sortedOrgs.value.length
|
||||
const rows = sortedPermissions.value.length
|
||||
|
||||
if (cols === 0 || rows === 0) return
|
||||
|
||||
const currentRow = Math.floor(currentIndex / cols)
|
||||
const currentCol = currentIndex % cols
|
||||
|
||||
let newIndex = currentIndex
|
||||
if (direction === 'left') {
|
||||
if (currentCol > 0) {
|
||||
// Move left within the same row
|
||||
newIndex = currentIndex - 1
|
||||
}
|
||||
// At leftmost column, do nothing (no wrap)
|
||||
} else if (direction === 'right') {
|
||||
if (currentCol < cols - 1) {
|
||||
// Move right within the same row
|
||||
newIndex = currentIndex + 1
|
||||
}
|
||||
// At rightmost column, do nothing (no wrap)
|
||||
} else if (direction === 'up') {
|
||||
if (currentRow > 0) {
|
||||
// Move up within the same column
|
||||
newIndex = currentIndex - cols
|
||||
} else {
|
||||
// At top row, navigate up to org table
|
||||
const lastRow = orgTableRef.value?.querySelector('tbody tr:last-child')
|
||||
const focusable = lastRow?.querySelector('a, button:not([disabled])')
|
||||
if (focusable) focusable.focus()
|
||||
return
|
||||
}
|
||||
} else if (direction === 'down') {
|
||||
if (currentRow < rows - 1) {
|
||||
// Move down within the same column
|
||||
newIndex = currentIndex + cols
|
||||
} else {
|
||||
// At bottom row, navigate down to permission actions
|
||||
focusPreferred(permActionsRef.value, { itemSelector: 'button' })
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if (newIndex !== currentIndex && checkboxes[newIndex]) {
|
||||
checkboxes[newIndex].focus()
|
||||
}
|
||||
}
|
||||
|
||||
// Handle permission actions button keynav
|
||||
function handlePermActionsKeydown(event) {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
navigateButtonRow(permActionsRef.value, event.target, direction, { itemSelector: 'button' })
|
||||
} else if (direction === 'up') {
|
||||
// Move to first column of last row in matrix
|
||||
const checkboxes = permMatrixRef.value?.querySelectorAll('input[type="checkbox"]')
|
||||
if (checkboxes?.length) {
|
||||
const cols = sortedOrgs.value.length
|
||||
const rows = sortedPermissions.value.length
|
||||
// First checkbox of last row = (rows - 1) * cols
|
||||
const lastRowFirstIndex = (rows - 1) * cols
|
||||
if (checkboxes[lastRowFirstIndex]) {
|
||||
checkboxes[lastRowFirstIndex].focus()
|
||||
} else {
|
||||
checkboxes[0].focus()
|
||||
}
|
||||
} else {
|
||||
// No matrix, go to org table
|
||||
const lastRow = orgTableRef.value?.querySelector('tbody tr:last-child')
|
||||
const focusable = lastRow?.querySelector('a, button:not([disabled])')
|
||||
if (focusable) focusable.focus()
|
||||
}
|
||||
} else if (direction === 'down') {
|
||||
// Move to permissions table
|
||||
const firstFocusable = permTableRef.value?.querySelector('tbody tr button:not([disabled])')
|
||||
if (firstFocusable) firstFocusable.focus()
|
||||
}
|
||||
}
|
||||
|
||||
// Focus helper for external navigation
|
||||
function focusFirstElement() {
|
||||
if (props.info.is_global_admin) {
|
||||
focusPreferred(orgActionsRef.value, { itemSelector: 'button' })
|
||||
} else {
|
||||
const firstFocusable = orgTableRef.value?.querySelector('tbody tr a, tbody tr button:not([disabled])')
|
||||
if (firstFocusable) firstFocusable.focus()
|
||||
}
|
||||
}
|
||||
|
||||
defineExpose({ focusFirstElement })
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="permissions-section">
|
||||
<div class="permissions-section" ref="orgSection">
|
||||
<h2>{{ info.is_global_admin ? 'Organizations' : 'Your Organizations' }}</h2>
|
||||
<div class="actions">
|
||||
<div class="actions" ref="orgActionsRef" @keydown="handleOrgActionsKeydown">
|
||||
<button v-if="info.is_global_admin" @click="$emit('createOrg')">+ Create Org</button>
|
||||
</div>
|
||||
<table class="org-table">
|
||||
<table class="org-table" ref="orgTableRef" @keydown="e => handleTableKeydown(e, 'org')">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
@@ -62,7 +276,7 @@ function getRoleNames(org) {
|
||||
|
||||
<div v-if="info.is_global_admin" class="permissions-section">
|
||||
<h2>Permissions</h2>
|
||||
<div class="matrix-wrapper">
|
||||
<div class="matrix-wrapper" ref="permMatrixRef" @keydown="handleMatrixKeydown">
|
||||
<div class="matrix-scroll">
|
||||
<div
|
||||
class="perm-matrix-grid"
|
||||
@@ -98,10 +312,10 @@ function getRoleNames(org) {
|
||||
</div>
|
||||
<p class="matrix-hint muted">Toggle which permissions each organization can grant to its members.</p>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<div class="actions" ref="permActionsRef" @keydown="handlePermActionsKeydown">
|
||||
<button v-if="info.is_global_admin" @click="$emit('openDialog', 'perm-create', { display_name: '', id: '' })">+ Create Permission</button>
|
||||
</div>
|
||||
<table class="org-table">
|
||||
<table class="org-table" ref="permTableRef" @keydown="e => handleTableKeydown(e, 'perm')">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Permission</th>
|
||||
@@ -162,4 +376,4 @@ function getRoleNames(org) {
|
||||
.perm-actions { text-align: center; }
|
||||
.center { text-align: center; }
|
||||
.muted { color: var(--color-text-muted); }
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -1,29 +1,42 @@
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { ref, computed } from 'vue'
|
||||
import UserBasicInfo from '@/components/UserBasicInfo.vue'
|
||||
import CredentialList from '@/components/CredentialList.vue'
|
||||
import RegistrationLinkModal from '@/components/RegistrationLinkModal.vue'
|
||||
import SessionList from '@/components/SessionList.vue'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import { apiJson } from '@/utils/api'
|
||||
import { getDirection, navigateButtonRow, focusPreferred, focusAtIndex } from '@/utils/keynav'
|
||||
|
||||
const props = defineProps({
|
||||
selectedUser: Object,
|
||||
userDetail: Object,
|
||||
selectedOrg: Object,
|
||||
loading: Boolean,
|
||||
showRegModal: Boolean
|
||||
showRegModal: Boolean,
|
||||
navigationDisabled: { type: Boolean, default: false }
|
||||
})
|
||||
|
||||
const emit = defineEmits(['generateUserRegistrationLink', 'goOverview', 'openOrg', 'onUserNameSaved', 'closeRegModal', 'editUserName', 'refreshUserDetail'])
|
||||
const emit = defineEmits(['generateUserRegistrationLink', 'goOverview', 'openOrg', 'onUserNameSaved', 'closeRegModal', 'editUserName', 'refreshUserDetail', 'navigateOut'])
|
||||
|
||||
const authStore = useAuthStore()
|
||||
const terminatingSessions = ref({})
|
||||
const hoveredCredentialUuid = ref(null)
|
||||
const hoveredSession = ref(null)
|
||||
|
||||
// Template refs for navigation
|
||||
const userInfoRef = ref(null)
|
||||
const regActionsRef = ref(null)
|
||||
const credentialListRef = ref(null)
|
||||
const sessionListRef = ref(null)
|
||||
const backButtonRef = ref(null)
|
||||
|
||||
// Check if any modal/dialog is open (blocks arrow key navigation)
|
||||
const hasActiveModal = computed(() => props.showRegModal)
|
||||
|
||||
function onLinkCopied() {
|
||||
authStore.showMessage('Link copied to clipboard!')
|
||||
authStore.showMessage(`📋 Link copied! Send it to ${props.selectedUser.display_name}.`)
|
||||
emit('closeRegModal')
|
||||
}
|
||||
|
||||
function handleEditName() {
|
||||
@@ -70,26 +83,114 @@ async function handleTerminateSession(session) {
|
||||
}
|
||||
}
|
||||
|
||||
// Handle user info section keynav
|
||||
function handleUserInfoKeydown(event) {
|
||||
if (hasActiveModal.value || props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
navigateButtonRow(userInfoRef.value, event.target, direction, { itemSelector: '.mini-btn' })
|
||||
} else if (direction === 'up') {
|
||||
emit('navigateOut', 'up')
|
||||
} else if (direction === 'down') {
|
||||
// Move to registration actions
|
||||
focusPreferred(regActionsRef.value, { itemSelector: 'button' })
|
||||
}
|
||||
}
|
||||
|
||||
// Handle registration actions keynav
|
||||
function handleRegActionsKeydown(event) {
|
||||
if (hasActiveModal.value || props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
navigateButtonRow(regActionsRef.value, event.target, direction, { itemSelector: 'button' })
|
||||
} else if (direction === 'up') {
|
||||
// Move to user info edit button
|
||||
focusPreferred(userInfoRef.value, { itemSelector: '.mini-btn' })
|
||||
} else if (direction === 'down') {
|
||||
// Move to credential list
|
||||
credentialListRef.value?.$el?.focus()
|
||||
}
|
||||
}
|
||||
|
||||
// Handle credential list navigate out
|
||||
function handleCredentialNavigateOut(direction) {
|
||||
if (hasActiveModal.value || props.navigationDisabled) return
|
||||
|
||||
if (direction === 'up') {
|
||||
focusPreferred(regActionsRef.value, { itemSelector: 'button' })
|
||||
} else if (direction === 'down') {
|
||||
// Move to session list
|
||||
focusAtIndex(sessionListRef.value?.$el, 0, { itemSelector: '.session-group' })
|
||||
}
|
||||
}
|
||||
|
||||
// Handle session list navigate out
|
||||
function handleSessionNavigateOut(direction) {
|
||||
if (hasActiveModal.value || props.navigationDisabled) return
|
||||
|
||||
if (direction === 'up') {
|
||||
// Move to credential list
|
||||
credentialListRef.value?.$el?.focus()
|
||||
} else if (direction === 'down') {
|
||||
// Move to back button
|
||||
const backBtn = backButtonRef.value?.querySelector('button')
|
||||
if (backBtn) backBtn.focus()
|
||||
}
|
||||
}
|
||||
|
||||
// Handle back button keynav
|
||||
function handleBackButtonKeydown(event) {
|
||||
if (hasActiveModal.value || props.navigationDisabled) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
if (direction === 'up') {
|
||||
// Move to session list
|
||||
focusAtIndex(sessionListRef.value?.$el, -1, { itemSelector: '.session-group' })
|
||||
}
|
||||
}
|
||||
|
||||
// Focus helper for external navigation
|
||||
function focusFirstElement() {
|
||||
focusPreferred(userInfoRef.value, { itemSelector: '.mini-btn' })
|
||||
}
|
||||
|
||||
defineExpose({ focusFirstElement })
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="user-detail">
|
||||
<UserBasicInfo
|
||||
v-if="userDetail && !userDetail.error"
|
||||
:name="userDetail.display_name || selectedUser.display_name"
|
||||
:visits="userDetail.visits"
|
||||
:created-at="userDetail.created_at"
|
||||
:last-seen="userDetail.last_seen"
|
||||
:loading="loading"
|
||||
:org-display-name="userDetail.org.display_name"
|
||||
:role-name="userDetail.role"
|
||||
:update-endpoint="`/auth/api/admin/orgs/${selectedUser.org_uuid}/users/${selectedUser.uuid}/display-name`"
|
||||
@saved="$emit('onUserNameSaved')"
|
||||
@edit-name="handleEditName"
|
||||
/>
|
||||
<div v-else-if="userDetail?.error" class="error small">{{ userDetail.error }}</div>
|
||||
<div ref="userInfoRef" @keydown="handleUserInfoKeydown">
|
||||
<UserBasicInfo
|
||||
v-if="userDetail && !userDetail.error"
|
||||
:name="userDetail.display_name || selectedUser.display_name"
|
||||
:visits="userDetail.visits"
|
||||
:created-at="userDetail.created_at"
|
||||
:last-seen="userDetail.last_seen"
|
||||
:loading="loading"
|
||||
:org-display-name="userDetail.org.display_name"
|
||||
:role-name="userDetail.role"
|
||||
:update-endpoint="`/auth/api/admin/orgs/${selectedUser.org_uuid}/users/${selectedUser.uuid}/display-name`"
|
||||
@saved="$emit('onUserNameSaved')"
|
||||
@edit-name="handleEditName"
|
||||
/>
|
||||
</div>
|
||||
<div v-if="userDetail?.error" class="error small">{{ userDetail.error }}</div>
|
||||
<template v-if="userDetail && !userDetail.error">
|
||||
<div class="registration-actions">
|
||||
<div class="registration-actions" ref="regActionsRef" @keydown="handleRegActionsKeydown">
|
||||
<button
|
||||
class="btn-secondary reg-token-btn"
|
||||
@click="$emit('generateUserRegistrationLink', selectedUser)"
|
||||
@@ -106,27 +207,33 @@ async function handleTerminateSession(session) {
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<CredentialList
|
||||
ref="credentialListRef"
|
||||
:credentials="userDetail.credentials"
|
||||
:aaguid-info="userDetail.aaguid_info"
|
||||
:allow-delete="true"
|
||||
:hovered-credential-uuid="hoveredCredentialUuid"
|
||||
:hovered-session-credential-uuid="hoveredSession?.credential_uuid"
|
||||
:navigation-disabled="hasActiveModal"
|
||||
@delete="handleDelete"
|
||||
@credential-hover="hoveredCredentialUuid = $event"
|
||||
@navigate-out="handleCredentialNavigateOut"
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
<SessionList
|
||||
ref="sessionListRef"
|
||||
:sessions="userDetail.sessions || []"
|
||||
:terminating-sessions="terminatingSessions"
|
||||
:hovered-credential-uuid="hoveredCredentialUuid"
|
||||
:navigation-disabled="hasActiveModal"
|
||||
:empty-message="'This user has no active sessions.'"
|
||||
:section-description="'View and manage the active sessions for this user.'"
|
||||
@terminate="handleTerminateSession"
|
||||
@session-hover="hoveredSession = $event"
|
||||
@navigate-out="handleSessionNavigateOut"
|
||||
/>
|
||||
</template>
|
||||
<div class="actions ancillary-actions">
|
||||
<div class="actions ancillary-actions" ref="backButtonRef" @keydown="handleBackButtonKeydown">
|
||||
<button v-if="selectedOrg" @click="$emit('openOrg', selectedOrg)" class="icon-btn" title="Back to Org">↩️</button>
|
||||
</div>
|
||||
<RegistrationLinkModal
|
||||
|
||||
+167
-115
@@ -2,27 +2,27 @@
|
||||
:root {
|
||||
--font-sans: "Inter", "Inter var", "Segoe UI", system-ui, -apple-system, "Helvetica Neue", sans-serif;
|
||||
--font-mono: "DM Mono", "JetBrains Mono", "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", monospace;
|
||||
--color-canvas: #f5f6f8;
|
||||
--color-surface: #ffffff;
|
||||
--color-surface-subtle: #f1f3f7;
|
||||
--color-border: #d0d5dd;
|
||||
--color-border-strong: #9aa2af;
|
||||
--color-heading: #101828;
|
||||
--color-text: #1f2933;
|
||||
--color-text-muted: #52616b;
|
||||
--color-link: #2563eb;
|
||||
--color-link-hover: #1d4ed8;
|
||||
--color-canvas: #ffffff;
|
||||
--color-surface: #eff6ff;
|
||||
--color-surface-subtle: #dbeafe;
|
||||
--color-border: #2563eb;
|
||||
--color-border-strong: #1e40af;
|
||||
--color-heading: #1e3a8a;
|
||||
--color-text: #1e293b;
|
||||
--color-text-muted: #475569;
|
||||
--color-link: #1d4ed8;
|
||||
--color-link-hover: #1e40af;
|
||||
--color-accent: #2563eb;
|
||||
--color-accent-strong: #1e3faa;
|
||||
--color-accent-strong: #1e40af;
|
||||
--color-accent-contrast: #ffffff;
|
||||
--color-success-text: #0f5132;
|
||||
--color-success-bg: #d1fadf;
|
||||
--color-error-text: #b42318;
|
||||
--color-error-bg: #ffe3e3;
|
||||
--color-info-text: #0f609b;
|
||||
--color-info-bg: #d6ecff;
|
||||
--color-success-text: #166534;
|
||||
--color-success-bg: #dcfce7;
|
||||
--color-error-text: #b91c1c;
|
||||
--color-error-bg: #fee2e2;
|
||||
--color-info-text: #1e40af;
|
||||
--color-info-bg: #dbeafe;
|
||||
--color-danger: #dc2626;
|
||||
--shadow-soft: 0 10px 30px rgba(15, 23, 42, 0.08);
|
||||
--shadow-soft: 0 10px 30px rgba(30, 64, 175, 0.15);
|
||||
--radius-none: 0;
|
||||
--radius-sm: 4px;
|
||||
--radius-md: 6px;
|
||||
@@ -34,9 +34,9 @@
|
||||
--space-lg: 1.5rem;
|
||||
--space-xl: 2.25rem;
|
||||
--space-xxl: 3.5rem;
|
||||
--layout-max-width: 1400px;
|
||||
--layout-padding: clamp(1.5rem, 3vw + 1rem, 3.25rem);
|
||||
--transition-base: 160ms ease;
|
||||
--focus-ring: 0 0 0 2px var(--color-accent);
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
@@ -46,7 +46,7 @@
|
||||
--color-surface-subtle: #1b243b;
|
||||
--color-border: #25304a;
|
||||
--color-border-strong: #3d4d6b;
|
||||
--color-heading: #f8fafc;
|
||||
--color-heading: #fff;
|
||||
--color-text: #e2e8f0;
|
||||
--color-text-muted: #94a3b8;
|
||||
--color-link: #60a5fa;
|
||||
@@ -72,11 +72,15 @@
|
||||
}
|
||||
|
||||
html {
|
||||
overflow: clip;
|
||||
height: 100%;
|
||||
background: var(--color-canvas);
|
||||
}
|
||||
|
||||
body {
|
||||
color-scheme: light dark;
|
||||
overflow: auto;
|
||||
scrollbar-gutter: stable;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
font-family: var(--font-sans);
|
||||
@@ -84,6 +88,10 @@ body {
|
||||
color: var(--color-text);
|
||||
line-height: 1.55;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
text-align: justify;
|
||||
hyphens: auto;
|
||||
-webkit-hyphens: auto;
|
||||
-moz-hyphens: auto;
|
||||
}
|
||||
|
||||
body,
|
||||
@@ -108,13 +116,6 @@ a:visited {
|
||||
a:hover,
|
||||
a:focus-visible {
|
||||
color: var(--color-link-hover);
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
a:focus-visible {
|
||||
outline: 2px solid var(--color-accent);
|
||||
outline-offset: 2px;
|
||||
border-radius: var(--radius-sm);
|
||||
}
|
||||
|
||||
.app-shell {
|
||||
@@ -139,7 +140,6 @@ a:focus-visible {
|
||||
padding: var(--layout-padding);
|
||||
box-sizing: border-box;
|
||||
margin: 0 auto;
|
||||
width: min(100%, var(--layout-max-width));
|
||||
}
|
||||
|
||||
.view-root--wide {
|
||||
@@ -187,13 +187,22 @@ a:focus-visible {
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.section-description {
|
||||
margin: 0;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
.button-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
flex-wrap: nowrap;
|
||||
gap: 0.75rem;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
.button-row button {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.surface {
|
||||
background: var(--color-surface);
|
||||
border: 1px solid var(--color-border);
|
||||
@@ -214,7 +223,6 @@ button {
|
||||
border: 1px solid transparent;
|
||||
padding: 0.65rem 1.1rem;
|
||||
cursor: pointer;
|
||||
transition: all var(--transition-base);
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@@ -223,11 +231,6 @@ button {
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
button:focus-visible {
|
||||
outline: 2px solid var(--color-accent);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
|
||||
button:disabled {
|
||||
cursor: not-allowed;
|
||||
filter: opacity(0.6);
|
||||
@@ -266,6 +269,13 @@ button:disabled {
|
||||
filter: brightness(0.92);
|
||||
}
|
||||
|
||||
/* Focus-visible outlines for buttons */
|
||||
.btn-primary:focus-visible,
|
||||
.btn-secondary:focus-visible,
|
||||
.btn-danger:focus-visible {
|
||||
outline: 1px solid var(-webkit-focus-ring-color);
|
||||
}
|
||||
|
||||
input[type="text"],
|
||||
input[type="search"],
|
||||
input[type="email"],
|
||||
@@ -281,14 +291,6 @@ select {
|
||||
transition: border-color var(--transition-base), box-shadow var(--transition-base);
|
||||
}
|
||||
|
||||
input:focus-visible,
|
||||
textarea:focus-visible,
|
||||
select:focus-visible {
|
||||
border-color: var(--color-accent);
|
||||
box-shadow: 0 0 0 3px #c7d2fe;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
label {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -348,10 +350,13 @@ th {
|
||||
.global-status {
|
||||
position: fixed;
|
||||
top: 1.5rem;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
left: 0;
|
||||
right: 0;
|
||||
margin: 0 auto;
|
||||
z-index: 1200;
|
||||
min-width: min(520px, calc(100vw - 2rem));
|
||||
width: fit-content;
|
||||
min-width: min(520px, calc(100% - 2rem));
|
||||
max-width: calc(100% - 2rem);
|
||||
display: none;
|
||||
}
|
||||
|
||||
@@ -388,10 +393,11 @@ th {
|
||||
|
||||
.dialog-overlay {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
background: transparent;
|
||||
backdrop-filter: blur(.1rem) brightness(0.7);
|
||||
-webkit-backdrop-filter: blur(.1rem) brightness(0.7);
|
||||
z-index: 1100;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -437,7 +443,7 @@ th {
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
:root { --card-width: 22rem; }
|
||||
:root { --card-width: 16rem; }
|
||||
|
||||
.record-list,
|
||||
.credential-list,
|
||||
@@ -447,9 +453,10 @@ th {
|
||||
grid-auto-flow: row;
|
||||
grid-template-columns: repeat(auto-fill, minmax(var(--card-width), 1fr));
|
||||
justify-content: start;
|
||||
gap: 1rem 1.25rem;
|
||||
gap: 0.5rem;
|
||||
align-items: stretch;
|
||||
margin: 0 auto;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
@media (max-width: 720px) {
|
||||
@@ -461,9 +468,7 @@ th {
|
||||
.session-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.75rem;
|
||||
padding: 1rem;
|
||||
border: 1px solid var(--color-border);
|
||||
padding: 0.5rem;
|
||||
border-radius: var(--radius-md);
|
||||
background: var(--color-surface);
|
||||
height: 100%;
|
||||
@@ -484,15 +489,20 @@ th {
|
||||
.credential-item.current-session,
|
||||
.credential-item.is-hovered,
|
||||
.session-item.is-current,
|
||||
.session-item.is-hovered { border-color: var(--color-accent); }
|
||||
.session-item.is-hovered { border-color: var(--color-accent); background-color: var(--color-surface-subtle); }
|
||||
|
||||
.credential-item.is-linked-session,
|
||||
.session-item.is-linked-credential { border-color: var(--color-accent); background-color: var(--color-surface-subtle); }
|
||||
|
||||
.credential-item:focus,
|
||||
.session-item:focus {
|
||||
outline: 1px solid var(-webkit-focus-ring-color);
|
||||
}
|
||||
|
||||
.item-top {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
height: 2.5rem;
|
||||
}
|
||||
|
||||
.item-icon {
|
||||
@@ -500,9 +510,6 @@ th {
|
||||
height: 40px;
|
||||
display: grid;
|
||||
place-items: center;
|
||||
background: var(--color-surface-subtle, transparent);
|
||||
border-radius: var(--radius-sm);
|
||||
border: 1px solid var(--color-border);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
@@ -510,18 +517,22 @@ th {
|
||||
border-radius: var(--radius-sm);
|
||||
}
|
||||
|
||||
.icon { flex: 0 0 auto; font-size: 1.5em; width: 40px; }
|
||||
|
||||
.item-title {
|
||||
flex: 1;
|
||||
margin: 0;
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
color: var(--color-heading);
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.item-actions {
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@@ -529,39 +540,30 @@ th {
|
||||
.item-actions .badge + .badge { margin-left: 0.25rem; }
|
||||
|
||||
.item-details {
|
||||
margin-left: calc(40px + 1rem);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.credential-dates {
|
||||
display: grid;
|
||||
grid-auto-flow: row;
|
||||
grid-template-columns: 7rem 1fr;
|
||||
gap: 0.35rem 0.5rem;
|
||||
font-size: 0.75rem;
|
||||
color: var(--color-text-muted);
|
||||
align-items: center;
|
||||
margin-left: 40px;
|
||||
}
|
||||
|
||||
.credential-dates,
|
||||
.session-dates {
|
||||
display: grid;
|
||||
grid-auto-flow: row;
|
||||
grid-template-columns: 7rem 1fr;
|
||||
gap: 0.35rem 0.5rem;
|
||||
grid-template-columns: 8em 1fr;
|
||||
font-size: 0.75rem;
|
||||
color: var(--color-text-muted);
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.date-label {
|
||||
font-weight: 500;
|
||||
color: inherit;
|
||||
color: var(--color-text-muted);
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.date-value {
|
||||
color: var(--color-text);
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.btn-card-delete { background: transparent; border: none; color: var(--color-danger); padding: 0.35rem 0.5rem; font-size: 1.05rem; line-height: 1; border-radius: var(--radius-sm); cursor: pointer; display: inline-flex; align-items: center; justify-content: center; }
|
||||
@@ -572,12 +574,43 @@ th {
|
||||
.session-emoji {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
.session-group {
|
||||
position: relative;
|
||||
}
|
||||
.session-group:focus-visible {
|
||||
outline: 1px solid var(-webkit-focus-ring-color);
|
||||
}
|
||||
.session-group-host {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: 1.5rem;
|
||||
font-weight: 600;
|
||||
margin: 0.5rem 0;
|
||||
}
|
||||
.session-group-icon {
|
||||
margin-left: -1.5rem;
|
||||
}
|
||||
.session-group-host a {
|
||||
color: var(--color-text);
|
||||
text-decoration: none;
|
||||
}
|
||||
.session-group:focus-visible .session-group-host,
|
||||
.session-group:focus-visible .session-group-host a {
|
||||
color: var(--color-heading);
|
||||
}
|
||||
.btn-card-delete {
|
||||
display: none;
|
||||
}
|
||||
.session-item:focus .btn-card-delete {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.badge {
|
||||
padding: 0.2rem 0.5rem;
|
||||
border-radius: var(--radius-sm);
|
||||
font-size: 0.8rem;
|
||||
font-weight: 500;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.badge-current {
|
||||
@@ -610,28 +643,18 @@ th {
|
||||
}
|
||||
|
||||
.user-info {
|
||||
background: var(--color-surface);
|
||||
border: 1px solid var(--color-border);
|
||||
border-radius: var(--radius-sm);
|
||||
padding: 1.1rem 1.25rem;
|
||||
display: grid;
|
||||
grid-template-columns: auto 1fr;
|
||||
gap: 0.75rem 1.25rem;
|
||||
border-radius: var(--radius-md);
|
||||
background: var(--color-surface);
|
||||
padding: 1.1rem 1.25rem;
|
||||
}
|
||||
|
||||
.user-info h3 {
|
||||
margin: 0;
|
||||
grid-column: span 2;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
font-size: 1.15rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.user-info span {
|
||||
text-align: left;
|
||||
color: var(--color-text);
|
||||
.user-details {
|
||||
display: grid;
|
||||
grid-template-columns: 7em 1fr;
|
||||
gap: 0 0.5rem;
|
||||
padding-left: 40px;
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
|
||||
.toggle-link {
|
||||
@@ -653,25 +676,13 @@ th {
|
||||
gap: 1.75rem;
|
||||
}
|
||||
|
||||
.credential-dates {
|
||||
grid-auto-flow: row;
|
||||
grid-template-columns: auto auto;
|
||||
}
|
||||
|
||||
.global-status {
|
||||
top: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
/* Mobile portrait (touch) or very narrow screens: stack buttons */
|
||||
/* Mobile portrait (touch) or very narrow screens */
|
||||
@media (max-width: 500px) and (orientation: portrait) and (pointer: coarse), (max-width: 350px) {
|
||||
button {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.button-row {
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
.dialog-backdrop {
|
||||
@@ -720,9 +731,28 @@ th {
|
||||
}
|
||||
}
|
||||
|
||||
/* Auth iframe overlay styles */
|
||||
body:has(#auth-iframe) {
|
||||
overflow: hidden;
|
||||
/* Global backdrop controlled by api.js ref-counting */
|
||||
body::before {
|
||||
content: '';
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 1099;
|
||||
background: transparent;
|
||||
backdrop-filter: blur(0) brightness(1);
|
||||
-webkit-backdrop-filter: blur(0) brightness(1);
|
||||
pointer-events: none;
|
||||
visibility: hidden;
|
||||
transition: all 0.2s ease-out;
|
||||
}
|
||||
|
||||
body.has-backdrop::before {
|
||||
-webkit-backdrop-filter: blur(.2rem) brightness(0.5);
|
||||
backdrop-filter: blur(.2rem) brightness(0.5);
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
body.has-backdrop {
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
#auth-iframe {
|
||||
@@ -735,6 +765,28 @@ body:has(#auth-iframe) {
|
||||
z-index: 9999;
|
||||
color-scheme: auto;
|
||||
background: transparent;
|
||||
backdrop-filter: blur(.1rem) brightness(0.7);
|
||||
-webkit-backdrop-filter: blur(.1rem) brightness(0.7);
|
||||
}
|
||||
|
||||
.slot-machine {
|
||||
padding: 0.875rem 1rem;
|
||||
background: var(--color-surface-hover, rgba(0, 0, 0, 0.03));
|
||||
border: 1px solid var(--color-border);
|
||||
border-radius: var(--radius-sm);
|
||||
font-family: 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
user-select: none;
|
||||
pointer-events: none;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.slot-reel {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
height: 1.8em;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script setup>
|
||||
import { computed } from 'vue'
|
||||
import { computed, ref, onMounted, watch } from 'vue'
|
||||
import { getDirection, navigateButtonRow } from '@/utils/keynav'
|
||||
|
||||
// Props:
|
||||
// entries: Array<{ label:string, href:string }>
|
||||
@@ -11,17 +12,78 @@ const props = defineProps({
|
||||
homeHref: { type: String, default: '/' }
|
||||
})
|
||||
|
||||
const navRef = ref(null)
|
||||
|
||||
const crumbs = computed(() => {
|
||||
const base = props.showHome ? [{ label: '🏠', href: props.homeHref }] : []
|
||||
return [...base, ...props.entries]
|
||||
if (props.showHome && props.entries.length > 0 && props.entries[0].href === props.homeHref) {
|
||||
// Combine home and first entry if they have the same href
|
||||
const combined = { label: '🏠 ' + props.entries[0].label, href: props.homeHref }
|
||||
return [combined, ...props.entries.slice(1)]
|
||||
} else {
|
||||
const base = props.showHome ? [{ label: '🏠', href: props.homeHref }] : []
|
||||
return [...base, ...props.entries]
|
||||
}
|
||||
})
|
||||
|
||||
// Find the index of the crumb matching current location
|
||||
const currentIndex = computed(() => {
|
||||
const currentHref = window.location.hash || window.location.pathname
|
||||
for (let i = crumbs.value.length - 1; i >= 0; i--) {
|
||||
const href = crumbs.value[i].href
|
||||
if (href === currentHref || (href && currentHref.startsWith(href))) {
|
||||
return i
|
||||
}
|
||||
}
|
||||
return crumbs.value.length - 1 // Default to last crumb
|
||||
})
|
||||
|
||||
function handleFocusIn(event) {
|
||||
// When the nav receives focus, focus the current page's crumb
|
||||
if (event.target === navRef.value) {
|
||||
const links = navRef.value.querySelectorAll('a')
|
||||
const targetIndex = Math.min(currentIndex.value, links.length - 1)
|
||||
if (links[targetIndex]) {
|
||||
links[targetIndex].focus()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function handleKeydown(event) {
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
event.preventDefault()
|
||||
navigateButtonRow(navRef.value, event.target, direction, { itemSelector: 'a' })
|
||||
}
|
||||
// Up/down are handled by parent component
|
||||
}
|
||||
|
||||
// Expose method to focus the current crumb from parent
|
||||
function focusCurrent() {
|
||||
const links = navRef.value?.querySelectorAll('a')
|
||||
if (links?.length) {
|
||||
const targetIndex = Math.min(currentIndex.value, links.length - 1)
|
||||
links[targetIndex]?.focus()
|
||||
}
|
||||
}
|
||||
|
||||
defineExpose({ focusCurrent })
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<nav class="breadcrumbs" aria-label="Breadcrumb" v-if="crumbs.length">
|
||||
<nav
|
||||
ref="navRef"
|
||||
class="breadcrumbs"
|
||||
aria-label="Breadcrumb"
|
||||
v-if="crumbs.length > 1"
|
||||
tabindex="0"
|
||||
@focusin="handleFocusIn"
|
||||
@keydown="handleKeydown"
|
||||
>
|
||||
<ol>
|
||||
<li v-for="(c, idx) in crumbs" :key="idx">
|
||||
<a :href="c.href">{{ c.label }}</a>
|
||||
<a :href="c.href" tabindex="-1">{{ c.label }}</a>
|
||||
<span v-if="idx < crumbs.length - 1" class="sep"> — </span>
|
||||
</li>
|
||||
</ol>
|
||||
@@ -33,6 +95,5 @@ const crumbs = computed(() => {
|
||||
.breadcrumbs ol { list-style: none; padding: 0; margin: 0; display: flex; flex-wrap: wrap; align-items: center; gap: .25rem; }
|
||||
.breadcrumbs li { display: inline-flex; align-items: center; gap: .25rem; font-size: .9rem; }
|
||||
.breadcrumbs a { text-decoration: none; color: var(--color-link); padding: 0 .25rem; border-radius:4px; transition: color 0.2s ease, background 0.2s ease; }
|
||||
.breadcrumbs a:hover, .breadcrumbs a:focus-visible { text-decoration: underline; color: var(--color-link-hover); outline: none; }
|
||||
.breadcrumbs .sep { color: var(--color-text-muted); margin: 0; }
|
||||
</style>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="credential-list">
|
||||
<div class="credential-list" tabindex="0" @focusin="handleListFocus" @keydown="handleListKeydown">
|
||||
<div v-if="loading"><p>Loading credentials...</p></div>
|
||||
<div v-else-if="!credentials?.length"><p>No passkeys found.</p></div>
|
||||
<template v-else>
|
||||
@@ -11,9 +11,12 @@
|
||||
'is-hovered': hoveredCredentialUuid === credential.credential_uuid,
|
||||
'is-linked-session': hoveredSessionCredentialUuid === credential.credential_uuid
|
||||
}]"
|
||||
tabindex="0"
|
||||
tabindex="-1"
|
||||
@mousedown.prevent
|
||||
@click.capture="handleCardClick"
|
||||
@focusin="handleCredentialFocus(credential.credential_uuid)"
|
||||
@focusout="handleCredentialBlur($event)"
|
||||
@keydown="handleItemKeydown($event, credential)"
|
||||
>
|
||||
<div class="item-top">
|
||||
<div class="item-icon">
|
||||
@@ -37,8 +40,9 @@
|
||||
@click="$emit('delete', credential)"
|
||||
class="btn-card-delete"
|
||||
:disabled="credential.is_current_session"
|
||||
:title="credential.is_current_session ? 'Cannot delete current session credential' : 'Delete passkey'"
|
||||
>🗑️</button>
|
||||
:title="credential.is_current_session ? 'Cannot delete current session credential' : 'Delete passkey and terminate any linked sessions.'"
|
||||
tabindex="-1"
|
||||
>❌</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item-details">
|
||||
@@ -57,8 +61,8 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, ref } from 'vue'
|
||||
import { formatDate } from '@/utils/helpers'
|
||||
import { navigateGrid, handleEscape, handleDeleteKey, getDirection } from '@/utils/keynav'
|
||||
|
||||
const props = defineProps({
|
||||
credentials: { type: Array, default: () => [] },
|
||||
@@ -67,9 +71,10 @@ const props = defineProps({
|
||||
allowDelete: { type: Boolean, default: false },
|
||||
hoveredCredentialUuid: { type: String, default: null },
|
||||
hoveredSessionCredentialUuid: { type: String, default: null },
|
||||
navigationDisabled: { type: Boolean, default: false },
|
||||
})
|
||||
|
||||
const emit = defineEmits(['delete', 'credentialHover'])
|
||||
const emit = defineEmits(['delete', 'credentialHover', 'navigate-out'])
|
||||
|
||||
const handleCredentialFocus = (uuid) => {
|
||||
emit('credentialHover', uuid)
|
||||
@@ -82,6 +87,58 @@ const handleCredentialBlur = (event) => {
|
||||
}
|
||||
}
|
||||
|
||||
const handleCardClick = (event) => {
|
||||
if (!event.currentTarget.matches(':focus')) {
|
||||
event.currentTarget.focus()
|
||||
event.stopPropagation()
|
||||
}
|
||||
}
|
||||
|
||||
const handleDelete = (event, credential) => {
|
||||
handleDeleteKey(event, () => {
|
||||
if (props.allowDelete && !credential.is_current_session) emit('delete', credential)
|
||||
})
|
||||
}
|
||||
|
||||
const handleListFocus = (event) => {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
const list = event.currentTarget
|
||||
// If focus came to the list container itself (not a child), focus first item
|
||||
if (event.target === list) {
|
||||
const firstItem = list.querySelector('.credential-item')
|
||||
if (firstItem) {
|
||||
firstItem.focus()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const handleListKeydown = (event) => {
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
// Escape emits navigate-out
|
||||
handleEscape(event, (dir) => emit('navigate-out', dir))
|
||||
}
|
||||
|
||||
const handleItemKeydown = (event, credential) => {
|
||||
// Handle delete (always allowed even with modal)
|
||||
handleDelete(event, credential)
|
||||
if (event.defaultPrevented) return
|
||||
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
// Arrow key navigation
|
||||
const direction = getDirection(event)
|
||||
if (direction) {
|
||||
event.preventDefault()
|
||||
const list = event.currentTarget.closest('.credential-list')
|
||||
const result = navigateGrid(list, event.currentTarget, direction, { itemSelector: '.credential-item' })
|
||||
if (result === 'boundary') {
|
||||
emit('navigate-out', direction)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const getCredentialAuthName = (credential) => {
|
||||
const info = props.aaguidInfo?.[credential.aaguid]
|
||||
return info ? info.name : 'Unknown Authenticator'
|
||||
@@ -95,3 +152,12 @@ const getCredentialAuthIcon = (credential) => {
|
||||
return info[iconKey] || null
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.btn-card-delete {
|
||||
display: none;
|
||||
}
|
||||
.credential-item:focus .btn-card-delete {
|
||||
display: block;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
<template>
|
||||
<section class="view-root view-root--narrow view-device-link">
|
||||
<header class="view-header">
|
||||
<h1>📱 Add Another Device</h1>
|
||||
<p class="view-lede">Generate a one-time link to set up passkeys on a new device.</p>
|
||||
</header>
|
||||
<div class="button-row" style="margin-top:1rem;">
|
||||
<button @click="showModal = true" class="btn-primary">Generate Registration Link</button>
|
||||
<button @click="authStore.currentView = 'profile'" class="btn-secondary">Back to Profile</button>
|
||||
</div>
|
||||
<RegistrationLinkModal
|
||||
v-if="showModal"
|
||||
endpoint="/auth/api/user/create-link"
|
||||
:user-name="userName"
|
||||
@close="showModal = false"
|
||||
@copied="onCopied"
|
||||
/>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import RegistrationLinkModal from '@/components/RegistrationLinkModal.vue'
|
||||
|
||||
const authStore = useAuthStore()
|
||||
const userName = ref(null)
|
||||
const showModal = ref(false)
|
||||
|
||||
const onCopied = () => {
|
||||
authStore.showMessage('Link copied to clipboard!', 'success', 2500)
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
// Extract optional admin-provided query parameters (?user=Name&emoji=😀)
|
||||
const params = new URLSearchParams(location.search)
|
||||
const qUser = params.get('user')
|
||||
if (qUser) userName.value = qUser.trim()
|
||||
})
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.view-lede {
|
||||
margin: 0;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
.qr-link {
|
||||
text-decoration: none;
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.button-row {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
@media (max-width: 720px) {
|
||||
.button-row {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.button-row button {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -5,7 +5,7 @@
|
||||
<p class="view-lede">{{ subheading }}</p>
|
||||
</header>
|
||||
|
||||
<section class="section-block">
|
||||
<section class="section-block" ref="userInfoSection">
|
||||
<div class="section-body">
|
||||
<UserBasicInfo
|
||||
v-if="user"
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
<section class="section-block">
|
||||
<div class="section-body host-actions">
|
||||
<div class="button-row">
|
||||
<div class="button-row" ref="buttonRow" @keydown="handleButtonRowKeydown">
|
||||
<button
|
||||
type="button"
|
||||
class="btn-secondary"
|
||||
@@ -58,10 +58,11 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed } from 'vue'
|
||||
import { computed, ref } from 'vue'
|
||||
import UserBasicInfo from '@/components/UserBasicInfo.vue'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import { goBack } from '@/utils/helpers'
|
||||
import { getDirection, navigateButtonRow } from '@/utils/keynav'
|
||||
|
||||
defineProps({
|
||||
initializing: {
|
||||
@@ -73,6 +74,10 @@ defineProps({
|
||||
const authStore = useAuthStore()
|
||||
const currentHost = window.location.host
|
||||
|
||||
// Template refs for navigation
|
||||
const userInfoSection = ref(null)
|
||||
const buttonRow = ref(null)
|
||||
|
||||
const user = computed(() => authStore.userInfo?.user || null)
|
||||
const orgDisplayName = computed(() => authStore.userInfo?.org?.display_name || '')
|
||||
const roleDisplayName = computed(() => authStore.userInfo?.role?.display_name || '')
|
||||
@@ -105,17 +110,27 @@ const goToAuthSite = () => {
|
||||
const logout = async () => {
|
||||
await authStore.logout()
|
||||
}
|
||||
|
||||
// Keyboard navigation for button row
|
||||
const handleButtonRowKeydown = (event) => {
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
navigateButtonRow(buttonRow.value, event.target, direction, { itemSelector: 'button' })
|
||||
}
|
||||
// Up does nothing (no elements above to navigate to)
|
||||
// Down does nothing (no elements below to navigate to)
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.host-view { padding: 3rem 1.5rem 4rem; }
|
||||
.host-actions { display: flex; flex-direction: column; gap: 0.75rem; }
|
||||
.host-actions .button-row { gap: 0.75rem; flex-wrap: wrap; }
|
||||
.host-actions .button-row button { flex: 0 0 auto; }
|
||||
.host-actions .button-row button { flex: 1 1 0; }
|
||||
.note { margin: 0; color: var(--color-text-muted); }
|
||||
.empty-state { margin: 0; color: var(--color-text-muted); }
|
||||
@media (max-width: 600px) {
|
||||
.host-actions .button-row { flex-direction: column; }
|
||||
.host-actions .button-row button { width: 100%; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,32 +1,143 @@
|
||||
<template>
|
||||
<div class="modal-overlay" @keydown.esc="$emit('close')" tabindex="-1">
|
||||
<div class="modal" role="dialog" aria-modal="true">
|
||||
<slot />
|
||||
</div>
|
||||
</div>
|
||||
<dialog ref="dialog" @close="$emit('close')" @keydown="handleDialogKeydown">
|
||||
<slot />
|
||||
</dialog>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted, onUnmounted, nextTick } from 'vue'
|
||||
import { navigateButtonRow, getDirection, focusPreferred, focusDialogDefault } from '@/utils/keynav'
|
||||
|
||||
const props = defineProps({
|
||||
// Optional: provide a fallback element to focus if original element is gone
|
||||
focusFallback: { type: [HTMLElement, Object], default: null },
|
||||
// Optional: index to help find next sibling when item is deleted
|
||||
focusIndex: { type: Number, default: -1 },
|
||||
// Optional: selector for finding siblings when restoring focus
|
||||
focusSiblingSelector: { type: String, default: '' }
|
||||
})
|
||||
|
||||
defineEmits(['close'])
|
||||
|
||||
// Dialog element reference
|
||||
const dialog = ref(null)
|
||||
|
||||
// Store the element that had focus before modal opened
|
||||
const previouslyFocusedElement = ref(null)
|
||||
|
||||
/**
|
||||
* Try to restore focus to the original element, or find a suitable fallback.
|
||||
* Called on unmount to restore focus when modal closes.
|
||||
*/
|
||||
const restoreFocus = () => {
|
||||
const prev = previouslyFocusedElement.value
|
||||
if (!prev) return
|
||||
|
||||
// Check if the original element still exists in DOM and is focusable
|
||||
if (document.body.contains(prev) && !prev.disabled) {
|
||||
prev.focus()
|
||||
return
|
||||
}
|
||||
|
||||
// Original element is gone (deleted) - try to find a sibling
|
||||
if (props.focusSiblingSelector && props.focusIndex >= 0) {
|
||||
// Find container that has items matching the selector
|
||||
const containers = [
|
||||
props.focusFallback?.$el || props.focusFallback,
|
||||
prev.closest('[data-nav-group]'),
|
||||
prev.parentElement?.closest('section'),
|
||||
document.querySelector('.view-root')
|
||||
].filter(Boolean)
|
||||
|
||||
for (const container of containers) {
|
||||
if (!container) continue
|
||||
const siblings = container.querySelectorAll(props.focusSiblingSelector)
|
||||
if (siblings.length > 0) {
|
||||
// Try to focus the next item, or the previous if we were at the end
|
||||
const targetIndex = Math.min(props.focusIndex, siblings.length - 1)
|
||||
const target = siblings[targetIndex]
|
||||
if (target && !target.disabled) {
|
||||
target.focus()
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fall back to the provided fallback element
|
||||
const fallback = props.focusFallback?.$el || props.focusFallback
|
||||
if (fallback && document.body.contains(fallback)) {
|
||||
const focusable = fallback.querySelector?.('button:not([disabled]), a, [tabindex="0"]') || fallback
|
||||
if (focusable?.focus) {
|
||||
focusable.focus()
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const handleDialogKeydown = (event) => {
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
// Check if we're in a modal-actions row
|
||||
const target = event.target
|
||||
const actionsRow = target.closest('.modal-actions')
|
||||
|
||||
if (actionsRow && (direction === 'left' || direction === 'right')) {
|
||||
event.preventDefault()
|
||||
navigateButtonRow(actionsRow, target, direction, { itemSelector: 'button' })
|
||||
} else if (direction === 'up' && actionsRow) {
|
||||
// From actions, try to go back to last input or focusable element in form
|
||||
event.preventDefault()
|
||||
const form = actionsRow.closest('form') || actionsRow.closest('.modal-form')
|
||||
const inputs = form?.querySelectorAll('input, textarea, select, button:not(.modal-actions button)')
|
||||
if (inputs && inputs.length > 0) {
|
||||
inputs[inputs.length - 1].focus()
|
||||
}
|
||||
} else if (direction === 'down' && !actionsRow) {
|
||||
// From an input, try to go to modal-actions
|
||||
const form = target.closest('form') || target.closest('.modal-form')
|
||||
if (form) {
|
||||
event.preventDefault()
|
||||
const actions = form.querySelector('.modal-actions')
|
||||
if (actions) {
|
||||
focusPreferred(actions, { primarySelector: '.btn-primary', itemSelector: 'button' })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// Save currently focused element before modal takes focus
|
||||
previouslyFocusedElement.value = document.activeElement
|
||||
|
||||
// Show the dialog as a modal
|
||||
nextTick(() => {
|
||||
if (dialog.value) {
|
||||
dialog.value.showModal()
|
||||
|
||||
// Autofocus the most appropriate element:
|
||||
// - For form dialogs (rename, edit): focus first input and select text
|
||||
// - For other dialogs: focus primary button (or fallback)
|
||||
// Mark primary button for keyboard navigation
|
||||
const primaryBtn = dialog.value.querySelector('.modal-actions .btn-primary')
|
||||
if (primaryBtn) {
|
||||
primaryBtn.setAttribute('data-nav-primary', '')
|
||||
}
|
||||
// Focus the most appropriate element
|
||||
focusDialogDefault(dialog.value)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
// Restore focus when modal closes
|
||||
restoreFocus()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.modal-overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: transparent;
|
||||
backdrop-filter: blur(.1rem) brightness(0.7);
|
||||
-webkit-backdrop-filter: blur(.1rem) brightness(0.7);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
.modal {
|
||||
dialog {
|
||||
background: var(--color-surface);
|
||||
border: 1px solid var(--color-border);
|
||||
border-radius: var(--radius-lg);
|
||||
@@ -36,37 +147,47 @@ defineEmits(['close'])
|
||||
width: min(500px, 90vw);
|
||||
max-height: 90vh;
|
||||
overflow-y: auto;
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
margin: auto;
|
||||
height: fit-content;
|
||||
}
|
||||
|
||||
.modal :deep(.modal-title),
|
||||
.modal :deep(h3) {
|
||||
dialog::backdrop {
|
||||
background: transparent;
|
||||
backdrop-filter: blur(.1rem) brightness(0.7);
|
||||
-webkit-backdrop-filter: blur(.1rem) brightness(0.7);
|
||||
}
|
||||
|
||||
dialog :deep(.modal-title),
|
||||
dialog :deep(h3) {
|
||||
margin: 0 0 var(--space-md);
|
||||
font-size: 1.25rem;
|
||||
font-weight: 600;
|
||||
color: var(--color-heading);
|
||||
}
|
||||
|
||||
.modal :deep(form) {
|
||||
dialog :deep(form) {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-md);
|
||||
}
|
||||
|
||||
.modal :deep(.modal-form) {
|
||||
dialog :deep(.modal-form) {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-md);
|
||||
}
|
||||
|
||||
.modal :deep(.modal-form label) {
|
||||
dialog :deep(.modal-form label) {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-xs);
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.modal :deep(.modal-form input),
|
||||
.modal :deep(.modal-form textarea) {
|
||||
dialog :deep(.modal-form input),
|
||||
dialog :deep(.modal-form textarea) {
|
||||
padding: var(--space-md);
|
||||
border: 1px solid var(--color-border);
|
||||
border-radius: var(--radius-sm);
|
||||
@@ -77,14 +198,14 @@ defineEmits(['close'])
|
||||
min-height: 2.5rem;
|
||||
}
|
||||
|
||||
.modal :deep(.modal-form input:focus),
|
||||
.modal :deep(.modal-form textarea:focus) {
|
||||
dialog :deep(.modal-form input:focus),
|
||||
dialog :deep(.modal-form textarea:focus) {
|
||||
outline: none;
|
||||
border-color: var(--color-accent);
|
||||
box-shadow: 0 0 0 2px #c7d2fe;
|
||||
}
|
||||
|
||||
.modal :deep(.modal-actions) {
|
||||
dialog :deep(.modal-actions) {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: var(--space-sm);
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
/>
|
||||
</label>
|
||||
<div v-if="error" class="error small">{{ error }}</div>
|
||||
<div class="modal-actions">
|
||||
<div class="modal-actions" @keydown="handleActionsKeydown">
|
||||
<button
|
||||
type="button"
|
||||
class="btn-secondary"
|
||||
@@ -25,6 +25,7 @@
|
||||
type="submit"
|
||||
class="btn-primary"
|
||||
:disabled="busy"
|
||||
data-nav-primary
|
||||
>
|
||||
{{ submitText }}
|
||||
</button>
|
||||
@@ -33,7 +34,8 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, nextTick, onMounted, ref } from 'vue'
|
||||
import { computed, ref } from 'vue'
|
||||
import { getDirection } from '@/utils/keynav'
|
||||
|
||||
const props = defineProps({
|
||||
modelValue: { type: String, default: '' },
|
||||
@@ -60,16 +62,15 @@ const localValue = computed({
|
||||
|
||||
const resolvedInputId = computed(() => props.inputId || generatedId)
|
||||
|
||||
onMounted(() => {
|
||||
if (!props.autoFocus) return
|
||||
nextTick(() => {
|
||||
if (props.autoSelect) {
|
||||
inputRef.value?.select()
|
||||
} else {
|
||||
inputRef.value?.focus()
|
||||
}
|
||||
})
|
||||
})
|
||||
const handleActionsKeydown = (event) => {
|
||||
const direction = getDirection(event)
|
||||
if (direction === 'up') {
|
||||
event.preventDefault()
|
||||
inputRef.value?.focus()
|
||||
return
|
||||
}
|
||||
// Left/right navigation is handled globally by keynav
|
||||
}
|
||||
|
||||
function handleCancel() {
|
||||
emit('cancel')
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
<section class="view-root" data-view="profile">
|
||||
<header class="view-header">
|
||||
<h1>User Profile</h1>
|
||||
<Breadcrumbs :entries="breadcrumbEntries" />
|
||||
<Breadcrumbs ref="breadcrumbs" :entries="breadcrumbEntries" @keydown="handleBreadcrumbKeydown" />
|
||||
<p class="view-lede">Account dashboard for managing credentials and authenticating with other devices.</p>
|
||||
</header>
|
||||
|
||||
<section class="section-block">
|
||||
<section class="section-block" ref="userInfoSection">
|
||||
<UserBasicInfo
|
||||
v-if="authStore.userInfo?.user"
|
||||
ref="userBasicInfo"
|
||||
:name="authStore.userInfo.user.user_name"
|
||||
:visits="authStore.userInfo.user.visits || 0"
|
||||
:created-at="authStore.userInfo.user.created_at"
|
||||
@@ -17,52 +18,59 @@
|
||||
update-endpoint="/auth/api/user/display-name"
|
||||
@saved="authStore.loadUserInfo()"
|
||||
@edit-name="openNameDialog"
|
||||
@keydown="handleUserInfoKeydown"
|
||||
>
|
||||
<div class="remote-auth-inline">
|
||||
<label v-if="!showDeviceInfo" class="remote-auth-label">Code words from remote device:</label>
|
||||
<RemoteAuth
|
||||
<label v-if="!showDeviceInfo" class="remote-auth-label">Code words:</label>
|
||||
<RemoteAuthPermit
|
||||
ref="pairingEntry"
|
||||
title=""
|
||||
description=""
|
||||
placeholder="word word word"
|
||||
@completed="handlePairingCompleted"
|
||||
@error="handlePairingError"
|
||||
@device-info-visible="showDeviceInfo = $event"
|
||||
/>
|
||||
</div>
|
||||
<p class="remote-auth-description">Provided by another device requesting remote auth.</p>
|
||||
</UserBasicInfo>
|
||||
</section>
|
||||
|
||||
<section class="section-block">
|
||||
<div class="section-header">
|
||||
<h2>Your Passkeys</h2>
|
||||
<p class="section-description">Keep at least one trusted passkey so you can always sign in.</p>
|
||||
<p class="section-description">Ideally have at least two passkeys in case you lose one. More than one user can be registered on the same device, giving you a choice at login. <a href="https://bitwarden.com/pricing/" target="_blank" rel="noopener noreferrer">Bitwarden</a> can sync one passkey to all your devices. Other secure options include <b>local passkeys</b>, as well as hardware keys such as <a href="https://www.yubico.com" target="_blank" rel="noopener noreferrer">YubiKey</a>. Cloud sync via Google, Microsoft or iCloud is discouraged.</p>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<CredentialList
|
||||
ref="credentialList"
|
||||
:credentials="authStore.userInfo?.credentials || []"
|
||||
:aaguid-info="authStore.userInfo?.aaguid_info || {}"
|
||||
:loading="authStore.isLoading"
|
||||
:hovered-credential-uuid="hoveredCredentialUuid"
|
||||
:hovered-session-credential-uuid="hoveredSession?.credential_uuid"
|
||||
:navigation-disabled="hasActiveModal"
|
||||
allow-delete
|
||||
@delete="handleDelete"
|
||||
@credential-hover="hoveredCredentialUuid = $event"
|
||||
@navigate-out="handleCredentialNavigateOut"
|
||||
/>
|
||||
<div class="button-row">
|
||||
<button @click="addNewCredential" class="btn-primary">Add New Passkey</button>
|
||||
<button @click="showRegLink = true" class="btn-secondary">Add Another Device</button>
|
||||
<div class="button-row" ref="credentialButtons">
|
||||
<button @click="addNewCredential" class="btn-primary" @keydown="handleCredentialButtonKeydown">Register New</button>
|
||||
<button @click="showRegLink = true" class="btn-secondary" @keydown="handleCredentialButtonKeydown">Another Device</button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<SessionList
|
||||
ref="sessionList"
|
||||
:sessions="sessions"
|
||||
:terminating-sessions="terminatingSessions"
|
||||
:hovered-credential-uuid="hoveredCredentialUuid"
|
||||
:navigation-disabled="hasActiveModal"
|
||||
@terminate="terminateSession"
|
||||
@session-hover="hoveredSession = $event"
|
||||
section-description="Review where you're signed in and end any sessions you no longer recognize."
|
||||
@navigate-out="handleSessionNavigateOut"
|
||||
section-description="You are currently signed in to the following sessions. If you don't recognize something, consider deleting not only the session but the associated passkey you suspect is compromised, as only this terminates all linked sessions and prevents logging in again."
|
||||
/>
|
||||
|
||||
<Modal v-if="showNameDialog" @close="showNameDialog = false">
|
||||
@@ -78,18 +86,19 @@
|
||||
</Modal>
|
||||
|
||||
<section class="section-block">
|
||||
<div class="button-row logout-row" :class="{ single: !hasMultipleSessions }">
|
||||
<div class="button-row" ref="logoutButtons">
|
||||
<button
|
||||
type="button"
|
||||
class="btn-secondary"
|
||||
@click="goBack"
|
||||
@keydown="handleLogoutButtonKeydown"
|
||||
>
|
||||
Back
|
||||
</button>
|
||||
<button v-if="!hasMultipleSessions" @click="logoutEverywhere" class="btn-danger logout-button" :disabled="authStore.isLoading">Logout</button>
|
||||
<button v-if="!hasMultipleSessions" @click="logoutEverywhere" class="btn-danger" :disabled="authStore.isLoading" @keydown="handleLogoutButtonKeydown">Logout</button>
|
||||
<template v-else>
|
||||
<button @click="logout" class="btn-danger logout-button" :disabled="authStore.isLoading">Logout</button>
|
||||
<button @click="logoutEverywhere" class="btn-danger logout-button" :disabled="authStore.isLoading">All</button>
|
||||
<button @click="logout" class="btn-danger" :disabled="authStore.isLoading" @keydown="handleLogoutButtonKeydown">Logout</button>
|
||||
<button @click="logoutEverywhere" class="btn-danger" :disabled="authStore.isLoading" @keydown="handleLogoutButtonKeydown">All</button>
|
||||
</template>
|
||||
</div>
|
||||
<p class="logout-note" v-if="!hasMultipleSessions"><strong>Logout</strong> from {{ currentSessionHost }}.</p>
|
||||
@@ -99,6 +108,7 @@
|
||||
v-if="showRegLink"
|
||||
endpoint="/auth/api/user/create-link"
|
||||
@close="showRegLink = false"
|
||||
@copied="onLinkCopied"
|
||||
/>
|
||||
</section>
|
||||
</template>
|
||||
@@ -112,12 +122,13 @@ import Modal from '@/components/Modal.vue'
|
||||
import NameEditForm from '@/components/NameEditForm.vue'
|
||||
import SessionList from '@/components/SessionList.vue'
|
||||
import RegistrationLinkModal from '@/components/RegistrationLinkModal.vue'
|
||||
import RemoteAuth from '@/components/RemoteAuthPermit.vue'
|
||||
import RemoteAuthPermit from '@/components/RemoteAuthPermit.vue'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import { adminUiPath, makeUiHref } from '@/utils/settings'
|
||||
import passkey from '@/utils/passkey'
|
||||
import { goBack } from '@/utils/helpers'
|
||||
import { apiJson } from '@/utils/api'
|
||||
import { navigateButtonRow, focusPreferred, focusAtIndex, getDirection } from '@/utils/keynav'
|
||||
|
||||
const authStore = useAuthStore()
|
||||
const updateInterval = ref(null)
|
||||
@@ -129,6 +140,16 @@ const hoveredCredentialUuid = ref(null)
|
||||
const hoveredSession = ref(null)
|
||||
const showDeviceInfo = ref(false)
|
||||
const pairingEntry = ref(null)
|
||||
const credentialList = ref(null)
|
||||
const credentialButtons = ref(null)
|
||||
const sessionList = ref(null)
|
||||
const logoutButtons = ref(null)
|
||||
const breadcrumbs = ref(null)
|
||||
const userBasicInfo = ref(null)
|
||||
const userInfoSection = ref(null)
|
||||
|
||||
// Check if any modal/dialog is open (blocks arrow key navigation)
|
||||
const hasActiveModal = computed(() => showNameDialog.value || showRegLink.value)
|
||||
|
||||
watch(showNameDialog, (newVal) => { if (newVal) newName.value = authStore.userInfo?.user?.user_name || '' })
|
||||
|
||||
@@ -164,13 +185,118 @@ const handlePairingError = (message) => {
|
||||
}
|
||||
}
|
||||
|
||||
const onLinkCopied = () => {
|
||||
authStore.showMessage('📋 Link copied! Send it to your other device.')
|
||||
showRegLink.value = false
|
||||
}
|
||||
|
||||
// Helper to focus preferred button in a row (primary first, or first button)
|
||||
const focusPreferredButton = (container) => {
|
||||
focusPreferred(container, { primarySelector: '.btn-primary', itemSelector: 'button' })
|
||||
}
|
||||
|
||||
// Navigation between components
|
||||
const handleBreadcrumbKeydown = (event) => {
|
||||
if (hasActiveModal.value) return // Block navigation when modal is open
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
// Left/right handled internally by Breadcrumbs component
|
||||
if (direction === 'down') {
|
||||
event.preventDefault()
|
||||
// Move to user info section - always focus edit button first
|
||||
focusPreferred(userInfoSection.value, { primarySelector: '.mini-btn', itemSelector: '.mini-btn, .pairing-input' })
|
||||
}
|
||||
// ArrowUp at the top does nothing
|
||||
}
|
||||
|
||||
const handleUserInfoKeydown = (event) => {
|
||||
if (hasActiveModal.value) return // Block navigation when modal is open
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
const itemSelector = '.mini-btn, .pairing-input'
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
navigateButtonRow(userInfoSection.value, event.target, direction, { itemSelector })
|
||||
} else if (direction === 'up') {
|
||||
// Move to breadcrumbs - focus current page crumb
|
||||
breadcrumbs.value?.focusCurrent?.()
|
||||
} else if (direction === 'down') {
|
||||
// Move to credential list
|
||||
credentialList.value?.$el?.focus()
|
||||
}
|
||||
}
|
||||
|
||||
const handleCredentialNavigateOut = (direction) => {
|
||||
if (hasActiveModal.value) return // Block navigation when modal is open
|
||||
|
||||
if (direction === 'down' || direction === 'right') {
|
||||
// Focus preferred button in credential section
|
||||
focusPreferredButton(credentialButtons.value)
|
||||
} else if (direction === 'up' || direction === 'left') {
|
||||
// Focus user info section - always focus edit button first
|
||||
focusPreferred(userInfoSection.value, { primarySelector: '.mini-btn', itemSelector: '.mini-btn, .pairing-input' })
|
||||
}
|
||||
}
|
||||
|
||||
const handleCredentialButtonKeydown = (event) => {
|
||||
if (hasActiveModal.value) return // Block navigation when modal is open
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
navigateButtonRow(credentialButtons.value, event.target, direction, { itemSelector: 'button' })
|
||||
} else if (direction === 'up') {
|
||||
// Move back to credential list
|
||||
focusAtIndex(credentialList.value?.$el, 0, { itemSelector: '.credential-item' })
|
||||
} else if (direction === 'down') {
|
||||
// Move to session list
|
||||
focusAtIndex(sessionList.value?.$el, 0, { itemSelector: '.session-group' })
|
||||
}
|
||||
}
|
||||
|
||||
const handleSessionNavigateOut = (direction) => {
|
||||
if (hasActiveModal.value) return // Block navigation when modal is open
|
||||
|
||||
if (direction === 'up') {
|
||||
// Focus preferred button in credential section
|
||||
focusPreferredButton(credentialButtons.value)
|
||||
} else if (direction === 'down') {
|
||||
// Focus preferred button in logout section
|
||||
focusPreferredButton(logoutButtons.value)
|
||||
}
|
||||
}
|
||||
|
||||
const handleLogoutButtonKeydown = (event) => {
|
||||
if (hasActiveModal.value) return // Block navigation when modal is open
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
navigateButtonRow(logoutButtons.value, event.target, direction, { itemSelector: 'button' })
|
||||
} else if (direction === 'up') {
|
||||
// Move back to session list - focus last group
|
||||
focusAtIndex(sessionList.value?.$el, -1, { itemSelector: '.session-group' })
|
||||
}
|
||||
// ArrowDown at the bottom does nothing
|
||||
}
|
||||
|
||||
const handleDelete = async (credential) => {
|
||||
const credentialId = credential?.credential_uuid
|
||||
if (!credentialId) return
|
||||
if (!confirm('Are you sure you want to delete this passkey?')) return
|
||||
try {
|
||||
await authStore.deleteCredential(credentialId)
|
||||
authStore.showMessage('Passkey deleted successfully!', 'success', 3000)
|
||||
authStore.showMessage('Passkey deleted! You should also remove it from your password manager or device.', 'success', 3000)
|
||||
} catch (error) { authStore.showMessage(`Failed to delete passkey: ${error.message}`, 'error') }
|
||||
}
|
||||
|
||||
@@ -219,13 +345,12 @@ const saveName = async () => {
|
||||
<style scoped>
|
||||
.view-lede { margin: 0; color: var(--color-text-muted); font-size: 1rem; }
|
||||
.section-header { display: flex; flex-direction: column; gap: 0.4rem; }
|
||||
.section-description { margin: 0; color: var(--color-text-muted); }
|
||||
.empty-state { margin: 0; color: var(--color-text-muted); text-align: center; padding: 1rem 0; }
|
||||
.logout-button { align-self: flex-start; }
|
||||
.logout-row { gap: 1rem; }
|
||||
.logout-row.single { justify-content: flex-start; }
|
||||
.logout-note { margin: 0.75rem 0 0; color: var(--color-text-muted); font-size: 0.875rem; }
|
||||
.remote-auth-inline { display: flex; flex-direction: column; gap: 0.5rem; }
|
||||
.remote-auth-label { display: block; margin: 0; font-size: 0.875rem; color: var(--color-text-muted); font-weight: 500; }
|
||||
@media (max-width: 720px) { .logout-button { width: 100%; } }
|
||||
.remote-auth-description {
|
||||
font-size: 0.75rem;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,15 +1,12 @@
|
||||
<template>
|
||||
<div class="qr-display">
|
||||
<div class="qr-section">
|
||||
<a :href="url" @click.prevent="copyLink" class="qr-link" title="Click to copy link">
|
||||
<a :href="url" @click.prevent="copyLink" class="qr-link" title="Click to copy link" tabindex="0" @keydown.enter.prevent="copyLink">
|
||||
<canvas ref="qrCanvas" class="qr-code"></canvas>
|
||||
<div v-if="showLink && url" class="link-text">{{ displayUrl }}</div>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div v-if="showCopyToast" class="copy-toast">
|
||||
✓ Link copied to clipboard
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -25,9 +22,6 @@ const props = defineProps({
|
||||
const emit = defineEmits(['copied'])
|
||||
|
||||
const qrCanvas = ref(null)
|
||||
const showCopyToast = ref(false)
|
||||
|
||||
let copyToastTimer = null
|
||||
|
||||
const displayUrl = computed(() => {
|
||||
if (!props.url) return ''
|
||||
@@ -65,13 +59,7 @@ async function copyLink() {
|
||||
if (!props.url) return
|
||||
try {
|
||||
await navigator.clipboard.writeText(props.url)
|
||||
showCopyToast.value = true
|
||||
emit('copied')
|
||||
|
||||
if (copyToastTimer) clearTimeout(copyToastTimer)
|
||||
copyToastTimer = setTimeout(() => {
|
||||
showCopyToast.value = false
|
||||
}, 2000)
|
||||
} catch (err) {
|
||||
console.error('Failed to copy link:', err)
|
||||
}
|
||||
@@ -139,23 +127,4 @@ watch(qrCanvas, () => {
|
||||
.qr-link:hover .link-text {
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.copy-toast {
|
||||
position: absolute;
|
||||
top: -2rem;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
background: var(--color-success);
|
||||
color: white;
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: var(--radius-sm);
|
||||
font-size: 0.875rem;
|
||||
z-index: 10;
|
||||
animation: fadeInOut 2s ease-in-out;
|
||||
}
|
||||
|
||||
@keyframes fadeInOut {
|
||||
0%, 100% { opacity: 0; }
|
||||
10%, 90% { opacity: 1; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,56 +1,43 @@
|
||||
<template>
|
||||
<div class="dialog-overlay" @keydown.esc.prevent="$emit('close')">
|
||||
<dialog ref="dialog" @close="$emit('close')" @keydown="handleDialogKeydown">
|
||||
<div class="device-dialog" role="dialog" aria-modal="true" aria-labelledby="regTitle">
|
||||
<div class="reg-header-row">
|
||||
<h2 id="regTitle" class="reg-title">
|
||||
📱 <span v-if="userName">Registration for {{ userName }}</span><span v-else>Add Another Device</span>
|
||||
</h2>
|
||||
<button class="icon-btn" @click="$emit('close')" aria-label="Close">❌</button>
|
||||
<button class="icon-btn" @click="$emit('close')" aria-label="Close" tabindex="-1">✕</button>
|
||||
</div>
|
||||
|
||||
<div class="device-link-section">
|
||||
<!-- Loading state -->
|
||||
<div v-if="loading" class="loading-state">
|
||||
<div class="spinner-small"></div>
|
||||
<span>Generating registration link...</span>
|
||||
</div>
|
||||
<p class="reg-help">
|
||||
Scan this QR code on the new device, or copy the link and open it there.
|
||||
</p>
|
||||
|
||||
<!-- Error state -->
|
||||
<div v-else-if="error" class="error-state">
|
||||
<p class="error-message">{{ error }}</p>
|
||||
<button class="btn-secondary" @click="generateLink">Retry</button>
|
||||
</div>
|
||||
<QRCodeDisplay
|
||||
:url="linkUrl"
|
||||
:show-link="true"
|
||||
@copied="onCopied"
|
||||
@keydown="handleQRKeydown"
|
||||
/>
|
||||
|
||||
<!-- Success state with QR code and link -->
|
||||
<template v-else-if="linkUrl">
|
||||
<p class="reg-help">
|
||||
Scan this QR code on the new device, or copy the link and open it there.
|
||||
</p>
|
||||
|
||||
<QRCodeDisplay
|
||||
:url="linkUrl"
|
||||
:show-link="true"
|
||||
@copied="onCopied"
|
||||
/>
|
||||
|
||||
<p class="expiry-note" v-if="expiresAt">
|
||||
This link expires {{ formatDate(expiresAt).toLowerCase() }}.
|
||||
</p>
|
||||
</template>
|
||||
<p class="expiry-note" v-if="expiresAt">
|
||||
This link expires {{ formatDate(expiresAt).toLowerCase() }}.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="reg-actions">
|
||||
<div class="reg-actions" ref="actionsRow" @keydown="handleActionsKeydown">
|
||||
<button class="btn-secondary" @click="$emit('close')">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</dialog>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { ref, onMounted, onUnmounted, nextTick } from 'vue'
|
||||
import QRCodeDisplay from '@/components/QRCodeDisplay.vue'
|
||||
import { apiJson } from '@/utils/api'
|
||||
import { formatDate } from '@/utils/helpers'
|
||||
import { getDirection } from '@/utils/keynav'
|
||||
|
||||
const props = defineProps({
|
||||
endpoint: { type: String, required: true },
|
||||
@@ -59,29 +46,35 @@ const props = defineProps({
|
||||
|
||||
const emit = defineEmits(['close', 'copied'])
|
||||
|
||||
const loading = ref(true)
|
||||
const error = ref(null)
|
||||
const dialog = ref(null)
|
||||
const linkUrl = ref(null)
|
||||
const expiresAt = ref(null)
|
||||
const actionsRow = ref(null)
|
||||
// Store the element that had focus before modal opened
|
||||
const previouslyFocusedElement = ref(null)
|
||||
|
||||
async function generateLink() {
|
||||
loading.value = true
|
||||
error.value = null
|
||||
linkUrl.value = null
|
||||
expiresAt.value = null
|
||||
|
||||
try {
|
||||
const data = await apiJson(props.endpoint, { method: 'POST' })
|
||||
if (data.url) {
|
||||
linkUrl.value = data.url
|
||||
expiresAt.value = data.expires ? new Date(data.expires) : null
|
||||
|
||||
// Show the dialog as modal
|
||||
await nextTick()
|
||||
if (dialog.value) {
|
||||
dialog.value.showModal()
|
||||
|
||||
// Focus primary button (or first button if no primary) after content renders
|
||||
const actions = actionsRow.value
|
||||
const target = actions?.querySelector('.btn-primary') || actions?.querySelector('button')
|
||||
target?.focus()
|
||||
}
|
||||
} else {
|
||||
error.value = data.detail || 'Failed to generate link'
|
||||
emit('close')
|
||||
}
|
||||
} catch (err) {
|
||||
error.value = err.message || 'Failed to generate link'
|
||||
} finally {
|
||||
loading.value = false
|
||||
} catch {
|
||||
emit('close')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,12 +82,79 @@ function onCopied() {
|
||||
emit('copied')
|
||||
}
|
||||
|
||||
const handleDialogKeydown = (event) => {
|
||||
// ESC is handled automatically by <dialog>
|
||||
// Handle other key navigation
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
if (direction === 'down' || direction === 'up') {
|
||||
// Let the individual handlers manage navigation
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
const handleQRKeydown = (event) => {
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
// Navigation constrained within modal: QR link <-> Close button
|
||||
if (direction === 'down' || direction === 'up') {
|
||||
// Toggle between QR link and close button
|
||||
actionsRow.value?.querySelector('button')?.focus()
|
||||
}
|
||||
// Left/right do nothing on QR code
|
||||
}
|
||||
|
||||
const handleActionsKeydown = (event) => {
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
|
||||
// Navigation constrained within modal: Close button <-> QR link
|
||||
if (direction === 'up' || direction === 'down') {
|
||||
// Toggle between close button and QR link
|
||||
document.querySelector('.qr-link')?.focus()
|
||||
}
|
||||
// Left/right do nothing (only one button)
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// Save currently focused element before modal takes focus
|
||||
previouslyFocusedElement.value = document.activeElement
|
||||
generateLink()
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
// Restore focus when modal closes
|
||||
const prev = previouslyFocusedElement.value
|
||||
if (prev && document.body.contains(prev) && !prev.disabled) {
|
||||
prev.focus()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
dialog {
|
||||
border: none;
|
||||
background: transparent;
|
||||
padding: 0;
|
||||
max-width: none;
|
||||
width: fit-content;
|
||||
height: fit-content;
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
dialog::backdrop {
|
||||
-webkit-backdrop-filter: blur(.2rem) brightness(0.5);
|
||||
backdrop-filter: blur(.2rem) brightness(0.5);
|
||||
}
|
||||
|
||||
.icon-btn { background: none; border: none; cursor: pointer; font-size: 1rem; opacity: .6; }
|
||||
.icon-btn:hover { opacity: 1; }
|
||||
.reg-header-row { display: flex; justify-content: space-between; align-items: center; gap: .75rem; margin-bottom: .75rem; }
|
||||
@@ -102,8 +162,5 @@ onMounted(() => {
|
||||
.device-dialog { background: var(--color-surface); padding: 1.25rem 1.25rem 1rem; border-radius: var(--radius-md); max-width: 480px; width: 100%; box-shadow: 0 6px 28px rgba(0,0,0,.25); }
|
||||
.reg-help { margin: .5rem 0 .75rem; font-size: .85rem; line-height: 1.4; text-align: center; color: var(--color-text-muted); }
|
||||
.reg-actions { display: flex; justify-content: flex-end; gap: .5rem; margin-top: 1rem; }
|
||||
.loading-state { display: flex; align-items: center; justify-content: center; gap: .5rem; padding: 2rem 0; color: var(--color-text-muted); }
|
||||
.error-state { text-align: center; padding: 1rem 0; }
|
||||
.error-message { color: var(--color-danger-text); margin-bottom: 1rem; }
|
||||
.expiry-note { font-size: .75rem; color: var(--color-text-muted); text-align: center; margin-top: .75rem; }
|
||||
</style>
|
||||
|
||||
@@ -3,11 +3,14 @@
|
||||
<form @submit.prevent="submitCode" class="pairing-form">
|
||||
<!-- Code input (shown when device info not yet received) -->
|
||||
<div v-if="!deviceInfo" class="input-row">
|
||||
<div class="input-wrapper" :class="{ 'has-error': serverError, 'is-complete': deviceInfo && !serverError, 'focused': isFocused }">
|
||||
<div class="input-wrapper" :class="{ 'has-error': serverError, 'is-complete': deviceInfo && !serverError, 'focused': isFocused, 'has-selection': hasSelection }">
|
||||
<!-- Visual slot-machine display overlay -->
|
||||
<div class="slot-machine" :class="{ 'has-error': serverError, 'is-complete': deviceInfo && !serverError }" aria-hidden="true">
|
||||
<div v-for="(word, index) in displayWords" :key="index" class="slot-reel" :class="{ 'invalid-word': word.invalid, 'empty': !word.text && !word.typedPrefix }">
|
||||
<div class="slot-word">
|
||||
<span v-if="word.selectionStartChar >= 0 && word.selectionEndChar > word.selectionStartChar"
|
||||
class="selection-overlay"
|
||||
:style="{ '--sel-start': word.selectionStartChar, '--sel-end': word.selectionEndChar, '--word-len': word.wordLen }"></span>
|
||||
<template v-if="word.typedPrefix">
|
||||
<span class="typed-prefix">{{ word.typedPrefix }}</span><span class="hint-suffix">{{ word.hintSuffix }}</span>
|
||||
<span v-if="word.hasCursor" class="cursor-overlay" :style="{ '--cursor-pos': word.cursorCharIndex, '--word-len': word.wordLen }"></span>
|
||||
@@ -75,8 +78,6 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p v-if="error && !deviceInfo" class="error-message">{{ error }}</p>
|
||||
</form>
|
||||
</div>
|
||||
</template>
|
||||
@@ -85,7 +86,7 @@
|
||||
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
|
||||
import { startAuthentication } from '@simplewebauthn/browser'
|
||||
import aWebSocket from '@/utils/awaitable-websocket'
|
||||
import { dec as b64dec, enc as b64enc } from '@/utils/base64url'
|
||||
import { b64dec, b64enc } from '@/utils/base64url'
|
||||
import { getSettings } from '@/utils/settings'
|
||||
import { getUniqueMatch, isValidWord, isValidPrefix } from '@/utils/wordlist'
|
||||
import { solvePoW } from '@/utils/pow'
|
||||
@@ -95,7 +96,7 @@ const props = defineProps({
|
||||
title: { type: String, default: 'Help Another Device Sign In' },
|
||||
description: { type: String, default: 'Enter the code shown on the device that needs to sign in.' },
|
||||
placeholder: { type: String, default: 'Enter three words' },
|
||||
action: { type: String, default: 'login' } // 'login' or 'register'
|
||||
action: { type: String, default: 'login' }, // 'login' or 'register'
|
||||
})
|
||||
|
||||
const emit = defineEmits(['completed', 'error', 'cancelled', 'back', 'register', 'deviceInfoVisible'])
|
||||
@@ -126,7 +127,11 @@ watch(deviceInfo, (newVal) => {
|
||||
const hasInvalidWord = ref(false)
|
||||
const serverError = ref(false)
|
||||
const cursorPos = ref(0)
|
||||
const selectionStart = ref(0)
|
||||
const selectionEnd = ref(0)
|
||||
const isFocused = ref(false)
|
||||
const isDeleting = ref(false)
|
||||
let previousCursorPos = 0
|
||||
let wsConnecting = false
|
||||
let currentChallenge = null
|
||||
let currentWork = null
|
||||
@@ -166,9 +171,42 @@ function getWords(input) {
|
||||
return input.trim().split(/[.\s]+/).filter(w => w.length > 0)
|
||||
}
|
||||
|
||||
// Get words for display, splitting concatenated valid words (e.g., "alienfood" -> ["alien", "food"])
|
||||
function getDisplayWords(input) {
|
||||
const rawWords = getWords(input)
|
||||
const result = []
|
||||
|
||||
for (const rawWord of rawWords) {
|
||||
// Try to split this raw word into valid words
|
||||
let remaining = rawWord.toLowerCase()
|
||||
while (remaining.length > 0 && result.length < 3) {
|
||||
let foundWord = null
|
||||
// Try to find the longest valid word from the start
|
||||
for (let len = Math.min(remaining.length, 6); len >= 3; len--) {
|
||||
const candidate = remaining.slice(0, len)
|
||||
if (isValidWord(candidate)) {
|
||||
foundWord = candidate
|
||||
break
|
||||
}
|
||||
}
|
||||
if (foundWord) {
|
||||
result.push(foundWord)
|
||||
remaining = remaining.slice(foundWord.length)
|
||||
} else {
|
||||
// No valid word found, keep the remaining as partial word
|
||||
result.push(remaining)
|
||||
break
|
||||
}
|
||||
}
|
||||
if (result.length >= 3) break
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
function countCompleteWords(input) {
|
||||
const endsWithSeparator = /[.\s]$/.test(input)
|
||||
const words = getWords(input)
|
||||
const words = getDisplayWords(input)
|
||||
return endsWithSeparator ? words.length : Math.max(0, words.length - 1)
|
||||
}
|
||||
|
||||
@@ -199,7 +237,7 @@ const coloredSegments = computed(() => {
|
||||
})
|
||||
|
||||
function checkWordsValidity(input) { return analyzeWords(input).valid }
|
||||
function allWordsValid(input) { return getWords(input).length > 0 && getWords(input).every(w => isValidWord(w)) }
|
||||
function allWordsValid(input) { return getDisplayWords(input).length > 0 && getDisplayWords(input).every(w => isValidWord(w)) }
|
||||
|
||||
// Get the current partial word being typed (not yet a complete word)
|
||||
function getCurrentPartialWord(input) {
|
||||
@@ -211,61 +249,127 @@ function getCurrentPartialWord(input) {
|
||||
|
||||
// Calculate cursor position in the normalized display (wordIndex, charIndex within word)
|
||||
// Returns { wordIndex: number, charIndex: number } where charIndex is position within the word text
|
||||
// This handles concatenated words like "alienfood" being displayed as "alien" + "food"
|
||||
function calcDisplayCursor(input, rawCursorPos) {
|
||||
if (!input || rawCursorPos === 0) {
|
||||
return { wordIndex: 0, charIndex: 0 }
|
||||
}
|
||||
|
||||
// Parse input to find word boundaries
|
||||
const beforeCursor = input.slice(0, rawCursorPos)
|
||||
const wordMatches = [...beforeCursor.matchAll(/[a-zA-Z]+/g)]
|
||||
|
||||
// Check if cursor is in whitespace after words
|
||||
const endsWithSeparator = /[.\s]$/.test(beforeCursor)
|
||||
|
||||
if (wordMatches.length === 0) {
|
||||
// No words before cursor, cursor is at start of first word
|
||||
// Get display words for the text before cursor
|
||||
const displayWordsBefore = getDisplayWords(beforeCursor)
|
||||
|
||||
if (displayWordsBefore.length === 0) {
|
||||
return { wordIndex: 0, charIndex: 0 }
|
||||
}
|
||||
|
||||
const lastMatch = wordMatches[wordMatches.length - 1]
|
||||
const lastMatchEnd = lastMatch.index + lastMatch[0].length
|
||||
|
||||
if (endsWithSeparator || rawCursorPos > lastMatchEnd) {
|
||||
// Cursor is after the last word (in whitespace), so it's at start of next word
|
||||
return { wordIndex: Math.min(wordMatches.length, 2), charIndex: 0 }
|
||||
if (endsWithSeparator) {
|
||||
// Cursor is in whitespace after words, so it's at start of next word
|
||||
return { wordIndex: Math.min(displayWordsBefore.length, 2), charIndex: 0 }
|
||||
}
|
||||
|
||||
// Cursor is within the last word
|
||||
const charIndex = rawCursorPos - lastMatch.index
|
||||
return { wordIndex: wordMatches.length - 1, charIndex: charIndex }
|
||||
// Cursor is within/after the last display word
|
||||
const lastDisplayWord = displayWordsBefore[displayWordsBefore.length - 1]
|
||||
const wordIndex = displayWordsBefore.length - 1
|
||||
|
||||
// Find where in the original input this display word ends
|
||||
// by getting the full display words and comparing
|
||||
const fullDisplayWords = getDisplayWords(input)
|
||||
|
||||
// Calculate char position within the word
|
||||
// The last display word from beforeCursor might be partial
|
||||
const charIndex = lastDisplayWord.length
|
||||
|
||||
// If this word is a complete valid word and it's not the 3rd word (index 2),
|
||||
// show cursor at start of next slot - but only when typing forward, not when deleting
|
||||
if (wordIndex < 2 && !isDeleting.value) {
|
||||
if (isValidWord(lastDisplayWord)) {
|
||||
return { wordIndex: wordIndex + 1, charIndex: 0 }
|
||||
}
|
||||
}
|
||||
|
||||
return { wordIndex: Math.min(wordIndex, 2), charIndex: charIndex }
|
||||
}
|
||||
|
||||
// Calculate display cursor without the "advance to next word" logic (for selection bounds)
|
||||
function calcDisplayCursorRaw(input, rawCursorPos) {
|
||||
if (!input || rawCursorPos === 0) {
|
||||
return { wordIndex: 0, charIndex: 0 }
|
||||
}
|
||||
|
||||
const beforeCursor = input.slice(0, rawCursorPos)
|
||||
const endsWithSeparator = /[.\s]$/.test(beforeCursor)
|
||||
const displayWordsBefore = getDisplayWords(beforeCursor)
|
||||
|
||||
if (displayWordsBefore.length === 0) {
|
||||
return { wordIndex: 0, charIndex: 0 }
|
||||
}
|
||||
|
||||
if (endsWithSeparator) {
|
||||
return { wordIndex: Math.min(displayWordsBefore.length, 2), charIndex: 0 }
|
||||
}
|
||||
|
||||
const lastDisplayWord = displayWordsBefore[displayWordsBefore.length - 1]
|
||||
const wordIndex = displayWordsBefore.length - 1
|
||||
return { wordIndex: Math.min(wordIndex, 2), charIndex: lastDisplayWord.length }
|
||||
}
|
||||
|
||||
// Compute display words for slot-machine overlay (always 3 slots)
|
||||
const displayWords = computed(() => {
|
||||
const words = getWords(code.value)
|
||||
const words = getDisplayWords(code.value)
|
||||
const result = []
|
||||
|
||||
// Get analysis for validation
|
||||
const { segments } = analyzeWords(code.value)
|
||||
const wordSegments = segments.filter(s => s.isWord)
|
||||
|
||||
// Get current partial word and autocomplete hint
|
||||
const partialWord = getCurrentPartialWord(code.value)
|
||||
const hint = autocompleteHint.value
|
||||
const endsWithSeparator = /[.\s]$/.test(code.value)
|
||||
|
||||
// Calculate selection bounds (raw positions without advance logic)
|
||||
const hasSelectionNow = selectionStart.value !== selectionEnd.value
|
||||
const selStart = calcDisplayCursorRaw(code.value, Math.min(selectionStart.value, selectionEnd.value))
|
||||
const selEnd = calcDisplayCursorRaw(code.value, Math.max(selectionStart.value, selectionEnd.value))
|
||||
|
||||
// Calculate where cursor should be displayed
|
||||
const cursor = calcDisplayCursor(code.value, cursorPos.value)
|
||||
// Use raw position when there's a selection (cursor shows at active end without advance)
|
||||
// Use advance logic only when typing without selection
|
||||
const cursor = hasSelectionNow
|
||||
? calcDisplayCursorRaw(code.value, cursorPos.value)
|
||||
: calcDisplayCursor(code.value, cursorPos.value)
|
||||
|
||||
// Always show exactly 3 slots
|
||||
for (let i = 0; i < 3; i++) {
|
||||
const isCursorSlot = cursor.wordIndex === i
|
||||
|
||||
// Calculate selection range for this word
|
||||
let selectionStartChar = -1
|
||||
let selectionEndChar = -1
|
||||
if (hasSelectionNow) {
|
||||
if (i > selStart.wordIndex && i < selEnd.wordIndex) {
|
||||
// Entire word is selected
|
||||
selectionStartChar = 0
|
||||
selectionEndChar = words[i]?.length ?? 0
|
||||
} else if (i === selStart.wordIndex && i === selEnd.wordIndex) {
|
||||
// Selection starts and ends in this word
|
||||
selectionStartChar = selStart.charIndex
|
||||
selectionEndChar = selEnd.charIndex
|
||||
} else if (i === selStart.wordIndex) {
|
||||
// Selection starts in this word
|
||||
selectionStartChar = selStart.charIndex
|
||||
selectionEndChar = words[i]?.length ?? 0
|
||||
} else if (i === selEnd.wordIndex) {
|
||||
// Selection ends in this word
|
||||
selectionStartChar = 0
|
||||
selectionEndChar = selEnd.charIndex
|
||||
}
|
||||
}
|
||||
|
||||
if (i < words.length) {
|
||||
const word = words[i].toLowerCase()
|
||||
const isInvalid = wordSegments[i]?.invalid || false
|
||||
const isLastWord = i === words.length - 1
|
||||
// Validate: last word without separator can be a prefix, others must be complete words
|
||||
const isInvalid = (isLastWord && !endsWithSeparator) ? !isValidPrefix(word) : !isValidWord(word)
|
||||
|
||||
if (isLastWord && !endsWithSeparator && hint && partialWord) {
|
||||
// Show typed prefix + hint suffix in the same slot
|
||||
@@ -278,7 +382,9 @@ const displayWords = computed(() => {
|
||||
invalid: isInvalid,
|
||||
hasCursor: isCursorSlot,
|
||||
cursorCharIndex: isCursorSlot ? cursor.charIndex : -1,
|
||||
wordLen: totalLen
|
||||
wordLen: totalLen,
|
||||
selectionStartChar,
|
||||
selectionEndChar
|
||||
})
|
||||
} else {
|
||||
// Complete word - show cursor at appropriate position
|
||||
@@ -287,7 +393,9 @@ const displayWords = computed(() => {
|
||||
invalid: isInvalid,
|
||||
hasCursor: isCursorSlot,
|
||||
cursorCharIndex: isCursorSlot ? cursor.charIndex : -1,
|
||||
wordLen: word.length
|
||||
wordLen: word.length,
|
||||
selectionStartChar,
|
||||
selectionEndChar
|
||||
})
|
||||
}
|
||||
} else {
|
||||
@@ -297,7 +405,9 @@ const displayWords = computed(() => {
|
||||
invalid: false,
|
||||
hasCursor: isCursorSlot,
|
||||
cursorCharIndex: 0,
|
||||
wordLen: 0
|
||||
wordLen: 0,
|
||||
selectionStartChar,
|
||||
selectionEndChar
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -305,13 +415,17 @@ const displayWords = computed(() => {
|
||||
return result
|
||||
})
|
||||
|
||||
const hasSelection = computed(() => selectionStart.value !== selectionEnd.value)
|
||||
|
||||
const hasThreeValidWords = computed(() => {
|
||||
const words = getWords(code.value)
|
||||
const words = getDisplayWords(code.value)
|
||||
return words.length === 3 && words.every(w => isValidWord(w))
|
||||
})
|
||||
|
||||
function normalizeCode(input) {
|
||||
return input.trim().toLowerCase().split(/[.\s]+/).filter(w => w).join('.')
|
||||
// Use display words to handle concatenated words like "alienfood" -> "alien.food"
|
||||
const words = getDisplayWords(input)
|
||||
return words.join('.')
|
||||
}
|
||||
|
||||
function startPowSolving() {
|
||||
@@ -346,7 +460,7 @@ async function ensureConnection() {
|
||||
wsConnecting = true
|
||||
try {
|
||||
const authHost = settings.value?.auth_host
|
||||
const wsPath = '/auth/ws/remote-auth/pair'
|
||||
const wsPath = '/auth/ws/remote-auth/permit'
|
||||
const wsUrl = authHost && location.host !== authHost ? `//${authHost}${wsPath}` : wsPath
|
||||
ws = await aWebSocket(wsUrl)
|
||||
const msg = await ws.receive_json()
|
||||
@@ -365,7 +479,7 @@ async function ensureConnection() {
|
||||
// Defer cursor position update to after browser processes the key
|
||||
function deferUpdateCursor(event) {
|
||||
// Handle Tab/Space for autocomplete immediately
|
||||
if (event.key === 'Tab' || event.key === ' ') {
|
||||
if (event.key === 'Tab' || event.key === ' ' || event.key === 'Escape') {
|
||||
handleKeydown(event)
|
||||
return
|
||||
}
|
||||
@@ -373,9 +487,22 @@ function deferUpdateCursor(event) {
|
||||
setTimeout(updateCursorPos, 0)
|
||||
}
|
||||
|
||||
// Update cursor position from input
|
||||
function updateCursorPos() {
|
||||
cursorPos.value = inputRef.value?.selectionStart ?? code.value.length
|
||||
const input = inputRef.value
|
||||
const start = input?.selectionStart ?? code.value.length
|
||||
const end = input?.selectionEnd ?? start
|
||||
|
||||
// Track direction based on which end moved
|
||||
// If selection exists, cursor is at the end being moved (selectionDirection)
|
||||
const direction = input?.selectionDirection ?? 'none'
|
||||
const activeCursor = direction === 'backward' ? start : end
|
||||
|
||||
isDeleting.value = activeCursor < previousCursorPos
|
||||
previousCursorPos = activeCursor
|
||||
cursorPos.value = activeCursor
|
||||
selectionEnd.value = end
|
||||
// Store start separately - cursorPos is the active end, we need both for selection
|
||||
selectionStart.value = start
|
||||
}
|
||||
|
||||
function updateAutocomplete() {
|
||||
@@ -396,7 +523,7 @@ function applyAutocomplete() {
|
||||
const { word, start, end } = getWordAtCursor(code.value, cursorPos.value)
|
||||
if (!word) return false
|
||||
const before = code.value.slice(0, start)
|
||||
const wordsBefore = getWords(before).length
|
||||
const wordsBefore = getDisplayWords(before).length
|
||||
const isThirdWord = wordsBefore === 2
|
||||
const suffix = isThirdWord ? '' : ' '
|
||||
const after = code.value.slice(end)
|
||||
@@ -410,83 +537,33 @@ function applyAutocomplete() {
|
||||
return true
|
||||
}
|
||||
|
||||
// Try to split concatenated words (e.g., "alienalien" -> "alien alien")
|
||||
function trySplitWords(input) {
|
||||
// Only process if there's a continuous string of letters at the end
|
||||
const match = input.match(/^(.*?)([a-zA-Z]+)$/)
|
||||
if (!match) return input
|
||||
|
||||
const prefix = match[1] // Everything before the letter sequence
|
||||
const letters = match[2].toLowerCase()
|
||||
|
||||
// Try to find valid word boundaries in the letter sequence
|
||||
const foundWords = []
|
||||
let remaining = letters
|
||||
|
||||
while (remaining.length > 0) {
|
||||
let foundWord = null
|
||||
|
||||
// Try to find the longest valid word from the start
|
||||
for (let len = Math.min(remaining.length, 6); len >= 3; len--) {
|
||||
const candidate = remaining.slice(0, len)
|
||||
if (isValidWord(candidate)) {
|
||||
foundWord = candidate
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if (foundWord) {
|
||||
foundWords.push(foundWord)
|
||||
remaining = remaining.slice(foundWord.length)
|
||||
|
||||
// Stop after 3 words
|
||||
if (foundWords.length >= 3) {
|
||||
remaining = ''
|
||||
break
|
||||
}
|
||||
} else {
|
||||
// No valid word found, keep the remaining as-is
|
||||
foundWords.push(remaining)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// Only return split version if we found at least one complete word
|
||||
// and there's a clear boundary (more than one segment, or the segment is a complete word)
|
||||
if (foundWords.length > 1 || (foundWords.length === 1 && isValidWord(foundWords[0]) && remaining === '')) {
|
||||
return prefix + foundWords.join(' ')
|
||||
}
|
||||
|
||||
return input
|
||||
}
|
||||
|
||||
function handleInput() {
|
||||
// Immediately update cursor position
|
||||
cursorPos.value = inputRef.value?.selectionStart ?? code.value.length
|
||||
|
||||
// First, try to auto-split concatenated words
|
||||
const splitCode = trySplitWords(code.value)
|
||||
if (splitCode !== code.value) {
|
||||
code.value = splitCode
|
||||
nextTick(() => {
|
||||
const newLen = splitCode.length
|
||||
inputRef.value?.setSelectionRange(newLen, newLen)
|
||||
cursorPos.value = newLen
|
||||
})
|
||||
}
|
||||
|
||||
const words = getWords(code.value)
|
||||
if (words.length >= 3) {
|
||||
const normalized = words.slice(0, 3).join(' ')
|
||||
if (code.value !== normalized) {
|
||||
const cursorWasAtEnd = cursorPos.value >= code.value.length
|
||||
code.value = normalized
|
||||
if (cursorWasAtEnd) {
|
||||
nextTick(() => {
|
||||
inputRef.value?.setSelectionRange(normalized.length, normalized.length)
|
||||
cursorPos.value = normalized.length
|
||||
})
|
||||
}
|
||||
// Mobile fallback for autocomplete: if cursor is right after "prefix " (partial word + space),
|
||||
// replace the partial with the completed word. On desktop, keydown intercepts space before input,
|
||||
// but mobile soft keyboards often insert the space before we can catch it.
|
||||
const cursor = cursorPos.value
|
||||
const beforeCursor = code.value.slice(0, cursor)
|
||||
// Check if cursor is right after a space that follows a word
|
||||
const spaceMatch = beforeCursor.match(/([a-zA-Z]+) $/)
|
||||
if (spaceMatch) {
|
||||
const partialWord = spaceMatch[1].toLowerCase()
|
||||
const match = getUniqueMatch(partialWord)
|
||||
// Only autocomplete if it's not already a complete word and we have a unique match
|
||||
if (match && match !== partialWord && !isValidWord(partialWord)) {
|
||||
const wordStartPos = cursor - spaceMatch[0].length
|
||||
const beforeWord = code.value.slice(0, wordStartPos)
|
||||
const afterSpace = code.value.slice(cursor)
|
||||
const wordsBefore = getDisplayWords(beforeWord).length
|
||||
const isThirdWord = wordsBefore === 2
|
||||
const suffix = isThirdWord ? '' : ' '
|
||||
code.value = beforeWord + match + suffix + afterSpace
|
||||
const newPos = wordStartPos + match.length + suffix.length
|
||||
nextTick(() => {
|
||||
inputRef.value?.setSelectionRange(newPos, newPos)
|
||||
cursorPos.value = newPos
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -496,7 +573,7 @@ function handleInput() {
|
||||
error.value = null
|
||||
serverError.value = false
|
||||
hasInvalidWord.value = !checkWordsValidity(code.value)
|
||||
const currentWords = getWords(code.value)
|
||||
const currentWords = getDisplayWords(code.value)
|
||||
if (currentWords.length >= 1 && !ws && !wsConnecting) ensureConnection()
|
||||
if (currentWords.length === 3) {
|
||||
if (!allWordsValid(code.value)) return
|
||||
@@ -527,14 +604,13 @@ async function lookupDeviceInfo() {
|
||||
const res = await ws.receive_json()
|
||||
updateChallenge(res.pow)
|
||||
if (typeof res.status === 'number' && res.status >= 400) {
|
||||
error.value = res.detail || 'Request failed'
|
||||
showMessage(res.detail || 'Request failed', 'error')
|
||||
serverError.value = true
|
||||
deviceInfo.value = null
|
||||
lastLookedUpCode = null
|
||||
return
|
||||
}
|
||||
if (res.status === 'found' && res.host) {
|
||||
code.value = currentCode.replace(/\./g, ' ')
|
||||
deviceInfo.value = {
|
||||
host: res.host,
|
||||
user_agent_pretty: res.user_agent_pretty,
|
||||
@@ -544,14 +620,14 @@ async function lookupDeviceInfo() {
|
||||
lastLookedUpCode = currentCode
|
||||
nextTick(() => { submitBtnRef.value?.focus() })
|
||||
} else {
|
||||
error.value = 'Unexpected response from server'
|
||||
showMessage('Unexpected response from server', 'error')
|
||||
serverError.value = true
|
||||
deviceInfo.value = null
|
||||
lastLookedUpCode = null
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Lookup error:', err)
|
||||
error.value = err.message || 'Lookup failed'
|
||||
showMessage(err.message || 'Lookup failed', 'error')
|
||||
serverError.value = true
|
||||
deviceInfo.value = null
|
||||
lastLookedUpCode = null
|
||||
@@ -563,6 +639,12 @@ async function lookupDeviceInfo() {
|
||||
}
|
||||
|
||||
function handleKeydown(event) {
|
||||
if (event.key === 'Escape') {
|
||||
code.value = ''
|
||||
handleInput()
|
||||
event.preventDefault()
|
||||
return
|
||||
}
|
||||
if (event.key === 'Tab') {
|
||||
if (autocompleteHint.value) {
|
||||
const applied = applyAutocomplete()
|
||||
@@ -654,7 +736,6 @@ function reset() {
|
||||
|
||||
onMounted(async () => {
|
||||
await fetchSettings()
|
||||
inputRef.value?.focus()
|
||||
// Initialize cursor position
|
||||
nextTick(() => {
|
||||
cursorPos.value = inputRef.value?.selectionStart ?? 0
|
||||
@@ -696,48 +777,26 @@ defineExpose({ reset, deny, code, handleInput, loading, error })
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
/* Slot machine visual display (matches RemoteAuthInline) */
|
||||
/* Slot machine visual display (matches RemoteAuthRequest) */
|
||||
.slot-machine {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 0.875rem 1rem;
|
||||
background: var(--color-surface-hover, rgba(0, 0, 0, 0.03));
|
||||
border: 2px solid var(--color-border);
|
||||
border-radius: var(--radius-sm, 6px);
|
||||
font-family: 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
|
||||
display: flex;
|
||||
gap: 0;
|
||||
align-items: center;
|
||||
user-select: none;
|
||||
pointer-events: none;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
box-sizing: border-box;
|
||||
z-index: 1;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.slot-machine.has-error {
|
||||
border-color: var(--color-error, #ef4444);
|
||||
.input-wrapper.focused.has-error .slot-machine {
|
||||
background: var(--color-error-bg, rgba(239, 68, 68, 0.05));
|
||||
}
|
||||
|
||||
.slot-machine.is-complete {
|
||||
border-color: var(--color-success, #10b981);
|
||||
}
|
||||
|
||||
.slot-reel {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex: 1 1 33.333%;
|
||||
min-width: 0;
|
||||
height: 1.8em;
|
||||
overflow: visible;
|
||||
position: relative;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.slot-reel:not(:last-child) {
|
||||
@@ -745,7 +804,6 @@ defineExpose({ reset, deny, code, handleInput, loading, error })
|
||||
}
|
||||
|
||||
.slot-word {
|
||||
font-size: 1.25rem;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.05em;
|
||||
text-align: center;
|
||||
@@ -781,16 +839,27 @@ defineExpose({ reset, deny, code, handleInput, loading, error })
|
||||
|
||||
.input-wrapper.focused .cursor-overlay {
|
||||
opacity: 1;
|
||||
animation: cursorBlink 1s ease-in-out infinite;
|
||||
animation: cursorBlink 250ms alternate infinite;
|
||||
}
|
||||
|
||||
.input-wrapper.focused.has-selection .cursor-overlay {
|
||||
animation: none;
|
||||
}
|
||||
|
||||
.selection-overlay {
|
||||
position: absolute;
|
||||
height: 1.2em;
|
||||
background: var(--color-primary, #3b82f6);
|
||||
opacity: 0.3;
|
||||
pointer-events: none;
|
||||
/* Position based on character indices - calculate from center of slot */
|
||||
left: calc(50% + (var(--sel-start) - var(--word-len, 0) / 2) * 0.65em);
|
||||
width: calc((var(--sel-end) - var(--sel-start)) * 0.65em);
|
||||
}
|
||||
|
||||
@keyframes cursorBlink {
|
||||
0%, 49% {
|
||||
opacity: 1;
|
||||
}
|
||||
50%, 100% {
|
||||
opacity: 0;
|
||||
}
|
||||
0%, 50% { opacity: 1; }
|
||||
80%, 100% { opacity: 0; }
|
||||
}
|
||||
|
||||
.slot-reel.invalid-word .slot-word {
|
||||
@@ -814,23 +883,13 @@ defineExpose({ reset, deny, code, handleInput, loading, error })
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 0.875rem 1rem;
|
||||
font-size: 1rem;
|
||||
font-family: inherit;
|
||||
border: 1px solid transparent;
|
||||
border-radius: var(--radius-sm, 6px);
|
||||
background: transparent;
|
||||
color: transparent;
|
||||
caret-color: transparent;
|
||||
outline: none;
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.pairing-input.hidden-input {
|
||||
color: transparent;
|
||||
caret-color: transparent;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.pairing-input:disabled {
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
<script setup>
|
||||
import { ref, computed, watch, onMounted, onUnmounted } from 'vue'
|
||||
import aWebSocket from '@/utils/awaitable-websocket'
|
||||
import { dec as b64dec, enc as b64enc } from '@/utils/base64url'
|
||||
import { b64dec, b64enc } from '@/utils/base64url'
|
||||
import { getSettings } from '@/utils/settings'
|
||||
import { solvePoW } from '@/utils/pow'
|
||||
import { words } from '@/utils/wordlist'
|
||||
@@ -360,16 +360,8 @@ defineExpose({ retry, cancel })
|
||||
}
|
||||
|
||||
.slot-reel {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
height: 1.8em;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
background: var(--color-surface, rgba(255, 255, 255, 0.5));
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.slot-machine:not(.stopped) .slot-reel:nth-child(1) {
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<div class="section-body center">
|
||||
<!-- Local passkey authentication view -->
|
||||
<div v-if="authView === 'local'" class="auth-view">
|
||||
<div class="button-row center">
|
||||
<div class="button-row center" ref="buttonRow">
|
||||
<slot name="actions"
|
||||
:loading="loading"
|
||||
:can-authenticate="canAuthenticate"
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
<!-- Remote authentication view (request new remote auth) -->
|
||||
<div v-else-if="authView === 'remote'" class="auth-view">
|
||||
<RemoteAuthInline
|
||||
<RemoteAuthRequest
|
||||
:active="authView === 'remote'"
|
||||
@authenticated="handleRemoteAuthenticated"
|
||||
@register="handleRemoteRegistration"
|
||||
@@ -55,11 +55,12 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, onMounted, onUnmounted, reactive, ref } from 'vue'
|
||||
import { computed, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
|
||||
import passkey from '@/utils/passkey'
|
||||
import { getSettings, uiBasePath } from '@/utils/settings'
|
||||
import { fetchJson, getUserFriendlyErrorMessage } from '@/utils/api'
|
||||
import RemoteAuthInline from '@/components/RemoteAuthRequest.vue'
|
||||
import RemoteAuthRequest from '@/components/RemoteAuthRequest.vue'
|
||||
import { focusDialogButton } from '@/utils/keynav'
|
||||
|
||||
const props = defineProps({
|
||||
mode: {
|
||||
@@ -78,6 +79,7 @@ const settings = ref(null)
|
||||
const userInfo = ref(null)
|
||||
const currentView = ref('initial') // 'initial', 'login', 'forbidden'
|
||||
const authView = ref('local') // 'local' or 'remote'
|
||||
const buttonRow = ref(null)
|
||||
let statusTimer = null
|
||||
|
||||
const isAuthenticated = computed(() => !!userInfo.value?.authenticated)
|
||||
@@ -255,6 +257,13 @@ function handleHeaderLinkClick(event) {
|
||||
}
|
||||
}
|
||||
|
||||
// Autofocus primary button when the view becomes ready
|
||||
watch(initializing, (newVal) => {
|
||||
if (!newVal) {
|
||||
nextTick(() => focusDialogButton(buttonRow.value))
|
||||
}
|
||||
})
|
||||
|
||||
onMounted(async () => {
|
||||
await fetchSettings()
|
||||
await fetchUserInfo()
|
||||
|
||||
@@ -5,14 +5,15 @@
|
||||
<p class="section-description">{{ sectionDescription }}</p>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div :class="['session-list']">
|
||||
<div>
|
||||
<template v-if="Array.isArray(sessions) && sessions.length">
|
||||
<div v-for="(group, host) in groupedSessions" :key="host" class="session-group">
|
||||
<h3 :class="['session-group-host', { 'is-current-site': group.isCurrentSite }]">
|
||||
<template v-if="host"><a :href="hostUrl(host)">🌐 {{ host }}</a></template>
|
||||
<template v-else>🌐 Unbound host</template>
|
||||
</h3>
|
||||
<div class="session-group-sessions">
|
||||
<div v-for="(group, host) in groupedSessions" :key="host" class="session-group" tabindex="0" @keydown="handleGroupKeydown($event, host)">
|
||||
<span :class="['session-group-host', { 'is-current-site': group.isCurrentSite }]">
|
||||
<span class="session-group-icon">🌐</span>
|
||||
<a v-if="host" :href="hostUrl(host)" tabindex="-1" target="_blank" rel="noopener noreferrer">{{ host }}</a>
|
||||
<template v-else>Unbound host</template>
|
||||
</span>
|
||||
<div class="session-list">
|
||||
<div
|
||||
v-for="session in group.sessions"
|
||||
:key="session.id"
|
||||
@@ -21,9 +22,12 @@
|
||||
'is-hovered': hoveredSession?.id === session.id,
|
||||
'is-linked-credential': hoveredCredentialUuid === session.credential_uuid
|
||||
}]"
|
||||
tabindex="0"
|
||||
tabindex="-1"
|
||||
@mousedown.prevent
|
||||
@click.capture="handleCardClick"
|
||||
@focusin="handleSessionFocus(session)"
|
||||
@focusout="handleSessionBlur($event)"
|
||||
@keydown="handleItemKeydown($event, session)"
|
||||
>
|
||||
<div class="item-top">
|
||||
<h4 class="item-title">{{ session.user_agent }}</h4>
|
||||
@@ -31,19 +35,20 @@
|
||||
<span v-if="session.is_current && !hoveredIp && !hoveredCredentialUuid" class="badge badge-current">Current</span>
|
||||
<span v-else-if="hoveredSession?.id === session.id" class="badge badge-current">Selected</span>
|
||||
<span v-else-if="hoveredCredentialUuid === session.credential_uuid" class="badge badge-current">Linked</span>
|
||||
<span v-else-if="!hoveredCredentialUuid && isSameNetwork(session.ip)" class="badge">Same IP</span>
|
||||
<span v-else-if="!hoveredCredentialUuid && isSameHost(session.ip)" class="badge">Same IP</span>
|
||||
<button
|
||||
@click="$emit('terminate', session)"
|
||||
class="btn-card-delete"
|
||||
:disabled="isTerminating(session.id)"
|
||||
:title="isTerminating(session.id) ? 'Terminating...' : 'Terminate session'"
|
||||
>🗑️</button>
|
||||
tabindex="-1"
|
||||
>❌</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item-details">
|
||||
<div class="session-dates">
|
||||
<span class="date-label">{{ formatDate(session.last_renewed) }}</span>
|
||||
<span class="date-value">{{ session.ip }}</span>
|
||||
<span class="date-value" @click="copyIp(session.ip)" title="Click to copy full IP">{{ displayIp(session.ip) }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -59,6 +64,9 @@
|
||||
<script setup>
|
||||
import { computed, ref } from 'vue'
|
||||
import { formatDate } from '@/utils/helpers'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import { hostIP } from '@/utils/helpers'
|
||||
import { navigateGrid, handleDeleteKey, handleEscape, getDirection } from '@/utils/keynav'
|
||||
|
||||
const props = defineProps({
|
||||
sessions: { type: Array, default: () => [] },
|
||||
@@ -66,9 +74,12 @@ const props = defineProps({
|
||||
sectionDescription: { type: String, default: "Review where you're signed in and end any sessions you no longer recognize." },
|
||||
terminatingSessions: { type: Object, default: () => ({}) },
|
||||
hoveredCredentialUuid: { type: String, default: null },
|
||||
navigationDisabled: { type: Boolean, default: false },
|
||||
})
|
||||
|
||||
const emit = defineEmits(['terminate', 'sessionHover'])
|
||||
const emit = defineEmits(['terminate', 'sessionHover', 'navigate-out'])
|
||||
|
||||
const authStore = useAuthStore()
|
||||
|
||||
const hoveredIp = ref(null)
|
||||
const hoveredSession = ref(null)
|
||||
@@ -88,41 +99,122 @@ const handleSessionBlur = (event) => {
|
||||
}
|
||||
}
|
||||
|
||||
const handleCardClick = (event) => {
|
||||
if (!event.currentTarget.matches(':focus')) {
|
||||
event.currentTarget.focus()
|
||||
event.stopPropagation()
|
||||
}
|
||||
}
|
||||
|
||||
const isTerminating = (sessionId) => !!props.terminatingSessions[sessionId]
|
||||
|
||||
const handleGroupKeydown = (event, host) => {
|
||||
const group = event.currentTarget
|
||||
const sessionList = group.querySelector('.session-list')
|
||||
const items = sessionList?.querySelectorAll('.session-item')
|
||||
const allGroups = Array.from(document.querySelectorAll('.session-group'))
|
||||
const groupIndex = allGroups.indexOf(group)
|
||||
|
||||
// Enter on group header opens link (always allowed)
|
||||
if (event.key === 'Enter' && event.target === group) {
|
||||
if (host) group.querySelector('a')?.click()
|
||||
return
|
||||
}
|
||||
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
// Arrow keys to enter the grid from the group
|
||||
const direction = getDirection(event)
|
||||
if (['down', 'right'].includes(direction) && event.target === group) {
|
||||
event.preventDefault()
|
||||
items?.[0]?.focus()
|
||||
return
|
||||
}
|
||||
|
||||
// Up/Left from group navigates to previous group or out
|
||||
if (['up', 'left'].includes(direction) && event.target === group) {
|
||||
event.preventDefault()
|
||||
if (groupIndex > 0) {
|
||||
allGroups[groupIndex - 1].focus()
|
||||
} else {
|
||||
emit('navigate-out', 'up')
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Escape emits navigate-out
|
||||
handleEscape(event, (dir) => emit('navigate-out', dir))
|
||||
}
|
||||
|
||||
const handleItemKeydown = (event, session) => {
|
||||
// Handle delete (always allowed even with modal)
|
||||
handleDeleteKey(event, () => {
|
||||
if (!isTerminating(session.id)) emit('terminate', session)
|
||||
})
|
||||
if (event.defaultPrevented) return
|
||||
|
||||
if (props.navigationDisabled) return
|
||||
|
||||
// Arrow key navigation
|
||||
const direction = getDirection(event)
|
||||
if (direction) {
|
||||
event.preventDefault()
|
||||
const group = event.currentTarget.closest('.session-group')
|
||||
const sessionListEl = group.querySelector('.session-list')
|
||||
const result = navigateGrid(sessionListEl, event.currentTarget, direction, { itemSelector: '.session-item' })
|
||||
|
||||
// Custom boundary handling for session list
|
||||
if (result === 'boundary') {
|
||||
if (direction === 'left' || direction === 'up') {
|
||||
// At left/top edge, focus group
|
||||
group?.focus()
|
||||
} else if (direction === 'down' || direction === 'right') {
|
||||
// Try to navigate to next group or emit navigate-out
|
||||
const allGroups = Array.from(document.querySelectorAll('.session-group'))
|
||||
const groupIndex = allGroups.indexOf(group)
|
||||
|
||||
if (groupIndex < allGroups.length - 1) {
|
||||
allGroups[groupIndex + 1].focus()
|
||||
} else {
|
||||
emit('navigate-out', 'down')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Escape focuses the group
|
||||
if (event.key === 'Escape') {
|
||||
event.preventDefault()
|
||||
event.currentTarget.closest('.session-group')?.focus()
|
||||
}
|
||||
}
|
||||
|
||||
const hostUrl = (host) => {
|
||||
// Assume http if there's a port number, https otherwise
|
||||
const protocol = host.includes(':') ? 'http' : 'https'
|
||||
return `${protocol}://${host}`
|
||||
}
|
||||
|
||||
// Extract /64 prefix for IPv6, or return full IP for IPv4
|
||||
const getNetworkPrefix = ip => {
|
||||
if (!ip) return null
|
||||
|
||||
// IPv4?
|
||||
if (!ip.includes(':')) return ip
|
||||
|
||||
// Normalize IPv6 using URL
|
||||
// Wrap in brackets so URL accepts it
|
||||
const norm = new URL(`http://[${ip}]/`).hostname
|
||||
|
||||
// norm is now fully expanded, e.g. "2001:0db8:0000:0000:0000:0000:0000:0001"
|
||||
const parts = norm.split(':')
|
||||
return parts.slice(0, 4).join(':')
|
||||
const copyIp = async (ip) => {
|
||||
if (!ip) return
|
||||
try {
|
||||
await navigator.clipboard.writeText(ip)
|
||||
authStore.showMessage('Full IP copied to clipboard!', 'success', 2000)
|
||||
} catch (err) {
|
||||
console.error('Failed to copy IP:', err)
|
||||
authStore.showMessage('Failed to copy IP', 'error', 3000)
|
||||
}
|
||||
}
|
||||
|
||||
const currentNetworkPrefix = computed(() => {
|
||||
// Use hovered IP if available, otherwise fall back to current session
|
||||
if (hoveredIp.value) return getNetworkPrefix(hoveredIp.value)
|
||||
const displayIp = ip => hostIP(ip) ?? ip
|
||||
|
||||
const currentHostIP = computed(() => {
|
||||
if (hoveredIp.value) return hostIP(hoveredIp.value)
|
||||
const current = props.sessions.find(s => s.is_current)
|
||||
return current ? getNetworkPrefix(current.ip) : null
|
||||
return current ? hostIP(current.ip) : null
|
||||
})
|
||||
|
||||
const isSameNetwork = (ip) => {
|
||||
if (!currentNetworkPrefix.value || !ip) return false
|
||||
return getNetworkPrefix(ip) === currentNetworkPrefix.value
|
||||
}
|
||||
const isSameHost = ip => currentHostIP.value && hostIP(ip) === currentHostIP.value
|
||||
|
||||
const groupedSessions = computed(() => {
|
||||
const groups = {}
|
||||
@@ -150,57 +242,3 @@ const groupedSessions = computed(() => {
|
||||
return sortedGroups
|
||||
})
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.session-meta-info {
|
||||
grid-column: span 2;
|
||||
}
|
||||
[data-component="session-list-section"] .session-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1.5em;
|
||||
}
|
||||
.session-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5em;
|
||||
}
|
||||
.session-group-host {
|
||||
font-size: 1em;
|
||||
font-weight: 600;
|
||||
margin: 0;
|
||||
}
|
||||
.session-group-host a {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
.session-group-host a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.session-group-host.is-current-site {
|
||||
color: var(--color-accent);
|
||||
}
|
||||
.session-group-sessions {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(var(--card-width), 1fr));
|
||||
gap: 0.5em;
|
||||
align-items: start;
|
||||
}
|
||||
.session-group-sessions .session-item {
|
||||
width: auto;
|
||||
height: auto;
|
||||
padding: 0.75rem;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
.session-group-sessions .session-item .item-title {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.session-group-sessions .session-item .item-details {
|
||||
margin-left: 0;
|
||||
}
|
||||
.session-group-sessions .session-item .session-dates {
|
||||
grid-template-columns: auto 1fr;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -11,12 +11,14 @@
|
||||
<div class="org-line" v-if="orgDisplayName">{{ orgDisplayName }}</div>
|
||||
<div class="role-line" v-if="roleName">{{ roleName }}</div>
|
||||
</div>
|
||||
<span class="info-label"><strong>Visits:</strong></span>
|
||||
<span class="info-value">{{ visits || 0 }}</span>
|
||||
<span class="info-label"><strong>Registered:</strong></span>
|
||||
<span class="info-value">{{ formatDate(createdAt) }}</span>
|
||||
<span class="info-label"><strong>Last seen:</strong></span>
|
||||
<span class="info-value">{{ formatDate(lastSeen) }}</span>
|
||||
<div class="user-details">
|
||||
<span class="date-label"><strong>Visits:</strong></span>
|
||||
<span class="date-value">{{ visits || 0 }}</span>
|
||||
<span class="date-label"><strong>Registered:</strong></span>
|
||||
<span class="date-value">{{ formatDate(createdAt) }}</span>
|
||||
<span class="date-label"><strong>Last seen:</strong></span>
|
||||
<span class="date-value">{{ formatDate(lastSeen) }}</span>
|
||||
</div>
|
||||
<div v-if="$slots.default" class="user-info-extra">
|
||||
<slot></slot>
|
||||
</div>
|
||||
@@ -48,14 +50,13 @@ const userLoaded = computed(() => !!props.name)
|
||||
|
||||
<style scoped>
|
||||
.user-info.has-extra {
|
||||
grid-template-columns: auto 1fr;
|
||||
grid-template-columns: auto 1fr 2fr;
|
||||
grid-template-areas:
|
||||
"heading heading"
|
||||
"org org"
|
||||
"label1 value1"
|
||||
"label2 value2"
|
||||
"label3 value3"
|
||||
"extra extra";
|
||||
"heading heading extra"
|
||||
"org org extra"
|
||||
"label1 value1 extra"
|
||||
"label2 value2 extra"
|
||||
"label3 value3 extra";
|
||||
}
|
||||
|
||||
.user-info:not(.has-extra) {
|
||||
@@ -68,19 +69,20 @@ const userLoaded = computed(() => !!props.name)
|
||||
"label3 value3";
|
||||
}
|
||||
|
||||
@media (min-width: 769px) {
|
||||
@media (max-width: 720px) {
|
||||
.user-info.has-extra {
|
||||
grid-template-columns: auto 1fr 2fr;
|
||||
grid-template-columns: auto 1fr;
|
||||
grid-template-areas:
|
||||
"heading heading extra"
|
||||
"org org extra"
|
||||
"label1 value1 extra"
|
||||
"label2 value2 extra"
|
||||
"label3 value3 extra";
|
||||
"heading heading"
|
||||
"org org"
|
||||
"label1 value1"
|
||||
"label2 value2"
|
||||
"label3 value3"
|
||||
"extra extra";
|
||||
}
|
||||
}
|
||||
|
||||
.user-name-heading { grid-area: heading; display: flex; align-items: center; gap: 0.4rem; flex-wrap: wrap; margin: 0 0 0.25rem 0; }
|
||||
.user-name-heading { grid-area: heading; display: flex; align-items: center; flex-wrap: wrap; margin: 0 0 0.25rem 0; }
|
||||
.org-role-sub { grid-area: org; display:flex; flex-direction:column; margin: -0.15rem 0 0.25rem; }
|
||||
.org-line { font-size: .7rem; font-weight:600; line-height:1.1; color: var(--color-text-muted); text-transform: uppercase; letter-spacing: 0.05em; }
|
||||
.role-line { font-size:.65rem; color: var(--color-text-muted); line-height:1.1; }
|
||||
@@ -93,15 +95,13 @@ const userLoaded = computed(() => !!props.name)
|
||||
.user-info-extra { grid-area: extra; padding-left: 2rem; border-left: 1px solid var(--color-border); }
|
||||
.user-name-row { display: inline-flex; align-items: center; gap: 0.35rem; max-width: 100%; }
|
||||
.user-name-row.editing { flex: 1 1 auto; }
|
||||
.icon { flex: 0 0 auto; }
|
||||
.display-name { font-weight: 600; font-size: 1.05em; line-height: 1.2; max-width: 14ch; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.name-input { width: auto; flex: 1 1 140px; min-width: 120px; padding: 6px 8px; font-size: 0.9em; border: 1px solid var(--color-border-strong); border-radius: 6px; background: var(--color-surface); color: var(--color-text); }
|
||||
.user-name-heading .name-input { width: auto; }
|
||||
.name-input:focus { outline: none; border-color: var(--color-accent); box-shadow: var(--focus-ring); }
|
||||
.mini-btn { width: auto; padding: 4px 6px; margin: 0; font-size: 0.75em; line-height: 1; background: var(--color-surface-muted); border: 1px solid var(--color-border-strong); border-radius: 6px; cursor: pointer; transition: background 0.2s, transform 0.15s, color 0.2s ease; color: var(--color-text); }
|
||||
.mini-btn { width: auto; padding: 4px 6px; margin: 0; font-size: 0.75em; line-height: 1; cursor: pointer; }
|
||||
.mini-btn:hover:not(:disabled) { background: var(--color-accent-soft); color: var(--color-accent); }
|
||||
.mini-btn:active:not(:disabled) { transform: translateY(1px); }
|
||||
.mini-btn:disabled { opacity: 0.5; cursor: not-allowed; }
|
||||
@media (max-width: 768px) { .user-info-extra { padding-left: 0; padding-top: 1rem; border-left: none; border-top: 1px solid var(--color-border); } }
|
||||
@media (max-width: 480px) { .user-name-heading { flex-direction: column; align-items: flex-start; } .user-name-row.editing { width: 100%; } .display-name { max-width: 100%; } }
|
||||
@media (max-width: 720px) { .user-info-extra { padding-left: 0; padding-top: 1rem; margin-top: 1rem; border-left: none; border-top: 1px solid var(--color-border); } }
|
||||
</style>
|
||||
|
||||
@@ -49,6 +49,29 @@ let authPromise = null
|
||||
let authResolve = null
|
||||
let authReject = null
|
||||
|
||||
// Global backdrop ref-count (works independently of Pinia store)
|
||||
let backdropHolders = 0
|
||||
|
||||
/**
|
||||
* Hold global backdrop (increment ref-count).
|
||||
* Multiple callers can hold the backdrop; it only hides when all release.
|
||||
*/
|
||||
export function holdGlobalBackdrop() {
|
||||
backdropHolders++
|
||||
document.body.classList.add('has-backdrop')
|
||||
}
|
||||
|
||||
/**
|
||||
* Release global backdrop (decrement ref-count).
|
||||
* Backdrop hides only when ref-count reaches zero.
|
||||
*/
|
||||
export function releaseGlobalBackdrop() {
|
||||
backdropHolders = Math.max(0, backdropHolders - 1)
|
||||
if (backdropHolders === 0) {
|
||||
document.body.classList.remove('has-backdrop')
|
||||
}
|
||||
}
|
||||
|
||||
// Cache for auth iframe URL by mode
|
||||
const authIframeUrlCache = {}
|
||||
|
||||
@@ -93,6 +116,7 @@ export function isAuthIframeOpen() {
|
||||
/**
|
||||
* Show the authentication iframe and return a promise that resolves on success.
|
||||
* If an auth iframe is already open (from any source), hooks into its completion.
|
||||
* Uses global backdrop system to avoid flicker between auth and caller's UI.
|
||||
* @param {string} iframeUrl - The URL for the iframe src
|
||||
* @returns {Promise<void>}
|
||||
* @throws {AuthCancelledError} - If authentication is cancelled by user
|
||||
@@ -119,6 +143,9 @@ export function showAuthIframe(iframeUrl) {
|
||||
// Remove existing iframe if any
|
||||
hideAuthIframe()
|
||||
|
||||
// Hold global backdrop for auth iframe
|
||||
holdGlobalBackdrop()
|
||||
|
||||
// Create new iframe for authentication using src URL
|
||||
authIframe = document.createElement('iframe')
|
||||
authIframe.id = 'auth-iframe'
|
||||
@@ -134,6 +161,7 @@ function hideAuthIframe() {
|
||||
if (authIframe) {
|
||||
authIframe.remove()
|
||||
authIframe = null
|
||||
releaseGlobalBackdrop()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* @param {string} str - Base64url encoded string
|
||||
* @returns {Uint8Array} - Decoded bytes
|
||||
*/
|
||||
export function dec(str) {
|
||||
export function b64dec(str) {
|
||||
// Convert URL-safe characters to standard base64
|
||||
const base64 = str.replace(/-/g, '+').replace(/_/g, '/')
|
||||
// Add padding if needed
|
||||
@@ -26,7 +26,7 @@ export function dec(str) {
|
||||
* @param {Uint8Array} bytes - Bytes to encode
|
||||
* @returns {string} - Base64url encoded string (no padding)
|
||||
*/
|
||||
export function enc(bytes) {
|
||||
export function b64enc(bytes) {
|
||||
const base64 = btoa(String.fromCharCode(...bytes))
|
||||
// Convert to URL-safe and remove padding
|
||||
return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
|
||||
|
||||
@@ -26,3 +26,18 @@ export function getCookie(name) {
|
||||
}
|
||||
|
||||
export const goBack = () => history.back() || window.close()
|
||||
|
||||
// IPv4 unchanged, IPv6 returns /64 network prefix in compact form
|
||||
export const hostIP = ip => {
|
||||
try {
|
||||
if (!ip || !ip.includes(':')) return ip
|
||||
const strip = s => s.replace(/^\[|\]$/g, '')
|
||||
const norm = strip(new URL(`http://[${ip}]/`).hostname)
|
||||
const [l, r] = norm.split('::').map(s => s ? s.split(':') : [])
|
||||
const full = r ? [...l, ...Array(8 - l.length - r.length).fill('0'), ...r] : l
|
||||
return strip(new URL(`http://[${full.slice(0, 4).join(':')}::]/`).hostname).replace(/::$/, '')
|
||||
} catch (e) {
|
||||
console.error('hostIP processing failed for:', ip, e)
|
||||
return ip
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,479 @@
|
||||
/**
|
||||
* Keyboard Navigation Module
|
||||
*
|
||||
* Provides reusable arrow key navigation for button groups and grids.
|
||||
*
|
||||
* Concepts:
|
||||
* - Group: A container with focusable elements (buttons, links, items)
|
||||
* - Button row: Left/right arrows navigate between buttons, up/down navigate to adjacent groups
|
||||
* - Grid: A responsive grid of items; arrows follow the visual grid layout
|
||||
*
|
||||
* Data attributes for customization:
|
||||
* - data-nav-group: Marks a navigation group container
|
||||
* - data-nav-primary: Marks the preferred element to focus when entering a group
|
||||
* - data-nav-items: CSS selector for focusable items within the group (default: 'button, a, [tabindex="0"], [tabindex="-1"]:not([disabled])')
|
||||
*
|
||||
* Automatic navigation:
|
||||
* - Buttons/links inside .button-row or .modal-actions get automatic left/right arrow navigation
|
||||
* - No need for explicit @keydown handlers on elements
|
||||
* - Call initKeyboardNavigation() once at app startup to enable global navigation
|
||||
*/
|
||||
|
||||
// Direction mapping from key events
|
||||
const DIRECTION_MAP = {
|
||||
ArrowLeft: 'left',
|
||||
ArrowRight: 'right',
|
||||
ArrowUp: 'up',
|
||||
ArrowDown: 'down'
|
||||
}
|
||||
|
||||
// Input types that use left/right arrows for internal cursor movement
|
||||
const TEXT_INPUT_TYPES = new Set([
|
||||
'text', 'email', 'password', 'search', 'tel', 'url', 'number'
|
||||
])
|
||||
|
||||
/**
|
||||
* Get the direction from a keyboard event.
|
||||
* For text inputs with content, left/right arrows return null to preserve cursor movement.
|
||||
* @param {KeyboardEvent} event
|
||||
* @returns {string|null} 'left', 'right', 'up', 'down', or null
|
||||
*/
|
||||
export const getDirection = (event) => {
|
||||
const direction = DIRECTION_MAP[event.key]
|
||||
if (!direction) return null
|
||||
|
||||
// For text inputs, preserve left/right for cursor movement when there's content
|
||||
const target = event.target
|
||||
const isTextInput = (target.tagName === 'INPUT' && TEXT_INPUT_TYPES.has(target.type)) || target.tagName === 'TEXTAREA'
|
||||
if (isTextInput && (direction === 'left' || direction === 'right')) {
|
||||
// Only allow navigation when input is empty
|
||||
if (target.value !== '') return null
|
||||
}
|
||||
|
||||
return direction
|
||||
}
|
||||
|
||||
/**
|
||||
* Get focusable elements within a container
|
||||
* @param {HTMLElement} container
|
||||
* @param {string} selector - CSS selector for items (optional)
|
||||
* @returns {HTMLElement[]}
|
||||
*/
|
||||
export const getFocusableItems = (container, selector = null) => {
|
||||
if (!container) return []
|
||||
const sel = selector || container.dataset?.navItems || 'button:not([disabled]), a, [tabindex="0"], [tabindex="-1"]:not([disabled])'
|
||||
return Array.from(container.querySelectorAll(sel))
|
||||
}
|
||||
|
||||
/**
|
||||
* Get grid layout information for a container
|
||||
* @param {HTMLElement} container
|
||||
* @param {string} itemSelector - CSS selector for grid items
|
||||
* @returns {{ items: HTMLElement[], cols: number } | null}
|
||||
*/
|
||||
export const getGridInfo = (container, itemSelector) => {
|
||||
const items = getFocusableItems(container, itemSelector)
|
||||
if (items.length === 0) return null
|
||||
|
||||
// Calculate columns by checking which items share the same top position
|
||||
const firstTop = items[0].getBoundingClientRect().top
|
||||
let cols = 0
|
||||
for (const item of items) {
|
||||
if (Math.abs(item.getBoundingClientRect().top - firstTop) < 5) cols++
|
||||
else break
|
||||
}
|
||||
return { items, cols: Math.max(1, cols) }
|
||||
}
|
||||
|
||||
/**
|
||||
* Navigate within a horizontal button row
|
||||
* @param {HTMLElement} container - The container element
|
||||
* @param {HTMLElement} current - Currently focused element
|
||||
* @param {string} direction - 'left', 'right', 'up', or 'down'
|
||||
* @param {Object} options
|
||||
* @param {string} options.itemSelector - CSS selector for buttons
|
||||
* @returns {'moved'|'boundary'|'none'} Result of navigation
|
||||
*/
|
||||
export const navigateButtonRow = (container, current, direction, options = {}) => {
|
||||
const items = getFocusableItems(container, options.itemSelector)
|
||||
if (items.length === 0) return 'none'
|
||||
|
||||
const currentIndex = items.indexOf(current)
|
||||
if (currentIndex === -1) return 'none'
|
||||
|
||||
if (direction === 'left') {
|
||||
if (currentIndex > 0) {
|
||||
items[currentIndex - 1].focus()
|
||||
return 'moved'
|
||||
}
|
||||
return 'boundary'
|
||||
}
|
||||
|
||||
if (direction === 'right') {
|
||||
if (currentIndex < items.length - 1) {
|
||||
items[currentIndex + 1].focus()
|
||||
return 'moved'
|
||||
}
|
||||
return 'boundary'
|
||||
}
|
||||
|
||||
// Up/down are always boundaries for button rows
|
||||
return 'boundary'
|
||||
}
|
||||
|
||||
/**
|
||||
* Navigate within a responsive grid
|
||||
* @param {HTMLElement} container - The grid container
|
||||
* @param {HTMLElement} current - Currently focused element
|
||||
* @param {string} direction - 'left', 'right', 'up', or 'down'
|
||||
* @param {Object} options
|
||||
* @param {string} options.itemSelector - CSS selector for grid items
|
||||
* @returns {'moved'|'boundary'|'none'} Result of navigation
|
||||
*/
|
||||
export const navigateGrid = (container, current, direction, options = {}) => {
|
||||
const grid = getGridInfo(container, options.itemSelector)
|
||||
if (!grid) return 'none'
|
||||
|
||||
const { items, cols } = grid
|
||||
const currentIndex = items.indexOf(current)
|
||||
if (currentIndex === -1) return 'none'
|
||||
|
||||
const row = Math.floor(currentIndex / cols)
|
||||
const col = currentIndex % cols
|
||||
let newIndex = currentIndex
|
||||
|
||||
switch (direction) {
|
||||
case 'left':
|
||||
if (col === 0) return 'boundary'
|
||||
newIndex = currentIndex - 1
|
||||
break
|
||||
case 'right':
|
||||
if (currentIndex >= items.length - 1) return 'boundary'
|
||||
newIndex = currentIndex + 1
|
||||
break
|
||||
case 'up':
|
||||
if (row === 0) return 'boundary'
|
||||
newIndex = currentIndex - cols
|
||||
break
|
||||
case 'down':
|
||||
if (currentIndex + cols >= items.length) return 'boundary'
|
||||
newIndex = currentIndex + cols
|
||||
break
|
||||
default:
|
||||
return 'none'
|
||||
}
|
||||
|
||||
if (newIndex !== currentIndex) {
|
||||
items[newIndex].focus()
|
||||
return 'moved'
|
||||
}
|
||||
return 'none'
|
||||
}
|
||||
|
||||
/**
|
||||
* Focus the preferred element in a group (primary or first focusable)
|
||||
* @param {HTMLElement} container
|
||||
* @param {Object} options
|
||||
* @param {string} options.primarySelector - CSS selector for primary element
|
||||
* @param {string} options.itemSelector - CSS selector for items
|
||||
* @returns {HTMLElement|null} The focused element, or null if none found
|
||||
*/
|
||||
export const focusPreferred = (container, options = {}) => {
|
||||
if (!container) return null
|
||||
|
||||
// First try data-nav-primary
|
||||
const primary = container.querySelector('[data-nav-primary]') ||
|
||||
(options.primarySelector && container.querySelector(options.primarySelector))
|
||||
if (primary) {
|
||||
primary.focus()
|
||||
return primary
|
||||
}
|
||||
|
||||
// Fall back to first focusable
|
||||
const items = getFocusableItems(container, options.itemSelector)
|
||||
if (items.length > 0) {
|
||||
items[0].focus()
|
||||
return items[0]
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
/**
|
||||
* Focus a specific item by index in a group
|
||||
* @param {HTMLElement} container
|
||||
* @param {number} index - Index of item to focus (negative counts from end)
|
||||
* @param {Object} options
|
||||
* @param {string} options.itemSelector - CSS selector for items
|
||||
* @returns {HTMLElement|null} The focused element, or null if not found
|
||||
*/
|
||||
export const focusAtIndex = (container, index, options = {}) => {
|
||||
if (!container) return null
|
||||
|
||||
const items = getFocusableItems(container, options.itemSelector)
|
||||
if (items.length === 0) return null
|
||||
|
||||
// Support negative indices
|
||||
const resolvedIndex = index < 0 ? items.length + index : index
|
||||
if (resolvedIndex >= 0 && resolvedIndex < items.length) {
|
||||
items[resolvedIndex].focus()
|
||||
return items[resolvedIndex]
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a keydown handler for button row navigation
|
||||
* @param {Object} options
|
||||
* @param {() => HTMLElement} options.getContainer - Function returning the container element
|
||||
* @param {string} options.itemSelector - CSS selector for buttons
|
||||
* @param {(direction: string) => void} options.onBoundary - Called when navigation hits a boundary
|
||||
* @param {() => boolean} options.isDisabled - Function returning whether navigation is disabled
|
||||
* @returns {(event: KeyboardEvent) => void}
|
||||
*/
|
||||
export const createButtonRowHandler = (options) => {
|
||||
const { getContainer, itemSelector, onBoundary, isDisabled } = options
|
||||
|
||||
return (event) => {
|
||||
if (isDisabled?.()) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
const container = getContainer()
|
||||
|
||||
if (direction === 'up' || direction === 'down') {
|
||||
// Vertical navigation always exits button rows
|
||||
onBoundary?.(direction)
|
||||
return
|
||||
}
|
||||
|
||||
const result = navigateButtonRow(container, event.target, direction, { itemSelector })
|
||||
if (result === 'boundary') {
|
||||
onBoundary?.(direction)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a keydown handler for grid navigation
|
||||
* @param {Object} options
|
||||
* @param {() => HTMLElement} options.getContainer - Function returning the container element
|
||||
* @param {string} options.itemSelector - CSS selector for grid items
|
||||
* @param {(direction: string) => void} options.onBoundary - Called when navigation hits a boundary
|
||||
* @param {() => boolean} options.isDisabled - Function returning whether navigation is disabled
|
||||
* @returns {(event: KeyboardEvent) => void}
|
||||
*/
|
||||
export const createGridHandler = (options) => {
|
||||
const { getContainer, itemSelector, onBoundary, isDisabled } = options
|
||||
|
||||
return (event) => {
|
||||
if (isDisabled?.()) return
|
||||
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
event.preventDefault()
|
||||
const container = getContainer()
|
||||
const result = navigateGrid(container, event.target, direction, { itemSelector })
|
||||
|
||||
if (result === 'boundary') {
|
||||
onBoundary?.(direction)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle escape key to navigate out of a component
|
||||
* @param {KeyboardEvent} event
|
||||
* @param {(direction: string) => void} onNavigateOut - Callback with direction
|
||||
* @param {() => boolean} isDisabled - Function returning whether navigation is disabled
|
||||
*/
|
||||
export const handleEscape = (event, onNavigateOut, isDisabled) => {
|
||||
if (isDisabled?.()) return false
|
||||
if (event.key !== 'Escape') return false
|
||||
|
||||
event.preventDefault()
|
||||
onNavigateOut?.('up')
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle delete/backspace key for item deletion
|
||||
* @param {KeyboardEvent} event
|
||||
* @param {() => void} onDelete - Callback to perform deletion
|
||||
* @returns {boolean} Whether the key was handled
|
||||
*/
|
||||
export const handleDeleteKey = (event, onDelete) => {
|
||||
const isMac = navigator.userAgent.includes('Mac OS')
|
||||
if (event.key === 'Delete' || (isMac && event.key === 'Backspace')) {
|
||||
event.preventDefault()
|
||||
onDelete?.()
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
/**
|
||||
* Focus the most appropriate button in a dialog/modal.
|
||||
* Priority: .btn-primary > .btn-secondary > any button
|
||||
* @param {HTMLElement} container - The dialog/modal container element
|
||||
* @returns {HTMLElement|null} The focused element, or null if none found
|
||||
*/
|
||||
export const focusDialogButton = (container) => {
|
||||
if (!container) return null
|
||||
|
||||
// Priority order for button selection
|
||||
const selectors = [
|
||||
'.btn-primary:not([disabled])',
|
||||
'.btn-secondary:not([disabled])',
|
||||
'button:not([disabled])'
|
||||
]
|
||||
|
||||
for (const selector of selectors) {
|
||||
const btn = container.querySelector(selector)
|
||||
if (btn) {
|
||||
btn.focus()
|
||||
return btn
|
||||
}
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
/**
|
||||
* Focus the most appropriate element in a dialog/modal.
|
||||
* For dialogs with input fields (rename/edit forms): focuses first input and selects text
|
||||
* For other dialogs: focuses primary button (or fallback)
|
||||
* @param {HTMLElement} container - The dialog/modal container element
|
||||
* @returns {HTMLElement|null} The focused element, or null if none found
|
||||
*/
|
||||
export const focusDialogDefault = (container) => {
|
||||
if (!container) return null
|
||||
|
||||
// Check for input fields first (form dialogs like rename)
|
||||
const input = container.querySelector('input:not([disabled]):not([type="hidden"]), textarea:not([disabled])')
|
||||
if (input) {
|
||||
input.focus()
|
||||
// Select text for better UX in rename dialogs
|
||||
if (typeof input.select === 'function') {
|
||||
input.select()
|
||||
}
|
||||
return input
|
||||
}
|
||||
|
||||
// Fall back to button focus for non-form dialogs
|
||||
return focusDialogButton(container)
|
||||
}
|
||||
|
||||
/**
|
||||
* Standard keydown handler for button rows with left/right navigation.
|
||||
* Can be used directly on buttons or on a container with event delegation.
|
||||
* Automatically finds the .button-row or .modal-actions container.
|
||||
* @param {KeyboardEvent} event - The keydown event
|
||||
* @param {Object} options
|
||||
* @param {(direction: string) => void} options.onBoundary - Called when navigation hits a boundary (up/down or edge)
|
||||
*/
|
||||
export const handleButtonKeydown = (event, options = {}) => {
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
// Find the button row container
|
||||
const target = event.target
|
||||
if (target.tagName !== 'BUTTON' && target.tagName !== 'A') return
|
||||
|
||||
const container = target.closest('.button-row, .modal-actions')
|
||||
if (!container) return
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
event.preventDefault()
|
||||
const result = navigateButtonRow(container, target, direction, { itemSelector: 'button, a' })
|
||||
if (result === 'boundary') {
|
||||
options.onBoundary?.(direction)
|
||||
}
|
||||
} else if (direction === 'up' || direction === 'down') {
|
||||
// Vertical navigation exits button rows
|
||||
options.onBoundary?.(direction)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Install keyboard navigation on a container element.
|
||||
* Handles arrow key navigation for buttons within .button-row or .modal-actions.
|
||||
* Uses event delegation so no need to add handlers to individual buttons.
|
||||
* @param {HTMLElement} container - The container element to enable navigation on
|
||||
* @param {Object} options
|
||||
* @param {(direction: string) => void} options.onBoundary - Called when navigation hits a boundary
|
||||
* @returns {() => void} Cleanup function to remove the event listener
|
||||
*/
|
||||
export const installKeyboardNav = (container, options = {}) => {
|
||||
if (!container) return () => {}
|
||||
|
||||
const handler = (event) => handleButtonKeydown(event, options)
|
||||
container.addEventListener('keydown', handler)
|
||||
|
||||
return () => container.removeEventListener('keydown', handler)
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Global Automatic Keyboard Navigation
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* Selector for containers that should have automatic button row navigation
|
||||
*/
|
||||
const BUTTON_ROW_SELECTOR = '.button-row, .modal-actions, .actions, .role-actions, .ancillary-actions'
|
||||
|
||||
/**
|
||||
* Global keydown handler for automatic button row navigation.
|
||||
* Handles arrow key navigation for buttons/links within .button-row or .modal-actions containers.
|
||||
* @param {KeyboardEvent} event
|
||||
*/
|
||||
const globalKeydownHandler = (event) => {
|
||||
const direction = getDirection(event)
|
||||
if (!direction) return
|
||||
|
||||
// Only handle buttons and links
|
||||
const target = event.target
|
||||
if (target.tagName !== 'BUTTON' && target.tagName !== 'A') return
|
||||
|
||||
// Find the button row container
|
||||
const container = target.closest(BUTTON_ROW_SELECTOR)
|
||||
if (!container) return
|
||||
|
||||
if (direction === 'left' || direction === 'right') {
|
||||
event.preventDefault()
|
||||
navigateButtonRow(container, target, direction, { itemSelector: 'button:not([disabled]), a' })
|
||||
}
|
||||
// Note: up/down navigation is intentionally not handled globally
|
||||
// Components can add their own handlers for vertical navigation between groups
|
||||
}
|
||||
|
||||
let globalNavInitialized = false
|
||||
|
||||
/**
|
||||
* Initialize global keyboard navigation.
|
||||
* Call this once at app startup to enable automatic arrow key navigation
|
||||
* for buttons within .button-row and .modal-actions containers.
|
||||
* Safe to call multiple times (only initializes once).
|
||||
*/
|
||||
export const initKeyboardNavigation = () => {
|
||||
if (globalNavInitialized) return
|
||||
if (typeof document === 'undefined') return // SSR safety
|
||||
|
||||
document.addEventListener('keydown', globalKeydownHandler)
|
||||
globalNavInitialized = true
|
||||
}
|
||||
|
||||
/**
|
||||
* Cleanup global keyboard navigation (useful for testing).
|
||||
*/
|
||||
export const destroyKeyboardNavigation = () => {
|
||||
if (!globalNavInitialized) return
|
||||
if (typeof document === 'undefined') return
|
||||
|
||||
document.removeEventListener('keydown', globalKeydownHandler)
|
||||
globalNavInitialized = false
|
||||
}
|
||||
@@ -57,21 +57,15 @@ export async function register(resetToken = null, displayName = null, onstartreg
|
||||
export async function authenticate() {
|
||||
const ws = await aWebSocket(await makeUrl('/auth/ws/authenticate'))
|
||||
try {
|
||||
const res = await ws.receive_json()
|
||||
console.log('Authentication options:', res)
|
||||
// status field present means error
|
||||
if (res.status) {
|
||||
throw new Error(res.detail || `Authentication failed: ${res.status}`)
|
||||
}
|
||||
let res = await ws.receive_json()
|
||||
if (res.status >= 400) throw new Error(res.detail || `Authentication failed: ${res.status}`)
|
||||
|
||||
const authResponse = await startAuthentication(res)
|
||||
ws.send_json(authResponse)
|
||||
|
||||
const result = await ws.receive_json()
|
||||
if (result.status) {
|
||||
throw new Error(result.detail || `Authentication failed: ${result.status}`)
|
||||
}
|
||||
return result
|
||||
res = await ws.receive_json()
|
||||
if (res.status >= 400) throw new Error(res.detail || `Authentication failed: ${res.status}`)
|
||||
return res
|
||||
} catch (error) {
|
||||
console.error('Authentication error:', error)
|
||||
throw Error(error.name === "NotAllowedError" ? 'Passkey authentication cancelled' : error.message)
|
||||
|
||||
+34
-1
@@ -5,17 +5,50 @@ import vue from '@vitejs/plugin-vue'
|
||||
import { existsSync, renameSync, mkdirSync } from 'node:fs'
|
||||
import sirv from 'sirv'
|
||||
|
||||
// Auth host mode: when set, clients accessing the auth host get /auth/ at / and /auth/admin/ at /admin/
|
||||
const authHost = process.env.PASKIA_AUTH_HOST
|
||||
|
||||
export default defineConfig(({ command }) => ({
|
||||
appType: 'mpa',
|
||||
publicDir: 'public',
|
||||
plugins: [
|
||||
vue(),
|
||||
// Auth host routing: rewrite paths when accessing dedicated auth host
|
||||
// Must run before serve-examples to handle / correctly
|
||||
authHost && {
|
||||
name: 'auth-host-routing',
|
||||
configureServer(server) {
|
||||
server.middlewares.use((req, _res, next) => {
|
||||
const host = req.headers.host?.split(':')[0]
|
||||
// Check if request is coming to the auth host
|
||||
if (host === authHost) {
|
||||
// Only rewrite specific paths that should map to /auth/*
|
||||
// Rewrite / and /index.html to /auth/
|
||||
if (req.url === '/' || req.url === '/index.html') {
|
||||
req.url = '/auth/'
|
||||
}
|
||||
// Rewrite /admin/* to /auth/admin/*
|
||||
else if (req.url.startsWith('/admin/') || req.url === '/admin') {
|
||||
req.url = '/auth' + req.url
|
||||
}
|
||||
// Everything else (Vite paths, passphrase links, etc.) passes through unchanged
|
||||
}
|
||||
next()
|
||||
})
|
||||
}
|
||||
},
|
||||
{
|
||||
name: 'serve-examples',
|
||||
configureServer(server) {
|
||||
const examplesDir = resolve(__dirname, '../examples')
|
||||
const serve = sirv(examplesDir, { dev: true })
|
||||
server.middlewares.use((req, _res, next) => {
|
||||
// Skip redirect to examples on auth host (handled by auth-host-routing)
|
||||
const host = req.headers.host?.split(':')[0]
|
||||
if (authHost && host === authHost) {
|
||||
next()
|
||||
return
|
||||
}
|
||||
if (req.url === '/' || req.url === '/index.html') req.url = '/examples/'
|
||||
next()
|
||||
})
|
||||
@@ -46,7 +79,7 @@ export default defineConfig(({ command }) => ({
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
].filter(Boolean),
|
||||
resolve: {
|
||||
alias: { '@': fileURLToPath(new URL('./src', import.meta.url)) }
|
||||
},
|
||||
|
||||
@@ -185,9 +185,13 @@ def main():
|
||||
|
||||
# If origins are configured, ensure auth_host is included at top
|
||||
if origins:
|
||||
# Insert auth_host at the beginning (Passkey.__init__ will dedupe)
|
||||
# Insert auth_host at the beginning
|
||||
origins.insert(0, args.auth_host)
|
||||
|
||||
# Remove duplicates while preserving order
|
||||
seen = set()
|
||||
origins = [x for x in origins if not (x in seen or seen.add(x))]
|
||||
|
||||
# Compute site_url and site_path for reset links
|
||||
# Priority: auth_host > first origin with localhost > http://localhost:port
|
||||
if args.auth_host:
|
||||
|
||||
@@ -559,6 +559,7 @@ async def admin_get_user_detail(
|
||||
sessions_payload.append(
|
||||
{
|
||||
"id": encode_session_key(entry.key),
|
||||
"credential_uuid": str(entry.credential_uuid),
|
||||
"host": entry.host,
|
||||
"ip": entry.ip,
|
||||
"user_agent": useragent.compact_user_agent(entry.user_agent),
|
||||
|
||||
@@ -38,7 +38,7 @@ async def websocket_remote_auth_request(ws: WebSocket):
|
||||
1. Client connects
|
||||
2. Server sends HARD PoW challenge, client solves and responds
|
||||
3. Server creates a 3-word pairing code and sends it with expiry
|
||||
4. Server waits for another device to authenticate via /remote-auth/pair
|
||||
4. Server waits for another device to authenticate via /remote-auth/permit
|
||||
5. When auth completes, server sends session_token to this client
|
||||
6. Client can then use the session token to set a cookie
|
||||
7. Connection times out after 5 minutes with explicit timeout message
|
||||
@@ -250,9 +250,9 @@ async def websocket_remote_auth_request(ws: WebSocket):
|
||||
remoteauth.instance.decrement_connections()
|
||||
|
||||
|
||||
@app.websocket("/pair")
|
||||
@app.websocket("/permit")
|
||||
@websocket_error_handler
|
||||
async def websocket_remote_auth_pair(ws: WebSocket):
|
||||
async def websocket_remote_auth_permit(ws: WebSocket):
|
||||
"""Complete a remote authentication request using a 3-word pairing code.
|
||||
|
||||
This endpoint is called from the user's profile on the authenticating device.
|
||||
|
||||
@@ -3,7 +3,7 @@ from uuid import UUID
|
||||
from fastapi import FastAPI, WebSocket
|
||||
|
||||
from paskia.authsession import create_session, get_reset, get_session
|
||||
from paskia.fastapi import authz
|
||||
from paskia.fastapi import authz, remote
|
||||
from paskia.fastapi.session import AUTH_COOKIE, infodict
|
||||
from paskia.fastapi.wsutil import validate_origin, websocket_error_handler
|
||||
from paskia.globals import db, passkey
|
||||
@@ -13,6 +13,9 @@ from paskia.util.tokens import create_token, session_key
|
||||
# Create a FastAPI subapp for WebSocket endpoints
|
||||
app = FastAPI()
|
||||
|
||||
# Mount the remote auth WebSocket endpoints
|
||||
app.mount("/remote-auth", remote.app)
|
||||
|
||||
|
||||
async def register_chat(
|
||||
ws: WebSocket,
|
||||
|
||||
@@ -39,6 +39,8 @@ async def init(
|
||||
In FastAPI lifespan we call with bootstrap=False to avoid duplicate bootstrapping
|
||||
since the CLI performs it once before servers start.
|
||||
"""
|
||||
from . import remoteauth
|
||||
|
||||
# Initialize passkey instance with provided parameters
|
||||
passkey.instance = Passkey(
|
||||
rp_id=rp_id,
|
||||
@@ -54,6 +56,9 @@ async def init(
|
||||
|
||||
await sql.init()
|
||||
|
||||
# Initialize remote auth manager
|
||||
await remoteauth.init()
|
||||
|
||||
if bootstrap:
|
||||
# Bootstrap system if needed
|
||||
from .bootstrap import bootstrap_if_needed
|
||||
|
||||
+26
-36
@@ -118,7 +118,7 @@ def parse_endpoint(
|
||||
return host, port, None, False
|
||||
|
||||
|
||||
def run_vite(vite_url: str, vite_host: str | None, vite_port: int):
|
||||
def run_vite(vite_url: str, vite_host: str | None, vite_port: int, auth_host: str | None = None):
|
||||
"""Spawn the frontend dev server (deno, npm, or bunx) as a background process."""
|
||||
devpath = Path(__file__).parent.parent / "frontend"
|
||||
if not (devpath / "package.json").exists():
|
||||
@@ -160,7 +160,10 @@ def run_vite(vite_url: str, vite_host: str | None, vite_port: int):
|
||||
|
||||
full_cmd = cmd + vite_args
|
||||
stderr.write(f">>> {' '.join([tool_name, *full_cmd[1:]])}\n")
|
||||
vite_process = subprocess.Popen(full_cmd, cwd=str(devpath), shell=False)
|
||||
vite_env = os.environ.copy()
|
||||
if auth_host:
|
||||
vite_env["PASKIA_AUTH_HOST"] = auth_host
|
||||
vite_process = subprocess.Popen(full_cmd, cwd=str(devpath), shell=False, env=vite_env)
|
||||
except Exception as e:
|
||||
stderr.write(
|
||||
f"┃ ⚠️ Vite couldn't start: {e}\n"
|
||||
@@ -389,20 +392,25 @@ def main():
|
||||
|
||||
# Compute origins for Caddy (user-specified or auto-generated)
|
||||
caddy_origins = []
|
||||
if args.auth_host:
|
||||
auth_host = args.auth_host
|
||||
if "://" not in auth_host:
|
||||
auth_host = f"https://{auth_host}"
|
||||
caddy_origins.append(auth_host)
|
||||
# Also run on rp-id when auth-host is specified
|
||||
caddy_origins.append(f"https://{args.rp_id}")
|
||||
if args.origins:
|
||||
# User specified explicit origins - use those
|
||||
caddy_origins = args.origins
|
||||
elif args.caddy:
|
||||
# Caddy mode without explicit origins: add https origin for the hostname
|
||||
if args.auth_host:
|
||||
# auth-host is the primary origin
|
||||
auth_host = args.auth_host
|
||||
if "://" not in auth_host:
|
||||
auth_host = f"https://{auth_host}"
|
||||
caddy_origins.append(auth_host)
|
||||
else:
|
||||
# Use rp-id as the hostname (standard port 443, no port in URL)
|
||||
caddy_origins.append(f"https://{args.rp_id}")
|
||||
for origin in args.origins:
|
||||
if "://" not in origin:
|
||||
origin = f"https://{origin}"
|
||||
caddy_origins.append(origin)
|
||||
# If neither auth-host nor origins specified, run on rp-id
|
||||
if not args.auth_host and not args.origins:
|
||||
caddy_origins.append(f"https://{args.rp_id}")
|
||||
|
||||
# Remove duplicates while preserving order
|
||||
seen = set()
|
||||
caddy_origins = [x for x in caddy_origins if not (x in seen or seen.add(x))]
|
||||
|
||||
# Start Caddy if requested (after computing origins)
|
||||
if args.caddy:
|
||||
@@ -413,7 +421,7 @@ def main():
|
||||
raise SystemExit(1)
|
||||
|
||||
# Start Vite dev server
|
||||
run_vite(vite_url, vite_host, vite_port)
|
||||
run_vite(vite_url, vite_host, vite_port, args.auth_host)
|
||||
|
||||
# Set dev mode with Vite URL in environment for subprocess
|
||||
env = os.environ.copy()
|
||||
@@ -429,28 +437,10 @@ def main():
|
||||
if args.auth_host:
|
||||
cmd.extend(["--auth-host", args.auth_host])
|
||||
|
||||
# Collect all origins: Caddy origins first (auth-host first), then user origins
|
||||
# Use a set to track and avoid duplicates
|
||||
all_origins = []
|
||||
seen_origins = set(args.origins) if args.origins else set()
|
||||
|
||||
# Add Caddy origins first (they include auth-host origin if configured)
|
||||
if args.caddy:
|
||||
for origin in caddy_origins:
|
||||
if origin not in seen_origins:
|
||||
all_origins.append(origin)
|
||||
seen_origins.add(origin)
|
||||
|
||||
# Add user-specified origins
|
||||
# Pass through origins as specified
|
||||
if args.origins:
|
||||
for origin in args.origins:
|
||||
if origin not in seen_origins:
|
||||
all_origins.append(origin)
|
||||
seen_origins.add(origin)
|
||||
|
||||
# Pass all origins to backend
|
||||
for origin in all_origins:
|
||||
cmd.extend(["--origin", origin])
|
||||
cmd.extend(["--origin", origin])
|
||||
|
||||
# Add remaining args (ones we didn't parse)
|
||||
cmd.extend(remaining)
|
||||
|
||||
Reference in New Issue
Block a user