Option to regenerate Newt keys

messages/en-US.json

@@ -2099,8 +2099,12 @@
     "credentials": "Credentials",
     "savecredentials": "Save Credentials",
     "regeneratecredentials": "Regenerate Credentials",
-    "regenerateClientCredentials": "Regenerate and save your managed credentials",
+    "regenerateCredentials": "Regenerate and save your credentials",
     "generatedcredentials": "Generated Credentials",
     "copyandsavethesecredentials": "Copy and save these credentials",
-    "copyandsavethesecredentialsdescription": "These credentials will not be shown again after you leave this page. Save them securely now."
+    "copyandsavethesecredentialsdescription": "These credentials will not be shown again after you leave this page. Save them securely now.",
+    "credentialsSaved" : "Credentials Saved",
+    "credentialsSavedDescription": "Credentials have been regenerated and saved successfully.",
+    "credentialsSaveError": "Credentials Save Error",
+    "credentialsSaveErrorDescription": "An error occurred while regenerating and saving the credentials."
 }

server/auth/actions.ts

@@ -19,6 +19,7 @@ export enum ActionsEnum {
     getSite = "getSite",
     listSites = "listSites",
     updateSite = "updateSite",
+    reGenerateSecret = "reGenerateSecret",
     createResource = "createResource",
     deleteResource = "deleteResource",
     getResource = "getResource",

server/routers/client/index.ts

@@ -3,4 +3,5 @@ export * from "./createClient";
 export * from "./deleteClient";
 export * from "./listClients";
 export * from "./updateClient";
-export * from "./getClient";
+export * from "./getClient";
+export * from "./reGenerateClientSecret";

server/routers/client/reGenerateClientSecret.ts

@@ -0,0 +1,130 @@
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
+import { db, olms, } from "@server/db";
+import { clients } from "@server/db";
+import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import logger from "@server/logger";
+import { eq, and } from "drizzle-orm";
+import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
+import { hashPassword } from "@server/auth/password";
+
+const reGenerateSecretParamsSchema = z
+    .object({
+        clientId: z.string().transform(Number).pipe(z.number().int().positive())
+    })
+    .strict();
+
+const reGenerateSecretBodySchema = z
+    .object({
+        olmId: z.string().min(1).optional(),
+        secret: z.string().min(1).optional(),
+
+    })
+    .strict();
+
+export type ReGenerateSecretBody = z.infer<typeof reGenerateSecretBodySchema>;
+
+registry.registerPath({
+    method: "post",
+    path: "/client/{clientId}/regenerate-secret",
+    description: "Regenerate a client's OLM credentials by its client ID.",
+    tags: [OpenAPITags.Client],
+    request: {
+        params: reGenerateSecretParamsSchema,
+        body: {
+            content: {
+                "application/json": {
+                    schema: reGenerateSecretBodySchema
+                }
+            }
+        }
+    },
+    responses: {}
+});
+
+
+export async function reGenerateClientSecret(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const parsedBody = reGenerateSecretBodySchema.safeParse(req.body);
+        if (!parsedBody.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedBody.error).toString()
+                )
+            );
+        }
+
+        const { olmId, secret } = parsedBody.data;
+
+        const parsedParams = reGenerateSecretParamsSchema.safeParse(req.params);
+        if (!parsedParams.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedParams.error).toString()
+                )
+            );
+        }
+
+        const { clientId } = parsedParams.data;
+
+        let secretHash = undefined;
+        if (secret) {
+            secretHash = await hashPassword(secret);
+        }
+
+
+        // Fetch the client to make sure it exists and the user has access to it
+        const [client] = await db
+            .select()
+            .from(clients)
+            .where(eq(clients.clientId, clientId))
+            .limit(1);
+
+        if (!client) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    `Client with ID ${clientId} not found`
+                )
+            );
+        }
+
+        const [existingOlm] = await db
+            .select()
+            .from(olms)
+            .where(eq(olms.clientId, clientId))
+            .limit(1);
+
+        if (existingOlm && olmId && secretHash) {
+            await db
+                .update(olms)
+                .set({
+                    olmId,
+                    secretHash
+                })
+                .where(eq(olms.clientId, clientId));
+        }
+
+        return response(res, {
+            data: existingOlm,
+            success: true,
+            error: false,
+            message: "Credentials regenerated successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        logger.error(error);
+        return next(
+            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
+        );
+    }
+}

server/routers/client/updateClient.ts

@@ -32,9 +32,6 @@ const updateClientSchema = z
         siteIds: z
             .array(z.number().int().positive())
             .optional(),
-        olmId: z.string().min(1).optional(),
-        secret: z.string().min(1).optional(),
-
     })
     .strict();
 
@@ -79,7 +76,7 @@ export async function updateClient(
             );
         }
 
