Compare commits
2 Commits
49b4c10e10
...
914b322805
| Author | SHA1 | Date | |
|---|---|---|---|
| 914b322805 | |||
| 2f306ca8a2 |
@@ -23,27 +23,62 @@ export default async function emailAsUserRoutes(server: FastifyInstance) {
|
||||
|
||||
const encryptedValue = (value: unknown) => value ? decrypt(value as any) : null
|
||||
|
||||
const accountResponse = (row: any) => ({
|
||||
const accountResponse = (row: any) => {
|
||||
const invalidEncryptedFields: string[] = []
|
||||
const safeEncryptedValue = (value: unknown, field: string) => {
|
||||
if (!value) return null
|
||||
try {
|
||||
return encryptedValue(value)
|
||||
} catch {
|
||||
invalidEncryptedFields.push(field)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
const email = safeEncryptedValue(row.emailEncrypted, "email")
|
||||
const smtpHost = safeEncryptedValue(row.smtpHostEncrypted, "smtpHost")
|
||||
const imapHost = safeEncryptedValue(row.imapHostEncrypted, "imapHost")
|
||||
safeEncryptedValue(row.passwordEncrypted, "password")
|
||||
|
||||
if (invalidEncryptedFields.length) {
|
||||
server.log.warn({
|
||||
accountId: row.id,
|
||||
invalidEncryptedFields,
|
||||
}, "E-Mail-Kontodaten können mit dem aktuellen ENCRYPTION_KEY nicht entschlüsselt werden")
|
||||
}
|
||||
|
||||
return {
|
||||
id: row.id,
|
||||
createdAt: row.createdAt,
|
||||
updatedAt: row.updatedAt,
|
||||
userId: row.userId,
|
||||
tenantId: row.tenantId,
|
||||
type: row.type,
|
||||
email: encryptedValue(row.emailEncrypted),
|
||||
smtpHost: encryptedValue(row.smtpHostEncrypted),
|
||||
email,
|
||||
displayName: email || `Mailkonto ${String(row.id).slice(0, 8)} muss repariert werden`,
|
||||
smtpHost,
|
||||
smtpPort: row.smtpPort ? Number(row.smtpPort) : null,
|
||||
smtpSsl: row.smtpSsl,
|
||||
imapHost: encryptedValue(row.imapHostEncrypted),
|
||||
imapHost,
|
||||
imapPort: row.imapPort ? Number(row.imapPort) : null,
|
||||
imapSsl: row.imapSsl,
|
||||
hasPassword: Boolean(row.passwordEncrypted),
|
||||
})
|
||||
credentialsReadable: invalidEncryptedFields.length === 0,
|
||||
invalidEncryptedFields,
|
||||
}
|
||||
}
|
||||
|
||||
const accountCredentials = (row: any) => ({
|
||||
...accountResponse(row),
|
||||
const accountCredentials = (row: any) => {
|
||||
const account = accountResponse(row)
|
||||
if (!account.credentialsReadable) {
|
||||
throw new Error("Die verschlüsselten Kontodaten sind nicht lesbar. Bitte das E-Mail-Konto in den Einstellungen vollständig neu speichern.")
|
||||
}
|
||||
|
||||
return {
|
||||
...account,
|
||||
password: encryptedValue(row.passwordEncrypted),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const bodyValue = (body: any, camelKey: string, snakeKey: string) => body[camelKey] ?? body[snakeKey]
|
||||
|
||||
|
||||
@@ -5,6 +5,8 @@ import { de as deLocale } from "date-fns/locale"
|
||||
type EmailAccount = {
|
||||
id: string
|
||||
email: string
|
||||
displayName?: string
|
||||
credentialsReadable?: boolean
|
||||
imapHost?: string | null
|
||||
hasPassword?: boolean
|
||||
}
|
||||
@@ -657,7 +659,7 @@ onMounted(loadAccounts)
|
||||
v-else-if="accounts.length"
|
||||
v-model="selectedAccountId"
|
||||
:items="accounts"
|
||||
label-key="email"
|
||||
label-key="displayName"
|
||||
value-key="id"
|
||||
class="w-full"
|
||||
/>
|
||||
|
||||
@@ -302,7 +302,7 @@ const sendEmail = async () => {
|
||||
>
|
||||
<USelectMenu
|
||||
:items="emailAccounts"
|
||||
label-key="email"
|
||||
label-key="displayName"
|
||||
value-key="id"
|
||||
v-model="emailData.account"
|
||||
/>
|
||||
|
||||
@@ -36,6 +36,7 @@ const resources = ref([])
|
||||
const events = ref([])
|
||||
const profiles = ref([])
|
||||
const inventoryitems = ref([])
|
||||
const projects = ref([])
|
||||
const isDraftModeActive = ref(false)
|
||||
const isFinalizeDraftsModalOpen = ref(false)
|
||||
const finalizingDrafts = ref(false)
|
||||
@@ -123,7 +124,8 @@ const resourceTypeOptions = [
|
||||
{ label: "Alle Ressourcen", value: "all" },
|
||||
{ label: "Teams", value: "Team" },
|
||||
{ label: "Profile", value: "Profile" },
|
||||
{ label: "Inventarartikel", value: "Inventarartikel" }
|
||||
{ label: "Inventarartikel", value: "Inventarartikel" },
|
||||
{ label: "Projekte", value: "Projekte" }
|
||||
]
|
||||
|
||||
const calendarViewOptions = [
|
||||
@@ -407,10 +409,17 @@ function resolveEventColor(eventType) {
|
||||
|
||||
function resolveEventTitle(event, projectsById) {
|
||||
if (event.name) return event.name
|
||||
if (event.project && projectsById.has(event.project)) return projectsById.get(event.project).name
|
||||
const projectId = getEventProjectId(event)
|
||||
if (projectId && projectsById.has(projectId)) return projectsById.get(projectId).name
|
||||
return event.quick ? activeQuickEntryConfig.value.name : "Planung"
|
||||
}
|
||||
|
||||
function getEventProjectId(event) {
|
||||
return event?.project && typeof event.project === "object"
|
||||
? event.project.id
|
||||
: event?.project
|
||||
}
|
||||
|
||||
function resolveRenderedEventColor(event) {
|
||||
if (event?.quick) return event?.color || activeQuickEntryConfig.value.color
|
||||
return resolveEventColor(event.eventtype)
|
||||
@@ -470,7 +479,7 @@ function normalizeSelectedResourceIds(resourceId) {
|
||||
return [resourceId]
|
||||
}
|
||||
|
||||
function buildResources({ profiles, inventoryitems }) {
|
||||
function buildResources({ profiles, inventoryitems, projects }) {
|
||||
const branchResources = []
|
||||
const teamResources = []
|
||||
const profileResources = []
|
||||
@@ -541,18 +550,28 @@ function buildResources({ profiles, inventoryitems }) {
|
||||
title: item.name
|
||||
}))
|
||||
|
||||
return [...branchResources, ...teamResources, ...profileResources, ...inventoryResources]
|
||||
const projectResources = projects
|
||||
.filter((project) => !project.archived)
|
||||
.map((project) => ({
|
||||
id: `PRJ-${project.id}`,
|
||||
type: "Projekte",
|
||||
title: project.name
|
||||
}))
|
||||
|
||||
return [...branchResources, ...teamResources, ...profileResources, ...inventoryResources, ...projectResources]
|
||||
}
|
||||
|
||||
function buildEvents({ rawEvents, projectsById }) {
|
||||
const mappedEvents = rawEvents
|
||||
.filter((event) => !event.archived)
|
||||
.flatMap((event) => {
|
||||
const projectId = getEventProjectId(event)
|
||||
const resourceIds = [
|
||||
...(profiles.value
|
||||
.filter((profile) => (event.profiles || []).includes(profile.id))
|
||||
.flatMap((profile) => getProfileResourceIds(profile))),
|
||||
...(event.inventoryitems || []).map((itemId) => `I-${itemId}`)
|
||||
...(event.inventoryitems || []).map((itemId) => `I-${itemId}`),
|
||||
...(projectId ? [`PRJ-${projectId}`] : [])
|
||||
]
|
||||
|
||||
return expandRecurringEvent(
|
||||
@@ -807,7 +826,9 @@ async function createQuickEvent(info) {
|
||||
vehicles: [],
|
||||
notes: "",
|
||||
link: "",
|
||||
project: null,
|
||||
project: resourceIds
|
||||
.filter((resourceId) => resourceId.startsWith("PRJ-"))
|
||||
.map((resourceId) => Number(resourceId.replace("PRJ-", "")))[0] || null,
|
||||
customer: null,
|
||||
vendor: null,
|
||||
}
|
||||
@@ -938,7 +959,7 @@ async function loadPlanningBoard() {
|
||||
loading.value = true
|
||||
|
||||
try {
|
||||
const [rawEvents, projects, profileResponse, inventoryItemRows] = await Promise.all([
|
||||
const [rawEvents, projectRows, profileResponse, inventoryItemRows] = await Promise.all([
|
||||
useEntities("events").select(),
|
||||
useEntities("projects").select(),
|
||||
useNuxtApp().$api("/api/tenant/profiles"),
|
||||
@@ -960,9 +981,10 @@ async function loadPlanningBoard() {
|
||||
}))
|
||||
)
|
||||
|
||||
const projectsById = new Map((projects || []).map((project) => [project.id, project]))
|
||||
const projectsById = new Map((projectRows || []).map((project) => [project.id, project]))
|
||||
profiles.value = profileRows || []
|
||||
inventoryitems.value = inventoryItemRows || []
|
||||
projects.value = projectRows || []
|
||||
|
||||
if (!absenceForm.userId) {
|
||||
absenceForm.userId = profileOptions.value[0]?.value || ""
|
||||
@@ -970,7 +992,8 @@ async function loadPlanningBoard() {
|
||||
|
||||
resources.value = buildResources({
|
||||
profiles: profiles.value,
|
||||
inventoryitems: inventoryitems.value
|
||||
inventoryitems: inventoryitems.value,
|
||||
projects: projects.value
|
||||
})
|
||||
|
||||
events.value = buildEvents({
|
||||
@@ -1109,7 +1132,7 @@ onMounted(() => {
|
||||
v-else-if="visibleResources.length === 0"
|
||||
icon="i-heroicons-calendar-days"
|
||||
title="Keine planbaren Ressourcen vorhanden"
|
||||
description="Lege Profile an oder aktiviere die Plantafel-Nutzung bei Inventarartikeln, damit hier Ressourcen erscheinen."
|
||||
description="Lege Profile oder Projekte an oder aktiviere die Plantafel-Nutzung bei Inventarartikeln, damit hier Ressourcen erscheinen."
|
||||
/>
|
||||
|
||||
<FullCalendar
|
||||
|
||||
@@ -5,6 +5,7 @@ const toast = useToast()
|
||||
const mode = route.params.mode
|
||||
const isCreate = computed(() => mode === "create")
|
||||
const loading = ref(false)
|
||||
const credentialsReadable = ref(true)
|
||||
|
||||
const itemInfo = ref({
|
||||
email: "",
|
||||
@@ -20,6 +21,7 @@ const itemInfo = ref({
|
||||
const setup = async () => {
|
||||
if(!isCreate.value) {
|
||||
const account = await useNuxtApp().$api(`/api/email/accounts/${route.params.id}`)
|
||||
credentialsReadable.value = account.credentialsReadable !== false
|
||||
itemInfo.value = {
|
||||
...itemInfo.value,
|
||||
...account,
|
||||
@@ -36,6 +38,13 @@ const payload = () => ({
|
||||
password: itemInfo.value.password || undefined,
|
||||
})
|
||||
|
||||
const canSave = computed(() => Boolean(
|
||||
itemInfo.value.email
|
||||
&& itemInfo.value.imapHost
|
||||
&& itemInfo.value.smtpHost
|
||||
&& (isCreate.value || credentialsReadable.value || itemInfo.value.password)
|
||||
))
|
||||
|
||||
const createAccount = async () => {
|
||||
loading.value = true
|
||||
const res = await useNuxtApp().$api(`/api/email/accounts`, {
|
||||
@@ -123,7 +132,7 @@ const syncAccount = async () => {
|
||||
v-if="!isCreate"
|
||||
icon="i-heroicons-check"
|
||||
:loading="loading"
|
||||
:disabled="!itemInfo.email || !itemInfo.imapHost || !itemInfo.smtpHost"
|
||||
:disabled="!canSave"
|
||||
@click="saveAccount"
|
||||
>
|
||||
Speichern
|
||||
@@ -132,6 +141,16 @@ const syncAccount = async () => {
|
||||
</UDashboardNavbar>
|
||||
|
||||
<div class="mx-auto max-w-4xl p-4">
|
||||
<UAlert
|
||||
v-if="!isCreate && !credentialsReadable"
|
||||
class="mb-4"
|
||||
color="error"
|
||||
variant="soft"
|
||||
icon="i-heroicons-exclamation-triangle"
|
||||
title="Zugangsdaten müssen repariert werden"
|
||||
description="Die Daten wurden mit einem anderen oder nicht mehr verfügbaren Verschlüsselungsschlüssel gespeichert. Trage E-Mail-Adresse, Passwort, IMAP-Host und SMTP-Host vollständig neu ein und speichere das Konto."
|
||||
/>
|
||||
|
||||
<UAlert
|
||||
v-if="!isCreate"
|
||||
class="mb-4"
|
||||
@@ -139,7 +158,7 @@ const syncAccount = async () => {
|
||||
variant="soft"
|
||||
icon="i-heroicons-lock-closed"
|
||||
title="Passwort bleibt geschützt"
|
||||
description="Das gespeicherte Passwort wird nicht angezeigt. Trage nur dann ein neues Passwort ein, wenn du es ändern möchtest."
|
||||
:description="credentialsReadable ? 'Das gespeicherte Passwort wird nicht angezeigt. Trage nur dann ein neues Passwort ein, wenn du es ändern möchtest.' : 'Das bisherige Passwort kann nicht entschlüsselt werden und muss neu eingetragen werden.'"
|
||||
/>
|
||||
|
||||
<UForm class="grid gap-6">
|
||||
@@ -158,11 +177,11 @@ const syncAccount = async () => {
|
||||
/>
|
||||
</UFormField>
|
||||
|
||||
<UFormField :label="isCreate ? 'Passwort' : 'Neues Passwort'">
|
||||
<UFormField :label="isCreate || !credentialsReadable ? 'Passwort' : 'Neues Passwort'">
|
||||
<UInput
|
||||
v-model="itemInfo.password"
|
||||
type="password"
|
||||
:placeholder="isCreate ? '' : 'Unverändert lassen'"
|
||||
:placeholder="isCreate || !credentialsReadable ? '' : 'Unverändert lassen'"
|
||||
/>
|
||||
</UFormField>
|
||||
</div>
|
||||
|
||||
@@ -73,7 +73,7 @@ setupPage()
|
||||
<div class="flex items-center gap-2">
|
||||
<UIcon name="i-heroicons-envelope" class="size-5 text-primary" />
|
||||
<p class="truncate font-medium">
|
||||
{{ account.email }}
|
||||
{{ account.displayName || account.email }}
|
||||
</p>
|
||||
<UBadge
|
||||
size="xs"
|
||||
@@ -88,6 +88,9 @@ setupPage()
|
||||
<span>SMTP: {{ account.smtpHost || "nicht gesetzt" }}:{{ account.smtpPort || "-" }}</span>
|
||||
<span>{{ account.hasPassword ? "Passwort hinterlegt" : "Passwort fehlt" }}</span>
|
||||
</div>
|
||||
<p v-if="account.credentialsReadable === false" class="mt-2 text-sm text-error">
|
||||
Die verschlüsselten Zugangsdaten sind nicht lesbar. Öffne das Konto und trage alle Zugangsdaten neu ein.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="flex shrink-0 items-center gap-2">
|
||||
@@ -96,6 +99,7 @@ setupPage()
|
||||
color="neutral"
|
||||
variant="soft"
|
||||
:loading="syncingAccount === account.id"
|
||||
:disabled="account.credentialsReadable === false"
|
||||
@click.stop="syncAccount(account)"
|
||||
>
|
||||
Synchronisieren
|
||||
|
||||
Reference in New Issue
Block a user