Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/app/(admin)/branding/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { useRef, useState } from "react";
import { useEffect, useRef, useState } from "react";
import Link from "next/link";
import { ArrowRight, ExternalLink, ImagePlus, LockKeyhole, Palette } from "@/components/icons";
import { useLanguage } from "@/components/language-provider";
Expand All @@ -20,6 +20,7 @@ export default function BrandingPage() {
const [status, setStatus] = useState<string | null>(null);
const [saving, setSaving] = useState(false);
const inputRef = useRef<HTMLInputElement>(null);
const previewRef = useRef<string | null>(null);
const [syncedAppName, setSyncedAppName] = useState(branding.appName);

// Reset the field whenever the saved name changes.
Expand All @@ -28,6 +29,11 @@ export default function BrandingPage() {
setAppName(branding.appName);
}

// Free the preview's object URL when leaving the page.
useEffect(() => () => {
if (previewRef.current) URL.revokeObjectURL(previewRef.current);
}, []);

if (!branding.canCustomizeBranding) {
return (
<div className="space-y-6">
Expand All @@ -52,8 +58,13 @@ export default function BrandingPage() {

function pickIcon(file: File | null) {
setIcon(file);
if (preview) URL.revokeObjectURL(preview);
setPreview(file ? URL.createObjectURL(file) : null);
setPreviewUrl(file ? URL.createObjectURL(file) : null);
}

function setPreviewUrl(url: string | null) {
if (previewRef.current) URL.revokeObjectURL(previewRef.current);
previewRef.current = url;
setPreview(url);
}

async function submit(event: React.FormEvent<HTMLFormElement>) {
Expand All @@ -64,6 +75,9 @@ export default function BrandingPage() {
await saveBranding(appName.trim(), icon);
await branding.refreshBranding();
setIcon(null);
// Drop the preview and the file input's value so the same file can be chosen again.
setPreviewUrl(null);
if (inputRef.current) inputRef.current.value = "";
setStatus(t("branding.updated"));
} catch (error) {
setStatus(error instanceof Error ? error.message : t("branding.saveFailed"));
Expand Down
105 changes: 60 additions & 45 deletions src/app/(auth)/onboarding/onboarding-client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,43 +43,46 @@ export function OnboardingClient() {
setLoading(true);
setError(null);

const normalized = hostname.toLowerCase().trim();
let checkedDomain = domainCheck;
let sendingRequested = enableSending;
if (skipDns) {
checkedDomain = { hostname: normalized, zone: { id: "manual", name: normalized } };
} else if (checkedDomain?.hostname !== normalized) {
const result = await checkDomain(normalized);
if (!result.ok || !result.domain) {
setLoading(false);
setError(result.error ?? t("onboarding.domainCheckFailed"));
try {
const normalized = hostname.toLowerCase().trim();
let checkedDomain = domainCheck;
let sendingRequested = enableSending;
if (skipDns) {
checkedDomain = { hostname: normalized, zone: { id: "manual", name: normalized } };
} else if (checkedDomain?.hostname !== normalized) {
const result = await checkDomain(normalized);
if (!result.ok || !result.domain) {
setError(result.error ?? t("onboarding.domainCheckFailed"));
return;
}
checkedDomain = result.domain;
sendingRequested = false;
setDomainCheck(result.domain);
setEnableSending(sendingRequested);
}
if (!checkedDomain) {
setError(t("onboarding.domainCheckFailed"));
return;
}
checkedDomain = result.domain;
sendingRequested = false;
setDomainCheck(result.domain);
setEnableSending(sendingRequested);
}
if (!checkedDomain) {
setLoading(false);
setError(t("onboarding.domainCheckFailed"));
return;
}

const { ok, data } = await createDomain(checkedDomain.hostname, skipDns ? true : sendingRequested, replaceMxRecords, skipDns);
setLoading(false);
if (!ok || !data.domain) {
if (data.code === "MX_RECORDS_CONFLICT") {
setMxConflict(true);
setError(null);
const { ok, data } = await createDomain(checkedDomain.hostname, skipDns ? true : sendingRequested, replaceMxRecords, skipDns);
if (!ok || !data.domain) {
if (data.code === "MX_RECORDS_CONFLICT") {
setMxConflict(true);
setError(null);
return;
}
setError(data.error ?? t("onboarding.addDomainFailed"));
return;
}
setError(data.error ?? t("onboarding.addDomainFailed"));
return;
setMxConflict(false);
setDomainId(data.domain.id);
setStep(2);
} catch {
setError(t("auth.serverUnreachable"));
} finally {
setLoading(false);
}
setMxConflict(false);
setDomainId(data.domain.id);
setStep(2);
}

async function inspectDomain() {
Expand All @@ -89,30 +92,42 @@ export function OnboardingClient() {
setDomainChecking(true);
setError(null);
setMxConflict(false);
const result = await checkDomain(normalized);
setDomainChecking(false);
if (!result.ok || !result.domain) {
try {
const result = await checkDomain(normalized);
if (!result.ok || !result.domain) {
setDomainCheck(null);
setEnableSending(false);
setError(result.error ?? t("onboarding.domainCheckFailed"));
return;
}

setDomainCheck(result.domain);
setEnableSending(false);
} catch {
setDomainCheck(null);
setEnableSending(false);
setError(result.error ?? t("onboarding.domainCheckFailed"));
return;
setError(t("auth.serverUnreachable"));
} finally {
setDomainChecking(false);
}

setDomainCheck(result.domain);
setEnableSending(false);
}

async function addMailbox() {
setLoading(true);
setError(null);

const { ok, data } = await createMailbox(domainId, localPart);
setLoading(false);
if (!ok) {
setError(data.error ?? t("onboarding.createMailboxFailed"));
return;
try {
const { ok, data } = await createMailbox(domainId, localPart);
if (!ok) {
setError(data.error ?? t("onboarding.createMailboxFailed"));
return;
}
router.push("/inbox");
} catch {
setError(t("auth.serverUnreachable"));
} finally {
setLoading(false);
}
router.push("/inbox");
}

return (
Expand Down
9 changes: 5 additions & 4 deletions src/app/(auth)/onboarding/utils.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { readResponseJson } from "@/lib/http/response";
import { authFetch } from "@/lib/auth/client";
import type {
DomainCreateResult,
Expand All @@ -8,7 +9,7 @@ import type {

export async function getDomains(): Promise<DomainListResult> {
const res = await authFetch("/api/domains");
return (await res.json()) as DomainListResult;
return (await readResponseJson(res)) as DomainListResult;
}

export async function checkDomain(hostname: string): Promise<DomainPreflightResponse> {
Expand All @@ -17,7 +18,7 @@ export async function checkDomain(hostname: string): Promise<DomainPreflightResp
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ hostname }),
});
const data = (await res.json()) as Omit<DomainPreflightResponse, "ok">;
const data = (await readResponseJson(res)) as Omit<DomainPreflightResponse, "ok">;
return { ok: res.ok, ...data };
}

Expand All @@ -35,7 +36,7 @@ export async function createDomain(

return {
ok: res.ok,
data: (await res.json()) as DomainCreateResult,
data: (await readResponseJson(res)) as DomainCreateResult,
};
}

Expand All @@ -51,6 +52,6 @@ export async function createMailbox(

return {
ok: res.ok,
data: (await res.json()) as MailboxCreateResult,
data: (await readResponseJson(res)) as MailboxCreateResult,
};
}
Loading
Loading