-        const { name, siteIds, olmId, secret } = parsedBody.data;
+        const { name, siteIds } = parsedBody.data;
 
         const parsedParams = updateClientParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
@@ -93,11 +90,6 @@ export async function updateClient(
 
         const { clientId } = parsedParams.data;
 
-        let secretHash = undefined;
-        if (secret) {
-            secretHash = await hashPassword(secret);
-        }
-
 
         // Fetch the client to make sure it exists and the user has access to it
         const [client] = await db
@@ -146,22 +138,6 @@ export async function updateClient(
                     .where(eq(clients.clientId, clientId));
             }
 
-            const [existingOlm] = await trx
-                .select()
-                .from(olms)
-                .where(eq(olms.clientId, clientId))
-                .limit(1);
-
-            if (existingOlm && olmId && secretHash) {
-                await trx
-                    .update(olms)
-                    .set({
-                        olmId,
-                        secretHash
-                    })
-                    .where(eq(olms.clientId, clientId));
-            }
-
             // Update site associations if provided
             // Remove sites that are no longer associated
             for (const siteId of sitesRemoved) {

server/routers/external.ts

@@ -178,6 +178,14 @@ authenticated.post(
     client.updateClient,
 );
 
+authenticated.post(
+    "/client/:clientId/regenerate-secret",
+    verifyClientsEnabled,
+    verifyClientAccess,
+    verifyUserHasAction(ActionsEnum.reGenerateSecret),
+    client.reGenerateClientSecret
+);
+
 // authenticated.get(
 //     "/site/:siteId/roles",
 //     verifySiteAccess,
@@ -191,6 +199,13 @@ authenticated.post(
     logActionAudit(ActionsEnum.updateSite),
     site.updateSite,
 );
+
+authenticated.post(
+    "/site/:siteId/regenerate-secret",
+    verifySiteAccess,
+    verifyUserHasAction(ActionsEnum.reGenerateSecret),
+    site.reGenerateSiteSecret
+);
 authenticated.delete(
     "/site/:siteId",
     verifySiteAccess,

server/routers/site/index.ts

@@ -6,3 +6,4 @@ export * from "./listSites";
 export * from "./listSiteRoles";
 export * from "./pickSiteDefaults";
 export * from "./socketIntegration";
+export * from "./reGenerateSiteSecret";

server/routers/site/reGenerateSiteSecret.ts

@@ -0,0 +1,106 @@
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
+import { db, newts } from "@server/db";
+import { eq } from "drizzle-orm";
+import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import logger from "@server/logger";
+import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
+import { hashPassword } from "@server/auth/password";
+
+const updateSiteParamsSchema = z
+    .object({
+        siteId: z.string().transform(Number).pipe(z.number().int().positive())
+    })
+    .strict();
+
+const updateSiteBodySchema = z
+    .object({
+        newtId: z.string().min(1).max(255).optional(),
+        newtSecret: z.string().min(1).max(255).optional(),
+    })
+    .strict()
+
+registry.registerPath({
+    method: "post",
+    path: "/site/{siteId}/regenerate-secret",
+    description:
+        "Regenerate a site's Newt credentials by its site ID.",
+    tags: [OpenAPITags.Site],
+    request: {
+        params: updateSiteParamsSchema,
+        body: {
+            content: {
+                "application/json": {
+                    schema: updateSiteBodySchema
+                }
+            }
+        }
+    },
+    responses: {}
+});
+
+export async function reGenerateSiteSecret(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const parsedParams = updateSiteParamsSchema.safeParse(req.params);
+        if (!parsedParams.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedParams.error).toString()
+                )
+            );
+        }
+
+        const parsedBody = updateSiteBodySchema.safeParse(req.body);
+        if (!parsedBody.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedBody.error).toString()
+                )
+            );
+        }
+
+        const { siteId } = parsedParams.data;
+        const { newtId, newtSecret } = parsedBody.data;
+
+        const secretHash = await hashPassword(newtSecret!);
+        const updatedSite = await db
+            .update(newts)
+            .set({
+                newtId,
+                secretHash
+            })
+            .where(eq(newts.siteId, siteId))
+            .returning();
+
+        if (updatedSite.length === 0) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    `Site with ID ${siteId} not found`
+                )
+            );
+        }
+
+        return response(res, {
+            data: updatedSite[0],
+            success: true,
+            error: false,
+            message: "Credentials regenerated successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        logger.error(error);
+        return next(
+            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
+        );
+    }
+}

src/app/[orgId]/settings/clients/[clientId]/credentials/page.tsx

