Fix CLI device approve origin

Author: Rieranthony

README.md

@@ -2,10 +2,24 @@
 
 Bun + Turborepo monorepo.
 
+Landing page: [claws.supply](https://claws.supply)
+
 ## Workspace Layout
 
 - `apps/web`: Next.js App Router application (`@claws-supply/web`)
-- `packages/cli`: claws.supply creator CLI (`@claws-supply/cli`)
+- `packages/cli`: claws.supply creator CLI (`claws-supply`)
+
+## CLI Usage
+
+Run without installing globally:
+
+```bash
+npx claws-supply auth
+npx claws-supply build
+npx claws-supply publish
+```
+
+`build` uses your current folder by default. Use `--source <path>` only when the target project is in a different folder.
 
 ## Requirements
 

apps/web/app/api/cli/v1/auth/device/approve/route.ts

@@ -1,8 +1,12 @@
 import { jsonError, jsonSuccess } from "@/lib/api/response";
 import { enforceCliDeviceDecisionRateLimit } from "@/lib/api/rate-limit";
-import { handleRouteError, requireSessionOrThrow } from "@/lib/api/route-helpers";
+import { requireSessionOrThrow } from "@/lib/api/route-helpers";
 import { parseJsonBodyWithSchema } from "@/lib/api/validation";
-import { postToDeviceAuthEndpoint, parseDeviceAuthError } from "@/lib/cli/device-auth";
+import { auth } from "@/lib/auth-server";
+import {
+  parseDeviceAuthApiError,
+  resolveDeviceAuthApiErrorStatus,
+} from "@/lib/cli/device-auth";
 import { cliDeviceDecisionSchema } from "@/lib/cli/schemas";
 
 export async function POST(request: Request) {
@@ -17,30 +21,18 @@ export async function POST(request: Request) {
     }
 
     const input = await parseJsonBodyWithSchema(request, cliDeviceDecisionSchema);
-    const response = await postToDeviceAuthEndpoint({
-      request,
-      path: "/device/approve",
+    const response = await auth.api.deviceApprove({
+      headers: request.headers,
       body: {
         userCode: input.userCode,
       },
     });
 
-    if (response.status >= 400) {
-      return jsonError(
-        parseDeviceAuthError(response.payload, "Unable to approve device code."),
-        {
-          code: "CLI_DEVICE_AUTH_APPROVE_ERROR",
-          status: response.status,
-        },
-      );
-    }
-
-    return jsonSuccess(response.payload);
+    return jsonSuccess(response);
   } catch (error) {
-    return handleRouteError(error, {
-      message: "Unable to approve device code.",
+    return jsonError(parseDeviceAuthApiError(error, "Unable to approve device code."), {
       code: "CLI_DEVICE_AUTH_APPROVE_ERROR",
-      status: 400,
+      status: resolveDeviceAuthApiErrorStatus(error, 400),
     });
   }
 }

apps/web/app/api/cli/v1/auth/device/deny/route.ts

@@ -1,8 +1,12 @@
 import { jsonError, jsonSuccess } from "@/lib/api/response";
 import { enforceCliDeviceDecisionRateLimit } from "@/lib/api/rate-limit";
-import { handleRouteError, requireSessionOrThrow } from "@/lib/api/route-helpers";
+import { requireSessionOrThrow } from "@/lib/api/route-helpers";
 import { parseJsonBodyWithSchema } from "@/lib/api/validation";
-import { postToDeviceAuthEndpoint, parseDeviceAuthError } from "@/lib/cli/device-auth";
+import { auth } from "@/lib/auth-server";
+import {
+  parseDeviceAuthApiError,
+  resolveDeviceAuthApiErrorStatus,
+} from "@/lib/cli/device-auth";
 import { cliDeviceDecisionSchema } from "@/lib/cli/schemas";
 
 export async function POST(request: Request) {
@@ -17,27 +21,18 @@ export async function POST(request: Request) {
     }
 
     const input = await parseJsonBodyWithSchema(request, cliDeviceDecisionSchema);
-    const response = await postToDeviceAuthEndpoint({
-      request,
-      path: "/device/deny",
+    const response = await auth.api.deviceDeny({
+      headers: request.headers,
       body: {
         userCode: input.userCode,
       },
     });
 
-    if (response.status >= 400) {
-      return jsonError(parseDeviceAuthError(response.payload, "Unable to deny device code."), {
-        code: "CLI_DEVICE_AUTH_DENY_ERROR",
-        status: response.status,
-      });
-    }
-
-    return jsonSuccess(response.payload);
+    return jsonSuccess(response);
   } catch (error) {
-    return handleRouteError(error, {
-      message: "Unable to deny device code.",
+    return jsonError(parseDeviceAuthApiError(error, "Unable to deny device code."), {
       code: "CLI_DEVICE_AUTH_DENY_ERROR",
-      status: 400,
+      status: resolveDeviceAuthApiErrorStatus(error, 400),
     });
   }
 }

apps/web/components/docs/docs-right-sidebar.tsx

@@ -1,4 +1,4 @@
-import { SidebarAdStack } from "@/components/ads/sidebar-ad-stack";
+// import { SidebarAdStack } from "@/components/ads/sidebar-ad-stack";
 import { Button } from "@/components/ui/button";
 import Link from "next/link";
 
@@ -50,7 +50,8 @@ export async function DocsRightSidebar() {
           </div>
         </section>
 
-        <SidebarAdStack />
+        {/* Temporarily hidden until ad release is ready. */}
+        {/* <SidebarAdStack /> */}
       </div>
     </div>
   );

apps/web/components/docs/docs-section-menu.tsx

@@ -37,15 +37,15 @@ export function DocsSectionMenu() {
               created by anthony riera{" "}
               <Link
                 className="underline underline-offset-2"
-                href="https://x.com/_anthonyriera"
+                href="https://x.com/anthonyriera"
                 rel="noreferrer"
                 target="_blank"
               >
-                @_anthonyriera on X
+                @anthonyriera on X
               </Link>
             </p>
             <p>
-              team:{" "}
+              and{" "}
               <Link
                 className="underline underline-offset-2"
                 href="https://cossistant.com"

apps/web/components/extra-sidebar.tsx

@@ -1,10 +1,10 @@
 import Link from "next/link";
 import { MemberAvatar } from "@/components/members/member-avatar";
-import { SidebarAdStack } from "@/components/ads/sidebar-ad-stack";
+// import { SidebarAdStack } from "@/components/ads/sidebar-ad-stack";
 import { getCommunitySidebarSnapshotCached } from "@/lib/members/read-service";
 import { memberPath } from "@/lib/routes";
 
-const SIDEBAR_SLOT_COUNT = 5;
+// const SIDEBAR_SLOT_COUNT = 5;
 const COMMUNITY_MEMBER_LIMIT = 10;
 
 export async function ExtraSidebar() {
@@ -37,7 +37,8 @@ export async function ExtraSidebar() {
           ))}
         </div>
       </section>
-      <SidebarAdStack slotCount={SIDEBAR_SLOT_COUNT} />
+      {/* Temporarily hidden until ad release is ready. */}
+      {/* <SidebarAdStack slotCount={SIDEBAR_SLOT_COUNT} /> */}
     </div>
   );
 }

apps/web/components/navbar.tsx

@@ -79,12 +79,14 @@ export function Navbar({ user }: NavbarProps) {
             >
               MEMBERS
             </Link>
+            {/* Temporarily hidden until ad release is ready.
             <Link
               className="text-xs tracking-wider hover:opacity-80 transition-opacity"
               href="/advertise"
             >
               ADVERTISE
             </Link>
+            */}
             <Link
               className="text-xs tracking-wider hover:opacity-80 transition-opacity"
               href="/docs"

apps/web/lib/cli/device-auth.ts

@@ -5,6 +5,19 @@ type DeviceAuthPostResult = {
   payload: unknown;
 };
 
+type DeviceAuthErrorPayload = {
+  error?: unknown;
+  error_description?: unknown;
+  message?: unknown;
+};
+
+type DeviceAuthApiError = {
+  body?: unknown;
+  message?: unknown;
+  status?: unknown;
+  statusCode?: unknown;
+};
+
 export async function postToDeviceAuthEndpoint(options: {
   request: Request;
   path: "/device/code" | "/device/token" | "/device/approve" | "/device/deny";
@@ -48,11 +61,7 @@ export function parseDeviceAuthError(payload: unknown, fallbackMessage: string):
     return fallbackMessage;
   }
 
-  const body = payload as {
-    error?: unknown;
-    error_description?: unknown;
-    message?: unknown;
-  };
+  const body = payload as DeviceAuthErrorPayload;
 
   if (typeof body.error_description === "string" && body.error_description.length > 0) {
     return body.error_description;
@@ -68,3 +77,42 @@ export function parseDeviceAuthError(payload: unknown, fallbackMessage: string):
 
   return fallbackMessage;
 }
+
+export function parseDeviceAuthApiError(error: unknown, fallbackMessage: string): string {
+  if (!error || typeof error !== "object") {
+    return fallbackMessage;
+  }
+
+  const candidate = error as DeviceAuthApiError;
+  const messageFromBody = parseDeviceAuthError(candidate.body, "");
+  if (messageFromBody.length > 0) {
+    return messageFromBody;
+  }
+
+  if (typeof candidate.message === "string" && candidate.message.trim().length > 0) {
+    return candidate.message;
+  }
+
+  return fallbackMessage;
+}
+
+export function resolveDeviceAuthApiErrorStatus(
+  error: unknown,
+  fallbackStatus: number,
+): number {
+  if (!error || typeof error !== "object") {
+    return fallbackStatus;
+  }
+
+  const candidate = error as DeviceAuthApiError;
+
+  if (typeof candidate.statusCode === "number" && Number.isFinite(candidate.statusCode)) {
+    return candidate.statusCode;
+  }
+
+  if (typeof candidate.status === "number" && Number.isFinite(candidate.status)) {
+    return candidate.status;
+  }
+
+  return fallbackStatus;
+}