fix: don't create org tokens in sandbox subcommand (#29)

Author: crowlKats

deno.json

@@ -17,7 +17,7 @@
   "imports": {
     "@cfa/gitignore-parser": "jsr:@cfa/gitignore-parser@^0.1.4",
     "@cliffy/command": "jsr:@cliffy/command@^1.0.0-rc.8",
-    "@deno/sandbox": "jsr:@deno/sandbox@^0.2.1",
+    "@deno/sandbox": "jsr:@deno/sandbox@^0.4.1",
     "@std/cli": "jsr:@std/cli@1.0.22",
     "@std/dotenv": "jsr:@std/dotenv@^0.225.5",
     "@std/encoding": "jsr:@std/encoding@^1.0.10",

deno.lock

@@ -4,7 +4,7 @@ import { green, magenta, red } from "@std/fmt/colors";
 
 import { getAppFromConfig, readConfig } from "./config.ts";
 import { renderTemporalTimestamp, withApp } from "./util.ts";
-import { createTrpcClient } from "./auth.ts";
+import { createTrpcClient, getAuth } from "./auth.ts";
 import type { GlobalOptions } from "./main.ts";
 
 type SandboxContext = GlobalOptions & {
@@ -15,18 +15,12 @@ export const sandboxNewCommand = new Command<SandboxContext>()
   .description("Create a new sandbox in an organization")
   .action(async (options) => {
     const org = await ensureOrg(options);
-    const client = createTrpcClient(options.debug, options.endpoint);
-
-    // deno-lint-ignore no-explicit-any
-    const token = await (client.orgs as any).accessTokens.create.mutate({
-      org,
-      description: "$$DENO_DEPLOY_CLI_SSH_TOKEN$$",
-      expiresAt: new Date(Date.now() + 1000 * 60 * 60).toISOString(), // 1 hour
-    });
+    const token = await getAuth(options.debug, options.endpoint);
 
     const sandbox = await Sandbox.create({
       debug: options.debug,
-      token: token.token,
+      token: token,
+      org,
     });
 
     const success = await sshIntoSandbox(sandbox);
@@ -147,23 +141,19 @@ export const sandboxSshCommand = new Command<SandboxContext>()
   .action(async (options, sandboxId) => {
     const org = await ensureOrg(options);
     const client = createTrpcClient(options.debug, options.endpoint);
-
-    const [cluster, token] = await Promise.all([
-      // deno-lint-ignore no-explicit-any
-      (client.sandboxes as any).findHostname.query({ org, sandboxId }),
-      // deno-lint-ignore no-explicit-any
-      (client.orgs as any).accessTokens.create.mutate({
-        org,
-        description: "$$DENO_DEPLOY_CLI_SSH_TOKEN$$",
-        expiresAt: new Date(Date.now() + 1000 * 60 * 60).toISOString(),
-      }),
-    ]);
+    const token = await getAuth(options.debug, options.endpoint);
+    // deno-lint-ignore no-explicit-any
+    const cluster = await (client.sandboxes as any).findHostname.query({
+      org,
+      sandboxId,
+    });
 
     await using sandbox = await Sandbox.connect({
       id: sandboxId,
       region: cluster.region,
       debug: options.debug,
-      token: token.token,
+      token: token,
+      org,
     });
     await sshIntoSandbox(sandbox);
   });