Merge branch 'dev' into feat/logo-path-in-enterprise

src/components/AuthPageBrandingForm.tsx

@@ -35,6 +35,8 @@ import { PaidFeaturesAlert } from "./PaidFeaturesAlert";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
 import { validateLocalPath } from "@app/lib/validateLocalPath";
+import { Alert, AlertDescription, AlertTitle } from "./ui/alert";
+import { tierMatrix } from "@server/lib/billing/tierMatrix";
 
 export type AuthPageCustomizationProps = {
     orgId: string;
@@ -162,14 +164,14 @@ export default function AuthPageBrandingForm({
                 `Choose your preferred authentication method for {{resourceName}}`,
             primaryColor: branding?.primaryColor ?? `#f36117` // default pangolin primary color
         },
-        disabled: !isPaidUser
+        disabled: !isPaidUser(tierMatrix.loginPageBranding)
     });
 
     async function updateBranding() {
         const isValid = await form.trigger();
         const brandingData = form.getValues();
 
-        if (!isValid || !isPaidUser) return;
+        if (!isValid || !isPaidUser(tierMatrix.loginPageBranding)) return;
 
         try {
             const updateRes = await api.put(
@@ -200,8 +202,6 @@ export default function AuthPageBrandingForm({
     }
 
     async function deleteBranding() {
-        if (!isPaidUser) return;
-
         try {
             const updateRes = await api.delete(
                 `/org/${orgId}/login-page-branding`
@@ -244,7 +244,9 @@ export default function AuthPageBrandingForm({
 
                 <SettingsSectionBody>
                     <SettingsSectionForm>
-                        <PaidFeaturesAlert />
+                        <PaidFeaturesAlert
+                            tiers={tierMatrix.loginPageBranding}
+                        />
 
                         <Form {...form}>
                             <form
@@ -357,7 +359,7 @@ export default function AuthPageBrandingForm({
                                 </div>
 
                                 {build === "saas" ||
-                                env.env.flags.useOrgOnlyIdp ? (
+                                env.env.app.identityProviderMode === "org" ? (
                                     <>
                                         <div className="mt-3 mb-6">
                                             <SettingsSectionTitle>
@@ -472,7 +474,7 @@ export default function AuthPageBrandingForm({
                                 disabled={
                                     isUpdatingBranding ||
                                     isDeletingBranding ||
-                                    !isPaidUser
+                                    !isPaidUser(tierMatrix.loginPageBranding)
                                 }
                                 className="gap-1"
                             >
@@ -487,7 +489,7 @@ export default function AuthPageBrandingForm({
                         disabled={
                             isUpdatingBranding ||
                             isDeletingBranding ||
-                            !isPaidUser
+                            !isPaidUser(tierMatrix.loginPageBranding)
                         }
                     >
                         {t("saveAuthPageBranding")}