✨apply branding to org auth page

server/private/routers/loginPage/loadLoginPageBranding.ts

@@ -13,16 +13,8 @@
 
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import {
-    db,
-    idpOrg,
-    loginPage,
-    loginPageBranding,
-    loginPageBrandingOrg,
-    loginPageOrg,
-    resources
-} from "@server/db";
-import { eq, and, type InferSelectModel } from "drizzle-orm";
+import { db, loginPageBranding, loginPageBrandingOrg, orgs } from "@server/db";
+import { eq, and } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -31,37 +23,15 @@ import { fromError } from "zod-validation-error";
 import type { LoadLoginPageBrandingResponse } from "@server/routers/loginPage/types";
 
 const querySchema = z.object({
-    resourceId: z.coerce.number().int().positive().optional(),
-    idpId: z.coerce.number().int().positive().optional(),
-    orgId: z.string().min(1).optional(),
-    fullDomain: z.string().min(1).optional()
+    orgId: z.string().min(1)
 });
 
-async function query(orgId?: string, fullDomain?: string) {
-    let orgLink: InferSelectModel<typeof loginPageBrandingOrg> | null = null;
-    if (orgId !== undefined) {
-        [orgLink] = await db
-            .select()
-            .from(loginPageBrandingOrg)
-            .where(eq(loginPageBrandingOrg.orgId, orgId));
-    } else if (fullDomain) {
-        const [res] = await db
-            .select()
-            .from(loginPage)
-            .where(eq(loginPage.fullDomain, fullDomain))
-            .innerJoin(
-                loginPageOrg,
-                eq(loginPage.loginPageId, loginPageOrg.loginPageId)
-            )
-            .innerJoin(
-                loginPageBrandingOrg,
-                eq(loginPageBrandingOrg.orgId, loginPageOrg.orgId)
-            )
-            .limit(1);
-
-        orgLink = res.loginPageBrandingOrg;
-    }
-
+async function query(orgId: string) {
+    const [orgLink] = await db
+        .select()
+        .from(loginPageBrandingOrg)
+        .where(eq(loginPageBrandingOrg.orgId, orgId))
+        .innerJoin(orgs, eq(loginPageBrandingOrg.orgId, orgs.orgId));
     if (!orgLink) {
         return null;
     }
@@ -73,14 +43,15 @@ async function query(orgId?: string, fullDomain?: string) {
             and(
                 eq(
                     loginPageBranding.loginPageBrandingId,
-                    orgLink.loginPageBrandingId
+                    orgLink.loginPageBrandingOrg.loginPageBrandingId
                 )
             )
         )
         .limit(1);
     return {
         ...res,
-        orgId: orgLink.orgId
+        orgId: orgLink.orgs.orgId,
+        orgName: orgLink.orgs.name
     };
 }
 
@@ -100,41 +71,9 @@ export async function loadLoginPageBranding(
             );
         }
 
-        const { resourceId, idpId, fullDomain } = parsedQuery.data;
+        const { orgId } = parsedQuery.data;
 
