From 736ea10154a532961ed7b1e14823bf4682e53257 Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Mon, 1 Jun 2026 23:13:09 +0200 Subject: [PATCH 01/11] Begin working on the client-side mailbroker management --- src/apps/admin/adminportal/types.ts | 5 + src/apps/admin/mailbroker/Mailbroker.svelte | 44 ++ .../mailbroker/Mailbroker/Sidebar.svelte | 19 + src/apps/admin/mailbroker/MailbrokerApp.ts | 43 ++ src/apps/admin/mailbroker/Pages/Logs.svelte | 13 + src/apps/admin/mailbroker/Pages/Sent.svelte | 7 + .../admin/mailbroker/Pages/Templates.svelte | 7 + src/apps/admin/mailbroker/runtime.ts | 43 ++ src/apps/admin/mailbroker/store.ts | 35 + src/apps/admin/mailbroker/types.ts | 15 + src/css/apps/admin/adminportal.css | 1 + src/css/apps/admin/adminportal/table.css | 35 + src/interfaces/runtimes/IMailbrokerRuntime.ts | 9 + src/interfaces/services/IAdminBootstrapper.ts | 27 +- src/ts/apps/store.ts | 1 + .../services/AdminBootstrapper/index.ts | 643 ++++++++++-------- .../services/AdminBootstrapper/store.ts | 16 + src/types/server/admin.ts | 20 +- src/types/server/mailbroker.ts | 66 ++ 19 files changed, 747 insertions(+), 302 deletions(-) create mode 100644 src/apps/admin/mailbroker/Mailbroker.svelte create mode 100644 src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte create mode 100644 src/apps/admin/mailbroker/MailbrokerApp.ts create mode 100644 src/apps/admin/mailbroker/Pages/Logs.svelte create mode 100644 src/apps/admin/mailbroker/Pages/Sent.svelte create mode 100644 src/apps/admin/mailbroker/Pages/Templates.svelte create mode 100644 src/apps/admin/mailbroker/runtime.ts create mode 100644 src/apps/admin/mailbroker/store.ts create mode 100644 src/apps/admin/mailbroker/types.ts create mode 100644 src/css/apps/admin/adminportal/table.css create mode 100644 src/interfaces/runtimes/IMailbrokerRuntime.ts create mode 100644 src/types/server/mailbroker.ts diff --git a/src/apps/admin/adminportal/types.ts b/src/apps/admin/adminportal/types.ts index 052997047..10ea56d9e 100755 --- a/src/apps/admin/adminportal/types.ts +++ b/src/apps/admin/adminportal/types.ts @@ -16,6 +16,7 @@ import type { SharedDriveType } from "$types/server/shares"; import type { ExpandedUserInfo, UserInfo } from "$types/user"; import type { ReadableStore } from "$types/shared/writable"; import type { Component } from "svelte"; +import type { Mailbroker } from "$types/server/mailbroker"; export interface AdminPortalPage { name: string; @@ -111,6 +112,10 @@ export type VersioningData = { users: ExpandedUserInfo[]; }; +export type MailbrokerTemplatesData = { + templates: ICommandResult; +}; + export type ScopesData = { admins: ExpandedUserInfo[]; }; diff --git a/src/apps/admin/mailbroker/Mailbroker.svelte b/src/apps/admin/mailbroker/Mailbroker.svelte new file mode 100644 index 000000000..b5aef1bfe --- /dev/null +++ b/src/apps/admin/mailbroker/Mailbroker.svelte @@ -0,0 +1,44 @@ + + + +
+ +
+ {#if loading} + loading + {:else if Page && data?.success} + {@const result = data.result!} + + {:else} + error: {data?.errorMessage ?? "Unknown error"} + {/if} +
+
diff --git a/src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte b/src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte new file mode 100644 index 000000000..3055452fd --- /dev/null +++ b/src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte @@ -0,0 +1,19 @@ + + +{#each [...mailbrokerPages] as [id, page]} + {#if !page.hidden} + + {#if page.separator} +
+ {/if} + {/if} +{/each} diff --git a/src/apps/admin/mailbroker/MailbrokerApp.ts b/src/apps/admin/mailbroker/MailbrokerApp.ts new file mode 100644 index 000000000..b0b43422d --- /dev/null +++ b/src/apps/admin/mailbroker/MailbrokerApp.ts @@ -0,0 +1,43 @@ +import type { App } from "$types/apps/app"; +import Mailbroker from "./Mailbroker.svelte"; +import { MailbrokerRuntime } from "./runtime"; + +const MailbrokerApp: App = { + metadata: { + name: "Mailbroker Manager", + version: "1.0.0", + author: "Izaak Kuipers", + appGroup: "adminTools", + icon: "ComponentIcon", + }, + position: { centered: true }, + size: { w: 640, h: 480 }, + minSize: { w: 640, h: 480 }, + maxSize: { w: 640, h: 480 }, + state: { + maximized: false, + minimized: false, + resizable: true, + fullscreen: false, + headless: true, + }, + controls: { + minimize: true, + maximize: true, + close: true, + }, + assets: { + runtime: MailbrokerRuntime, + component: Mailbroker as any, + }, + glass: true, + elevated: true, + hidden: false, + core: false, + overlay: false, + noSafeMode: false, + vital: true, + id: "Mailbroker", +}; + +export default MailbrokerApp; diff --git a/src/apps/admin/mailbroker/Pages/Logs.svelte b/src/apps/admin/mailbroker/Pages/Logs.svelte new file mode 100644 index 000000000..55a0a6a20 --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/Logs.svelte @@ -0,0 +1,13 @@ + + + + + + + + +
\ No newline at end of file diff --git a/src/apps/admin/mailbroker/Pages/Sent.svelte b/src/apps/admin/mailbroker/Pages/Sent.svelte new file mode 100644 index 000000000..a2efb6c1c --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/Sent.svelte @@ -0,0 +1,7 @@ + + +{data.length} diff --git a/src/apps/admin/mailbroker/Pages/Templates.svelte b/src/apps/admin/mailbroker/Pages/Templates.svelte new file mode 100644 index 000000000..15aece798 --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/Templates.svelte @@ -0,0 +1,7 @@ + + +{data.length} diff --git a/src/apps/admin/mailbroker/runtime.ts b/src/apps/admin/mailbroker/runtime.ts new file mode 100644 index 000000000..24da860c3 --- /dev/null +++ b/src/apps/admin/mailbroker/runtime.ts @@ -0,0 +1,43 @@ +import type { IMailbrokerRuntime } from "$interfaces/runtimes/IMailbrokerRuntime"; +import type { IAdminBootstrapper } from "$interfaces/services/IAdminBootstrapper"; +import { AppProcess } from "$ts/apps/process"; +import { Daemon } from "$ts/env"; +import { Store } from "$ts/writable"; +import type { AppProcessData } from "$types/apps/app"; +import { mailbrokerPages } from "./store"; + +export class MailbrokerRuntime extends AppProcess implements IMailbrokerRuntime { + currentPage = Store(""); + get admin() { + return Daemon.serviceHost?.getService("AdminBootstrapper")!; + } + + //#region LIFECYCLE + + constructor(pid: number, parentPid: number, app: AppProcessData) { + super(pid, parentPid, app); + + this.switchPage("templates"); + + this.setSource(__SOURCE__); + } + + switchPage(pageId: string) { + this.Log(`Loading page '${pageId}'`); + + if (!mailbrokerPages.has(pageId)) return; + + const page = mailbrokerPages.get(pageId); + + this.currentPage.set(pageId); + this.windowTitle.set(`${page?.name}`); + } + + async start() {} + + async stop() {} + + async render() {} + + //#endregion LIFECYCLE +} diff --git a/src/apps/admin/mailbroker/store.ts b/src/apps/admin/mailbroker/store.ts new file mode 100644 index 000000000..79f267b4c --- /dev/null +++ b/src/apps/admin/mailbroker/store.ts @@ -0,0 +1,35 @@ +import Logs from "./Pages/Logs.svelte"; +import Sent from "./Pages/Sent.svelte"; +import Templates from "./Pages/Templates.svelte"; +import type { MailbrokerPage, MailbrokerPages } from "./types"; + +export const mailbrokerPages: MailbrokerPages = new Map([ + [ + "templates", + { + name: "Templates", + icon: "mails", + content: Templates, + data: async (process) => await process.admin.getMailbrokerTemplates(), + }, + ], + [ + "sent", + { + name: "Sent emails", + icon: "send", + content: Sent, + separator: true, + data: async (process) => await process.admin.getMailbrokerSentRecords(), + }, + ], + [ + "logs", + { + name: "Logs", + icon: "list", + content: Logs, + data: async (process) => await process.admin.getMailbrokerLogs(), + }, + ], +]); diff --git a/src/apps/admin/mailbroker/types.ts b/src/apps/admin/mailbroker/types.ts new file mode 100644 index 000000000..cae438e25 --- /dev/null +++ b/src/apps/admin/mailbroker/types.ts @@ -0,0 +1,15 @@ +import type { ICommandResult } from "$interfaces/ICommandResult"; +import type { IMailbrokerRuntime } from "$interfaces/runtimes/IMailbrokerRuntime"; +import type { MaybePromise } from "$types/shared/common"; +import type { Component } from "svelte"; + +export interface MailbrokerPage { + name: string; + icon: string; + content: Component; + hidden?: boolean; + separator?: boolean; + data?: (process: IMailbrokerRuntime) => MaybePromise>>; +} + +export type MailbrokerPages = Map; diff --git a/src/css/apps/admin/adminportal.css b/src/css/apps/admin/adminportal.css index 741efa73f..4d1610c03 100755 --- a/src/css/apps/admin/adminportal.css +++ b/src/css/apps/admin/adminportal.css @@ -17,6 +17,7 @@ @import url("./adminportal/page/auditlog.css"); @import url("./adminportal/page/logs.css"); @import url("./adminportal/sidebar.css"); +@import url("./adminportal/table.css"); @import url("./adminportal/userdata.css"); #AdminPortal { diff --git a/src/css/apps/admin/adminportal/table.css b/src/css/apps/admin/adminportal/table.css new file mode 100644 index 000000000..66c9a4f43 --- /dev/null +++ b/src/css/apps/admin/adminportal/table.css @@ -0,0 +1,35 @@ +#AdminPortal > div.body table { + display: block; + width: 100%; + width: max-content; + max-width: 100%; + overflow: auto; + border-spacing: 0; + border-collapse: collapse; + margin: -1px; +} + +#AdminPortal > div.body table tr { + background-color: var(--button-bg); + border-top: var(--win-border); +} + +#AdminPortal > div.body table tr:hover td { + background-color: var(--button-glass-hover-bg); +} + +#AdminPortal > div.body table th, +#AdminPortal > div.body table td { + padding: 5px 8px; + border: var(--win-border); + text-align: left !important; + white-space: nowrap; +} + +#AdminPortal > div.body table tr th { + font-weight: bold !important; +} + +#AdminPortal > div.body table tr:nth-child(2n) { + background-color: var(--button-bg) 1px solid; +} diff --git a/src/interfaces/runtimes/IMailbrokerRuntime.ts b/src/interfaces/runtimes/IMailbrokerRuntime.ts new file mode 100644 index 000000000..657b2c09c --- /dev/null +++ b/src/interfaces/runtimes/IMailbrokerRuntime.ts @@ -0,0 +1,9 @@ +import type { IAppProcess } from "$interfaces/IAppProcess"; +import type { IAdminBootstrapper } from "$interfaces/services/IAdminBootstrapper"; +import type { ReadableStore } from "$types/shared/writable"; + +export interface IMailbrokerRuntime extends IAppProcess { + get admin(): IAdminBootstrapper; + currentPage: ReadableStore; + switchPage(pageId: string): void; +} diff --git a/src/interfaces/services/IAdminBootstrapper.ts b/src/interfaces/services/IAdminBootstrapper.ts index 56b180199..bdb7520e7 100644 --- a/src/interfaces/services/IAdminBootstrapper.ts +++ b/src/interfaces/services/IAdminBootstrapper.ts @@ -16,10 +16,11 @@ import type { UserTotp, } from "$types/server/admin"; import type { BugReport, ReportStatistics } from "$types/server/bughunt"; -import type { FilesystemProgressCallback, FsAccess, UserQuota } from "$types/system/fs"; -import type { StoreItem } from "$types/tpa/package"; +import type { Mailbroker } from "$types/server/mailbroker"; import type { QueryResult } from "$types/server/query"; import type { SharedDriveType } from "$types/server/shares"; +import type { FilesystemProgressCallback, FsAccess, UserQuota } from "$types/system/fs"; +import type { StoreItem } from "$types/tpa/package"; import type { ExpandedUserInfo, UserInfo, UserPreferences } from "$types/user"; export interface IAdminBootstrapper extends IBaseService { @@ -118,4 +119,26 @@ export interface IAdminBootstrapper extends IBaseService { getMigrationIndexFor(userId: string): Promise>; GetIpAddresses(): Promise; getReportSourceFile(report: BugReport): Promise>; + getMailbrokerKey(id: string): Promise>; + getMailbrokerLogs(): Promise>; + getMailbrokerTemplate(id: string): Promise>; + getMailbrokerTemplates(): Promise>; + getMailbrokerSentRecord(id: string): Promise>; + getMailbrokerSentRecords(): Promise>; + deleteMailbrokerKey(id: string): Promise; + disableMailbrokerKey(id: string): Promise; + enableMailbrokerKey(id: string): Promise; + createMailbrokerKey(serverName: string): Promise>; + sendMailTemplateById(id: string, userId: string, props: Record): Promise>; + sendMailTemplateByName( + name: string, + userId: string, + props: Record + ): Promise>; + deleteMailbrokerSentRecord(id: string): Promise; + deprecateMailbrokerTemplate(id: string): Promise; + undeprecateMailbrokerTemplate(id: string): Promise; + deleteMailbrokerTemplate(id: string): Promise; + updateMailbrokerTemplate(id: string, update: Mailbroker.MailTemplateUpdate): Promise; + createMailbrokerTemplate(data: Mailbroker.MailTemplateCreate): Promise; } diff --git a/src/ts/apps/store.ts b/src/ts/apps/store.ts index 03a0e9595..6f3cb7c49 100755 --- a/src/ts/apps/store.ts +++ b/src/ts/apps/store.ts @@ -68,6 +68,7 @@ export const BuiltinAppImportPathAbsolutes = import.meta.glob([ export const AdminAppImportPathAbsolutes = import.meta.glob([ "$apps/admin/adminportal/AdminPortal", "$apps/admin/executequery/ExecuteQueryApp", + "$apps/admin/mailbroker/MailbrokerApp", ]); export const appShortcuts: [number, AppKeyCombinations][] = []; diff --git a/src/ts/servicehost/services/AdminBootstrapper/index.ts b/src/ts/servicehost/services/AdminBootstrapper/index.ts index 7df637542..5ecae8c70 100644 --- a/src/ts/servicehost/services/AdminBootstrapper/index.ts +++ b/src/ts/servicehost/services/AdminBootstrapper/index.ts @@ -1,3 +1,4 @@ +import type { ICommandResult } from "$interfaces/ICommandResult"; import type { IServiceHost } from "$interfaces/IServiceHost"; import type { IStoreConnector } from "$interfaces/modules/server/IStoreConnector"; import type { IUserConnector } from "$interfaces/modules/server/IUserConnector"; @@ -12,6 +13,7 @@ import { AdminServerDrive } from "$ts/kernel/mods/fs/drives/aefs"; import { Backend } from "$ts/kernel/mods/server/axios"; import { ArcBuild } from "$ts/metadata/build"; import { ArcMode } from "$ts/metadata/mode"; +import { CommandResult } from "$ts/result"; import { BaseService } from "$ts/servicehost/base"; import { UserPaths } from "$ts/user/store"; import { deepCopyWithBlobs } from "$ts/util"; @@ -21,6 +23,7 @@ import { toForm } from "$ts/util/form"; import { join } from "$ts/util/fs"; import { tryJsonParse } from "$ts/util/json"; import { compareVersion } from "$ts/util/version"; +import type { App, InstalledApp } from "$types/apps/app"; import type { Activity, AuditLog, @@ -36,26 +39,33 @@ import type { UserStatistics, UserTotp, } from "$types/server/admin"; -import type { App, InstalledApp } from "$types/apps/app"; import type { BugReport, ReportStatistics } from "$types/server/bughunt"; +import type { Mailbroker } from "$types/server/mailbroker"; +import type { QueryResult } from "$types/server/query"; +import type { SharedDriveType } from "$types/server/shares"; +import type { Service } from "$types/services/service"; import type { FilesystemProgressCallback, UserQuota } from "$types/system/fs"; import type { ArcPackage, StoreItem } from "$types/tpa/package"; -import type { Service } from "$types/services/service"; -import type { SharedDriveType } from "$types/server/shares"; import type { ExpandedUserInfo, UserInfo, UserPreferences } from "$types/user"; +import axios from "axios"; import { fromExtension } from "human-filetypes"; +import beautify from "js-beautify"; import JSZip from "jszip"; +import { parse } from "stacktrace-parser"; import { AdminProtocolHandlers } from "./proto"; import { AdminScopes } from "./store"; -import type { ICommandResult } from "$interfaces/ICommandResult"; -import type { QueryResult } from "$types/server/query"; -import { CommandResult } from "$ts/result"; -import { parse } from "stacktrace-parser"; -import beautify from "js-beautify"; -import axios from "axios"; export class AdminBootstrapper extends BaseService implements IAdminBootstrapper { private userInfo: UserInfo | undefined; + private get adminClient() { + return Backend.create({ + headers: { + Authorization: `Bearer ${Daemon.token}`, + }, + responseType: "json", + baseURL: Server.url + "/admin", + }); + } //#region LIFECYCLE @@ -175,7 +185,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper if (this._disposed) return []; try { - const response = await Backend.get("/admin/users/list", { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get("/users/list"); return (response.data as ExpandedUserInfo[]).map((u) => { u.profile.profilePicture = `${Server.url}${u.profile.profilePicture}`; @@ -199,7 +209,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper if (this._disposed) return []; try { - const response = await Backend.get("/admin/logs", { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get("/logs"); return response.data as ServerLogItem[]; } catch { @@ -211,7 +221,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper if (this._disposed) return []; try { - const response = await Backend.get("/admin/auditlog", { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get("/auditlog"); return response.data as AuditLog[]; } catch { @@ -222,9 +232,8 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async queryAuditLog(query: AuditLogQueryOptions): Promise>> { try { return CommandResult.FromResponse( - await Backend.get(`/admin/audit/query`, { + await this.adminClient.get(`/audit/query`, { params: query, - headers: { Authorization: `Bearer ${Daemon!.token}` }, }) ); } catch (e) { @@ -234,11 +243,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async grantAdmin(username: string) { if (this._disposed) return false; - try { - const response = await Backend.post("/admin/grant", toForm({ target: username }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post("/grant", toForm({ target: username })); return response.status === 200; } catch { return false; @@ -247,11 +254,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async revokeAdmin(username: string) { if (this._disposed) return false; - try { - const response = await Backend.post("/admin/revoke", toForm({ target: username }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post("/revoke", toForm({ target: username })); return response.status === 200; } catch { return false; @@ -261,9 +266,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getPreferencesOf(username: string) { if (this._disposed) return; try { - const response = await Backend.get(`/admin/preferences/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/preferences/${username}`); return response.data as UserPreferences; } catch { @@ -273,11 +276,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async setPreferencesOf(username: string, preferences: UserPreferences) { if (this._disposed) return false; - try { - const response = await Backend.put(`/admin/preferences/${username}`, preferences, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.put(`/preferences/${username}`, preferences); return response.status === 200; } catch { return false; @@ -286,11 +287,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteUser(username: string) { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/users/delete/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/users/delete/${username}`); return response.status === 200; } catch { return false; @@ -300,9 +299,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getStatistics() { if (this._disposed) return; try { - const response = await Backend.get(`/admin/stats`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/stats`); return response.data as ServerStatistics; } catch { @@ -313,9 +310,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getAllTokens() { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/tokens`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/tokens`); return response.data as Token[]; } catch { @@ -325,13 +320,11 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async purgeAllTokens() { if (this._disposed) return false; + try { - const response = await Backend.delete(`/admin/tokens/purge/all`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.delete(`/tokens/purge/all`); location.reload(); - return response.status === 200; } catch { return false; @@ -340,11 +333,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async purgeOneToken(id: string) { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/tokens/purge/one/${id}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/tokens/purge/one/${id}`); return response.status === 200; } catch { return false; @@ -353,11 +344,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async purgeUserTokens(userId: string) { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/tokens/purge/user/${userId}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/tokens/purge/user/${userId}`); return response.status === 200; } catch { return false; @@ -366,11 +355,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteBugReport(reportId: string) { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/bughunt/report/${reportId}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/bughunt/report/${reportId}`); return response.status === 200; } catch { return false; @@ -379,15 +366,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async closeBugReport(reportId: string) { if (this._disposed) return false; - try { - const response = await Backend.patch( - `/admin/bughunt/close/${reportId}`, - {}, - { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - } - ); + try { + const response = await this.adminClient.patch(`/bughunt/close/${reportId}`); return response.status === 200; } catch { return false; @@ -396,15 +377,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async reopenBugReport(reportId: string) { if (this._disposed) return false; - try { - const response = await Backend.patch( - `/admin/bughunt/open/${reportId}`, - {}, - { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - } - ); + try { + const response = await this.adminClient.patch(`/bughunt/open/${reportId}`); return response.status === 200; } catch { return false; @@ -414,9 +389,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getAllBugReports() { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/bughunt/list`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/bughunt/list`); return response.data as BugReport[]; } catch { @@ -427,7 +400,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getBugReport(id: string): Promise { if (this._disposed) return; try { - const response = await Backend.get(`/bughunt/report/${id}`, { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get(`/report/${id}`); return response.data as BugReport; } catch { @@ -438,9 +411,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getBugHuntStatistics() { if (this._disposed) return; try { - const response = await Backend.get(`/admin/bughunt/stats`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/bughunt/stats`); return response.data as ReportStatistics; } catch { @@ -450,11 +421,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async approveUser(username: string) { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/users/approve`, toForm({ target: username }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post(`/users/approve`, toForm({ target: username })); return response.status === 200; } catch { return false; @@ -463,11 +432,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async disapproveUser(username: string) { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/users/disapprove`, toForm({ target: username }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post(`/users/disapprove`, toForm({ target: username })); return response.status === 200; } catch { return false; @@ -476,11 +443,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async changeEmailOf(username: string, newEmail: string) { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/users/changeemail`, toForm({ target: username, newEmail }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post(`/users/changeemail`, toForm({ target: username, newEmail })); return response.status === 200; } catch { return false; @@ -489,11 +454,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async changePasswordOf(username: string, newPassword: string) { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/users/changepswd`, toForm({ target: username, newPassword }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post(`/users/changepswd`, toForm({ target: username, newPassword })); return response.status === 200; } catch { return false; @@ -503,9 +466,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getAvailableScopes(): Promise> { if (this._disposed) return {}; try { - const response = await Backend.get(`/admin/scopes/available`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/scopes/available`); return response.data as Record; } catch { @@ -516,9 +477,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getScopesOf(username: string): Promise { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/scopes/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/scopes/${username}`); return response.data as string[]; } catch { @@ -528,11 +487,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async setScopesOf(username: string, scopes: string[]): Promise { if (this._disposed) return false; - try { - const response = await Backend.put(`/admin/scopes`, toForm({ target: username, scopes: JSON.stringify(scopes) }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.put(`/admin/scopes`, toForm({ target: username, scopes: JSON.stringify(scopes) })); return response.status === 200; } catch { return false; @@ -542,9 +499,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getQuotaOf(username: string): Promise { if (this._disposed) return; try { - const response = await Backend.get(`/admin/fs/quota/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/fs/quota/${username}`); return response.data as UserQuota; } catch { @@ -554,11 +509,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async setQuotaOf(username: string, newQuota: number) { if (this._disposed) return false; - try { - const response = await Backend.put(`/admin/fs/quota/${username}`, toForm({ limit: newQuota }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.put(`/fs/quota/${username}`, toForm({ limit: newQuota })); return response.status === 200; } catch { return false; @@ -568,9 +521,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getAllActivity(): Promise { if (this._disposed) return []; try { - const response = await Backend.get("/admin/activities/list", { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get("/activities/list"); return response.data as Activity[]; } catch { @@ -581,9 +532,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getActivityOf(username: string): Promise { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/activities/user/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/activities/user/${username}`); return response.data as Activity[]; } catch { @@ -593,11 +542,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteAllActivities(): Promise { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/activities`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/activities`); return response.status === 200; } catch { return false; @@ -606,11 +553,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteActivitiesOf(username: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/activities/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/activities/${username}`); return response.status === 200; } catch { return false; @@ -620,7 +565,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getAllTotp(): Promise { if (this._disposed) return []; try { - const response = await Backend.get("/admin/totp", { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get("/totp"); return response.data as PartialUserTotp[]; } catch { @@ -631,7 +576,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getTotpOf(username: string): Promise { if (this._disposed) return; try { - const response = await Backend.get(`/admin/totp/${username}`, { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get(`/totp/${username}`); return response.status === 200 ? response.data : undefined; } catch { @@ -641,15 +586,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deActivateTotpOf(username: string) { if (this._disposed) return false; - try { - const response = await Backend.post( - `/admin/totp/deactivate/${username}`, - {}, - { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - } - ); + try { + const response = await this.adminClient.post(`/totp/deactivate/${username}`, {}); return response.status === 200; } catch { return false; @@ -658,11 +597,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteTotpOf(username: string) { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/totp/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/totp/${username}`); return response.status === 200; } catch { return false; @@ -672,7 +609,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getAllFsAccessors(): Promise { if (this._disposed) return []; try { - const response = await Backend.get("/admin/accessors", { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get("/accessors"); return response.data as FsAccess[]; } catch { @@ -683,9 +620,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getFsAccessorsOf(username: string): Promise { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/accessors/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/accessors/${username}`); return response.data; } catch { @@ -695,9 +630,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteAllFsAccessors(): Promise { if (this._disposed) return false; - try { - const response = await Backend.delete("/admin/accessors", { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + try { + const response = await this.adminClient.delete("/accessors"); return response.status === 200; } catch { return false; @@ -706,11 +641,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteFsAccessorsOf(username: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/accessors/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/accessors/${username}`); return response.status === 200; } catch { return false; @@ -720,7 +653,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getAllIndexingNodes(): Promise { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/index`, { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get(`/index`); return response.data as FSItem[]; } catch { @@ -731,7 +664,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getIndexingNodesOf(username: string): Promise { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/index/${username}`, { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get(`/index/${username}`); return response.data as FSItem[]; } catch { @@ -742,11 +675,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async forceIndexFor(username: string): Promise { if (this._disposed) return []; try { - const response = await Backend.post( - `/admin/index/${username}`, - {}, - { headers: { Authorization: `Bearer ${Daemon!.token}` } } - ); + const response = await this.adminClient.post(`/index/${username}`, {}); return response.data as string[]; } catch { @@ -756,11 +685,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteIndexingOf(username: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/index/${username}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/index/${username}`); return response.status === 200; } catch { return false; @@ -798,9 +725,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getAllShares(): Promise { if (this._disposed) return []; - try { - const response = await Backend.get("/admin/share/list", { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + try { + const response = await this.adminClient.get("/share/list"); return response.data as SharedDriveType[]; } catch { return []; @@ -809,10 +736,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getSharesOf(userId: string): Promise { if (this._disposed) return []; + try { - const response = await Backend.get(`/admin/share/list/${userId}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/share/list/${userId}`); return response.data as SharedDriveType[]; } catch { @@ -822,9 +748,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteShare(shareId: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/share/${shareId}`, { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + try { + const response = await this.adminClient.delete(`/share/${shareId}`); return response.status === 200; } catch { return false; @@ -833,11 +759,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async kickUserFromShare(shareId: string, userId: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/share/kick/${shareId}`, toForm({ userId }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post(`/share/kick/${shareId}`, toForm({ userId })); return response.status === 200; } catch { return false; @@ -846,11 +770,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async addUserToShare(shareId: string, userId: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/share/adduser/${shareId}`, toForm({ userId }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post(`/share/adduser/${shareId}`, toForm({ userId })); return response.status === 200; } catch { return false; @@ -860,9 +782,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getShareAccessors(shareId: string): Promise { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/share/accessors/${shareId}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/share/accessors/${shareId}`); return response.data as FSItem[]; } catch { @@ -872,11 +792,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteShareAccessors(shareId: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/share/accessors/${shareId}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/share/accessors/${shareId}`); return response.status === 200; } catch { return false; @@ -885,11 +803,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async changeSharePassword(shareId: string, newPassword: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/share/changepswd/${shareId}`, toForm({ newPassword }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post(`/share/changepswd/${shareId}`, toForm({ newPassword })); return response.status === 200; } catch { return false; @@ -898,11 +814,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async renameShare(shareId: string, newName: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/share/rename/${shareId}`, toForm({ newName }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post(`/share/rename/${shareId}`, toForm({ newName })); return response.status === 200; } catch { return false; @@ -911,11 +825,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async changeShareOwner(shareId: string, newUserId: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/share/chown/${shareId}`, toForm({ newUserId }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.post(`/share/chown/${shareId}`, toForm({ newUserId })); return response.status === 200; } catch { return false; @@ -925,9 +837,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getStatisticsOf(userId: string): Promise { if (this._disposed) return; try { - const response = await Backend.get(`/admin/users/stats/${userId}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/users/stats/${userId}`); return response.data as UserStatistics; } catch { @@ -937,11 +847,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async setShareQuotaOf(shareId: string, quota: number): Promise { if (this._disposed) return false; - try { - const response = await Backend.put(`/admin/share/quota/${shareId}`, toForm({ limit: quota }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.put(`/share/quota/${shareId}`, toForm({ limit: quota })); return response.status === 200; } catch { return false; @@ -951,9 +859,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getShareQuotaOf(shareId: string): Promise { if (this._disposed) return undefined; try { - const response = await Backend.get(`/admin/share/quota/${shareId}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/share/quota/${shareId}`); return response.data as UserQuota; } catch { @@ -963,13 +869,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async unlockShare(shareId: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.post( - `/admin/share/unlock/${shareId}`, - {}, - { headers: { Authorization: `Bearer ${Daemon!.token}` } } - ); + try { + const response = await this.adminClient.post(`/share/unlock/${shareId}`); return response.status === 2000; } catch { return false; @@ -978,13 +880,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async lockShare(shareId: string): Promise { if (this._disposed) return false; - try { - const response = await Backend.post( - `/admin/share/lock/${shareId}`, - {}, - { headers: { Authorization: `Bearer ${Daemon!.token}` } } - ); + try { + const response = await this.adminClient.post(`/share/lock/${shareId}`); return response.status === 2000; } catch { return false; @@ -994,10 +892,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteStoreItem(_id: string): Promise { false; try { - const response = await Backend.delete(`/admin/store/delete/one/${_id}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); - + const response = await this.adminClient.delete(`/store/delete/one/${_id}`); return response.status === 200; } catch { return false; @@ -1007,10 +902,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteUserStoreItems(userId: string): Promise { false; try { - const response = await Backend.delete(`/admin/store/delete/user/${userId}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); - + const response = await this.adminClient.delete(`/store/delete/user/${userId}`); return response.status === 200; } catch { return false; @@ -1020,7 +912,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getAllStoreItems() { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/store/list`, { headers: { Authorization: `Bearer ${Daemon!.token}` } }); + const response = await this.adminClient.get(`/store/list`); return response.data as StoreItem[]; } catch { @@ -1031,9 +923,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async getUserStoreItems(userId: string) { if (this._disposed) return []; try { - const response = await Backend.get(`/admin/storel/list/${userId}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + const response = await this.adminClient.get(`/storel/list/${userId}`); return response.data as StoreItem[]; } catch { @@ -1043,13 +933,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deprecatePackage(itemId: string) { if (this._disposed) return false; - try { - const response = await Backend.post( - `/admin/store/deprecate/${itemId}`, - {}, - { headers: { Authorization: `Bearer ${Daemon!.token}` } } - ); + try { + const response = await this.adminClient.post(`/store/deprecate/${itemId}`); return response.status === 200; } catch { return false; @@ -1058,13 +944,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async undeprecatePackage(itemId: string) { if (this._disposed) return false; - try { - const response = await Backend.post( - `/admin/store/undeprecate/${itemId}`, - {}, - { headers: { Authorization: `Bearer ${Daemon!.token}` } } - ); + try { + const response = await this.adminClient.post(`/store/undeprecate/${itemId}`); return response.status === 200; } catch { return false; @@ -1100,12 +982,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper } try { - const response = await Backend.post( - `/admin/store/block/${id}`, - {}, - { headers: { Authorization: `Bearer ${Daemon!.token}` } } - ); - + const response = await this.adminClient.post(`/store/block/${id}`); return response.status === 200; } catch { return false; @@ -1133,12 +1010,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper } try { - const response = await Backend.post( - `/admin/store/unblock/${id}`, - {}, - { headers: { Authorization: `Bearer ${Daemon!.token}` } } - ); - + const response = await this.adminClient.post(`/store/unblock/${id}`); return response.status === 200; } catch { return false; @@ -1147,13 +1019,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async storeItemMakeOfficial(id: string) { if (this._disposed) return false; - try { - const response = await Backend.post( - `/admin/store/official/on/${id}`, - {}, - { headers: { Authorization: `Bearer ${Daemon!.token}` } } - ); + try { + const response = await this.adminClient.post(`/store/official/on/${id}`); return response.status === 200; } catch { return false; @@ -1162,13 +1030,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async storeItemMakeNotOfficial(id: string) { if (this._disposed) return false; - try { - const response = await Backend.post( - `/admin/store/official/off/${id}`, - {}, - { headers: { Authorization: `Bearer ${Daemon!.token}` } } - ); + try { + const response = await this.adminClient.post(`/store/official/off/${id}`); return response.status === 200; } catch { return false; @@ -1249,11 +1113,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async deleteStoreItemVerification(id: string) { if (this._disposed) return false; - try { - const response = await Backend.delete(`/admin/store/verification/${id}`, { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); + try { + const response = await this.adminClient.delete(`/store/verification/${id}`); return response.status === 200; } catch { return false; @@ -1262,15 +1124,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper async verifyStoreItem(id: string, note: string) { if (this._disposed) return false; - try { - const response = await Backend.post(`/admin/store/verification/${id}`, toForm({ note }), { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - }); - - if (response.status !== 200) { - return false; - } + try { + await this.adminClient.post(`/store/verification/${id}`, toForm({ note })); await Fs.createDirectory(join(UserPaths.Documents, `AdminBootstrapper`)); await Fs.writeFile(join(UserPaths.Documents, `AdminBootstrapper/Verification_${id}_${Date.now()}.txt`), textToBlob(note)); @@ -1281,14 +1137,13 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper } async getRegisteredVersionFor(username: string): Promise { + if (this._disposed) return ""; this.Log(`getRegisteredVersionFor: ${username}`); try { - const contents = await Backend.get(`/admin/fs/file/${username}/System/RegisteredVersion`, { + const contents = await this.adminClient.get(`/fs/file/${username}/System/RegisteredVersion`, { responseType: "text", - headers: { Authorization: `Bearer ${Daemon.token}` }, }); - if (contents.status !== 200) throw ""; return contents.data; } catch { @@ -1297,14 +1152,11 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper } async getMigrationIndexFor(username: string): Promise> { + if (this._disposed) return {}; this.Log(`getMigrationIndexFor: ${username}`); try { - const contents = await Backend.get(`/admin/fs/file/${username}/System/Migrations/Index.json`, { - responseType: "json", - headers: { Authorization: `Bearer ${Daemon.token}` }, - }); - if (contents.status !== 200) throw ""; + const contents = await this.adminClient.get(`/fs/file/${username}/System/Migrations/Index.json`); return contents.data; } catch { @@ -1313,12 +1165,9 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper } async GetIpAddresses(): Promise { + if (this._disposed) return []; try { - const response = await Backend.get(`/admin/ip/list`, { - responseType: "json", - headers: { Authorization: `Bearer ${Daemon.token}` }, - }); - if (response.status !== 200) throw ""; + const response = await this.adminClient.get(`/ip/list`); return response.data; } catch { @@ -1327,6 +1176,8 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper } async getReportSourceFile(report: BugReport): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + const trace = parse(report.body) .filter(Boolean) .filter((f) => (f.file?.startsWith("./assets") || f.file?.startsWith(report.location.origin)) && f.file.endsWith(".js")); @@ -1343,7 +1194,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper if (url.toString().includes("team.arcweb.nl")) { return CommandResult.Error("Previews are not supported because their JS files aren't retained"); } - + try { const file = (await axios.get(url.toString(), { responseType: "text" })).data as string; @@ -1374,6 +1225,218 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper return CommandResult.Error(`${e} -- URL: ${url}`); } } + + async getMailbrokerKey(id: string): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.get(`/mailbroker/keys/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async getMailbrokerLogs(): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.get(`/mailbroker/logs`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async getMailbrokerTemplates(): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.get(`/mailbroker/templates`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async getMailbrokerSentRecords(): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.get(`/mailbroker/sent`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async getMailbrokerTemplate(id: string): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.get(`/mailbroker/templates/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async getMailbrokerSentRecord(id: string): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.get(`/mailbroker/sent/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async deleteMailbrokerKey(id: string): Promise { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.delete(`/mailbroker/keys/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async disableMailbrokerKey(id: string): Promise { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.post(`/mailbroker/keys/disable/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async enableMailbrokerKey(id: string): Promise { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.post(`/mailbroker/keys/enable/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async createMailbrokerKey(serverName: string): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.post(`/mailbroker/keys`, toForm({ serverName })); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async sendMailTemplateById( + id: string, + userId: string, + props: Record + ): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.post( + `/mailbroker/send/byid/${id}`, + toForm({ userId, props: JSON.stringify(props) }) + ); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async sendMailTemplateByName( + name: string, + userId: string, + props: Record + ): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.post( + `/mailbroker/send/byname/${name}`, + toForm({ userId, props: JSON.stringify(props) }) + ); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async deleteMailbrokerSentRecord(id: string): Promise { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.delete(`/mailbroker/sent/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async deprecateMailbrokerTemplate(id: string): Promise { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.post(`/mailbroker/templates/deprecate/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async undeprecateMailbrokerTemplate(id: string): Promise { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.post(`/mailbroker/templates/undeprecate/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async deleteMailbrokerTemplate(id: string): Promise { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.delete(`/mailbroker/templates/${id}`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async updateMailbrokerTemplate(id: string, update: Mailbroker.MailTemplateUpdate): Promise { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.patch(`/mailbroker/templates/${id}`, toForm(update)); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + + async createMailbrokerTemplate(data: Mailbroker.MailTemplateCreate): Promise { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.patch(`/mailbroker/templates`, toForm(data)); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } } export const adminService: Service = { diff --git a/src/ts/servicehost/services/AdminBootstrapper/store.ts b/src/ts/servicehost/services/AdminBootstrapper/store.ts index f1d0638c3..f1aa26b78 100644 --- a/src/ts/servicehost/services/AdminBootstrapper/store.ts +++ b/src/ts/servicehost/services/AdminBootstrapper/store.ts @@ -80,6 +80,14 @@ export const AdminScopes = { adminAfsWrite: "admin.afs.write", adminAfsQuota: "admin.afs.quota", adminIpList: "admin.ip.list", + adminMailbrokerTemplatesRead: "admin.mailbroker.templates.read", + adminMailbrokerTemplatesWrite: "admin.mailbroker.templates.write", + adminMailbrokerSentRead: "admin.mailbroker.sent.read", + adminMailbrokerSentWrite: "admin.mailbroker.sent.write", + adminMailbrokerLogsRead: "admin.mailbroker.logs.read", + adminMailbrokerKeysRead: "admin.mailbroker.keys.read", + adminMailbrokerKeysWrite: "admin.mailbroker.keys.write", + adminMailbrokerSend: "admin.mailbroker.send", } as const; export type AdminScopesType = (typeof AdminScopes)[keyof typeof AdminScopes]; @@ -166,4 +174,12 @@ export const AdminScopeCaptions: Record = { adminAfsWrite: "write admin resource drive", adminAfsQuota: "get admin resource drive quota", adminIpList: "get IP addresses of users", + adminMailbrokerTemplatesRead: "Read mailbroker templates", + adminMailbrokerTemplatesWrite: "Write/delete/create mailbroker templates", + adminMailbrokerSentRead: "Read mailbroker sent records", + adminMailbrokerSentWrite: "Delete mailbroker sent records", + adminMailbrokerLogsRead: "Read mailbroker logs", + adminMailbrokerKeysRead: "Read mailbroker API keys", + adminMailbrokerKeysWrite: "Write/delete/create mailbroker keys", + adminMailbrokerSend: "Manually send mails using the mailbroker", }; diff --git a/src/types/server/admin.ts b/src/types/server/admin.ts index 002e4d950..6c938a03c 100644 --- a/src/types/server/admin.ts +++ b/src/types/server/admin.ts @@ -1,5 +1,5 @@ -import type { QueryableOptions } from "./query"; import type { ExpandedUserInfo } from "../user"; +import type { QueryableOptions } from "./query"; export interface Activity { authorId: string; @@ -180,13 +180,13 @@ export interface AuditLogQueryOptions extends QueryableOptions { } export interface BugReportSourceInformation { - line: number; - column: number; - originalSource: string; - prettySource: string; - prettyLine?: number; - prettyColumn?: number; - errorMessage?: string; - fileUrl?: string; - filename?: string; + line: number; + column: number; + originalSource: string; + prettySource: string; + prettyLine?: number; + prettyColumn?: number; + errorMessage?: string; + fileUrl?: string; + filename?: string; } diff --git a/src/types/server/mailbroker.ts b/src/types/server/mailbroker.ts new file mode 100644 index 000000000..e05097b7f --- /dev/null +++ b/src/types/server/mailbroker.ts @@ -0,0 +1,66 @@ +export namespace Mailbroker { + export interface MailKey { + _id: string; + serverName: string; + value: string; + disabled: boolean; + createdAt: string; + updatedAt: string; + } + + export interface MailLog { + _id: string; + code: string; + message: string; + details?: string; + createdAt: string; + updatedAt: string; + } + + export interface SentMail { + _id: string; + subject: string; + textContent: string; + htmlContent: string; + keyId: string; + to: SentMailRecipient; + createdAt: string; + updatedAt: string; + } + + export interface SentMailRecipient { + email: string; + serverName?: string; + username?: string; + } + + export interface SentMailCreate { + subject: string; + keyId: string; + textContent?: string; + htmlContent: string; + to: SentMailRecipient; + } + + export interface MailTemplate { + _id: string; + name: string; + htmlContent: string; + textContent: string; + subjectContent: string; + fromSuffix: string; + deprecated: boolean; + createdAt: string; + updatedAt: string; + } + + export interface MailTemplateCreate { + name: string; + htmlContent: string; + textContent?: string; + subjectContent?: string; + fromSuffix?: string; + } + + export type MailTemplateUpdate = Partial; +} From c94921942fffa2b5bdfeb238a3667fdcff47587a Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Sun, 2 Aug 2026 21:51:42 +0200 Subject: [PATCH 02/11] Some fixes to go with the mergeback --- .../services/AdminBootstrapper/index.ts | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/ts/servicehost/services/AdminBootstrapper/index.ts b/src/ts/servicehost/services/AdminBootstrapper/index.ts index 19d51e994..9914e1a38 100644 --- a/src/ts/servicehost/services/AdminBootstrapper/index.ts +++ b/src/ts/servicehost/services/AdminBootstrapper/index.ts @@ -19,7 +19,6 @@ import { arrayBufferToBlob, arrayBufferToText, textToBlob } from "$ts/util/conve import { toForm } from "$ts/util/form"; import { join } from "$ts/util/fs"; import { tryJsonParse } from "$ts/util/json"; -import type { App, InstalledApp } from "$types/apps/app"; import type { Activity, AdminTemporaryPassword, @@ -37,11 +36,11 @@ import type { UserTotp, } from "$types/server/admin"; import type { BugReport, ReportStatistics } from "$types/server/bughunt"; +import type { Mailbroker } from "$types/server/mailbroker"; import type { QueryResult } from "$types/server/query"; import type { SharedDriveType } from "$types/server/shares"; import type { Service } from "$types/services/service"; import type { BetaFeedback } from "$types/system/beta"; -import type { Mailbroker } from "$types/server/mailbroker"; import type { FilesystemProgressCallback, UserQuota } from "$types/system/fs"; import type { ArcPackage, StoreItem } from "$types/tpa/package"; import type { ExpandedUserInfo, UserInfo, UserPreferences } from "$types/user"; @@ -217,25 +216,6 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper } } - async setSystemFor(userId: string, value: boolean) { - if (this._disposed) return false; - try { - const response = await Backend.post( - `/admin/users/system/set/${userId}/${value}`, - {}, - { - headers: { Authorization: `Bearer ${Daemon!.token}` }, - } - ); - - try { - const response = await this.adminClient.post("/revoke", toForm({ target: username })); - return response.status === 200; - } catch { - return false; - } - } - async setSystemFor(userId: string, value: boolean) { if (this._disposed) return false; try { From d054e28e46a12b4017939c47c3dacdc63d1e1642 Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Mon, 3 Aug 2026 01:03:36 +0200 Subject: [PATCH 03/11] Continue working on the mailbroker manager app --- src/apps/admin/mailbroker/Mailbroker.svelte | 25 +++-- .../mailbroker/Mailbroker/Sidebar.svelte | 27 +++-- .../Mailbroker/TemplateListing.svelte | 75 +++++++++++++ .../TemplateListing/ListingOption.svelte | 20 ++++ .../Mailbroker/TemplatePills.svelte | 20 ++++ src/apps/admin/mailbroker/MailbrokerApp.ts | 11 +- .../admin/mailbroker/Pages/GenericList.svelte | 18 ++++ .../admin/mailbroker/Pages/Templates.svelte | 7 -- .../mailbroker/Pages/ViewTemplate.svelte | 49 +++++++++ .../Pages/ViewTemplate/TemplateEditor.svelte | 32 ++++++ .../TemplateEditor/GeneralTab.svelte | 12 +++ .../TemplateEditor/HtmlContentTab.svelte | 10 ++ .../TemplateEditor/TextContentTab.svelte | 10 ++ .../Pages/ViewTemplate/TemplateHeader.svelte | 40 +++++++ src/apps/admin/mailbroker/runtime.ts | 9 +- src/apps/admin/mailbroker/store.ts | 36 ++++++- src/apps/admin/mailbroker/types.ts | 3 +- .../filemanager/FileManager/Sidebar.svelte | 12 +-- .../FileManager/Sidebar/DriveEntry.svelte | 2 +- .../FileManager/Sidebar/RootFolder.svelte | 2 +- src/assets/apps/mailbrokeradmin.svg | 9 ++ src/css/apps/admin/mailbroker.css | 74 +++++++++++++ .../admin/mailbroker/pages/viewtemplate.css | 42 ++++++++ src/css/apps/admin/mailbroker/sidebar.css | 8 ++ .../apps/admin/mailbroker/templatelisting.css | 101 ++++++++++++++++++ src/css/apps/user/filemanager/sidebar.css | 76 ++----------- src/css/window.css | 9 +- src/css/window/sidebar/symbolic.css | 72 +++++++++++++ src/interfaces/runtimes/IMailbrokerRuntime.ts | 3 +- src/interfaces/services/IAdminBootstrapper.ts | 2 +- src/ts/images/apps.ts | 1 + .../services/AdminBootstrapper/index.ts | 12 ++- 32 files changed, 708 insertions(+), 121 deletions(-) create mode 100644 src/apps/admin/mailbroker/Mailbroker/TemplateListing.svelte create mode 100644 src/apps/admin/mailbroker/Mailbroker/TemplateListing/ListingOption.svelte create mode 100644 src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte create mode 100644 src/apps/admin/mailbroker/Pages/GenericList.svelte delete mode 100644 src/apps/admin/mailbroker/Pages/Templates.svelte create mode 100644 src/apps/admin/mailbroker/Pages/ViewTemplate.svelte create mode 100644 src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor.svelte create mode 100644 src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte create mode 100644 src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte create mode 100644 src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte create mode 100644 src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte create mode 100644 src/assets/apps/mailbrokeradmin.svg create mode 100644 src/css/apps/admin/mailbroker.css create mode 100644 src/css/apps/admin/mailbroker/pages/viewtemplate.css create mode 100644 src/css/apps/admin/mailbroker/sidebar.css create mode 100644 src/css/apps/admin/mailbroker/templatelisting.css create mode 100644 src/css/window/sidebar/symbolic.css diff --git a/src/apps/admin/mailbroker/Mailbroker.svelte b/src/apps/admin/mailbroker/Mailbroker.svelte index b5aef1bfe..a3c5b8153 100644 --- a/src/apps/admin/mailbroker/Mailbroker.svelte +++ b/src/apps/admin/mailbroker/Mailbroker.svelte @@ -7,9 +7,10 @@ import Sidebar from "./Mailbroker/Sidebar.svelte"; import { mailbrokerPages } from "./store"; import type { MailbrokerPage } from "./types"; + import Spinner from "$lib/Spinner.svelte"; let { process }: { process: IMailbrokerRuntime } = $props(); - const { currentPage } = process; + const { currentPage, pageProps } = process; let Page: Component | undefined = $state(); let pageData = $state(); let loading = $state(false); @@ -19,7 +20,11 @@ const sub = currentPage.subscribe(async (v) => { loading = true; pageData = mailbrokerPages.get(v); - data = (await pageData?.data?.(process)) ?? CommandResult.Ok(); + const canAccess = !pageData?.scopes || process.admin.canAccess(...pageData?.scopes); + data = canAccess + ? ((await pageData?.data?.(process, pageProps())) ?? CommandResult.Ok()) + : CommandResult.Error("You're missing the required scopes to access this resource."); + Page = pageData?.content; loading = false; }); @@ -31,14 +36,22 @@
-
+
{#if loading} - loading + {:else if Page && data?.success} {@const result = data.result!} - + {:else} - error: {data?.errorMessage ?? "Unknown error"} +
+
+ +
+

The page failed to load

+

{data?.errorMessage ?? "An unknown error occurred."}

+
+
+
{/if}
diff --git a/src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte b/src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte index 3055452fd..ec8b88909 100644 --- a/src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte +++ b/src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte @@ -6,14 +6,19 @@ const { currentPage } = process; -{#each [...mailbrokerPages] as [id, page]} - {#if !page.hidden} - - {#if page.separator} -
- {/if} - {/if} -{/each} +
+
+

Mailbroker manager

+ {#each [...mailbrokerPages] as [id, page]} + {#if !page.hidden} + + {#if page.separator} +
+ {/if} + {/if} + {/each} +
+
diff --git a/src/apps/admin/mailbroker/Mailbroker/TemplateListing.svelte b/src/apps/admin/mailbroker/Mailbroker/TemplateListing.svelte new file mode 100644 index 000000000..23f3a3366 --- /dev/null +++ b/src/apps/admin/mailbroker/Mailbroker/TemplateListing.svelte @@ -0,0 +1,75 @@ + + +
+
+

{filteredTemplates.length} {Plural("template", filteredTemplates.length)}

+
+ + +
+ {#if !hideNewButton && process.admin.canAccess(AdminScopes.adminMailbrokerTemplatesWrite)} + + {/if} +
+ +
+ {#each filteredTemplates as template (template._id)} + + {/each} + + {#if !filteredTemplates.length} +

+ There are no templates that match the criteria. +

+ {/if} +
+
diff --git a/src/apps/admin/mailbroker/Mailbroker/TemplateListing/ListingOption.svelte b/src/apps/admin/mailbroker/Mailbroker/TemplateListing/ListingOption.svelte new file mode 100644 index 000000000..9e6cedf8b --- /dev/null +++ b/src/apps/admin/mailbroker/Mailbroker/TemplateListing/ListingOption.svelte @@ -0,0 +1,20 @@ + + + diff --git a/src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte b/src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte new file mode 100644 index 000000000..b92f5fb1c --- /dev/null +++ b/src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte @@ -0,0 +1,20 @@ + + +
+
+ + {formatBytes(template.htmlContent.length)} +
+
+ + {formatBytes(template.textContent.length)} +
+ {#if template.deprecated} +
Deprecated
+ {/if} +
diff --git a/src/apps/admin/mailbroker/MailbrokerApp.ts b/src/apps/admin/mailbroker/MailbrokerApp.ts index b0b43422d..45c82f16a 100644 --- a/src/apps/admin/mailbroker/MailbrokerApp.ts +++ b/src/apps/admin/mailbroker/MailbrokerApp.ts @@ -1,3 +1,4 @@ +import "$css/apps/admin/mailbroker.css"; import type { App } from "$types/apps/app"; import Mailbroker from "./Mailbroker.svelte"; import { MailbrokerRuntime } from "./runtime"; @@ -8,12 +9,12 @@ const MailbrokerApp: App = { version: "1.0.0", author: "Izaak Kuipers", appGroup: "adminTools", - icon: "ComponentIcon", + icon: "MailbrokerAdminIcon", }, position: { centered: true }, - size: { w: 640, h: 480 }, - minSize: { w: 640, h: 480 }, - maxSize: { w: 640, h: 480 }, + size: { w: 800, h: 480 }, + minSize: { w: 800, h: 480 }, + maxSize: { w: NaN, h: NaN }, state: { maximized: false, minimized: false, @@ -37,7 +38,7 @@ const MailbrokerApp: App = { overlay: false, noSafeMode: false, vital: true, - id: "Mailbroker", + id: "MailbrokerApp", }; export default MailbrokerApp; diff --git a/src/apps/admin/mailbroker/Pages/GenericList.svelte b/src/apps/admin/mailbroker/Pages/GenericList.svelte new file mode 100644 index 000000000..1c580e925 --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/GenericList.svelte @@ -0,0 +1,18 @@ + + + diff --git a/src/apps/admin/mailbroker/Pages/Templates.svelte b/src/apps/admin/mailbroker/Pages/Templates.svelte deleted file mode 100644 index 15aece798..000000000 --- a/src/apps/admin/mailbroker/Pages/Templates.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - -{data.length} diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate.svelte new file mode 100644 index 000000000..9db898137 --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate.svelte @@ -0,0 +1,49 @@ + + + + \ No newline at end of file diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor.svelte new file mode 100644 index 000000000..103370e9d --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor.svelte @@ -0,0 +1,32 @@ + + +
+
+ {#each Object.entries(tabs) as [tab]} + + {/each} +
+
+ {#if Component} + + {/if} +
+
diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte new file mode 100644 index 000000000..944e710ad --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte @@ -0,0 +1,12 @@ + + +general + + \ No newline at end of file diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte new file mode 100644 index 000000000..93a8038b3 --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte @@ -0,0 +1,10 @@ + + +html content diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte new file mode 100644 index 000000000..17c3c3474 --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte @@ -0,0 +1,10 @@ + + +text content diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte new file mode 100644 index 000000000..d651639f2 --- /dev/null +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte @@ -0,0 +1,40 @@ + + +
+ +
+

{$updateData.name} - ArcOS {$updateData.fromSuffix}

+

{$updateData.subjectContent}

+ +
+
+ +
+

Created at:

+

{dayjs(template.createdAt).format("D MMMM YYYY, HH:mm:ss")}

+
+ +
+

Updated at:

+

{dayjs(template.updatedAt).format("D MMMM YYYY, HH:mm:ss")}

+
+ +
+
diff --git a/src/apps/admin/mailbroker/runtime.ts b/src/apps/admin/mailbroker/runtime.ts index 24da860c3..1a8ffed55 100644 --- a/src/apps/admin/mailbroker/runtime.ts +++ b/src/apps/admin/mailbroker/runtime.ts @@ -8,6 +8,8 @@ import { mailbrokerPages } from "./store"; export class MailbrokerRuntime extends AppProcess implements IMailbrokerRuntime { currentPage = Store(""); + pageProps = Store>({}); + get admin() { return Daemon.serviceHost?.getService("AdminBootstrapper")!; } @@ -17,18 +19,21 @@ export class MailbrokerRuntime extends AppProcess implements IMailbrokerRuntime constructor(pid: number, parentPid: number, app: AppProcessData) { super(pid, parentPid, app); - this.switchPage("templates"); + this.switchPage("activeTemplates"); this.setSource(__SOURCE__); } - switchPage(pageId: string) { + switchPage(pageId: string, props?: Record) { this.Log(`Loading page '${pageId}'`); if (!mailbrokerPages.has(pageId)) return; + this.pageProps.set({}); + const page = mailbrokerPages.get(pageId); + this.pageProps.set(props ?? {}); this.currentPage.set(pageId); this.windowTitle.set(`${page?.name}`); } diff --git a/src/apps/admin/mailbroker/store.ts b/src/apps/admin/mailbroker/store.ts index 79f267b4c..42666fa68 100644 --- a/src/apps/admin/mailbroker/store.ts +++ b/src/apps/admin/mailbroker/store.ts @@ -1,16 +1,40 @@ +import { AdminScopes } from "$ts/servicehost/services/AdminBootstrapper/store"; +import GenericList from "./Pages/GenericList.svelte"; import Logs from "./Pages/Logs.svelte"; import Sent from "./Pages/Sent.svelte"; -import Templates from "./Pages/Templates.svelte"; +import ViewTemplate from "./Pages/ViewTemplate.svelte"; import type { MailbrokerPage, MailbrokerPages } from "./types"; export const mailbrokerPages: MailbrokerPages = new Map([ [ - "templates", + "activeTemplates", { - name: "Templates", + name: "Active templates", icon: "mails", - content: Templates, - data: async (process) => await process.admin.getMailbrokerTemplates(), + content: GenericList, + data: async (process) => await process.admin.getMailbrokerTemplates((template) => !template.deprecated), + scopes: [AdminScopes.adminMailbrokerTemplatesRead], + }, + ], + [ + "deprecatedTemplates", + { + name: "Deprecated templates", + icon: "mails", + content: GenericList, + data: async (process) => await process.admin.getMailbrokerTemplates((template) => template.deprecated), + scopes: [AdminScopes.adminMailbrokerTemplatesRead], + }, + ], + [ + "viewTemplate", + { + name: "View template", + icon: "eye", + hidden: true, + content: ViewTemplate, + data: async (process, props: { templateId: string }) => await process.admin.getMailbrokerTemplate(props.templateId), + scopes: [AdminScopes.adminMailbrokerTemplatesRead], }, ], [ @@ -21,6 +45,7 @@ export const mailbrokerPages: MailbrokerPages = new Map( content: Sent, separator: true, data: async (process) => await process.admin.getMailbrokerSentRecords(), + scopes: [AdminScopes.adminMailbrokerSentRead], }, ], [ @@ -30,6 +55,7 @@ export const mailbrokerPages: MailbrokerPages = new Map( icon: "list", content: Logs, data: async (process) => await process.admin.getMailbrokerLogs(), + scopes: [AdminScopes.adminMailbrokerLogsRead], }, ], ]); diff --git a/src/apps/admin/mailbroker/types.ts b/src/apps/admin/mailbroker/types.ts index cae438e25..ebdc170b3 100644 --- a/src/apps/admin/mailbroker/types.ts +++ b/src/apps/admin/mailbroker/types.ts @@ -9,7 +9,8 @@ export interface MailbrokerPage { content: Component; hidden?: boolean; separator?: boolean; - data?: (process: IMailbrokerRuntime) => MaybePromise>>; + data?: (process: IMailbrokerRuntime, pageProps: any) => MaybePromise>>; + scopes?: string[]; } export type MailbrokerPages = Map; diff --git a/src/apps/user/filemanager/FileManager/Sidebar.svelte b/src/apps/user/filemanager/FileManager/Sidebar.svelte index 7099d6d6d..6e9fa46cd 100755 --- a/src/apps/user/filemanager/FileManager/Sidebar.svelte +++ b/src/apps/user/filemanager/FileManager/Sidebar.svelte @@ -10,11 +10,11 @@ const { path, rootFolders, drives } = process; -
-
+
+

{process.userPreferences().account.displayName || process.username}

- @@ -24,12 +24,12 @@ {/each}
{#if Object.values(process.virtualLocations).filter((l) => !l.hidden).length} -
+

Places

{#each Object.entries(process.virtualLocations) as [id, location] (id)} {#if !location.hidden || $userPreferences.appPreferences.fileManager?.showHiddenDrives}
{/if} -
+

Drives

{#each Object.entries($drives) as [id, drive] (`${id}-${drive.data.uuid}`)} {#if !drive.data.HIDDEN || $userPreferences.appPreferences.fileManager?.showHiddenDrives} diff --git a/src/apps/user/filemanager/FileManager/Sidebar/DriveEntry.svelte b/src/apps/user/filemanager/FileManager/Sidebar/DriveEntry.svelte index d1fc614f8..3642337d7 100755 --- a/src/apps/user/filemanager/FileManager/Sidebar/DriveEntry.svelte +++ b/src/apps/user/filemanager/FileManager/Sidebar/DriveEntry.svelte @@ -21,7 +21,7 @@ diff --git a/src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte b/src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte index b92f5fb1c..79de8ea49 100644 --- a/src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte +++ b/src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte @@ -2,7 +2,7 @@ import { formatBytes } from "$ts/util/fs"; import type { Mailbroker } from "$types/server/mailbroker"; - let { template }: { template: Mailbroker.MailTemplate } = $props(); + let { template, deprecated }: { template: Mailbroker.MailTemplate; deprecated: boolean; } = $props();
@@ -14,7 +14,7 @@ {formatBytes(template.textContent.length)}
- {#if template.deprecated} + {#if deprecated}
Deprecated
{/if}
diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate.svelte index 9db898137..c8ddc15b8 100644 --- a/src/apps/admin/mailbroker/Pages/ViewTemplate.svelte +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate.svelte @@ -1,17 +1,20 @@ - - \ No newline at end of file + + + + {#snippet leftContent()} + + {#if deprecated} + Undeprecate + {:else} + Deprecate + {/if} + + {/snippet} + {#snippet rightContent()} + Send... + Discard + Save + {/snippet} + diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte index 944e710ad..43ed0e974 100644 --- a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte @@ -1,5 +1,6 @@ -general +
+

Template name

+ +
- \ No newline at end of file +
+

Subject content

+ +
+ +
+

From suffix

+ +
diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte index 93a8038b3..e71c03c16 100644 --- a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte @@ -1,10 +1,34 @@ -html content + + +
+ +
diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte index 17c3c3474..067ba96ef 100644 --- a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte @@ -1,5 +1,6 @@ -text content + \ No newline at end of file diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte index d651639f2..aa6b2e1e5 100644 --- a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte +++ b/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte @@ -9,10 +9,12 @@ process, template, updateData, + deprecated, }: { process: IMailbrokerRuntime; template: Mailbroker.MailTemplate; updateData: ReadableStore; + deprecated: boolean; } = $props(); @@ -21,7 +23,7 @@

{$updateData.name} - ArcOS {$updateData.fromSuffix}

{$updateData.subjectContent}

- +
diff --git a/src/apps/admin/mailbroker/runtime.ts b/src/apps/admin/mailbroker/runtime.ts index 1a8ffed55..7a5011939 100644 --- a/src/apps/admin/mailbroker/runtime.ts +++ b/src/apps/admin/mailbroker/runtime.ts @@ -24,11 +24,15 @@ export class MailbrokerRuntime extends AppProcess implements IMailbrokerRuntime this.setSource(__SOURCE__); } - switchPage(pageId: string, props?: Record) { + switchPage(pageId: string, props?: Record, force = false) { this.Log(`Loading page '${pageId}'`); if (!mailbrokerPages.has(pageId)) return; + if (force) { + this.currentPage.set(""); + } + this.pageProps.set({}); const page = mailbrokerPages.get(pageId); diff --git a/src/css/apps/admin/mailbroker/pages/viewtemplate.css b/src/css/apps/admin/mailbroker/pages/viewtemplate.css index b64853786..45d60b556 100644 --- a/src/css/apps/admin/mailbroker/pages/viewtemplate.css +++ b/src/css/apps/admin/mailbroker/pages/viewtemplate.css @@ -1,40 +1,43 @@ -#MailbrokerApp > div.body { - div.page-view-template { - div.template-header { - display: flex; - align-items: center; - padding: 10px 20px; - gap: 10px; - border-bottom: var(--win-border); - - h1 { - font-size: 18px; - } +@import url("./viewtemplate/editor.css"); - p.subject { - opacity: 0.5; - margin-bottom: 8px; - } +#MailbrokerApp > div.body div.page-view-template { + display: flex; + flex-direction: column; - > span.lucide { - font-size: 32px; - color: var(--accent-light); - margin-right: 10px; - } + div.template-header { + display: flex; + align-items: center; + padding: 10px 20px; + gap: 10px; + border-bottom: var(--win-border); - > div.dates { - margin-left: auto; - - > div.date { - margin-bottom: 8px; + h1 { + font-size: 18px; + } + + p.subject { + opacity: 0.5; + margin-bottom: 8px; + } - > h2 { - opacity: 0.5; - } + > span.lucide { + font-size: 32px; + color: var(--accent-light); + margin-right: 10px; + } + + > div.dates { + margin-left: auto; + + > div.date { + margin-bottom: 8px; + + > h2 { + opacity: 0.5; + } - > p { - font-size: 12px; - } + > p { + font-size: 12px; } } } diff --git a/src/css/apps/admin/mailbroker/pages/viewtemplate/editor.css b/src/css/apps/admin/mailbroker/pages/viewtemplate/editor.css new file mode 100644 index 000000000..571a0cd8a --- /dev/null +++ b/src/css/apps/admin/mailbroker/pages/viewtemplate/editor.css @@ -0,0 +1,117 @@ +#MailbrokerApp > div.body div.page-view-template { + div.template-editor { + height: 0; + flex-grow: 1; + display: flex; + flex-direction: column; + + div.editor-tabs { + display: flex; + align-items: end; + padding: 10px; + padding-bottom: 0; + height: 40px; + border-bottom: var(--win-border); + + button { + border-radius: 0; + border: var(--win-border); + border-bottom: 0; + height: 26px; + padding: 0 8px; + min-width: unset; + background-color: var(--win-bg); + outline: none; + + &:hover { + background-color: var(--button-glass-bg); + } + + & + button { + border-left: 0; + } + + &.selected { + background-color: var(--win-bg); + height: 30px; + padding: 0 8px; + translate: 0 1px; + border-left: var(--win-border); + border-top-right-radius: 5px; + border-top-left-radius: 5px; + } + + & + button.selected { + margin-left: -1px; + } + + &:first-child { + border-top-left-radius: 5px; + } + + &:last-child { + border-top-right-radius: 5px; + } + } + } + + div.tab-content { + height: 0; + flex-grow: 1; + padding: 10px; + } + + div.tab-general div.property { + display: flex; + align-items: center; + gap: 20px; + margin-bottom: 10px; + + h3 { + width: 150px; + } + + input { + width: 250px; + } + } + + textarea { + font-family: "Source Code Pro"; + font-size: 14px; + padding: 10px; + background-color: var(--win-bg); + border: none; + resize: none; + } + + div.tab-html { + display: flex; + padding: 0; + + textarea, + div.iframe-wrapper { + width: 50%; + } + + div.iframe-wrapper { + background-color: #fff; + border-left:var(--win-border); + } + + iframe { + width: 100%; + height: 100%; + } + } + + div.tab-text { + padding: 0; + + textarea { + width: 100%; + height: 100%; + } + } + } +} diff --git a/src/interfaces/runtimes/IMailbrokerRuntime.ts b/src/interfaces/runtimes/IMailbrokerRuntime.ts index 905bd9777..100b39919 100644 --- a/src/interfaces/runtimes/IMailbrokerRuntime.ts +++ b/src/interfaces/runtimes/IMailbrokerRuntime.ts @@ -6,5 +6,5 @@ export interface IMailbrokerRuntime extends IAppProcess { get admin(): IAdminBootstrapper; currentPage: ReadableStore; pageProps: ReadableStore>; - switchPage(pageId: string, props?: Record): void; + switchPage(pageId: string, props?: Record, force?: boolean): void; } diff --git a/src/ts/servicehost/services/AdminBootstrapper/index.ts b/src/ts/servicehost/services/AdminBootstrapper/index.ts index 0be991155..2baaf6ef8 100644 --- a/src/ts/servicehost/services/AdminBootstrapper/index.ts +++ b/src/ts/servicehost/services/AdminBootstrapper/index.ts @@ -1413,7 +1413,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper if (this._disposed) return CommandResult.Error("Disposed"); try { - const response = await this.adminClient.post(`/mailbroker/templates/deprecate/${id}`); + const response = await this.adminClient.post(`/mailbroker/templates/${id}/deprecate`); return CommandResult.Ok(response.data); } catch (e) { return CommandResult.AxiosError(e); @@ -1424,7 +1424,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper if (this._disposed) return CommandResult.Error("Disposed"); try { - const response = await this.adminClient.post(`/mailbroker/templates/undeprecate/${id}`); + const response = await this.adminClient.post(`/mailbroker/templates/${id}/undeprecate`); return CommandResult.Ok(response.data); } catch (e) { return CommandResult.AxiosError(e); From c81796aa4e1bb529f8a61965e88e312142eae899 Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Mon, 3 Aug 2026 10:23:22 +0200 Subject: [PATCH 05/11] Rename MailbrokerApp to MailbrokerManagerApp --- .../{mailbroker => mailbrokermanagerapp}/Mailbroker.svelte | 0 .../Mailbroker/Sidebar.svelte | 0 .../Mailbroker/TemplateListing.svelte | 0 .../Mailbroker/TemplateListing/ListingOption.svelte | 0 .../Mailbroker/TemplatePills.svelte | 0 .../MailbrokerManagerApp.ts} | 6 +++--- .../Pages/GenericList.svelte | 0 .../{mailbroker => mailbrokermanagerapp}/Pages/Logs.svelte | 0 .../{mailbroker => mailbrokermanagerapp}/Pages/Sent.svelte | 0 .../Pages/ViewTemplate.svelte | 0 .../Pages/ViewTemplate/TemplateEditor.svelte | 0 .../Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte | 0 .../Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte | 0 .../Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte | 0 .../Pages/ViewTemplate/TemplateHeader.svelte | 0 .../admin/{mailbroker => mailbrokermanagerapp}/runtime.ts | 0 .../admin/{mailbroker => mailbrokermanagerapp}/store.ts | 0 .../admin/{mailbroker => mailbrokermanagerapp}/types.ts | 0 18 files changed, 3 insertions(+), 3 deletions(-) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Mailbroker.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Mailbroker/Sidebar.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Mailbroker/TemplateListing.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Mailbroker/TemplateListing/ListingOption.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Mailbroker/TemplatePills.svelte (100%) rename src/apps/admin/{mailbroker/MailbrokerApp.ts => mailbrokermanagerapp/MailbrokerManagerApp.ts} (89%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Pages/GenericList.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Pages/Logs.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Pages/Sent.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Pages/ViewTemplate.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Pages/ViewTemplate/TemplateEditor.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/Pages/ViewTemplate/TemplateHeader.svelte (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/runtime.ts (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/store.ts (100%) rename src/apps/admin/{mailbroker => mailbrokermanagerapp}/types.ts (100%) diff --git a/src/apps/admin/mailbroker/Mailbroker.svelte b/src/apps/admin/mailbrokermanagerapp/Mailbroker.svelte similarity index 100% rename from src/apps/admin/mailbroker/Mailbroker.svelte rename to src/apps/admin/mailbrokermanagerapp/Mailbroker.svelte diff --git a/src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte b/src/apps/admin/mailbrokermanagerapp/Mailbroker/Sidebar.svelte similarity index 100% rename from src/apps/admin/mailbroker/Mailbroker/Sidebar.svelte rename to src/apps/admin/mailbrokermanagerapp/Mailbroker/Sidebar.svelte diff --git a/src/apps/admin/mailbroker/Mailbroker/TemplateListing.svelte b/src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplateListing.svelte similarity index 100% rename from src/apps/admin/mailbroker/Mailbroker/TemplateListing.svelte rename to src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplateListing.svelte diff --git a/src/apps/admin/mailbroker/Mailbroker/TemplateListing/ListingOption.svelte b/src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplateListing/ListingOption.svelte similarity index 100% rename from src/apps/admin/mailbroker/Mailbroker/TemplateListing/ListingOption.svelte rename to src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplateListing/ListingOption.svelte diff --git a/src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte b/src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplatePills.svelte similarity index 100% rename from src/apps/admin/mailbroker/Mailbroker/TemplatePills.svelte rename to src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplatePills.svelte diff --git a/src/apps/admin/mailbroker/MailbrokerApp.ts b/src/apps/admin/mailbrokermanagerapp/MailbrokerManagerApp.ts similarity index 89% rename from src/apps/admin/mailbroker/MailbrokerApp.ts rename to src/apps/admin/mailbrokermanagerapp/MailbrokerManagerApp.ts index 45c82f16a..e9bf30b7e 100644 --- a/src/apps/admin/mailbroker/MailbrokerApp.ts +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManagerApp.ts @@ -3,7 +3,7 @@ import type { App } from "$types/apps/app"; import Mailbroker from "./Mailbroker.svelte"; import { MailbrokerRuntime } from "./runtime"; -const MailbrokerApp: App = { +const MailbrokerManagerApp: App = { metadata: { name: "Mailbroker Manager", version: "1.0.0", @@ -38,7 +38,7 @@ const MailbrokerApp: App = { overlay: false, noSafeMode: false, vital: true, - id: "MailbrokerApp", + id: "MailbrokerManagerApp", }; -export default MailbrokerApp; +export default MailbrokerManagerApp; diff --git a/src/apps/admin/mailbroker/Pages/GenericList.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/GenericList.svelte similarity index 100% rename from src/apps/admin/mailbroker/Pages/GenericList.svelte rename to src/apps/admin/mailbrokermanagerapp/Pages/GenericList.svelte diff --git a/src/apps/admin/mailbroker/Pages/Logs.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/Logs.svelte similarity index 100% rename from src/apps/admin/mailbroker/Pages/Logs.svelte rename to src/apps/admin/mailbrokermanagerapp/Pages/Logs.svelte diff --git a/src/apps/admin/mailbroker/Pages/Sent.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte similarity index 100% rename from src/apps/admin/mailbroker/Pages/Sent.svelte rename to src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte similarity index 100% rename from src/apps/admin/mailbroker/Pages/ViewTemplate.svelte rename to src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateEditor.svelte similarity index 100% rename from src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor.svelte rename to src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateEditor.svelte diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte similarity index 100% rename from src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte rename to src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateEditor/GeneralTab.svelte diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte similarity index 100% rename from src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte rename to src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateEditor/HtmlContentTab.svelte diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte similarity index 100% rename from src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte rename to src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateEditor/TextContentTab.svelte diff --git a/src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateHeader.svelte similarity index 100% rename from src/apps/admin/mailbroker/Pages/ViewTemplate/TemplateHeader.svelte rename to src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateHeader.svelte diff --git a/src/apps/admin/mailbroker/runtime.ts b/src/apps/admin/mailbrokermanagerapp/runtime.ts similarity index 100% rename from src/apps/admin/mailbroker/runtime.ts rename to src/apps/admin/mailbrokermanagerapp/runtime.ts diff --git a/src/apps/admin/mailbroker/store.ts b/src/apps/admin/mailbrokermanagerapp/store.ts similarity index 100% rename from src/apps/admin/mailbroker/store.ts rename to src/apps/admin/mailbrokermanagerapp/store.ts diff --git a/src/apps/admin/mailbroker/types.ts b/src/apps/admin/mailbrokermanagerapp/types.ts similarity index 100% rename from src/apps/admin/mailbroker/types.ts rename to src/apps/admin/mailbrokermanagerapp/types.ts From 496b1d046986101f242287cdfab2dd52ff4e14e4 Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Mon, 3 Aug 2026 20:36:24 +0200 Subject: [PATCH 06/11] a --- ...broker.svelte => MailbrokerManager.svelte} | 4 +- .../Sidebar.svelte | 0 .../TemplateListing.svelte | 2 +- .../TemplateListing/ListingOption.svelte | 0 .../TemplatePills.svelte | 0 .../MailbrokerManagerApp.ts | 4 +- .../Overlays/SendOverlay/SendOverlay.svelte | 97 +++++++++++++++++++ .../Overlays/SendOverlay/SendOverlay.ts | 45 +++++++++ .../Overlays/SendOverlay/runtime.ts | 92 ++++++++++++++++++ .../Overlays/SendOverlay/types.ts | 14 +++ .../Pages/GenericList.svelte | 2 +- .../Pages/NewTemplate.svelte | 52 ++++++++++ .../Pages/ViewTemplate.svelte | 5 +- .../Pages/ViewTemplate/TemplateHeader.svelte | 2 +- .../admin/mailbrokermanagerapp/runtime.ts | 7 +- src/apps/admin/mailbrokermanagerapp/store.ts | 11 +++ src/css/apps/admin/mailbroker.css | 10 +- .../admin/mailbroker/overiays/sendoverlay.css | 73 ++++++++++++++ .../admin/mailbroker/pages/newtemplate.css | 4 + .../admin/mailbroker/pages/viewtemplate.css | 2 +- .../mailbroker/pages/viewtemplate/editor.css | 2 +- src/css/apps/admin/mailbroker/sidebar.css | 2 +- .../apps/admin/mailbroker/templatelisting.css | 2 +- src/css/window/actionbar.css | 4 + src/interfaces/runtimes/IMailbrokerRuntime.ts | 11 +++ src/interfaces/services/IAdminBootstrapper.ts | 8 +- src/ts/apps/store.ts | 2 +- .../services/AdminBootstrapper/index.ts | 10 +- src/types/server/mailbroker.ts | 8 -- 29 files changed, 444 insertions(+), 31 deletions(-) rename src/apps/admin/mailbrokermanagerapp/{Mailbroker.svelte => MailbrokerManager.svelte} (95%) rename src/apps/admin/mailbrokermanagerapp/{Mailbroker => MailbrokerManager}/Sidebar.svelte (100%) rename src/apps/admin/mailbrokermanagerapp/{Mailbroker => MailbrokerManager}/TemplateListing.svelte (95%) rename src/apps/admin/mailbrokermanagerapp/{Mailbroker => MailbrokerManager}/TemplateListing/ListingOption.svelte (100%) rename src/apps/admin/mailbrokermanagerapp/{Mailbroker => MailbrokerManager}/TemplatePills.svelte (100%) create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.svelte create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.ts create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/runtime.ts create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/types.ts create mode 100644 src/apps/admin/mailbrokermanagerapp/Pages/NewTemplate.svelte create mode 100644 src/css/apps/admin/mailbroker/overiays/sendoverlay.css create mode 100644 src/css/apps/admin/mailbroker/pages/newtemplate.css diff --git a/src/apps/admin/mailbrokermanagerapp/Mailbroker.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte similarity index 95% rename from src/apps/admin/mailbrokermanagerapp/Mailbroker.svelte rename to src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte index a3c5b8153..7cd2776c2 100644 --- a/src/apps/admin/mailbrokermanagerapp/Mailbroker.svelte +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte @@ -4,7 +4,7 @@ import CustomTitlebar from "$lib/CustomTitlebar.svelte"; import { CommandResult } from "$ts/result"; import { onMount, type Component } from "svelte"; - import Sidebar from "./Mailbroker/Sidebar.svelte"; + import Sidebar from "./MailbrokerManager/Sidebar.svelte"; import { mailbrokerPages } from "./store"; import type { MailbrokerPage } from "./types"; import Spinner from "$lib/Spinner.svelte"; @@ -36,7 +36,7 @@
-
+
{#if loading} {:else if Page && data?.success} diff --git a/src/apps/admin/mailbrokermanagerapp/Mailbroker/Sidebar.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/Sidebar.svelte similarity index 100% rename from src/apps/admin/mailbrokermanagerapp/Mailbroker/Sidebar.svelte rename to src/apps/admin/mailbrokermanagerapp/MailbrokerManager/Sidebar.svelte diff --git a/src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplateListing.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte similarity index 95% rename from src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplateListing.svelte rename to src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte index 23f3a3366..7a53a6673 100644 --- a/src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplateListing.svelte +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte @@ -55,7 +55,7 @@
{#if !hideNewButton && process.admin.canAccess(AdminScopes.adminMailbrokerTemplatesWrite)} - {/if} diff --git a/src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplateListing/ListingOption.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing/ListingOption.svelte similarity index 100% rename from src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplateListing/ListingOption.svelte rename to src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing/ListingOption.svelte diff --git a/src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplatePills.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplatePills.svelte similarity index 100% rename from src/apps/admin/mailbrokermanagerapp/Mailbroker/TemplatePills.svelte rename to src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplatePills.svelte diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManagerApp.ts b/src/apps/admin/mailbrokermanagerapp/MailbrokerManagerApp.ts index e9bf30b7e..7a8398705 100644 --- a/src/apps/admin/mailbrokermanagerapp/MailbrokerManagerApp.ts +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManagerApp.ts @@ -1,6 +1,6 @@ import "$css/apps/admin/mailbroker.css"; import type { App } from "$types/apps/app"; -import Mailbroker from "./Mailbroker.svelte"; +import MailbrokerManager from "./MailbrokerManager.svelte"; import { MailbrokerRuntime } from "./runtime"; const MailbrokerManagerApp: App = { @@ -29,7 +29,7 @@ const MailbrokerManagerApp: App = { }, assets: { runtime: MailbrokerRuntime, - component: Mailbroker as any, + component: MailbrokerManager as any, }, glass: true, elevated: true, diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.svelte b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.svelte new file mode 100644 index 000000000..3c9c7afa5 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.svelte @@ -0,0 +1,97 @@ + + +
+ + +
+ +
+ {#each process.properties as property (property.name)} +
+

{property.name}

+
+ {#if property.isUser} + {#if property.variant === MailbrokerSendOverlay.PropertyVariant.UserId} + + + {:else if property.variant === MailbrokerSendOverlay.PropertyVariant.Username} + + + {/if} + {:else if property.variant === MailbrokerSendOverlay.PropertyVariant.Url} + + + {:else} + + + {/if} +
+
+ {/each} +
+ + + {#snippet rightContent()} + process.closeWindow()}>Cancel + Send + {/snippet} + diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.ts b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.ts new file mode 100644 index 000000000..553239f52 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.ts @@ -0,0 +1,45 @@ +import type { App } from "$types/apps/app"; +import { MailbrokerSendOverlayRuntime } from "./runtime"; +import SendOverlaySvelte from "./SendOverlay.svelte"; + +const SendOverlay: App = { + metadata: { + name: "Send mailbroker template", + author: "Izaak Kuipers", + version: "1.0.0", + icon: "MailbrokerAdminIcon", + }, + position: { centered: true }, + size: { + w: 450, + h: 300, + }, + minSize: { + w: 450, + h: 300, + }, + maxSize: { + w: 450, + h: 300, + }, + controls: { + minimize: false, + maximize: false, + close: true, + }, + state: { + resizable: false, + headless: true, + fullscreen: false, + maximized: false, + minimized: false, + }, + assets: { + runtime: MailbrokerSendOverlayRuntime, + component: SendOverlaySvelte as any, + }, + hidden: true, + id: "MailbrokerManagerApp_SendOverlay", +}; + +export default SendOverlay; \ No newline at end of file diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/runtime.ts b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/runtime.ts new file mode 100644 index 000000000..e9d0c08be --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/runtime.ts @@ -0,0 +1,92 @@ +import type { IMailbrokerSendOverlayRuntime } from "$interfaces/runtimes/IMailbrokerRuntime"; +import type { IAdminBootstrapper } from "$interfaces/services/IAdminBootstrapper"; +import { AppProcess } from "$ts/apps/process"; +import { Daemon } from "$ts/env"; +import { BTN_OKAY_SUG, MessageBox } from "$ts/util/dialog"; +import type { AppProcessData } from "$types/apps/app"; +import type { User } from "$types/server/admin"; +import type { Mailbroker } from "$types/server/mailbroker"; +import type { ExpandedUserInfo } from "$types/user"; +import { MailbrokerSendOverlay } from "./types"; + +export class MailbrokerSendOverlayRuntime extends AppProcess implements IMailbrokerSendOverlayRuntime { + public template?: Mailbroker.MailTemplate; + public templateId: string; + public properties: MailbrokerSendOverlay.Property[] = []; + public users: ExpandedUserInfo[] = []; + + get admin() { + return Daemon.serviceHost?.getService("AdminBootstrapper")!; + } + + constructor(pid: number, parentPid: number, app: AppProcessData, templateId: string) { + super(pid, parentPid, app); + + this.templateId = templateId; + } + + protected async start(): Promise { + const result = await this.admin.getMailbrokerTemplate(this.templateId); + + if (!result.success) { + MessageBox( + { + title: "Not found", + message: `The mailbroker template specified could not be found on the server. Please try again. ${result.errorMessage ?? "Unknown failure"}`, + image: "WarningIcon", + sound: "arcos.dialog.warning", + buttons: [BTN_OKAY_SUG], + }, + Daemon.getShell()?.pid!, + true + ); + + return; + } + + this.template = result.result; + this.users = await this.admin.getAllUsers(); + this.parseProperties(); + } + + private parseProperties() { + if (!this.template) return; + + const result: MailbrokerSendOverlay.Property[] = []; + const testStr = `${this.template.htmlContent}${this.template.subjectContent}${this.template.textContent}`; + const regex = /%(?[a-zA-Z_-]+)%/g; + const matches = testStr.matchAll(regex); + + for (const match of matches ?? []) { + const name = match?.groups?.name; + if (!name || result.find((r) => r.name === name)) continue; + + const property: MailbrokerSendOverlay.Property = { + variant: MailbrokerSendOverlay.PropertyVariant.Unknown, + isUser: false, + name, + }; + + switch (name.toLowerCase()) { + case "url": + property.variant = MailbrokerSendOverlay.PropertyVariant.Url; + break; + case "username": + property.variant = MailbrokerSendOverlay.PropertyVariant.Username; + property.isUser = true; + break; + case "userid": + property.variant = MailbrokerSendOverlay.PropertyVariant.UserId; + property.isUser = true; + break; + default: + property.variant = MailbrokerSendOverlay.PropertyVariant.Unknown; + break; + } + + result.push(property); + } + + this.properties = result; + } +} diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/types.ts b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/types.ts new file mode 100644 index 000000000..5f3c467eb --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/types.ts @@ -0,0 +1,14 @@ +export namespace MailbrokerSendOverlay { + export interface Property { + name: string; + variant: PropertyVariant; + isUser: boolean; + } + + export enum PropertyVariant { + Unknown, + Username, + UserId, + Url + } +} \ No newline at end of file diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/GenericList.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/GenericList.svelte index 1c580e925..48246c2c3 100644 --- a/src/apps/admin/mailbrokermanagerapp/Pages/GenericList.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Pages/GenericList.svelte @@ -1,7 +1,7 @@ + + + + + {#snippet rightContent()} + + Save + + {/snippet} + diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte index c8ddc15b8..35bb403a9 100644 --- a/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte @@ -88,7 +88,10 @@ {/snippet} {#snippet rightContent()} - Send... + process.spawnOverlay("SendOverlay", pageProps.templateId)}>Send... Discard Save {/snippet} diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateHeader.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateHeader.svelte index aa6b2e1e5..e867cc49a 100644 --- a/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateHeader.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate/TemplateHeader.svelte @@ -3,7 +3,7 @@ import type { Mailbroker } from "$types/server/mailbroker"; import type { ReadableStore } from "$types/shared/writable"; import dayjs from "dayjs"; - import TemplatePills from "../../Mailbroker/TemplatePills.svelte"; + import TemplatePills from "../../MailbrokerManager/TemplatePills.svelte"; const { process, diff --git a/src/apps/admin/mailbrokermanagerapp/runtime.ts b/src/apps/admin/mailbrokermanagerapp/runtime.ts index 7a5011939..f52caca35 100644 --- a/src/apps/admin/mailbrokermanagerapp/runtime.ts +++ b/src/apps/admin/mailbrokermanagerapp/runtime.ts @@ -3,7 +3,8 @@ import type { IAdminBootstrapper } from "$interfaces/services/IAdminBootstrapper import { AppProcess } from "$ts/apps/process"; import { Daemon } from "$ts/env"; import { Store } from "$ts/writable"; -import type { AppProcessData } from "$types/apps/app"; +import type { App, AppProcessData } from "$types/apps/app"; +import SendOverlay from "./Overlays/SendOverlay/SendOverlay"; import { mailbrokerPages } from "./store"; export class MailbrokerRuntime extends AppProcess implements IMailbrokerRuntime { @@ -14,6 +15,10 @@ export class MailbrokerRuntime extends AppProcess implements IMailbrokerRuntime return Daemon.serviceHost?.getService("AdminBootstrapper")!; } + protected overlayStore: Record = { + SendOverlay, + }; + //#region LIFECYCLE constructor(pid: number, parentPid: number, app: AppProcessData) { diff --git a/src/apps/admin/mailbrokermanagerapp/store.ts b/src/apps/admin/mailbrokermanagerapp/store.ts index 42666fa68..e846886e1 100644 --- a/src/apps/admin/mailbrokermanagerapp/store.ts +++ b/src/apps/admin/mailbrokermanagerapp/store.ts @@ -1,6 +1,7 @@ import { AdminScopes } from "$ts/servicehost/services/AdminBootstrapper/store"; import GenericList from "./Pages/GenericList.svelte"; import Logs from "./Pages/Logs.svelte"; +import NewTemplate from "./Pages/NewTemplate.svelte"; import Sent from "./Pages/Sent.svelte"; import ViewTemplate from "./Pages/ViewTemplate.svelte"; import type { MailbrokerPage, MailbrokerPages } from "./types"; @@ -37,6 +38,16 @@ export const mailbrokerPages: MailbrokerPages = new Map( scopes: [AdminScopes.adminMailbrokerTemplatesRead], }, ], + [ + "newTemplate", + { + name: "Create template", + icon: "plus", + hidden: true, + content: NewTemplate, + scopes: [AdminScopes.adminMailbrokerTemplatesWrite], + }, + ], [ "sent", { diff --git a/src/css/apps/admin/mailbroker.css b/src/css/apps/admin/mailbroker.css index fe3062609..ed14c6a61 100644 --- a/src/css/apps/admin/mailbroker.css +++ b/src/css/apps/admin/mailbroker.css @@ -1,8 +1,10 @@ @import url("./mailbroker/sidebar.css"); @import url("./mailbroker/templatelisting.css"); @import url("./mailbroker/pages/viewtemplate.css"); +@import url("./mailbroker/pages/newtemplate.css"); +@import url("./mailbroker/overiays/sendoverlay.css"); -#MailbrokerApp > div.body { +#MailbrokerManagerApp > div.body { padding: 0; display: flex; align-items: center; @@ -24,6 +26,12 @@ height: 0; flex-grow: 1; + &.loading { + display:flex; + justify-content: center; + align-items: center; + } + div.page-load-error { padding: 10px; border: var(--button-glass-bg) 1px solid; diff --git a/src/css/apps/admin/mailbroker/overiays/sendoverlay.css b/src/css/apps/admin/mailbroker/overiays/sendoverlay.css new file mode 100644 index 000000000..a351dbeb6 --- /dev/null +++ b/src/css/apps/admin/mailbroker/overiays/sendoverlay.css @@ -0,0 +1,73 @@ +#MailbrokerManagerApp_SendOverlay > div.body { + padding: 0; + display: flex; + flex-direction: column; + + div.user-selector { + display: flex; + align-items: center; + height: 40px; + border-bottom: var(--win-border); + + span.lucide { + border-right:var(--win-border); + width: 40px; + height: 40px; + display: flex; + justify-content: center; + align-items: center; + font-size: 20px; + } + + select { + flex-grow: 1; + border: none; + height: 100%; + margin-right: 10px; + } + } + + div.properties { + height: 0; + flex-grow: 1; + padding: 10px; + overflow-y: scroll; + } + + div.property { + display: flex; + align-items: center; + gap: 10px; + margin-bottom: 10px; + + h2 { + width: 150px; + } + + div.value { + height: 30px; + display: flex; + align-items: center; + background-color: var(--button-glass-bg); + border: var(--button-glass-hover-bg) 1px solid; + border-radius: 10px; + } + + div.value span.lucide { + width: 30px; + height: 28px; + border-right: var(--win-border); + display: flex; + justify-content: center; + align-items: center; + } + + div.value input { + width: 250px; + height: 100%; + border: none; + background-color: transparent; + padding: 0 10px; + } + } +} diff --git a/src/css/apps/admin/mailbroker/pages/newtemplate.css b/src/css/apps/admin/mailbroker/pages/newtemplate.css new file mode 100644 index 000000000..f7368de31 --- /dev/null +++ b/src/css/apps/admin/mailbroker/pages/newtemplate.css @@ -0,0 +1,4 @@ +#MailbrokerManagerApp > div.body div.page-create-template { + display: flex; + flex-direction: column; +} diff --git a/src/css/apps/admin/mailbroker/pages/viewtemplate.css b/src/css/apps/admin/mailbroker/pages/viewtemplate.css index 45d60b556..3ac7f7946 100644 --- a/src/css/apps/admin/mailbroker/pages/viewtemplate.css +++ b/src/css/apps/admin/mailbroker/pages/viewtemplate.css @@ -1,6 +1,6 @@ @import url("./viewtemplate/editor.css"); -#MailbrokerApp > div.body div.page-view-template { +#MailbrokerManagerApp > div.body div.page-view-template { display: flex; flex-direction: column; diff --git a/src/css/apps/admin/mailbroker/pages/viewtemplate/editor.css b/src/css/apps/admin/mailbroker/pages/viewtemplate/editor.css index 571a0cd8a..7aa18c75f 100644 --- a/src/css/apps/admin/mailbroker/pages/viewtemplate/editor.css +++ b/src/css/apps/admin/mailbroker/pages/viewtemplate/editor.css @@ -1,4 +1,4 @@ -#MailbrokerApp > div.body div.page-view-template { +#MailbrokerManagerApp > div.body { div.template-editor { height: 0; flex-grow: 1; diff --git a/src/css/apps/admin/mailbroker/sidebar.css b/src/css/apps/admin/mailbroker/sidebar.css index 620d9850e..80579157c 100644 --- a/src/css/apps/admin/mailbroker/sidebar.css +++ b/src/css/apps/admin/mailbroker/sidebar.css @@ -1,4 +1,4 @@ -#MailbrokerApp > div.body { +#MailbrokerManagerApp > div.body { div.sidebar { width: 200px; height: 100%; diff --git a/src/css/apps/admin/mailbroker/templatelisting.css b/src/css/apps/admin/mailbroker/templatelisting.css index e50f215c3..aa8b8ad68 100644 --- a/src/css/apps/admin/mailbroker/templatelisting.css +++ b/src/css/apps/admin/mailbroker/templatelisting.css @@ -1,4 +1,4 @@ -#MailbrokerApp > div.body { +#MailbrokerManagerApp > div.body { div.template-listing { height: 100%; display: flex; diff --git a/src/css/window/actionbar.css b/src/css/window/actionbar.css index 4b6f457fc..2c69cde60 100644 --- a/src/css/window/actionbar.css +++ b/src/css/window/actionbar.css @@ -13,6 +13,10 @@ div.window div.window-action-bar { justify-content: space-between; } +.theme-light div.window-action-bar { + background-color: var(--win-bg) !important; +} + div.window div.window-action-bar > div { display: flex; align-items: center; diff --git a/src/interfaces/runtimes/IMailbrokerRuntime.ts b/src/interfaces/runtimes/IMailbrokerRuntime.ts index 100b39919..366f13b1b 100644 --- a/src/interfaces/runtimes/IMailbrokerRuntime.ts +++ b/src/interfaces/runtimes/IMailbrokerRuntime.ts @@ -1,6 +1,9 @@ +import type { MailbrokerSendOverlay } from "$apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/types"; import type { IAppProcess } from "$interfaces/IAppProcess"; import type { IAdminBootstrapper } from "$interfaces/services/IAdminBootstrapper"; +import type { Mailbroker } from "$types/server/mailbroker"; import type { ReadableStore } from "$types/shared/writable"; +import type { ExpandedUserInfo } from "$types/user"; export interface IMailbrokerRuntime extends IAppProcess { get admin(): IAdminBootstrapper; @@ -8,3 +11,11 @@ export interface IMailbrokerRuntime extends IAppProcess { pageProps: ReadableStore>; switchPage(pageId: string, props?: Record, force?: boolean): void; } + +export interface IMailbrokerSendOverlayRuntime extends IAppProcess { + get admin(): IAdminBootstrapper; + properties: MailbrokerSendOverlay.Property[]; + template?: Mailbroker.MailTemplate; + templateId: string; + users: ExpandedUserInfo[]; +} diff --git a/src/interfaces/services/IAdminBootstrapper.ts b/src/interfaces/services/IAdminBootstrapper.ts index 2ae6192ab..d5ed6c826 100644 --- a/src/interfaces/services/IAdminBootstrapper.ts +++ b/src/interfaces/services/IAdminBootstrapper.ts @@ -129,19 +129,21 @@ export interface IAdminBootstrapper extends IBaseService { getMailbrokerKey(id: string): Promise>; getMailbrokerLogs(): Promise>; getMailbrokerTemplate(id: string): Promise>; - getMailbrokerTemplates(filter?: (template: Mailbroker.MailTemplate) => boolean): Promise>; + getMailbrokerTemplates( + filter?: (template: Mailbroker.MailTemplate) => boolean + ): Promise>; getMailbrokerSentRecord(id: string): Promise>; getMailbrokerSentRecords(): Promise>; deleteMailbrokerKey(id: string): Promise; disableMailbrokerKey(id: string): Promise; enableMailbrokerKey(id: string): Promise; createMailbrokerKey(serverName: string): Promise>; - sendMailTemplateById(id: string, userId: string, props: Record): Promise>; + sendMailTemplateById(id: string, userId: string, props: Record): Promise>; sendMailTemplateByName( name: string, userId: string, props: Record - ): Promise>; + ): Promise>; deleteMailbrokerSentRecord(id: string): Promise; deprecateMailbrokerTemplate(id: string): Promise; undeprecateMailbrokerTemplate(id: string): Promise; diff --git a/src/ts/apps/store.ts b/src/ts/apps/store.ts index a9af50707..a2f9870d9 100755 --- a/src/ts/apps/store.ts +++ b/src/ts/apps/store.ts @@ -70,7 +70,7 @@ export const BuiltinAppImportPathAbsolutes = import.meta.glob([ export const AdminAppImportPathAbsolutes = import.meta.glob([ "$apps/admin/adminportal/AdminPortal", "$apps/admin/executequery/ExecuteQueryApp", - "$apps/admin/mailbroker/MailbrokerApp", + "$apps/admin/mailbrokermanagerapp/MailbrokerManagerApp", ]); export const appShortcuts: [number, AppKeyCombinations][] = []; diff --git a/src/ts/servicehost/services/AdminBootstrapper/index.ts b/src/ts/servicehost/services/AdminBootstrapper/index.ts index 2baaf6ef8..6b05296c2 100644 --- a/src/ts/servicehost/services/AdminBootstrapper/index.ts +++ b/src/ts/servicehost/services/AdminBootstrapper/index.ts @@ -1366,7 +1366,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper id: string, userId: string, props: Record - ): Promise> { + ): Promise> { if (this._disposed) return CommandResult.Error("Disposed"); try { @@ -1374,7 +1374,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper `/mailbroker/send/byid/${id}`, toForm({ userId, props: JSON.stringify(props) }) ); - return CommandResult.Ok(response.data); + return CommandResult.Ok(response.data.result); } catch (e) { return CommandResult.AxiosError(e); } @@ -1384,7 +1384,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper name: string, userId: string, props: Record - ): Promise> { + ): Promise> { if (this._disposed) return CommandResult.Error("Disposed"); try { @@ -1392,7 +1392,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper `/mailbroker/send/byname/${name}`, toForm({ userId, props: JSON.stringify(props) }) ); - return CommandResult.Ok(response.data); + return CommandResult.Ok(response.data.result); } catch (e) { return CommandResult.AxiosError(e); } @@ -1457,7 +1457,7 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper if (this._disposed) return CommandResult.Error("Disposed"); try { - const response = await this.adminClient.patch(`/mailbroker/templates`, toForm(data)); + const response = await this.adminClient.post(`/mailbroker/templates`, toForm(data)); return CommandResult.Ok(response.data); } catch (e) { return CommandResult.AxiosError(e); diff --git a/src/types/server/mailbroker.ts b/src/types/server/mailbroker.ts index e05097b7f..88eb96d4c 100644 --- a/src/types/server/mailbroker.ts +++ b/src/types/server/mailbroker.ts @@ -34,14 +34,6 @@ export namespace Mailbroker { username?: string; } - export interface SentMailCreate { - subject: string; - keyId: string; - textContent?: string; - htmlContent: string; - to: SentMailRecipient; - } - export interface MailTemplate { _id: string; name: string; From 820087bcbb90b946d761d867bfe11872ec599235 Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Mon, 3 Aug 2026 23:34:27 +0200 Subject: [PATCH 07/11] Finish Mailbroker Manager --- .../MailbrokerManager.svelte | 2 +- .../MailbrokerManager/SentRecordPills.svelte | 23 +++++ .../MailbrokerManager/TemplateListing.svelte | 2 +- .../Overlays/SendOverlay/SendOverlay.svelte | 6 ++ .../mailbrokermanagerapp/Pages/Logs.svelte | 34 ++++++- .../mailbrokermanagerapp/Pages/Sent.svelte | 57 +++++++++++- .../Pages/Sent/SentListingOption.svelte | 20 +++++ .../Pages/ViewSentRecord.svelte | 88 +++++++++++++++++++ .../ViewSentRecord/SentRecordHeader.svelte | 35 ++++++++ .../Pages/ViewTemplate.svelte | 42 +++++++++ .../Pages/ViewTemplate/TemplateHeader.svelte | 26 +++--- src/apps/admin/mailbrokermanagerapp/store.ts | 12 +++ src/apps/components/messagebox/messageBox.ts | 2 +- src/css/apps/admin/mailbroker.css | 6 +- .../apps/admin/mailbroker/listingheader.css | 49 +++++++++++ src/css/apps/admin/mailbroker/pages/logs.css | 25 ++++++ src/css/apps/admin/mailbroker/pages/sent.css | 49 +++++++++++ .../apps/admin/mailbroker/pages/viewsent.css | 76 ++++++++++++++++ .../apps/admin/mailbroker/templatelisting.css | 51 +---------- 19 files changed, 534 insertions(+), 71 deletions(-) create mode 100644 src/apps/admin/mailbrokermanagerapp/MailbrokerManager/SentRecordPills.svelte create mode 100644 src/apps/admin/mailbrokermanagerapp/Pages/Sent/SentListingOption.svelte create mode 100644 src/apps/admin/mailbrokermanagerapp/Pages/ViewSentRecord.svelte create mode 100644 src/apps/admin/mailbrokermanagerapp/Pages/ViewSentRecord/SentRecordHeader.svelte create mode 100644 src/css/apps/admin/mailbroker/listingheader.css create mode 100644 src/css/apps/admin/mailbroker/pages/logs.css create mode 100644 src/css/apps/admin/mailbroker/pages/sent.css create mode 100644 src/css/apps/admin/mailbroker/pages/viewsent.css diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte index 7cd2776c2..522b1b13e 100644 --- a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte @@ -34,7 +34,7 @@ -
+
{#if loading} diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/SentRecordPills.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/SentRecordPills.svelte new file mode 100644 index 000000000..e34fb3b99 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/SentRecordPills.svelte @@ -0,0 +1,23 @@ + + +
+
+ + {formatBytes(sentRecord.htmlContent.length)} +
+
+ + {formatBytes(sentRecord.textContent.length)} +
+ {#if sentRecord.to.username && sentRecord.to.serverName} +
+ + To a user +
+ {/if} +
diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte index 7a53a6673..0c697da58 100644 --- a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte @@ -48,7 +48,7 @@
-
+

{filteredTemplates.length} {Plural("template", filteredTemplates.length)}

diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.svelte b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.svelte index 3c9c7afa5..a3e2955bb 100644 --- a/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/SendOverlay/SendOverlay.svelte @@ -2,6 +2,7 @@ import type { IMailbrokerSendOverlayRuntime } from "$interfaces/runtimes/IMailbrokerRuntime"; import ActionBar from "$lib/Window/ActionBar.svelte"; import ActionButton from "$lib/Window/ActionBar/ActionButton.svelte"; + import ActionPill from "$lib/Window/ActionBar/ActionPill.svelte"; import { BTN_OKAY_SUG, MessageBox } from "$ts/util/dialog"; import type { ExpandedUserInfo } from "$types/user"; import { MailbrokerSendOverlay } from "./types"; @@ -90,6 +91,11 @@
+ {#snippet leftContent()} + {#if process.template?.deprecated} + Deprecated template + {/if} + {/snippet} {#snippet rightContent()} process.closeWindow()}>Cancel Send diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/Logs.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/Logs.svelte index 55a0a6a20..8ac8f18ed 100644 --- a/src/apps/admin/mailbrokermanagerapp/Pages/Logs.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Pages/Logs.svelte @@ -1,5 +1,6 @@ @@ -7,7 +8,36 @@ - + + + + + -
CodeMessageDetailsWhen?
\ No newline at end of file + + + + + + + + + {#each data.toReversed() as log (log._id)} + + + + + {log.code} + {log.message} + {log.details} + {dayjs(log.createdAt).format("D MMM YYYY, HH:mm:ss")} + + {/each} + + diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte index a2efb6c1c..40615d18f 100644 --- a/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte @@ -1,7 +1,60 @@ -{data.length} +
+

{data.length} {Plural("sent email", data.length)}

+
+ + +
+
+ +
+ {#each filteredSent as sentRecord (sentRecord._id)} + + {/each} + + {#if !filteredSent.length} +

+ There are no sent records that match the criteria. +

+ {/if} +
diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/Sent/SentListingOption.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/Sent/SentListingOption.svelte new file mode 100644 index 000000000..9f9169a7a --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Pages/Sent/SentListingOption.svelte @@ -0,0 +1,20 @@ + + + diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/ViewSentRecord.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewSentRecord.svelte new file mode 100644 index 000000000..fee20c1b7 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Pages/ViewSentRecord.svelte @@ -0,0 +1,88 @@ + + + + +
+ +
+ {#if showCode} + + {:else} + + {/if} +
+
+ + + {#snippet leftContent()} + (showCode = false)} icon="eye" /> + (showCode = true)} icon="code" /> + {/snippet} + {#snippet rightContent()} + + Delete... + + {/snippet} + diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/ViewSentRecord/SentRecordHeader.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewSentRecord/SentRecordHeader.svelte new file mode 100644 index 000000000..13da95971 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Pages/ViewSentRecord/SentRecordHeader.svelte @@ -0,0 +1,35 @@ + + +
+ +
+

{sentRecord.subject}

+ {#if sentRecord.to.serverName && sentRecord.to.username} +

From {sentRecord.to.serverName}, to {sentRecord.to.email} ({sentRecord.to.username})

+ {:else} +

To {sentRecord.to.email}

+ {/if} + +
+ +
+ {#if sentRecord.createdAt} +
+

Created at:

+

{dayjs(sentRecord.createdAt).format("D MMMM YYYY, HH:mm:ss")}

+
+ {/if} + {#if sentRecord.updatedAt} +
+

Updated at:

+

{dayjs(sentRecord.updatedAt).format("D MMMM YYYY, HH:mm:ss")}

+
+ {/if} +
+
diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte index 35bb403a9..5b0a1488b 100644 --- a/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Pages/ViewTemplate.svelte @@ -9,6 +9,7 @@ import { onDestroy, onMount, tick } from "svelte"; import TemplateEditor from "./ViewTemplate/TemplateEditor.svelte"; import TemplateHeader from "./ViewTemplate/TemplateHeader.svelte"; + import { BTN_CANCEL, BTN_OKAY_SUG, GetConfirmation, MessageBox } from "$ts/util/dialog"; interface PageProps { templateId: string; @@ -60,6 +61,43 @@ } } + async function deleteTemplate() { + if (!deprecated) return; + + const proceed = await GetConfirmation( + { + title: "Delete template?", + message: + "Are you absolutely sure that you want to delete this deprecated mailbroker template? This cannot be reverted, and may have unforseen consequences if the template is still used by ArcOS systems.", + image: "WarningIcon", + sound: "arcos.dialog.warning", + }, + process.pid, + true + ); + + if (!proceed) return; + + const result = await process.admin.deleteMailbrokerTemplate(data._id); + + if (!result.success) { + MessageBox( + { + title: "Failed to delete", + message: `An error occurred while attempting to delete the mailbroker template. ${result.errorMessage ?? "Unknown failure"}`, + buttons: [BTN_OKAY_SUG], + image: "ErrorIcon", + sound: "arcos.dialog.error", + }, + process.pid, + true + ); + return; + } + + process.switchPage("activeTemplates"); + } + onMount(() => { discard(); let firstCall = false; @@ -86,6 +124,10 @@ Deprecate {/if} + Delete {/snippet} {#snippet rightContent()}

{$updateData.name} - ArcOS {$updateData.fromSuffix}

{$updateData.subjectContent}

- +
- -
-

Created at:

-

{dayjs(template.createdAt).format("D MMMM YYYY, HH:mm:ss")}

-
- -
-

Updated at:

-

{dayjs(template.updatedAt).format("D MMMM YYYY, HH:mm:ss")}

-
- + {#if template.createdAt} +
+

Created at:

+

{dayjs(template.createdAt).format("D MMMM YYYY, HH:mm:ss")}

+
+ {/if} + {#if template.updatedAt} +
+

Updated at:

+

{dayjs(template.updatedAt).format("D MMMM YYYY, HH:mm:ss")}

+
+ {/if}
diff --git a/src/apps/admin/mailbrokermanagerapp/store.ts b/src/apps/admin/mailbrokermanagerapp/store.ts index e846886e1..95f001df1 100644 --- a/src/apps/admin/mailbrokermanagerapp/store.ts +++ b/src/apps/admin/mailbrokermanagerapp/store.ts @@ -3,6 +3,7 @@ import GenericList from "./Pages/GenericList.svelte"; import Logs from "./Pages/Logs.svelte"; import NewTemplate from "./Pages/NewTemplate.svelte"; import Sent from "./Pages/Sent.svelte"; +import ViewSentRecord from "./Pages/ViewSentRecord.svelte"; import ViewTemplate from "./Pages/ViewTemplate.svelte"; import type { MailbrokerPage, MailbrokerPages } from "./types"; @@ -59,6 +60,17 @@ export const mailbrokerPages: MailbrokerPages = new Map( scopes: [AdminScopes.adminMailbrokerSentRead], }, ], + [ + "viewSentRecord", + { + name: "View sent record", + icon: "eye", + hidden: true, + content: ViewSentRecord, + data: async (process, props: { sentRecordId: string }) => await process.admin.getMailbrokerSentRecord(props.sentRecordId), + scopes: [AdminScopes.adminMailbrokerSentRead], + }, + ], [ "logs", { diff --git a/src/apps/components/messagebox/messageBox.ts b/src/apps/components/messagebox/messageBox.ts index 8849a4d25..10b1e811b 100644 --- a/src/apps/components/messagebox/messageBox.ts +++ b/src/apps/components/messagebox/messageBox.ts @@ -25,7 +25,7 @@ export const MessageBoxApp: App = { controls: { minimize: false, maximize: false, - close: true, + close: false, }, assets: { runtime: MessageBoxRuntime, diff --git a/src/css/apps/admin/mailbroker.css b/src/css/apps/admin/mailbroker.css index ed14c6a61..20bce526a 100644 --- a/src/css/apps/admin/mailbroker.css +++ b/src/css/apps/admin/mailbroker.css @@ -1,7 +1,11 @@ @import url("./mailbroker/sidebar.css"); @import url("./mailbroker/templatelisting.css"); +@import url("./mailbroker/pages/sent.css"); +@import url("./mailbroker/pages/viewsent.css"); @import url("./mailbroker/pages/viewtemplate.css"); @import url("./mailbroker/pages/newtemplate.css"); +@import url("./mailbroker/listingheader.css"); +@import url("./mailbroker/pages/logs.css"); @import url("./mailbroker/overiays/sendoverlay.css"); #MailbrokerManagerApp > div.body { @@ -27,7 +31,7 @@ flex-grow: 1; &.loading { - display:flex; + display: flex; justify-content: center; align-items: center; } diff --git a/src/css/apps/admin/mailbroker/listingheader.css b/src/css/apps/admin/mailbroker/listingheader.css new file mode 100644 index 000000000..4250b1960 --- /dev/null +++ b/src/css/apps/admin/mailbroker/listingheader.css @@ -0,0 +1,49 @@ +#MailbrokerManagerApp > div.body div.page-content div.listing-header { + display: flex; + align-items: center; + margin-bottom: 10px; + gap: 10px; + + > h1 { + font-size: 14px; + padding: 0 10px; + margin-right: auto; + } + + > div.search-bar { + display: flex; + align-items: center; + gap: 8px; + height: 30px; + padding: 0 8px; + border: var(--button-glass-bg) 1px solid; + border-radius: 8px; + background-color: var(--button-glass-bg); + + > input { + height: 100%; + border: none; + border-radius: 0; + padding: 0; + background-color: transparent; + } + + > span.lucide { + font-size: 16px; + opacity: 0.5; + } + } + + > button.suggested { + display: flex; + align-items: center; + gap: 5px; + padding: 0 10px; + height: 30px; + min-width: unset; + + > span.lucide { + font-weight: normal; + } + } +} diff --git a/src/css/apps/admin/mailbroker/pages/logs.css b/src/css/apps/admin/mailbroker/pages/logs.css new file mode 100644 index 000000000..a1d4a4a8f --- /dev/null +++ b/src/css/apps/admin/mailbroker/pages/logs.css @@ -0,0 +1,25 @@ +#MailbrokerManagerApp > div.body > div.container > div.page-content.page-logs { + overflow: auto; + padding: 10px; + + table { + border-collapse: collapse; + min-width: fit-content; + + td, + th { + white-space: nowrap; + padding: 0 15px; + line-height: 30px; + text-align: left; + } + + td.icon, + th.icon { + padding-right: 0; + padding-left: 5px; + font-size: 16px; + color: var(--accent-light); + } + } +} diff --git a/src/css/apps/admin/mailbroker/pages/sent.css b/src/css/apps/admin/mailbroker/pages/sent.css new file mode 100644 index 000000000..4b45ddc92 --- /dev/null +++ b/src/css/apps/admin/mailbroker/pages/sent.css @@ -0,0 +1,49 @@ +#MailbrokerManagerApp > div.body > div.container > div.page-content.page-sent-emails { + display: flex; + flex-direction: column; + padding: 10px; + + > div.sent-emails { + height: 0; + flex-grow: 1; + overflow-y: auto; + + > p.empty-notice { + padding: 10px; + border: var(--button-glass-bg) 1px solid; + border-radius: 10px; + text-align: center; + + > span { + opacity: 0.5; + } + } + + > button.sent-listing-option { + display: flex; + align-items: center; + gap: 10px; + width: 100%; + text-align: left; + background-color: transparent; + padding: 10px; + margin-bottom: 10px; + + &:hover { + background-color: var(--button-glass-bg); + } + + > span.lucide { + font-size: 24px; + color: var(--accent-light); + margin: 0 5px; + } + + div.info p.recipient { + opacity: 0.5; + margin-bottom: 8px; + font-size: 12px; + } + } + } +} diff --git a/src/css/apps/admin/mailbroker/pages/viewsent.css b/src/css/apps/admin/mailbroker/pages/viewsent.css new file mode 100644 index 000000000..4d222dbb0 --- /dev/null +++ b/src/css/apps/admin/mailbroker/pages/viewsent.css @@ -0,0 +1,76 @@ +#MailbrokerManagerApp > div.body div.page-view-sent-record { + display: flex; + flex-direction: column; + + div.sent-record-header { + display: flex; + align-items: center; + padding: 10px 20px; + gap: 10px; + border-bottom: var(--win-border); + + h1 { + font-size: 18px; + } + + p.recipient { + opacity: 0.5; + margin-bottom: 8px; + } + + > span.lucide { + font-size: 32px; + color: var(--accent-light); + margin-right: 10px; + } + + > div.dates { + margin-left: auto; + + > div.date { + margin-bottom: 8px; + + > h2 { + opacity: 0.5; + } + + > p { + font-size: 12px; + } + } + } + } + + div.content-viewer { + display: flex; + flex-grow: 1; + + textarea { + width: 50%; + height: 100%; + padding: 10px; + border: none; + resize: none; + background-color: var(--win-bg); + font-family: "Source Code Pro"; + } + + div.html-content { + width: 50%; + height: 100%; + border-left: var(--win-border); + background-color: #fff; + + textarea { + width: 100%; + } + + iframe { + width: 100%; + height: 100%; + resize: none; + border: none; + } + } + } +} diff --git a/src/css/apps/admin/mailbroker/templatelisting.css b/src/css/apps/admin/mailbroker/templatelisting.css index aa8b8ad68..5e2bd4602 100644 --- a/src/css/apps/admin/mailbroker/templatelisting.css +++ b/src/css/apps/admin/mailbroker/templatelisting.css @@ -5,56 +5,6 @@ flex-direction: column; padding: 10px; - > div.header { - display: flex; - align-items: center; - margin-bottom: 10px; - gap: 10px; - - > h1 { - font-size: 14px; - padding: 0 10px; - margin-right: auto; - } - - > div.search-bar { - display: flex; - align-items: center; - gap: 8px; - height: 30px; - padding: 0 8px; - border: var(--button-glass-bg) 1px solid; - border-radius: 8px; - background-color: var(--button-glass-bg); - - > input { - height: 100%; - border: none; - border-radius: 0; - padding: 0; - background-color: transparent; - } - - > span.lucide { - font-size: 16px; - opacity: 0.5; - } - } - - > button.new-template { - display: flex; - align-items: center; - gap: 5px; - padding: 0 10px; - height: 30px; - min-width: unset; - - > span.lucide { - font-weight: normal; - } - } - } - > div.templates { height: 0; flex-grow: 1; @@ -79,6 +29,7 @@ text-align: left; background-color: transparent; padding: 10px; + margin-bottom: 10px; &:hover { background-color: var(--button-glass-bg); From 7d3853f010883ca8e21fb1eae1b02728373655cb Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Mon, 3 Aug 2026 23:37:51 +0200 Subject: [PATCH 08/11] typo --- src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte index 40615d18f..171612a2e 100644 --- a/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte @@ -43,7 +43,7 @@

{data.length} {Plural("sent email", data.length)}

- +
From 8ca0bcac6143bb88d7ead7c807a191576fbd73d8 Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Tue, 4 Aug 2026 15:07:44 +0200 Subject: [PATCH 09/11] Mailbroker key management --- .../MailbrokerManager/SentRecordPills.svelte | 2 +- .../MailbrokerManager/ServerKeyPills.svelte | 24 +++ .../MailbrokerManager/TemplateListing.svelte | 1 + .../MailbrokerManager/TemplatePills.svelte | 2 +- .../Overlays/NewKeyOverlay/NewKey.svelte | 49 ++++++ .../Overlays/NewKeyOverlay/NewKeyOverlay.ts | 45 ++++++ .../Overlays/NewKeyOverlay/runtime.ts | 19 +++ .../Overlays/ViewKeyOverlay/KeyOverlay.svelte | 145 ++++++++++++++++++ .../Overlays/ViewKeyOverlay/KeyOverlay.ts | 45 ++++++ .../Overlays/ViewKeyOverlay/runtime.ts | 52 +++++++ .../mailbrokermanagerapp/Pages/Sent.svelte | 11 +- .../Pages/ServerKeys.svelte | 65 ++++++++ .../Pages/ServerKeys/ServerKeyOption.svelte | 16 ++ .../admin/mailbrokermanagerapp/runtime.ts | 4 + src/apps/admin/mailbrokermanagerapp/store.ts | 11 ++ src/css/apps/admin/mailbroker.css | 9 +- .../admin/mailbroker/overlays/keyoverlay.css | 87 +++++++++++ .../mailbroker/overlays/newkeyoverlay.css | 33 ++++ .../{overiays => overlays}/sendoverlay.css | 0 src/css/apps/admin/mailbroker/pages/keys.css | 49 ++++++ src/interfaces/runtimes/IMailbrokerRuntime.ts | 13 ++ src/interfaces/services/IAdminBootstrapper.ts | 1 + .../services/AdminBootstrapper/index.ts | 11 ++ 23 files changed, 684 insertions(+), 10 deletions(-) create mode 100644 src/apps/admin/mailbrokermanagerapp/MailbrokerManager/ServerKeyPills.svelte create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/NewKey.svelte create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/NewKeyOverlay.ts create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/runtime.ts create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/KeyOverlay.svelte create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/KeyOverlay.ts create mode 100644 src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/runtime.ts create mode 100644 src/apps/admin/mailbrokermanagerapp/Pages/ServerKeys.svelte create mode 100644 src/apps/admin/mailbrokermanagerapp/Pages/ServerKeys/ServerKeyOption.svelte create mode 100644 src/css/apps/admin/mailbroker/overlays/keyoverlay.css create mode 100644 src/css/apps/admin/mailbroker/overlays/newkeyoverlay.css rename src/css/apps/admin/mailbroker/{overiays => overlays}/sendoverlay.css (100%) create mode 100644 src/css/apps/admin/mailbroker/pages/keys.css diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/SentRecordPills.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/SentRecordPills.svelte index e34fb3b99..ed9f06918 100644 --- a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/SentRecordPills.svelte +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/SentRecordPills.svelte @@ -5,7 +5,7 @@ let { sentRecord }: { sentRecord: Mailbroker.SentMail } = $props(); -
+
{formatBytes(sentRecord.htmlContent.length)} diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/ServerKeyPills.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/ServerKeyPills.svelte new file mode 100644 index 000000000..1f3128d23 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/ServerKeyPills.svelte @@ -0,0 +1,24 @@ + + +
+ {#if disabled} +
+ Disabled +
+ {:else} +
+ Enabled +
+ {/if} + {#if serverKey.serverName === "arcapi.nl"} +
Master key
+ {/if} + {#if Server.hostname === serverKey.serverName} +
This server
+ {/if} +
diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte index 0c697da58..e3b3e9fd5 100644 --- a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte @@ -36,6 +36,7 @@ if (template.fromSuffix.toLowerCase().includes(query)) return true; if (template.subjectContent.toLowerCase().includes(query)) return true; if (template.textContent.toLowerCase().includes(query)) return true; + if (template._id.toLowerCase().includes(query)) return true; return false; }); diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplatePills.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplatePills.svelte index 79de8ea49..47109e684 100644 --- a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplatePills.svelte +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplatePills.svelte @@ -5,7 +5,7 @@ let { template, deprecated }: { template: Mailbroker.MailTemplate; deprecated: boolean; } = $props(); -
+
{formatBytes(template.htmlContent.length)} diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/NewKey.svelte b/src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/NewKey.svelte new file mode 100644 index 000000000..ae97c6570 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/NewKey.svelte @@ -0,0 +1,49 @@ + + +
+ +
+

New server key

+

Enter the name of the server for which you want to create the server key:

+ +
+
+ + + {#snippet rightContent()} + process.closeWindow()}>Cancel + Create + {/snippet} + diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/NewKeyOverlay.ts b/src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/NewKeyOverlay.ts new file mode 100644 index 000000000..d63a57737 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/NewKeyOverlay.ts @@ -0,0 +1,45 @@ +import type { App } from "$types/apps/app"; +import NewKey from "./NewKey.svelte"; +import { MailbrokerNewKeyOverlayRuntime } from "./runtime"; + +const NewKeyOverlay: App = { + metadata: { + name: "New mailbroker key", + author: "Izaak Kuipers", + version: "1.0.0", + icon: "MailbrokerAdminIcon", + }, + position: { centered: true }, + size: { + w: 380, + h: 200, + }, + minSize: { + w: 380, + h: 200, + }, + maxSize: { + w: 380, + h: 200, + }, + controls: { + minimize: false, + maximize: false, + close: true, + }, + state: { + resizable: false, + headless: true, + fullscreen: false, + maximized: false, + minimized: false, + }, + assets: { + runtime: MailbrokerNewKeyOverlayRuntime, + component: NewKey as any, + }, + hidden: true, + id: "MailbrokerManagerApp_NewKeyOverlay", +}; + +export default NewKeyOverlay; diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/runtime.ts b/src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/runtime.ts new file mode 100644 index 000000000..2b3daa8b2 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/NewKeyOverlay/runtime.ts @@ -0,0 +1,19 @@ +import type { IMailbrokerRuntime, IMailbrokerNewKeyOverlayRuntime } from "$interfaces/runtimes/IMailbrokerRuntime"; +import type { IAdminBootstrapper } from "$interfaces/services/IAdminBootstrapper"; +import { AppProcess } from "$ts/apps/process"; +import { Daemon, Stack } from "$ts/env"; +import type { AppProcessData } from "$types/apps/app"; + +export class MailbrokerNewKeyOverlayRuntime extends AppProcess implements IMailbrokerNewKeyOverlayRuntime { + get admin() { + return Daemon.serviceHost?.getService("AdminBootstrapper")!; + } + + get parent() { + return Stack.getProcess(this.parentPid)!; + } + + constructor(pid: number, parentPid: number, app: AppProcessData) { + super(pid, parentPid, app); + } +} diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/KeyOverlay.svelte b/src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/KeyOverlay.svelte new file mode 100644 index 000000000..dc07c8639 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/KeyOverlay.svelte @@ -0,0 +1,145 @@ + + +{#if process.key} +
+ +
+

Key for {process.key?.serverName}

+

{process.key?.value}

+ +
+
+ +
+
+

Created at

+

{dayjs(process.key.createdAt).format("D MMMM YYYY, HH:mm:ss")}

+
+ +
+

Updated at

+

{dayjs(process.key.updatedAt).format("D MMMM YYYY, HH:mm:ss")}

+
+ +
+

Sent records

+

{process.sentRecords.length} {Plural("record", process.sentRecords.length)} sent by this server

+
+
+ + + {#snippet leftContent()} + Copy... + {/snippet} + {#snippet rightContent()} + + {disabled ? "Enable" : "Disable"} + + + Delete + + process.closeWindow()}>Close + {/snippet} + +{/if} diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/KeyOverlay.ts b/src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/KeyOverlay.ts new file mode 100644 index 000000000..e7f470f50 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/KeyOverlay.ts @@ -0,0 +1,45 @@ +import type { App } from "$types/apps/app"; +import KeyOverlaySvelte from "./KeyOverlay.svelte"; +import { MailbrokerViewKeyOverlayRuntime } from "./runtime"; + +const KeyOverlay: App = { + metadata: { + name: "View mailbroker key", + author: "Izaak Kuipers", + version: "1.0.0", + icon: "MailbrokerAdminIcon", + }, + position: { centered: true }, + size: { + w: 450, + h: 300, + }, + minSize: { + w: 450, + h: 300, + }, + maxSize: { + w: 450, + h: 300, + }, + controls: { + minimize: false, + maximize: false, + close: true, + }, + state: { + resizable: false, + headless: true, + fullscreen: false, + maximized: false, + minimized: false, + }, + assets: { + runtime: MailbrokerViewKeyOverlayRuntime, + component: KeyOverlaySvelte as any, + }, + hidden: true, + id: "MailbrokerManagerApp_KeyOverlay", +}; + +export default KeyOverlay; \ No newline at end of file diff --git a/src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/runtime.ts b/src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/runtime.ts new file mode 100644 index 000000000..48fc6b45b --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Overlays/ViewKeyOverlay/runtime.ts @@ -0,0 +1,52 @@ +import type { IMailbrokerViewKeyOverlayRuntime } from "$interfaces/runtimes/IMailbrokerRuntime"; +import type { IAdminBootstrapper } from "$interfaces/services/IAdminBootstrapper"; +import { AppProcess } from "$ts/apps/process"; +import { Daemon } from "$ts/env"; +import { AdminScopes } from "$ts/servicehost/services/AdminBootstrapper/store"; +import { BTN_OKAY_SUG, MessageBox } from "$ts/util/dialog"; +import type { AppProcessData } from "$types/apps/app"; +import type { Mailbroker } from "$types/server/mailbroker"; + +export class MailbrokerViewKeyOverlayRuntime extends AppProcess implements IMailbrokerViewKeyOverlayRuntime { + public key?: Mailbroker.MailKey; + public keyId: string; + public sentRecords: Mailbroker.SentMail[] = []; + + get admin() { + return Daemon.serviceHost?.getService("AdminBootstrapper")!; + } + + constructor(pid: number, parentPid: number, app: AppProcessData, key: string) { + super(pid, parentPid, app); + + this.keyId = key; + } + + protected async start(): Promise { + const result = await this.admin.getMailbrokerKey(this.keyId); + + if (!result.success) { + MessageBox( + { + title: "Not found", + message: `The mailbroker key specified could not be found on the server. Please try again. ${result.errorMessage ?? "Unknown failure"}`, + image: "WarningIcon", + sound: "arcos.dialog.warning", + buttons: [BTN_OKAY_SUG], + }, + Daemon.getShell()?.pid!, + true + ); + + return; + } + + this.key = result.result; + + if (!this.admin.canAccess(AdminScopes.adminMailbrokerSentRead)) return; + + this.sentRecords = + (await this.admin.getMailbrokerSentRecords()).result?.filter((record) => record.to?.serverName === this.key!.serverName) ?? + []; + } +} diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte index 171612a2e..2241ffb1e 100644 --- a/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Pages/Sent.svelte @@ -23,11 +23,12 @@ return; } - filteredSent = data.filter((template) => { - if (template.to.email.toLowerCase().includes(query)) return true; - if (template.to.serverName?.toLowerCase().includes(query)) return true; - if (template.to.username?.toLowerCase().includes(query)) return true; - if (template.subject.toLowerCase().includes(query)) return true; + filteredSent = data.filter((sent) => { + if (sent.to.email.toLowerCase().includes(query)) return true; + if (sent.to.serverName?.toLowerCase().includes(query)) return true; + if (sent.to.username?.toLowerCase().includes(query)) return true; + if (sent.subject.toLowerCase().includes(query)) return true; + if (sent._id.toLowerCase().includes(query)) return true; return false; }); diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/ServerKeys.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ServerKeys.svelte new file mode 100644 index 000000000..9824f5382 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Pages/ServerKeys.svelte @@ -0,0 +1,65 @@ + + +
+

{data.length} {Plural("server key", data.length)}

+
+ + +
+ +
+ +
+ {#each filteredKeys as serverKey (serverKey._id)} + + {/each} + + {#if !filteredKeys.length} +

+ There are no sent records that match the criteria. +

+ {/if} +
diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/ServerKeys/ServerKeyOption.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/ServerKeys/ServerKeyOption.svelte new file mode 100644 index 000000000..8c5502907 --- /dev/null +++ b/src/apps/admin/mailbrokermanagerapp/Pages/ServerKeys/ServerKeyOption.svelte @@ -0,0 +1,16 @@ + + + diff --git a/src/apps/admin/mailbrokermanagerapp/runtime.ts b/src/apps/admin/mailbrokermanagerapp/runtime.ts index f52caca35..4982fca36 100644 --- a/src/apps/admin/mailbrokermanagerapp/runtime.ts +++ b/src/apps/admin/mailbrokermanagerapp/runtime.ts @@ -4,7 +4,9 @@ import { AppProcess } from "$ts/apps/process"; import { Daemon } from "$ts/env"; import { Store } from "$ts/writable"; import type { App, AppProcessData } from "$types/apps/app"; +import NewKeyOverlay from "./Overlays/NewKeyOverlay/NewKeyOverlay"; import SendOverlay from "./Overlays/SendOverlay/SendOverlay"; +import KeyOverlay from "./Overlays/ViewKeyOverlay/KeyOverlay"; import { mailbrokerPages } from "./store"; export class MailbrokerRuntime extends AppProcess implements IMailbrokerRuntime { @@ -17,6 +19,8 @@ export class MailbrokerRuntime extends AppProcess implements IMailbrokerRuntime protected overlayStore: Record = { SendOverlay, + KeyOverlay, + NewKeyOverlay, }; //#region LIFECYCLE diff --git a/src/apps/admin/mailbrokermanagerapp/store.ts b/src/apps/admin/mailbrokermanagerapp/store.ts index 95f001df1..948219f62 100644 --- a/src/apps/admin/mailbrokermanagerapp/store.ts +++ b/src/apps/admin/mailbrokermanagerapp/store.ts @@ -3,6 +3,7 @@ import GenericList from "./Pages/GenericList.svelte"; import Logs from "./Pages/Logs.svelte"; import NewTemplate from "./Pages/NewTemplate.svelte"; import Sent from "./Pages/Sent.svelte"; +import ServerKeys from "./Pages/ServerKeys.svelte"; import ViewSentRecord from "./Pages/ViewSentRecord.svelte"; import ViewTemplate from "./Pages/ViewTemplate.svelte"; import type { MailbrokerPage, MailbrokerPages } from "./types"; @@ -71,6 +72,16 @@ export const mailbrokerPages: MailbrokerPages = new Map( scopes: [AdminScopes.adminMailbrokerSentRead], }, ], + [ + "keys", + { + name: "Server keys", + icon: "key", + content: ServerKeys, + data: async (process) => await process.admin.getAllMailbrokerKeys(), + scopes: [AdminScopes.adminMailbrokerKeysRead], + }, + ], [ "logs", { diff --git a/src/css/apps/admin/mailbroker.css b/src/css/apps/admin/mailbroker.css index 20bce526a..d5c273c97 100644 --- a/src/css/apps/admin/mailbroker.css +++ b/src/css/apps/admin/mailbroker.css @@ -4,9 +4,12 @@ @import url("./mailbroker/pages/viewsent.css"); @import url("./mailbroker/pages/viewtemplate.css"); @import url("./mailbroker/pages/newtemplate.css"); -@import url("./mailbroker/listingheader.css"); +@import url("./mailbroker/pages/keys.css"); @import url("./mailbroker/pages/logs.css"); -@import url("./mailbroker/overiays/sendoverlay.css"); +@import url("./mailbroker/listingheader.css"); +@import url("./mailbroker/overlays/sendoverlay.css"); +@import url("./mailbroker/overlays/keyoverlay.css"); +@import url("./mailbroker/overlays/newkeyoverlay.css"); #MailbrokerManagerApp > div.body { padding: 0; @@ -62,7 +65,7 @@ } } - div.template-pills { + div.pills { display: flex; align-items: center; gap: 5px; diff --git a/src/css/apps/admin/mailbroker/overlays/keyoverlay.css b/src/css/apps/admin/mailbroker/overlays/keyoverlay.css new file mode 100644 index 000000000..894858f1c --- /dev/null +++ b/src/css/apps/admin/mailbroker/overlays/keyoverlay.css @@ -0,0 +1,87 @@ +#MailbrokerManagerApp_KeyOverlay > div.body { + padding: 0; + display: flex; + flex-direction: column; + + div.header { + display: flex; + align-items: center; + padding: 10px 20px; + gap: 10px; + border-bottom: var(--win-border); + + h1 { + font-size: 18px; + } + + p.value { + opacity: 0.5; + margin-bottom: 8px; + font-family: "Source Code Pro"; + } + + span.lucide { + font-size: 32px; + color: var(--accent-light); + margin-right: 10px; + } + + div.pills { + display: flex; + align-items: center; + gap: 5px; + + div.pill { + height: 20px; + padding: 0 7px; + border-radius: 4px; + background-color: var(--button-bg); + display: flex; + align-items: center; + gap: 5px; + } + } + } + + div.properties { + padding: 15px; + flex-grow: 1; + + div.property { + display: flex; + align-items: center; + gap: 10px; + margin-bottom: 10px; + + h2 { + width: 150px; + } + + div.value { + height: 30px; + display: flex; + align-items: center; + background-color: var(--button-glass-bg); + border: var(--button-glass-hover-bg) 1px solid; + border-radius: 10px; + } + + div.value span.lucide { + width: 30px; + height: 28px; + border-right: var(--win-border); + display: flex; + justify-content: center; + align-items: center; + } + + div.value input { + width: 250px; + height: 100%; + border: none; + background-color: transparent; + padding: 0 10px; + } + } + } +} diff --git a/src/css/apps/admin/mailbroker/overlays/newkeyoverlay.css b/src/css/apps/admin/mailbroker/overlays/newkeyoverlay.css new file mode 100644 index 000000000..8be3654b8 --- /dev/null +++ b/src/css/apps/admin/mailbroker/overlays/newkeyoverlay.css @@ -0,0 +1,33 @@ +#MailbrokerManagerApp_NewKeyOverlay > div.body { + padding: 0; + display: flex; + flex-direction: column; + + div.top { + display: flex; + align-items: start; + gap: 15px; + padding: 15px; + height: 0; + flex-grow: 1; + + img { + height: 48px; + } + + h1 { + font-size: 16px; + margin-bottom: 5px; + } + + input { + width: 100%; + margin-top: 15px; + } + + > div.right { + width: 0; + flex-grow: 1; + } + } +} diff --git a/src/css/apps/admin/mailbroker/overiays/sendoverlay.css b/src/css/apps/admin/mailbroker/overlays/sendoverlay.css similarity index 100% rename from src/css/apps/admin/mailbroker/overiays/sendoverlay.css rename to src/css/apps/admin/mailbroker/overlays/sendoverlay.css diff --git a/src/css/apps/admin/mailbroker/pages/keys.css b/src/css/apps/admin/mailbroker/pages/keys.css new file mode 100644 index 000000000..ddee16303 --- /dev/null +++ b/src/css/apps/admin/mailbroker/pages/keys.css @@ -0,0 +1,49 @@ +#MailbrokerManagerApp > div.body > div.container > div.page-content.page-server-keys { + display: flex; + flex-direction: column; + padding: 10px; + + > div.server-keys { + height: 0; + flex-grow: 1; + overflow-y: auto; + + > p.empty-notice { + padding: 10px; + border: var(--button-glass-bg) 1px solid; + border-radius: 10px; + text-align: center; + + > span { + opacity: 0.5; + } + } + + > button.server-key-option { + display: flex; + align-items: center; + gap: 10px; + width: 100%; + text-align: left; + background-color: transparent; + padding: 10px; + margin-bottom: 10px; + + &:hover { + background-color: var(--button-glass-bg); + } + + > span.lucide { + font-size: 24px; + color: var(--accent-light); + margin: 0 5px; + } + + div.info p.what { + opacity: 0.5; + margin-bottom: 8px; + font-size: 12px; + } + } + } +} diff --git a/src/interfaces/runtimes/IMailbrokerRuntime.ts b/src/interfaces/runtimes/IMailbrokerRuntime.ts index 366f13b1b..b51108bf0 100644 --- a/src/interfaces/runtimes/IMailbrokerRuntime.ts +++ b/src/interfaces/runtimes/IMailbrokerRuntime.ts @@ -19,3 +19,16 @@ export interface IMailbrokerSendOverlayRuntime extends IAppProcess { templateId: string; users: ExpandedUserInfo[]; } + +export interface IMailbrokerViewKeyOverlayRuntime extends IAppProcess { + get admin(): IAdminBootstrapper; + + key?: Mailbroker.MailKey; + keyId: string; + sentRecords: Mailbroker.SentMail[]; +} + +export interface IMailbrokerNewKeyOverlayRuntime extends IAppProcess { + get admin(): IAdminBootstrapper; + get parent(): IMailbrokerRuntime; +} diff --git a/src/interfaces/services/IAdminBootstrapper.ts b/src/interfaces/services/IAdminBootstrapper.ts index d5ed6c826..2f934ac6d 100644 --- a/src/interfaces/services/IAdminBootstrapper.ts +++ b/src/interfaces/services/IAdminBootstrapper.ts @@ -127,6 +127,7 @@ export interface IAdminBootstrapper extends IBaseService { markBetaFeedbackAsRead(id: string): Promise; createTemporaryLogin(userId: string): Promise>; getMailbrokerKey(id: string): Promise>; + getAllMailbrokerKeys(): Promise>; getMailbrokerLogs(): Promise>; getMailbrokerTemplate(id: string): Promise>; getMailbrokerTemplates( diff --git a/src/ts/servicehost/services/AdminBootstrapper/index.ts b/src/ts/servicehost/services/AdminBootstrapper/index.ts index 6b05296c2..034e3eedb 100644 --- a/src/ts/servicehost/services/AdminBootstrapper/index.ts +++ b/src/ts/servicehost/services/AdminBootstrapper/index.ts @@ -1257,6 +1257,17 @@ export class AdminBootstrapper extends BaseService implements IAdminBootstrapper } } + async getAllMailbrokerKeys(): Promise> { + if (this._disposed) return CommandResult.Error("Disposed"); + + try { + const response = await this.adminClient.get(`/mailbroker/keys`); + return CommandResult.Ok(response.data); + } catch (e) { + return CommandResult.AxiosError(e); + } + } + async getMailbrokerLogs(): Promise> { if (this._disposed) return CommandResult.Error("Disposed"); From 77d103107fca64be20bd4ad4a7f9f46d922132b0 Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Tue, 4 Aug 2026 17:26:29 +0200 Subject: [PATCH 10/11] Remove unused type --- src/apps/admin/adminportal/types.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/apps/admin/adminportal/types.ts b/src/apps/admin/adminportal/types.ts index c48bd7c10..f7dcb56a3 100755 --- a/src/apps/admin/adminportal/types.ts +++ b/src/apps/admin/adminportal/types.ts @@ -16,7 +16,6 @@ import type { FsAccess } from "$types/system/fs"; import type { StoreItem } from "$types/tpa/package"; import type { ExpandedUserInfo, UserInfo } from "$types/user"; import type { Component } from "svelte"; -import type { Mailbroker } from "$types/server/mailbroker"; export interface AdminPortalPage { name: string; @@ -116,10 +115,6 @@ export type VersioningData = { users: ExpandedUserInfo[]; }; -export type MailbrokerTemplatesData = { - templates: ICommandResult; -}; - export type ScopesData = { admins: ExpandedUserInfo[]; }; From e6233244a4965ac187ebbc97d45c17a4f578b3ba Mon Sep 17 00:00:00 2001 From: Izaak Kuipers Date: Tue, 4 Aug 2026 17:40:44 +0200 Subject: [PATCH 11/11] Various issues I noticed --- .../MailbrokerManager.svelte | 4 +-- .../MailbrokerManager/Sidebar.svelte | 4 +-- .../MailbrokerManager/TemplateListing.svelte | 4 +-- .../TemplateListing/ListingOption.svelte | 4 +-- .../MailbrokerManagerApp.ts | 4 +-- .../Overlays/NewKeyOverlay/NewKeyOverlay.ts | 2 +- .../Overlays/NewKeyOverlay/runtime.ts | 4 +-- .../Pages/GenericList.svelte | 4 +-- .../Pages/NewTemplate.svelte | 4 +-- .../mailbrokermanagerapp/Pages/Sent.svelte | 4 +-- .../Pages/Sent/SentListingOption.svelte | 4 +-- .../Pages/ServerKeys.svelte | 8 ++--- .../Pages/ServerKeys/ServerKeyOption.svelte | 4 +-- .../Pages/ViewSentRecord.svelte | 4 +-- .../Pages/ViewTemplate.svelte | 4 +-- .../Pages/ViewTemplate/TemplateEditor.svelte | 4 +-- .../TemplateEditor/GeneralTab.svelte | 4 +-- .../TemplateEditor/HtmlContentTab.svelte | 4 +-- .../TemplateEditor/TextContentTab.svelte | 4 +-- .../Pages/ViewTemplate/TemplateHeader.svelte | 4 +-- .../admin/mailbrokermanagerapp/runtime.ts | 4 +-- src/apps/admin/mailbrokermanagerapp/types.ts | 4 +-- src/css/apps/admin/adminportal.css | 1 - src/css/apps/admin/adminportal/table.css | 35 ------------------- src/interfaces/runtimes/IMailbrokerRuntime.ts | 4 +-- 25 files changed, 47 insertions(+), 83 deletions(-) delete mode 100644 src/css/apps/admin/adminportal/table.css diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte index 522b1b13e..9ce1a8209 100644 --- a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager.svelte @@ -1,6 +1,6 @@ diff --git a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte index e3b3e9fd5..191f2e724 100644 --- a/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte +++ b/src/apps/admin/mailbrokermanagerapp/MailbrokerManager/TemplateListing.svelte @@ -1,5 +1,5 @@ diff --git a/src/apps/admin/mailbrokermanagerapp/Pages/NewTemplate.svelte b/src/apps/admin/mailbrokermanagerapp/Pages/NewTemplate.svelte index b1a0f0258..f6265d6be 100644 --- a/src/apps/admin/mailbrokermanagerapp/Pages/NewTemplate.svelte +++ b/src/apps/admin/mailbrokermanagerapp/Pages/NewTemplate.svelte @@ -1,5 +1,5 @@