zudoku 0.1.1-dev.30 → 0.1.1-dev.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.1.1-dev.30",
+  "version": "0.1.1-dev.32",
   "type": "module",
   "files": [
     "dist",

package/src/app/App.tsx

@@ -7,9 +7,10 @@ import config from "virtual:zudoku-config";
 import { configuredApiPlugins } from "virtual:zudoku-api-plugins";
 import { configuredAuthProvider } from "virtual:zudoku-auth";
 import { configuredDocsPlugins } from "virtual:zudoku-docs-plugins";
+import { configuredApiKeysPlugin } from "virtual:zudoku-api-keys-plugin";
 
 // Base React Component
-import { DevPortal } from "virtual:zudoku-component";
+import { DevPortal } from "zudoku/components";
 
 // IMPORTANT: This component must not contain tailwind classes
 // This directory is not processed by the tailwind plugin
@@ -27,7 +28,11 @@ export default function App() {
       }}
       navigation={config.navigation ?? []}
       authentication={configuredAuthProvider}
-      plugins={[...configuredDocsPlugins, ...configuredApiPlugins]}
+      plugins={[
+        ...configuredDocsPlugins,
+        ...configuredApiPlugins,
+        configuredApiKeysPlugin,
+      ]}
     />
   );
 }

package/src/lib/components/Header.tsx