-        let orgId: string | undefined = undefined;
-        if (resourceId) {
-            const [resource] = await db
-                .select()
-                .from(resources)
-                .where(eq(resources.resourceId, resourceId))
-                .limit(1);
-
-            if (!resource) {
-                return next(
-                    createHttpError(HttpCode.NOT_FOUND, "Resource not found")
-                );
-            }
-
-            orgId = resource.orgId;
-        } else if (idpId) {
-            const [idpOrgLink] = await db
-                .select()
-                .from(idpOrg)
-                .where(eq(idpOrg.idpId, idpId));
-
-            if (!idpOrgLink) {
-                return next(
-                    createHttpError(HttpCode.NOT_FOUND, "IdP not found")
-                );
-            }
-
-            orgId = idpOrgLink.orgId;
-        } else if (parsedQuery.data.orgId) {
-            orgId = parsedQuery.data.orgId;
-        }
-
-        const branding = await query(orgId, fullDomain);
+        const branding = await query(orgId);
 
         if (!branding) {
             return next(

server/routers/loginPage/types.ts

@@ -12,6 +12,7 @@ export type LoadLoginPageResponse = LoginPage & { orgId: string };
 
 export type LoadLoginPageBrandingResponse = LoginPageBranding & {
     orgId: string;
+    orgName: string;
 };
 
 export type GetLoginPageBrandingResponse = LoginPageBranding;

src/app/auth/(private)/org/page.tsx

@@ -9,7 +9,10 @@ import { LoginFormIDP } from "@app/components/LoginForm";
 import { ListOrgIdpsResponse } from "@server/routers/orgIdp/types";
 import { build } from "@server/build";
 import { headers } from "next/headers";
-import { LoadLoginPageResponse } from "@server/routers/loginPage/types";
+import {
+    LoadLoginPageBrandingResponse,
+    LoadLoginPageResponse
+} from "@server/routers/loginPage/types";
 import IdpLoginButtons from "@app/components/private/IdpLoginButtons";
 import {
     Card,
@@ -26,6 +29,7 @@ import ValidateSessionTransferToken from "@app/components/private/ValidateSessio
 import { GetOrgTierResponse } from "@server/routers/billing/types";
 import { TierId } from "@server/lib/billing/tiers";
 import { getCachedSubscription } from "@app/lib/api/getCachedSubscription";
+import { replacePlaceholder } from "@app/lib/replacePlaceholder";
 
 export const dynamic = "force-dynamic";
 
@@ -33,7 +37,6 @@ export default async function OrgAuthPage(props: {
     params: Promise<{}>;
     searchParams: Promise<{ token?: string }>;
 }) {
-    const params = await props.params;
     const searchParams = await props.searchParams;
 
     const env = pullEnv();
@@ -122,12 +125,10 @@ export default async function OrgAuthPage(props: {
 
     let loginIdps: LoginFormIDP[] = [];
     if (build === "saas") {
-        const idpsRes = await cache(
-            async () =>
-                await priv.get<AxiosResponse<ListOrgIdpsResponse>>(
-                    `/org/${loginPage!.orgId}/idp`
-                )
-        )();
+        const idpsRes = await priv.get<AxiosResponse<ListOrgIdpsResponse>>(
+            `/org/${loginPage.orgId}/idp`
+        );
+
         loginIdps = idpsRes.data.data.idps.map((idp) => ({
             idpId: idp.idpId,
             name: idp.name,
@@ -135,6 +136,16 @@ export default async function OrgAuthPage(props: {
         })) as LoginFormIDP[];
     }
 
+    let branding: LoadLoginPageBrandingResponse | null = null;
+    try {
+        const res = await priv.get<
+            AxiosResponse<LoadLoginPageBrandingResponse>
+        >(`/login-page-branding?orgId=${loginPage.orgId}`);
+        if (res.status === 200) {
+            branding = res.data.data;
+        }
+    } catch (error) {}
+
     return (
         <div>
             <div className="text-center mb-2">
@@ -152,11 +163,30 @@ export default async function OrgAuthPage(props: {
             </div>
             <Card className="shadow-md w-full max-w-md">
                 <CardHeader>
-                    <CardTitle>{t("orgAuthSignInTitle")}</CardTitle>
+                    {branding?.logoUrl && (
+                        <div className="flex flex-row items-center justify-center mb-3">
+                            <img
+                                src={branding.logoUrl}
+                                height={branding.logoHeight}
+                                width={branding.logoWidth}
+                            />
+                        </div>
+                    )}
+                    <CardTitle>
+                        {branding?.orgTitle
+                            ? replacePlaceholder(branding.orgTitle, {
+                                  orgName: branding.orgName
+                              })
+                            : t("orgAuthSignInTitle")}
+                    </CardTitle>
                     <CardDescription>
-                        {loginIdps.length > 0
-                            ? t("orgAuthChooseIdpDescription")
-                            : ""}
+                        {branding?.orgSubtitle
+                            ? replacePlaceholder(branding.orgSubtitle, {
+                                  orgName: branding.orgName
+                              })
+                            : loginIdps.length > 0
+                              ? t("orgAuthChooseIdpDescription")
+                              : ""}
                     </CardDescription>
                 </CardHeader>
                 <CardContent>

src/components/ResourceAuthPortal.tsx

@@ -48,6 +48,7 @@ import { useTranslations } from "next-intl";
 import { build } from "@server/build";
 import { useLicenseStatusContext } from "@app/hooks/useLicenseStatusContext";
 import type { GetLoginPageBrandingResponse } from "@server/routers/loginPage/types";
+import { replacePlaceholder } from "@app/lib/replacePlaceholder";
 
 const pinSchema = z.object({
     pin: z
@@ -329,24 +330,6 @@ export default function ResourceAuthPortal(props: ResourceAuthPortalProps) {
         }
     }
 
-    function replacePlaceholder(
-        stringWithPlaceholder: string,
-        data: Record<string, string>
-    ) {
-        let newString = stringWithPlaceholder;
-
-        const keys = Object.keys(data);
-
-        for (const key of keys) {
-            newString = newString.replace(
-                new RegExp(`{{${key}}}`, "gm"),
-                data[key]
-            );
-        }
-
-        return newString;
-    }
-
     function getTitle(resourceName: string) {
         if (
             build !== "oss" &&
@@ -399,7 +382,7 @@ export default function ResourceAuthPortal(props: ResourceAuthPortalProps) {
     return (
         <div
             style={{
-                // @ts-expect-error
+                // @ts-expect-error CSS variable
                 "--primary": isUnlocked() ? props.branding?.primaryColor : null
             }}
         >

src/lib/replacePlaceholder.ts

@@ -0,0 +1,17 @@
+export function replacePlaceholder(
+    stringWithPlaceholder: string,
+    data: Record<string, string>
+) {
+    let newString = stringWithPlaceholder;
+
+    const keys = Object.keys(data);
+
+    for (const key of keys) {
+        newString = newString.replace(
+            new RegExp(`{{${key}}}`, "gm"),
+            data[key]
+        );
+    }
+
+    return newString;
+}