Merge branch 'aig' of github.com:fosrl/pangolin into aig

src/app/[orgId]/resource/[resourceGuid]/keys/page.tsx

@@ -18,7 +18,7 @@ import { cache } from "react";
 export async function generateMetadata(): Promise<Metadata> {
     const t = await getTranslations();
     return {
-        title: t("myVirtualApiKeysResourceTitle")
+        title: t("myVirtualApiKeysTitle")
     };
 }
 
@@ -41,7 +41,9 @@ export default async function ResourceKeysPage(props: ResourceKeysPageProps) {
     const user = await getUser();
 
     if (!user) {
-        redirect("/");
+        redirect(
+            `/auth/resource/${encodeURIComponent(resourceGuid)}?redirect=${encodeURIComponent(`/${orgId}/resource/${resourceGuid}/keys`)}`
+        );
     }
 
     const cookieHeader = await authCookieHeader();
@@ -111,11 +113,7 @@ export default async function ResourceKeysPage(props: ResourceKeysPageProps) {
                 launcherMode
                 showViewAsAdmin={isAdminOrOwner}
             >
-                <UserVirtualApiKeys
-                    orgId={orgId}
-                    resourceGuid={resourceGuid}
-                    initialData={keysData}
-                />
+                <UserVirtualApiKeys orgId={orgId} initialData={keysData} />
             </Layout>
         </UserProvider>
     );

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

@@ -71,6 +71,9 @@ export default async function ResourceAuthPage(props: {
         );
     }
 
+    const isInference = authInfo.mode === "inference";
+    const keysPath = `/${authInfo.orgId}/resource/${authInfo.resourceGuid}/keys`;
+
     const hasLoginPageDomain = await isOrgSubscribed(
         authInfo.orgId,
         tierMatrix.loginPageDomain
@@ -159,7 +162,9 @@ export default async function ResourceAuthPage(props: {
 
     if (user && !user.emailVerified && env.flags.emailVerificationRequired) {
         redirect(
-            `/auth/verify-email?redirect=/auth/resource/${authInfo.resourceGuid}`
+            `/auth/verify-email?redirect=${encodeURIComponent(
+                `/auth/resource/${authInfo.resourceGuid}`
+            )}`
         );
     }
 
@@ -193,6 +198,16 @@ export default async function ResourceAuthPage(props: {
         );
     }
 
+    // Inference resources never establish a resource session on the inference
+    // host. Authenticated users retrieve their virtual API key on the dashboard.
+    if (isInference && user) {
+        redirect(keysPath);
+    }
+
+    // After password/pincode/SSO, do not send the browser back to the
+    // inference host (session alone cannot pass Badger). Land on keys instead.
+    const postAuthRedirect = isInference ? keysPath : redirectUrl;
+
     if (!hasAuth) {
         // no authentication so always go straight to the resource
         redirect(redirectUrl);
@@ -277,7 +292,7 @@ export default async function ResourceAuthPage(props: {
                 <AutoLoginHandler
                     resourceId={authInfo.resourceId}
                     skipToIdpId={authInfo.skipToIdpId}
-                    redirectUrl={redirectUrl}
+                    redirectUrl={postAuthRedirect}
                     orgId={build === "saas" ? authInfo.orgId : undefined}
                 />
             );
@@ -315,7 +330,7 @@ export default async function ResourceAuthPage(props: {
                             name: authInfo.resourceName,
                             id: authInfo.resourceId
                         }}
-                        redirect={redirectUrl}
+                        redirect={postAuthRedirect}
                         idps={loginIdps}
                         orgId={build === "saas" ? authInfo.orgId : undefined}
                         branding={

src/components/UserVirtualApiKeys.tsx

@@ -4,11 +4,9 @@ import { useState } from "react";
 import { useTranslations } from "next-intl";
 import { AxiosResponse } from "axios";
 import moment from "moment";
-import { Badge } from "@app/components/ui/badge";
 import { Button } from "@app/components/ui/button";
 import CopyTextBox from "@app/components/CopyTextBox";
 import CopyToClipboard from "@app/components/CopyToClipboard";
-import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import {
     SettingsContainer,
     SettingsFormCell,
@@ -34,7 +32,6 @@ import {
 
 type UserVirtualApiKeysProps = {
     orgId: string;
-    resourceGuid?: string;
     initialData: ListMyVirtualApiKeysResponse;
 };
 
@@ -131,12 +128,12 @@ function IdentityKeyCenterpiece({
     orgId,
     virtualApiKeyId,
     lastChars,
-    resourceGuid
+    resourceName
 }: {
     orgId: string;
     virtualApiKeyId: string;
     lastChars: string;
-    resourceGuid?: string;
+    resourceName?: string | null;
 }) {
     const t = useTranslations();
     const preview = formatVirtualApiKeyPreview(virtualApiKeyId, lastChars);
@@ -145,11 +142,11 @@ function IdentityKeyCenterpiece({
         virtualApiKeyId
     );
     const displayValue = credential ?? preview;
-    const headline = resourceGuid
-        ? t("myVirtualApiKeysIdentityResourceHeadline")
+    const headline = resourceName
+        ? t("myVirtualApiKeysIdentityResourceHeadline", { resourceName })
         : t("myVirtualApiKeysIdentityHeadline");
-    const description = resourceGuid
-        ? t("myVirtualApiKeysIdentityResourceDescription")
+    const description = resourceName
+        ? t("myVirtualApiKeysIdentityResourceDescription", { resourceName })
         : t("myVirtualApiKeysIdentityDescription");
 
     return (
@@ -220,17 +217,10 @@ function ManualKeyRow({
 
 export default function UserVirtualApiKeys({
     orgId,
-    resourceGuid,
     initialData
 }: UserVirtualApiKeysProps) {
     const t = useTranslations();
-
-    const title = resourceGuid
-        ? t("myVirtualApiKeysResourceTitle")
-        : t("myVirtualApiKeysTitle");
-    const description = resourceGuid
-        ? t("myVirtualApiKeysResourceDescription")
-        : t("myVirtualApiKeysDescription");
+    const resourceName = initialData.resourceName;
 
     return (
         <>
@@ -239,7 +229,7 @@ export default function UserVirtualApiKeys({
                     orgId={orgId}
                     virtualApiKeyId={initialData.userKey.virtualApiKeyId}
                     lastChars={initialData.userKey.lastChars}
-                    resourceGuid={resourceGuid}
+                    resourceName={resourceName}
                 />
 
                 {initialData.manualKeys.length > 0 ? (
@@ -249,9 +239,10 @@ export default function UserVirtualApiKeys({
                                 {t("myVirtualApiKeysManualTitle")}
                             </SectionTitle>
                             <SettingsSectionDescription>
-                                {resourceGuid
+                                {resourceName
                                     ? t(
-                                          "myVirtualApiKeysManualResourceDescription"
+                                          "myVirtualApiKeysManualResourceDescription",
+                                          { resourceName }
                                       )
                                     : t("myVirtualApiKeysManualDescription")}
                             </SettingsSectionDescription>

src/components/resource-launcher/LauncherInferenceApiKeysSection.tsx

@@ -202,7 +202,12 @@ export function LauncherInferenceApiKeysSection({
                                     </SettingsSubsectionTitle>
                                     <SettingsSubsectionDescription>
                                         {t(
-                                            "myVirtualApiKeysManualResourceDescription"
+                                            "myVirtualApiKeysManualResourceDescription",
+                                            {
+                                                resourceName:
+                                                    data.resourceName ??
+                                                    t("resource")
+                                            }
                                         )}
                                     </SettingsSubsectionDescription>
                                 </SettingsSubsectionHeader>