@@ -25,7 +25,7 @@ export const Header = memo(() => {
             </span>
           </div>
           <div className="grid grid-cols-[--sidecar-grid-cols] items-center gap-8">
-            <div className="w-full max-w-prose mx-auto">
+            <div className="w-full max-w-prose">
               <button className="flex items-center border border-input hover:bg-accent hover:text-accent-foreground p-4 relative h-8 justify-start rounded-lg bg-background text-sm text-muted-foreground shadow-none w-40 sm:w-72">
                 <div className="flex items-center gap-2 flex-grow">
                   <SearchIcon size={14} />
@@ -37,9 +37,9 @@ export const Header = memo(() => {
               </button>
             </div>
             <div className="items-center justify-self-end text-sm hidden lg:flex">
-              {!isLoggedIn ? (
+              {isLoggedIn ? (
                 <button
-                  className="cursor-pointer hover:bg-secondary p-1 px-2 mx-2 rounded"
+                  className="cursor-pointer hover:bg-secondary p-1 px-2 mx-2 rounded text-nowrap"
                   onClick={logout}
                 >
                   Logout {email ? `(${email})` : null}

package/src/lib/components/Layout.tsx

@@ -47,7 +47,12 @@ export const Layout = ({ children }: { children?: ReactNode }) => {
         >
           <SideNavigation />
         </Suspense>
-        <main className="dark:border-white/10 lg:overflow-visible translate-x-0 lg:w-[calc(100%-var(--side-nav-width))] lg:translate-x-[--side-nav-width] pl-12">
+        <main
+          className="dark:border-white/10 translate-x-0
+          lg:overflow-visible
+          lg:peer-data-[navigation=true]:w-[calc(100%-var(--side-nav-width))]
+          lg:peer-data-[navigation=true]:translate-x-[--side-nav-width] peer-data-[navigation=true]:pl-12"
+        >
           {children ?? <Outlet />}
         </main>
       </div>

package/src/lib/components/SyntaxHighlight.tsx

@@ -32,6 +32,7 @@ type SyntaxHighlightProps = {
   noBackground?: boolean;
   wrapLines?: boolean;
   copyable?: boolean;
+  showLanguageIndicator?: boolean;
 } & Omit<HighlightProps, "children">;
 
 export const SyntaxHighlight = ({
@@ -81,9 +82,11 @@ export const SyntaxHighlight = ({
               )}
             </button>
           )}
-          <span className="absolute top-1.5 right-3 text-[11px] font-mono text-muted-foreground transition group-hover:opacity-0">
-            {props.language}
-          </span>
+          {props.showLanguageIndicator && (
+            <span className="absolute top-1.5 right-3 text-[11px] font-mono text-muted-foreground transition group-hover:opacity-0">
+              {props.language}
+            </span>
+          )}
           {tokens.map((line, i) => (
             <div key={i} {...getLineProps({ line })}>
               {line.map((token, key) => (

package/src/lib/components/context/DevPortalProvider.ts

@@ -23,7 +23,7 @@ export const useApiIdentities = () => {
   const { getApiIdentities } = useDevPortal();
   return useSuspenseQuery({
     queryFn: getApiIdentities,
-    queryKey: ["api-keys"],
+    queryKey: ["api-identities"],
   });
 };
 

package/src/lib/components/navigation/SideNavigation.tsx

@@ -9,7 +9,10 @@ export const SideNavigation = () => {
   const navigation = useNavigation();
 
   return (
-    <SideNavigationWrapper ref={navRef}>
+    <SideNavigationWrapper
+      ref={navRef}
+      data={navigation.data.items.length > 0 ? "true" : "false"}
+    >
       {navigation.data.items.map((category) => (
         <SideNavigationCategory key={category.label} category={category} />
       ))}

package/src/lib/components/navigation/SideNavigationCategory.tsx

@@ -36,7 +36,7 @@ export const SideNavigationCategory = ({
       open={isOpen}
       onOpenChange={() => setIsOpen((prev) => !prev)}
     >
-      {category.label.length > 0 && (
+      {category.label.length > 0 ? (
         <Collapsible.Trigger asChild={isCollapsible} disabled={!isCollapsible}>
           <h5
             className={cn(
@@ -53,6 +53,8 @@ export const SideNavigationCategory = ({
             )}
           </h5>
         </Collapsible.Trigger>
+      ) : (
+        "Endpoints"
       )}
       <Collapsible.Content className="CollapsibleContent -mx-[--padding-nav-item]">
         {/* margin on Collapsible.Content will lead jumpiness when animating because it's not added to the calculated height */}

package/src/lib/components/navigation/SideNavigationItem.tsx

@@ -23,6 +23,10 @@ export const linkItem = cva(
         true: "text-primary font-medium",
         false: "text-foreground/80",
       },
+      isMuted: {
+        true: "opacity-60",
+        false: "",
+      },
     },
   },
 );
@@ -54,7 +58,10 @@ export const SideNavigationItem = ({
   if (isLinkItem(item)) {
     const classes = cn(
       "flex items-center gap-2",
-      linkItem({ isActive: item.href === location.pathname }),
+      linkItem({
+        isActive: item.href === location.pathname,
+        isMuted: true,
+      }),
     );
     return item.href.startsWith("http") ? (
       <a

package/src/lib/components/navigation/SideNavigationWrapper.tsx

@@ -1,15 +1,18 @@
 import { forwardRef, type PropsWithChildren } from "react";
+import { cn } from "../../util/cn.js";
 
 export const SideNavigationWrapper = forwardRef<
   HTMLDivElement,
-  PropsWithChildren
->(({ children }, ref) => {
-  return (
-    <nav
-      className="hidden lg:flex flex-col fixed text-sm overflow-y-auto shrink-0 p-[--padding-nav-item] -mx-[--padding-nav-item] pb-20 pt-[--padding-content-top] w-[--side-nav-width] h-[calc(100%-var(--header-height))] scroll-pt-2 gap-2"
-      ref={ref}
-    >
-      {children}
-    </nav>
-  );
-});
+  PropsWithChildren<{ data?: string; className?: string }>
+>(({ children, className, data }, ref) => (
+  <nav
+    data-navigation={data}
+    className={cn(
+      "peer hidden lg:flex flex-col fixed text-sm overflow-y-auto shrink-0 p-[--padding-nav-item] -mx-[--padding-nav-item] pb-20 pt-[--padding-content-top] w-[--side-nav-width] h-[calc(100%-var(--header-height))] scroll-pt-2 gap-2",
+      className,
+    )}
+    ref={ref}
+  >
+    {children}
+  </nav>
+));

package/src/lib/core/DevPortalContext.ts

@@ -7,7 +7,7 @@ import {
   type DevPortalProps,
 } from "../components/DevPortal.js";
 import {
-  isApiKeyPlugin,
+  isApiIdentityPlugin,
   isNavigationPlugin,
   needsInitialization,
   type DevPortalPlugin,
@@ -26,6 +26,7 @@ export interface ApiIdentity {
 type BaseNavigationCategoryItem = {
   label: ReactNode;
   title?: string;
+  muted?: boolean;
   icon?: ReactNode | IconName;
 };
 
@@ -117,7 +118,7 @@ export class DevPortalContext {
   getApiIdentities = async () => {
     const keys = await Promise.all(
       this.plugins
-        .filter(isApiKeyPlugin)
+        .filter(isApiIdentityPlugin)
         .map((plugin) => plugin.getIdentities(this)),
     );
 

package/src/lib/core/plugins.ts

@@ -37,7 +37,7 @@ export const needsInitialization = (
 ): obj is InitializationPlugin =>
   "initialize" in obj && typeof obj.initialize === "function";
 
-export const isApiKeyPlugin = (
+export const isApiIdentityPlugin = (
   obj: DevPortalPlugin,
 ): obj is ApiIdentityPlugin =>
   "getIdentities" in obj && typeof obj.getIdentities === "function";

package/src/lib/plugins/api-key/CreateApiKeys.tsx

@@ -0,0 +1,84 @@
+import { useDevPortal } from "../../components/context/DevPortalProvider.js";
+import { type ApiKeyPluginOptions, ApiKeyService } from "./index.js";
+import { useMutation } from "@tanstack/react-query";
+import { Button } from "../../ui/Button.js";
+import { Input } from "../../components/Input.js";
+import { cn } from "../../util/cn.js";
+import { Link, useNavigate } from "react-router-dom";
+import { useForm } from "react-hook-form";
+
+type CreateApiKeys = { description: string; expiresAt?: string };
+
+export const CreateApiKey = ({
+  options,
+  service,
+}: {
+  options: ApiKeyPluginOptions;
+  service: ApiKeyService;
+}) => {
+  const context = useDevPortal();
+  const navigate = useNavigate();
+  const form = useForm<CreateApiKeys>();
+  const createKeyMutation = useMutation({
+    mutationFn: ({ description, expiresAt }: CreateApiKeys) => {
+      if (!service.createKey) {
+        throw new Error("deleteKey not implemented");
+      }
+
+      return service.createKey({ description }, context);
+    },
+    onSuccess: () => navigate("/settings/api-keys/"),
+  });
+
+  if (!service.createKey) {
+    return null;
+  }
+
+  return (
+    <div className="max-w-screen-lg pt-[--padding-content-top] pb-[--padding-content-bottom]">
+      <div className="flex justify-between mb-4 border-b pb-1">
+        <h1 className="font-medium text-2xl">New API Keys</h1>
+      </div>
+      <form
+        onSubmit={form.handleSubmit((data) => {
+          if (data.expiresAt === "never") {
+            delete data.expiresAt;
+          }
+          createKeyMutation.mutate(data);
+        })}
+      >
+        <div className="flex gap-2 flex-col">
+          Note
+          <Input {...form.register("description")} />
+          Expiration
+          <select
+            className={cn(
+              "row-start-1 col-start-1 border border-input text-foreground px-2 py-1 pe-6",
+              "rounded-md appearance-none bg-zinc-50 hover:bg-white dark:bg-zinc-800 hover:dark:bg-zinc-800/75",
+            )}
+            {...form.register("expiresAt")}
+          >
+            <option value="never">Never</option>
+            {[7, 30, 60, 90].map((option) => (
+              <option value={addDaysToDate(option)} key={option}>
+                {option} Days
+              </option>
+            ))}
+          </select>
+          <div className="flex gap-2">
+            <Button>Generate Key</Button>
+            <Button variant="outline" asChild>
+              <Link to="/settings/api-keys/">Cancel</Link>
+            </Button>
+          </div>
+        </div>
+      </form>
+    </div>
+  );
+};
+
+const addDaysToDate = (days: number): string => {
+  const date = new Date();
+  date.setDate(date.getDate() + days);
+  return date.toISOString().split("T")[0];
+};

package/src/lib/plugins/api-key/SettingsApiKeys.tsx

@@ -1,22 +1,116 @@
-import { useApiIdentities } from "../../components/context/DevPortalProvider.js";
-import { type ApiKeyPluginOptions } from "./index.js";
+import { useDevPortal } from "../../components/context/DevPortalProvider.js";
+import { type ApiKeyPluginOptions, ApiKeyService } from "./index.js";
+import {
+  useMutation,
+  useQueryClient,
+  useSuspenseQuery,
+} from "@tanstack/react-query";
+import { Button } from "../../ui/Button.js";
+import { Card } from "../../ui/Card.js";
+import { EyeIcon, EyeOffIcon, RotateCwIcon, TrashIcon } from "lucide-react";
+import { Link } from "react-router-dom";
+import { useState } from "react";
 
 export const SettingsApiKeys = ({
   options,
+  service,
 }: {
   options: ApiKeyPluginOptions;
+  service: ApiKeyService;
 }) => {
-  const keys = useApiIdentities();
+  const context = useDevPortal();
+  const queryClient = useQueryClient();
+  const { data } = useSuspenseQuery({
+    queryFn: () => service.getKeys(context),
+    queryKey: ["api-keys"],
+  });
+
+  const deleteKeyMutation = useMutation({
+    mutationFn: (id: string) => {
+      if (!service.deleteKey) {
+        throw new Error("deleteKey not implemented");
+      }
+
+      return service.deleteKey(id, context);
+    },
+    onSuccess: () => {
+      void queryClient.invalidateQueries({ queryKey: ["api-keys"] });
+    },
+  });
+
+  return (
+    <div className="max-w-screen-lg pt-[--padding-content-top] pb-[--padding-content-bottom]">
+      <div className="flex justify-between mb-4 border-b border-border pb-1">
+        <h1 className="font-medium text-2xl">API Keys</h1>
+        {service.createKey && (
+          <Button asChild>
+            <Link to="/settings/api-keys/new">Create API Key</Link>
+          </Button>
+        )}
+      </div>
+
+      <Card>
+        <ul className="grid grid-cols-[min-content_1fr_min-content] ">
+          {data?.map((key) => (
+            <li
+              className="border-b border-border p-5 grid grid-cols-subgrid col-span-full gap-2 items-center"
+              key={key.id}
+            >
+              <div className="flex flex-col gap-1 text-sm">
+                {key.description ?? key.id}
+                {key.expiresOn ? (
+                  <div>Expires on {key.expiresOn}</div>
+                ) : (
+                  key.createdOn && (
+                    <div className="text-gray-500">
+                      Created on {new Date(key.createdOn).toLocaleDateString()}
+                    </div>
+                  )
+                )}
+              </div>
+              <div className="items-center flex justify-center">
+                <RevealApiKey apiKey={key.key} />
+              </div>
+              <div className="flex gap-2">
+                {service.rollKey && (
+                  <Button size="icon">
+                    <RotateCwIcon size={16} />
+                  </Button>
+                )}
+                {service.deleteKey && (
+                  <Button
+                    variant="destructive"
+                    size="icon"
+                    onClick={() => deleteKeyMutation.mutate(key.id)}
+                    disabled={deleteKeyMutation.isPending}
+                  >
+                    <TrashIcon size={16} />
+                  </Button>
+                )}
+              </div>
+            </li>
+          ))}
+        </ul>
+      </Card>
+    </div>
+  );
+};
+
+const RevealApiKey = ({ apiKey }: { apiKey: string }) => {
+  const [revealed, setRevealed] = useState(false);
 
   return (
-    <div className="prose dark:prose-invert">
-      <h1>Who's who</h1>
-      <button className="border">Create API Key</button>
-      <ul>
-        {keys.data.map((key) => (
-          <li>{key.name}</li>
-        ))}
-      </ul>
+    <div className="flex gap-2 items-center text-sm">
+      <code className="border border-border rounded bg-gray-100 dark:bg-gray-950 p-1 font-mono">
+        {revealed ? apiKey : "•".repeat(apiKey.length)}
+      </code>
+      <Button
+        variant="outline"
+        onClick={() => setRevealed((prev) => !prev)}
+        size="icon"
+      >
+        {revealed ? <EyeOffIcon size={16} /> : <EyeIcon size={16} />}
+      </Button>
     </div>
   );
 };

package/src/lib/plugins/api-key/index.tsx

@@ -1,55 +1,34 @@
-import { DevPortalSystemPaths } from "../../components/DevPortal.js";
 import { DevPortalContext } from "../../core/DevPortalContext.js";
 import {
   type ApiIdentityPlugin,
   type DevPortalPlugin,
 } from "../../core/plugins.js";
 import { SettingsApiKeys } from "./SettingsApiKeys.js";
+import { CreateApiKey } from "./CreateApiKeys.js";
 
-export type GetConsumerOptions =
-  | {
-      getConsumers: (context: DevPortalContext) => Promise<ConsumerData | void>;
-    }
-  | { consumerEndpoint: string };
+export type ApiKeyResults = Promise<ApiKey[]>;
+const DEFAULT_API_KEY_ENDPOINT =
+  "https://zudoku-rewiringamerica-main-ef9c9c0.d2.zuplo.dev";
 
-export type ApiKeyPluginOptions = {
-  rollKey?: (
-    id: string,
-    consumerName: string,
+export type ApiKeyService = {
+  getKeys: (context: DevPortalContext) => ApiKeyResults;
+  rollKey?: (id: string, context: DevPortalContext) => Promise<void>;
+  deleteKey?: (id: string, context: DevPortalContext) => Promise<void>;
+  updateKeyDescription?: (
+    apiKey: { jd: string; description: string },
     context: DevPortalContext,
   ) => Promise<void>;
-  deleteKey?: (
-    id: string,
-    consumerName: string,
+  createKey?: (
+    apiKey: { description: string; expiresAt?: string },
     context: DevPortalContext,
   ) => Promise<void>;
-  updateConsumerDescription?: (
-    consumerName: string,
-    description: string,
-    context: DevPortalContext,
-  ) => Promise<void>;
-  createConsumer?: (
-    description: string,
-    context: DevPortalContext,
-  ) => Promise<void>;
-  deleteConsumer?: (
-    consumerName: string,
-    context: DevPortalContext,
-  ) => Promise<void>;
-} & GetConsumerOptions;
+};
 
-export interface ConsumerData {
-  consumers: Consumer[];
-}
+export type GetApiKeysOptions = ApiKeyService | { endpoint: string } | {};
 
-export interface Consumer {
-  name: string;
-  createdOn?: string;
-  description?: string;
-  apiKeys: ConsumerApiKey[];
-}
+export type ApiKeyPluginOptions = {} & GetApiKeysOptions;
 
-export interface ConsumerApiKey {
+export interface ApiKey {
   id: string;
   description?: string;
   createdOn?: string;
@@ -58,45 +37,67 @@ export interface ConsumerApiKey {
   key: string;
 }
 
-const defaultGetConsumers = async (context: DevPortalContext) => {
-  const accessToken = await context.authentication?.getToken?.(context);
+const createDefaultHandler = (endpoint: string): ApiKeyService => {
+  return {
+    deleteKey: async (id, context) => {
+      const accessToken = await context.authentication?.getToken?.(context);
 
-  if (!accessToken) {
-    throw new Error("No token found");
-  }
+      if (!accessToken) {
+        throw new Error("Not authenticated");
+      }
 
-  const consumers = await fetch(
-    "https://zudoku-customer-main-b36fa2f.d2.zuplo.dev/v1/developer/api-keys",
-    {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-      },
+      await fetch(endpoint + `/v1/developer/api-keys/${id}`, {
+        method: "DELETE",
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+        },
+      });
     },
-  );
+    createKey: async (apiKey, context) => {
+      const accessToken = await context.authentication?.getToken?.(context);
 
-  return { consumers: [await consumers.json()] };
-};
+      if (!accessToken) {
+        throw new Error("Not authenticated");
+      }
 
-export const apiKeyPlugin = (
-  options: ApiKeyPluginOptions,
-): DevPortalPlugin & ApiIdentityPlugin => {
-  const getConsumers =
-    "getConsumers" in options ? options.getConsumers : defaultGetConsumers;
+      await fetch(endpoint + `/v1/developer/api-keys`, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(apiKey),
+      });
+    },
+    getKeys: async (context) => {
+      const accessToken = await context.authentication?.getToken?.(context);
 
-  return {
-    getNavigation: async (path: string) => {
-      if (path !== DevPortalSystemPaths.Settings) {
+      if (!accessToken) {
         return [];
       }
 
-      return [
-        {
-          path: "settings/api-keys",
-          label: "API Keys",
-          children: [],
+      const consumers = await fetch(endpoint + `/v1/developer/api-keys`, {
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
         },
-      ];
+      });
+
+      return await consumers.json();
     },
+  };
+};
+
+export const apiKeyPlugin = (
+  options: ApiKeyPluginOptions,
+): DevPortalPlugin & ApiIdentityPlugin => {
+  const service =
+    "getKeys" in options
+      ? options
+      : createDefaultHandler(
+          "endpoint" in options ? options.endpoint : DEFAULT_API_KEY_ENDPOINT,
+        );
+
+  return {
     getIdentities: async (context) => {
       return [];
       // throw new Error("Not implemented");
@@ -115,7 +116,11 @@ export const apiKeyPlugin = (
       return [
         {
           path: "/settings/api-keys",
-          element: <SettingsApiKeys options={options} />,
+          element: <SettingsApiKeys options={options} service={service} />,
+        },
+        {
+          path: "/settings/api-keys/new",
+          element: <CreateApiKey options={options} service={service} />,
         },
       ];
     },

package/src/lib/plugins/markdown/MdxPage.tsx

@@ -75,10 +75,10 @@ export const MdxPage = ({
       <div
         className={cn(
           ProseClasses,
-          "mx-auto max-w-full xl:w-full xl:max-w-prose flex-1 flex-shrink pt-[--padding-content-top] pb-[--padding-content-bottom]",
+          "max-w-full xl:w-full xl:max-w-prose flex-1 flex-shrink pt-[--padding-content-top] pb-[--padding-content-bottom]",
         )}
       >
-        <header className="-translate-y-1">
+        <header>
           {category && <CategoryHeading>{category}</CategoryHeading>}
           {title && (
             <Heading level={1} id={slugify(title, { lower: true })}>