Merge remote-tracking branch 'upstream/dev' into feature-i18n

.gitignore

@@ -33,3 +33,4 @@ bin
 .secrets
 test_event.json
 .idea/
+package-lock.json

server/routers/auth/login.ts

@@ -37,6 +37,8 @@ export type LoginResponse = {
     emailVerificationRequired?: boolean;
 };
 
+export const dynamic = "force-dynamic";
+
 export async function login(
     req: Request,
     res: Response,

server/routers/internal.ts

@@ -6,6 +6,7 @@ import * as badger from "./badger";
 import * as auth from "@server/routers/auth";
 import * as supporterKey from "@server/routers/supporterKey";
 import * as license from "@server/routers/license";
+import * as idp from "@server/routers/idp";
 import HttpCode from "@server/types/HttpCode";
 import {
     verifyResourceAccess,
@@ -38,10 +39,11 @@ internalRouter.get(
     supporterKey.isSupporterKeyVisible
 );
 
-internalRouter.get(
-    `/license/status`,
-    license.getLicenseStatus
-);
+internalRouter.get(`/license/status`, license.getLicenseStatus);
+
+internalRouter.get("/idp", idp.listIdps);
+
+internalRouter.get("/idp/:idpId", idp.getIdp);
 
 // Gerbil routes
 const gerbilRouter = Router();

src/app/[orgId]/settings/api-keys/create/page.tsx

@@ -44,7 +44,6 @@ import {
     CreateOrgApiKeyBody,
     CreateOrgApiKeyResponse
 } from "@server/routers/apiKeys";
-import { ApiKey } from "@server/db";
 import {
     InfoSection,
     InfoSectionContent,

src/app/auth/idp/[idpId]/oidc/callback/page.tsx

@@ -1,10 +1,13 @@
 import { cookies } from "next/headers";
 import ValidateOidcToken from "./ValidateOidcToken";
-import { idp } from "@server/db";
-import { db } from "@server/db";
-import { eq } from "drizzle-orm";
+import { cache } from "react";
+import { priv } from "@app/lib/api";
+import { AxiosResponse } from "axios";
+import { GetIdpResponse } from "@server/routers/idp";
 import { getTranslations } from "next-intl/server";
 
+export const dynamic = "force-dynamic";
+
 export default async function Page(props: {
     params: Promise<{ orgId: string; idpId: string }>;
     searchParams: Promise<{
@@ -19,13 +22,14 @@ export default async function Page(props: {
     const allCookies = await cookies();
     const stateCookie = allCookies.get("p_oidc_state")?.value;
 
-    // query db directly in server component because just need the name
-    const [idpRes] = await db
-        .select({ name: idp.name })
-        .from(idp)
-        .where(eq(idp.idpId, parseInt(params.idpId!)));
 
-    if (!idpRes) {
+    const idpRes = await cache(
+        async () => await priv.get<AxiosResponse<GetIdpResponse>>(`/idp/${params.idpId}`)
+    )();
+
+    const foundIdp = idpRes.data?.data?.idp;
+
+    if (!foundIdp) {
         return <div>{t('idpErrorNotFound')}</div>;
     }
 
@@ -37,7 +41,7 @@ export default async function Page(props: {
                 code={searchParams.code}
                 expectedState={searchParams.state}
                 stateCookie={stateCookie}
-                idp={{ name: idpRes.name }}
+                idp={{ name: foundIdp.name }}
             />
         </>
     );

src/app/auth/login/page.tsx

@@ -6,9 +6,11 @@ import DashboardLoginForm from "./DashboardLoginForm";
 import { Mail } from "lucide-react";
 import { pullEnv } from "@app/lib/pullEnv";
 import { cleanRedirect } from "@app/lib/cleanRedirect";
-import { db } from "@server/db";
 import { idp } from "@server/db";
 import { LoginFormIDP } from "@app/components/LoginForm";
+import { priv } from "@app/lib/api";
+import { AxiosResponse } from "axios";
+import { ListIdpsResponse } from "@server/routers/idp";
 import { getTranslations } from "next-intl/server";
 
 export const dynamic = "force-dynamic";
@@ -35,8 +37,10 @@ export default async function Page(props: {
         redirectUrl = cleanRedirect(searchParams.redirect as string);
     }
 
-    const idps = await db.select().from(idp);
-    const loginIdps = idps.map((idp) => ({
+    const idpsRes = await cache(
+        async () => await priv.get<AxiosResponse<ListIdpsResponse>>("/idp")
+    )();
+    const loginIdps = idpsRes.data.data.idps.map((idp) => ({
         idpId: idp.idpId,
         name: idp.name
     })) as LoginFormIDP[];

src/app/auth/resource/[resourceId]/page.tsx

@@ -14,8 +14,9 @@ import ResourceAccessDenied from "./ResourceAccessDenied";
 import AccessToken from "./AccessToken";
 import { pullEnv } from "@app/lib/pullEnv";
 import { LoginFormIDP } from "@app/components/LoginForm";
-import { db } from "@server/db";
-import { idp } from "@server/db";
+import { ListIdpsResponse } from "@server/routers/idp";
+
+export const dynamic = "force-dynamic";
 
 export default async function ResourceAuthPage(props: {
     params: Promise<{ resourceId: number }>;
@@ -130,8 +131,10 @@ export default async function ResourceAuthPage(props: {
         );
     }
 
-    const idps = await db.select().from(idp);
-    const loginIdps = idps.map((idp) => ({
+    const idpsRes = await cache(
+        async () => await priv.get<AxiosResponse<ListIdpsResponse>>("/idp")
+    )();
+    const loginIdps = idpsRes.data.data.idps.map((idp) => ({
         idpId: idp.idpId,
         name: idp.name
     })) as LoginFormIDP[];

src/components/ContainersSelector.tsx

@@ -95,7 +95,7 @@ export const ContainersSelector: FC<ContainerSelectorProps> = ({
                         <CredenzaTitle>Containers in {site.name}</CredenzaTitle>
                         <CredenzaDescription>
                             Select any container to use as a hostname for this
-                            target. Click a port to use select a port.
+                            target. Click a port to use a port.
                         </CredenzaDescription>
                     </CredenzaHeader>
                     <CredenzaBody>

src/hooks/useDockerSocket.ts

@@ -104,12 +104,12 @@ export function useDockerSocket(site: Site) {
                                 console.warn(
                                     "Max retry attempts reached. Containers may still be loading."
                                 );
-                                toast({
-                                    variant: "destructive",
-                                    title: "Containers not ready",
-                                    description:
-                                        "Containers are still loading. Please try again in a moment."
-                                });
+                                // toast({
+                                //     variant: "destructive",
+                                //     title: "Containers not ready",
+                                //     description:
+                                //         "Containers are still loading. Please try again in a moment."
+                                // });
                             }
                         } else {
                             console.error(