fix: build errors

homarr-labs · Sep 25, 2024 · df2f30b · df2f30b
1 parent 2bbc98b
commit df2f30b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/api/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/api/page.tsx
@@ -4,6 +4,7 @@ import { Stack, Tabs, TabsList, TabsPanel, TabsTab } from "@mantine/core";
 import { openApiDocument } from "@homarr/api";
 import { api } from "@homarr/api/server";
 import { extractBaseUrlFromHeaders } from "@homarr/common";
+import { useScopedI18n } from "@homarr/translation/client";
 import { getScopedI18n } from "@homarr/translation/server";
 
 import { SwaggerUIClient } from "~/app/[locale]/manage/tools/api/components/swagger-ui";
@@ -21,13 +22,14 @@ export async function generateMetadata() {
 export default async function ApiPage() {
   const document = openApiDocument(extractBaseUrlFromHeaders(headers()));
   const apiKeys = await api.apiKeys.getAll();
+  const t = useScopedI18n("management.page.tool.api.tab");
 
   return (
     <Stack>
       <Tabs defaultValue={"documentation"}>
         <TabsList>
-          <TabsTab value={"documentation"}>Documentation</TabsTab>
-          <TabsTab value={"authentication"}>Authentication</TabsTab>
+          <TabsTab value={"documentation"}>{t("documentation.label")}</TabsTab>
+          <TabsTab value={"authentication"}>{t("apiKey.label")}</TabsTab>
         </TabsList>
         <TabsPanel value={"authentication"}>
           <ApiKeysManagement apiKeys={apiKeys} />

diff --git a/apps/nextjs/src/app/api/[...trpc]/route.ts b/apps/nextjs/src/app/api/[...trpc]/route.ts
@@ -13,7 +13,7 @@ const handlerAsync = async (req: Request) => {
   let session: Session | null;
 
   logger.info(
-    "Creating OpenAPI fetch handler for user " + (apiKeyHeaderValue ? "with an api key" : "without an api key"),
+    `Creating OpenAPI fetch handler for user ${apiKeyHeaderValue ? "with an api key" : "without an api key"}`,
   );
 
   if (apiKeyHeaderValue !== null) {
@@ -46,7 +46,7 @@ const handlerAsync = async (req: Request) => {
     req,
     endpoint: "/",
     router: appRouter,
-    createContext: () => createTRPCContext({ session: session, headers: req.headers }),
+    createContext: () => createTRPCContext({ session, headers: req.headers }),
   });
 };
 

diff --git a/packages/api/src/router/apiKeys.ts b/packages/api/src/router/apiKeys.ts
@@ -31,7 +31,7 @@ export const apiKeysRouter = createTRPCRouter({
     await db.insert(apiKeys).values({
       id: createId(),
       apiKey: hashedRandomToken,
-      salt: salt,
+      salt,
       userId: ctx.session.user.id,
     });
     return {

diff --git a/packages/auth/callbacks.ts b/packages/auth/callbacks.ts
@@ -1,9 +1,9 @@
 import { cookies } from "next/headers";
 import type { Adapter } from "@auth/core/adapters";
-import type { Session } from "@auth/core/types";
 import dayjs from "dayjs";
 import type { NextAuthConfig } from "next-auth";
 
+import type { Session } from "@homarr/auth";
 import type { Database } from "@homarr/db";
 import { eq, inArray } from "@homarr/db";
 import { groupMembers, groupPermissions, users } from "@homarr/db/schema/sqlite";
@@ -43,7 +43,7 @@ export const createSessionAsync = async (
       permissions: await getCurrentUserPermissionsAsync(db, user.id),
       colorScheme: "auto",
     },
-  } satisfies Session;
+  } as Session;
 };
 
 export const createSessionCallback = (db: Database): NextAuthCallbackOf<"session"> => {

diff --git a/packages/translation/src/lang/en.ts b/packages/translation/src/lang/en.ts
@@ -1858,7 +1858,11 @@ export default {
             },
           },
           tab: {
+            documentation: {
+              label: "Documentation",
+            },
             apiKey: {
+              label: "Authentication",
               title: "API Keys",
               button: {
                 createApiToken: "Create API token",