Go to domains if no domains

Fix missing resource id in cache
Claify that this is only for the cloud
2026-07-19 12:06:28 +02:00 · 2026-07-18 16:30:29 -04:00 · 2026-07-18 16:15:30 -04:00 · 2026-07-18 11:53:56 -04:00
6 changed files with 44 additions and 15 deletions
@@ -41,7 +41,7 @@ services:
      - 80:80 # Port for traefik because of the network_mode
  traefik:
-    image: traefik:v3.7
+    image: traefik:v3.6
    container_name: traefik
    restart: unless-stopped
    network_mode: service:gerbil # Ports appear on the gerbil service
@@ -50,7 +50,7 @@ services:
      - 80:80{{end}}
  traefik:
-    image: docker.io/traefik:v3.7
+    image: docker.io/traefik:v3.6
    container_name: traefik
    restart: unless-stopped
    {{if .InstallGerbil}}network_mode: service:gerbil # Ports appear on the gerbil service{{end}}{{if not .InstallGerbil}}
@@ -1995,6 +1995,9 @@
    "domainPickerSubdomain": "Subdomain: {subdomain}",
    "domainPickerNamespace": "Namespace: {namespace}",
    "domainPickerShowMore": "Show More",
    "domainPickerNoDomainsAvailableTitle": "No domains available",
    "domainPickerNoDomainsAvailableDescription": "You don't have any domains set up yet. Create a domain to continue.",
    "domainPickerNoDomainsAvailableAction": "Go to Domains",
    "regionSelectorTitle": "Select Region",
    "domainPickerRemoteExitNodeWarning": "Provided domains are not supported when sites connect to remote exit nodes. For resources to be available on remote nodes, use a custom domain instead.",
    "regionSelectorInfo": "Selecting a region helps us provide better performance for your location. You do not have to be in the same region as your server.",
@@ -30,14 +30,14 @@ export const NotifyTrialExpiring = ({
    const isLastDay = daysRemaining === 1;
    const previewText = hasEnded
-        ? `Your trial for ${orgName} has ended.`
+        ? `Your cloud trial for ${orgName} has ended.`
        : isLastDay
-          ? `Your trial for ${orgName} ends tomorrow.`
+          ? `Your cloud trial for ${orgName} ends tomorrow.`
-          : `Your trial for ${orgName} ends in ${daysRemaining} days.`;
+          : `Your cloud trial for ${orgName} ends in ${daysRemaining} days.`;
    const heading = hasEnded
-        ? "Your Trial Ended"
+        ? "Your Cloud Trial Ended"
-        : "Your Trial is Ending Soon";
+        : "Your Cloud Trial is Ending Soon";
    return (
        <Html>
@@ -55,7 +55,7 @@ export const NotifyTrialExpiring = ({
                        {hasEnded ? (
                            <>
                                <EmailText>
-                                    Your free trial for{" "}
+                                    Your cloud free trial for{" "}
                                    <strong>{orgName}</strong> ended on{" "}
                                    <strong>{trialEndsAt}</strong>. Your account
                                    has been moved to the free plan, which
@@ -64,10 +64,11 @@ export const NotifyTrialExpiring = ({
                                <EmailText>
                                    Some features and resources may now be
-                                    restricted. To restore full
+                                    restricted. To restore full access and
-                                    access and continue using all the features
+                                    continue using all the features you had
-                                    you had during your trial, please upgrade to
+                                    during your trial, please upgrade to a paid
-                                    a paid plan.
+                                    plan. This does not effect any self hosted
                                    licenses.
                                </EmailText>
                                <EmailText>
@@ -93,7 +94,8 @@ export const NotifyTrialExpiring = ({
                                <EmailText>
                                    After your trial ends, your account will be
                                    moved to the free plan and some
-                                    functionality may be restricted.
+                                    functionality may be restricted. This does
                                    not effect any self hosted licenses.
                                </EmailText>
                                <EmailText>
@@ -418,7 +418,7 @@ export async function verifyResourceSession(
        }
        // check for HTTP Basic Auth header
-        const clientHeaderAuthKey = `headerAuth:${clientHeaderAuth}`;
+        const clientHeaderAuthKey = `headerAuth:${resource.resourceId}:${clientHeaderAuth}`;
        if (headerAuth && clientHeaderAuth) {
            if (localCache.get(clientHeaderAuthKey)) {
                logger.debug(
@@ -1,6 +1,6 @@
 "use client";
-import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import {
@@ -43,10 +43,12 @@ import {
    CheckCircle2,
    ChevronsUpDown,
    ExternalLink,
    Globe,
    KeyRound,
    Zap
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
 import { usePaidStatus } from "@/hooks/usePaidStatus";
 import { TierFeature, tierMatrix } from "@server/lib/billing/tierMatrix";
@@ -494,6 +496,28 @@ export default function DomainPicker({
    const hasMoreProvided =
        sortedAvailableOptions.length > providedDomainsShown;
    const noDomainsAvailable =
        !loadingDomains &&
        organizationDomains.length === 0 &&
        (build === "oss" || hideFreeDomain || requiresPaywall);
    if (noDomainsAvailable) {
        return (
            <Alert>
                <Globe className="h-4 w-4" />
                <AlertTitle>{t("domainPickerNoDomainsAvailableTitle")}</AlertTitle>
                <AlertDescription className="space-y-3">
                    <p>{t("domainPickerNoDomainsAvailableDescription")}</p>
                    <Button asChild size="sm" variant="outline">
                        <Link href={`/${orgId}/settings/domains`}>
                            {t("domainPickerNoDomainsAvailableAction")}
                        </Link>
                    </Button>
                </AlertDescription>
            </Alert>
        );
    }
    return (
        <div className="space-y-4">
            <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
Author	SHA1	Message	Date
Owen	a2e1c7b751	Go to domains if no domains	2026-07-18 16:30:29 -04:00
Owen	9e2ec72ced	Fix missing resource id in cache	2026-07-18 16:15:30 -04:00
Owen	02fe1f3abd	Claify that this is only for the cloud	2026-07-18 11:53:56 -04:00