@@ -74,24 +74,24 @@ export default function CredentialsPage() {
         setLoading(true);
 
         try {
-            await api.post(`/client/${client?.clientId}`, {
+            await api.post(`/client/${client?.clientId}/regenerate-secret`, {
                 olmId: clientDefaults?.olmId,
                 secret: clientDefaults?.olmSecret,
             });
 
             toast({
-                title: t("clientUpdated"),
-                description: t("clientUpdatedDescription")
+                title: t("credentialsSaved"),
+                description: t("credentialsSavedDescription")
             });
 
             router.refresh();
         } catch (e) {
             toast({
                 variant: "destructive",
-                title: t("clientUpdateFailed"),
+                title: t("credentialsSaveError"),
                 description: formatAxiosError(
                     e,
-                    t("clientUpdateError")
+                    t("credentialsSaveErrorDescription")
                 )
             });
         } finally {
@@ -107,7 +107,7 @@ export default function CredentialsPage() {
                         {t("generatedcredentials")}
                     </SettingsSectionTitle>
                     <SettingsSectionDescription>
-                        {t("regenerateClientCredentials")}
+                        {t("regenerateCredentials")}
                     </SettingsSectionDescription>
                 </SettingsSectionHeader>
 

src/app/[orgId]/settings/clients/[clientId]/layout.tsx

@@ -7,6 +7,7 @@ import ClientInfoCard from "../../../../../components/ClientInfoCard";
 import ClientProvider from "@app/providers/ClientProvider";
 import { redirect } from "next/navigation";
 import { HorizontalTabs } from "@app/components/HorizontalTabs";
+import { getTranslations } from "next-intl/server";
 
 type SettingsLayoutProps = {
     children: React.ReactNode;
@@ -30,13 +31,15 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
         redirect(`/${params.orgId}/settings/clients`);
     }
 
+    const t = await getTranslations();
+
     const navItems = [
         {
-            title: "General",
+            title: t('general'),
             href: `/{orgId}/settings/clients/{clientId}/general`
         },
         {
-            title: "Credentials",
+            title: t('credentials'),
             href: `/{orgId}/settings/clients/{clientId}/credentials`
         }
     ];

src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx

@@ -0,0 +1,212 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import {
+    SettingsContainer,
+    SettingsSection,
+    SettingsSectionBody,
+    SettingsSectionDescription,
+    SettingsSectionHeader,
+    SettingsSectionTitle
+} from "@app/components/Settings";
+import { Button } from "@app/components/ui/button";
+import { Alert, AlertDescription, AlertTitle } from "@app/components/ui/alert";
+import { InfoIcon } from "lucide-react";
+import { createApiClient, formatAxiosError } from "@app/lib/api";
+import { useEnvContext } from "@app/hooks/useEnvContext";
+import { toast } from "@app/hooks/useToast";
+import { useParams, useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+import { InfoSection, InfoSectionContent, InfoSections, InfoSectionTitle } from "@app/components/InfoSection";
+import CopyToClipboard from "@app/components/CopyToClipboard";
+import { PickSiteDefaultsResponse } from "@server/routers/site";
+import { useSiteContext } from "@app/hooks/useSiteContext";
+
+export default function CredentialsPage() {
+    const { env } = useEnvContext();
+    const api = createApiClient({ env });
+    const { orgId } = useParams();
+    const router = useRouter();
+    const t = useTranslations();
+    const [newtId, setNewtId] = useState("");
+    const [newtSecret, setNewtSecret] = useState("");
+    const { site, updateSite } = useSiteContext();
+
+    const [siteDefaults, setSiteDefaults] =
+        useState<PickSiteDefaultsResponse | null>(null);
+
+    const [loading, setLoading] = useState(false);
+    const [saving, setSaving] = useState(false);
+
+    // Clear credentials when user leaves/reloads
+    useEffect(() => {
+        const clearCreds = () => {
+            setNewtId("");
+            setNewtSecret("");
+        };
+        window.addEventListener("beforeunload", clearCreds);
+        return () => window.removeEventListener("beforeunload", clearCreds);
+    }, []);
+
+    const handleRegenerate = async () => {
+        try {
+            setLoading(true);
+            await api
+                .get(`/org/${orgId}/pick-site-defaults`)
+                .then((res) => {
+                    if (res && res.status === 200) {
+                        const data = res.data.data;
+
+                        setSiteDefaults(data);
+
+                        const newtId = data.newtId;
+                        const newtSecret = data.newtSecret;
+                        setNewtId(newtId);
+                        setNewtSecret(newtSecret);
+
+                    }
+                });
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleSave = async () => {
+        setLoading(true);
+
+        try {
+            await api.post(`/site/${site?.siteId}/regenerate-secret`, {
+                newtId: siteDefaults?.newtId,
+                newtSecret: siteDefaults?.newtSecret,
+            });
+
+            toast({
+                title: t("credentialsSaved"),
+                description: t("credentialsSavedDescription")
+            });
+
+            router.refresh();
+        } catch (e) {
+            toast({
+                variant: "destructive",
+                title: t("credentialsSaveError"),
+                description: formatAxiosError(
+                    e,
+                    t("credentialsSaveErrorDescription")
+                )
+            });
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    return (
+        <SettingsContainer>
+            <SettingsSection>
+                <SettingsSectionHeader>
+                    <SettingsSectionTitle>
+                        {t("generatedcredentials")}
+                    </SettingsSectionTitle>
+                    <SettingsSectionDescription>
+                        {t("regenerateCredentials")}
+                    </SettingsSectionDescription>
+                </SettingsSectionHeader>
+
+                <SettingsSectionBody>
+                    {!siteDefaults ? (
+                        <Button
+                            onClick={handleRegenerate}
+                            loading={loading}
+                            disabled={loading}
+                        >
+                            {t("regeneratecredentials")}
+                        </Button>
+                    ) : (
+                        <>
+                            <SettingsSection>
+                                <SettingsSectionHeader>
+                                    <SettingsSectionTitle>
+                                        {t("siteNewtCredentials")}
+                                    </SettingsSectionTitle>
+                                    <SettingsSectionDescription>
+                                        {t(
+                                            "siteNewtCredentialsDescription"
+                                        )}
+                                    </SettingsSectionDescription>
+                                </SettingsSectionHeader>
+                                <SettingsSectionBody>
+                                    <InfoSections cols={3}>
+                                        <InfoSection>
+                                            <InfoSectionTitle>
+                                                {t("newtEndpoint")}
+                                            </InfoSectionTitle>
+                                            <InfoSectionContent>
+                                                <CopyToClipboard
+                                                    text={
+                                                        env.app.dashboardUrl
+                                                    }
+                                                />
+                                            </InfoSectionContent>
+                                        </InfoSection>
+                                        <InfoSection>
+                                            <InfoSectionTitle>
+                                                {t("newtId")}
+                                            </InfoSectionTitle>
+                                            <InfoSectionContent>
+                                                <CopyToClipboard
+                                                    text={newtId}
+                                                />
+                                            </InfoSectionContent>
+                                        </InfoSection>
+                                        <InfoSection>
+                                            <InfoSectionTitle>
+                                                {t("newtSecretKey")}
+                                            </InfoSectionTitle>
+                                            <InfoSectionContent>
+                                                <CopyToClipboard
+                                                    text={newtSecret}
+                                                />
+                                            </InfoSectionContent>
+                                        </InfoSection>
+                                    </InfoSections>
+
+
+                                    <Alert variant="neutral" className="mt-4">
+                                        <InfoIcon className="h-4 w-4" />
+                                        <AlertTitle className="font-semibold">
+                                            {t("copyandsavethesecredentials")}
+                                        </AlertTitle>
+                                        <AlertDescription>
+                                            {t(
+                                                "copyandsavethesecredentialsdescription"
+                                            )}
+                                        </AlertDescription>
+                                    </Alert>
+                                </SettingsSectionBody>
+                            </SettingsSection>
+
+                            <div className="flex justify-end mt-6 space-x-2">
+                                <Button
+                                    variant="outline"
+                                    onClick={() => {
+                                        setNewtId("");
+                                        setNewtSecret("");
+                                    }}
+                                >
+                                    {t("cancel")}
+                                </Button>
+                                <Button
+                                    onClick={handleSave}
+                                    loading={saving}
+                                    disabled={saving}
+                                >
+                                    {t("savecredentials")}
+                                </Button>
+                            </div>
+                        </>
+                    )}
+                </SettingsSectionBody>
+            </SettingsSection>
+        </SettingsContainer>
+    );
+}

src/app/[orgId]/settings/sites/[niceId]/layout.tsx

@@ -36,6 +36,10 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
         {
             title: t('general'),
             href: "/{orgId}/settings/sites/{niceId}/general"
+        },
+        {
+            title: t('credentials'),
+            href: "/{orgId}/settings/sites/{niceId}/credentials"
         }
     ];
 

src/components/ClientInfoCard.tsx

@@ -1,7 +1,6 @@
 "use client";
 
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { InfoIcon } from "lucide-react";
+import { Alert, AlertDescription } from "@/components/ui/alert";
 import { useClientContext } from "@app/hooks/useClientContext";
 import {
     InfoSection,
@@ -19,9 +18,7 @@ export default function SiteInfoCard({}: ClientInfoCardProps) {
 
     return (
         <Alert>
-            <InfoIcon className="h-4 w-4" />
-            <AlertTitle className="font-semibold">{t("clientInformation")}</AlertTitle>
-            <AlertDescription className="mt-4">
+            <AlertDescription>
                 <InfoSections cols={2}>
                         <>
                             <InfoSection>