refactor front end hooks

src/components/AuthPageSettings.tsx

@@ -28,7 +28,7 @@ import { ListDomainsResponse } from "@server/routers/domain";
 import { DomainRow } from "@app/components/DomainsTable";
 import { toUnicode } from "punycode";
 import { Globe, Trash2 } from "lucide-react";
-import CertificateStatus from "@app/components/private/CertificateStatus";
+import CertificateStatus from "@app/components/CertificateStatus";
 import {
     Credenza,
     CredenzaBody,
@@ -42,10 +42,10 @@ import {
 import DomainPicker from "@app/components/DomainPicker";
 import { finalizeSubdomainSanitize } from "@app/lib/subdomain-utils";
 import { InfoPopup } from "@app/components/ui/info-popup";
-import { Alert, AlertDescription } from "@app/components/ui/alert";
 import { build } from "@server/build";
 import { usePaidStatus } from "@app/hooks/usePaidStatus";
-import { PaidFeaturesAlert } from "../PaidFeaturesAlert";
+import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
+import { tierMatrix } from "@server/lib/billing/tierMatrix";
 
 // Auth page form schema
 const AuthPageFormSchema = z.object({
@@ -75,7 +75,7 @@ function AuthPageSettings({
     const t = useTranslations();
     const { env } = useEnvContext();
 
-    const { hasSaasSubscription } = usePaidStatus();
+    const { isPaidUser } = usePaidStatus();
 
     // Auth page domain state
     const [loginPage, setLoginPage] = useState(defaultLoginPage);
@@ -177,7 +177,7 @@ function AuthPageSettings({
         try {
             // Handle auth page domain
             if (data.authPageDomainId) {
-                if (build === "enterprise" || hasSaasSubscription) {
+                if (isPaidUser(tierMatrix.loginPageDomain)) {
                     const sanitizedSubdomain = data.authPageSubdomain
                         ? finalizeSubdomainSanitize(data.authPageSubdomain)
                         : "";
@@ -361,7 +361,11 @@ function AuthPageSettings({
                                                 onClick={() =>
                                                     setEditDomainOpen(true)
                                                 }
-                                                disabled={!hasSaasSubscription}
+                                                disabled={
+                                                    !isPaidUser(
+                                                        tierMatrix.loginPageDomain
+                                                    )
+                                                }
                                             >
                                                 {form.watch("authPageDomainId")
                                                     ? t("changeDomain")
@@ -376,7 +380,9 @@ function AuthPageSettings({
                                                         clearAuthPageDomain
                                                     }
                                                     disabled={
-                                                        !hasSaasSubscription
+                                                        !isPaidUser(
+                                                            tierMatrix.loginPageDomain
+                                                        )
                                                     }
                                                 >
                                                     <Trash2 size="14" />
@@ -395,7 +401,9 @@ function AuthPageSettings({
 
                                     {env.flags.usePangolinDns &&
                                         (build === "enterprise" ||
-                                            !hasSaasSubscription) &&
+                                            !isPaidUser(
+                                                tierMatrix.loginPageDomain
+                                            )) &&
                                         loginPage?.domainId &&
                                         loginPage?.fullDomain &&
                                         !hasUnsavedChanges && (
@@ -424,7 +432,7 @@ function AuthPageSettings({
                         disabled={
                             isSubmitting ||
                             !hasUnsavedChanges ||
-                            !hasSaasSubscription
+                            !isPaidUser(tierMatrix.loginPageDomain)
                         }
                     >
                         {t("saveAuthPageDomain")}
@@ -477,7 +485,10 @@ function AuthPageSettings({
                                     handleDomainSelection(selectedDomain);
                                 }
                             }}
-                            disabled={!selectedDomain || !hasSaasSubscription}
+                            disabled={
+                                !selectedDomain ||
+                                !isPaidUser(tierMatrix.loginPageDomain)
+                            }
                         >
                             {t("selectDomain")}
                         </Button>

src/components/LoginOrgSelector.tsx

@@ -2,11 +2,9 @@
 
 import { useState } from "react";
 import { Button } from "@app/components/ui/button";
-import { Alert, AlertDescription } from "@app/components/ui/alert";
 import { useTranslations } from "next-intl";
-import { Separator } from "./ui/separator";
 import LoginPasswordForm from "./LoginPasswordForm";
-import IdpLoginButtons from "./private/IdpLoginButtons";
+import IdpLoginButtons from "./IdpLoginButtons";
 import { LookupUserResponse } from "@server/routers/auth/lookupUser";
 import UserProfileCard from "./UserProfileCard";
 

src/components/OrgIdpTable.tsx

@@ -2,7 +2,7 @@
 
 import { ColumnDef } from "@tanstack/react-table";
 import { ExtendedColumnDef } from "@app/components/ui/data-table";
-import { IdpDataTable } from "@app/components/private/OrgIdpDataTable";
+import { IdpDataTable } from "@app/components/OrgIdpDataTable";
 import { Button } from "@app/components/ui/button";
 import { ArrowRight, ArrowUpDown, MoreHorizontal } from "lucide-react";
 import { useState } from "react";

src/components/OrgLoginPage.tsx

@@ -3,7 +3,7 @@ import {
     LoadLoginPageBrandingResponse,
     LoadLoginPageResponse
 } from "@server/routers/loginPage/types";
-import IdpLoginButtons from "@app/components/private/IdpLoginButtons";
+import IdpLoginButtons from "@app/components/IdpLoginButtons";
 import {
     Card,
     CardContent,

src/components/ResourceInfoBox.tsx

@@ -11,7 +11,7 @@ import {
     InfoSectionTitle
 } from "@app/components/InfoSection";
 import { useTranslations } from "next-intl";
-import CertificateStatus from "@app/components/private/CertificateStatus";
+import CertificateStatus from "@app/components/CertificateStatus";
 import { toUnicode } from "punycode";
 import { useEnvContext } from "@app/hooks/useEnvContext";