From b3576a29f03e8e18341495da402d2846820fffa7 Mon Sep 17 00:00:00 2001
From: TheCactusBlue <thecactusblue@gmail.com>
Date: Wed, 9 Apr 2025 09:33:37 -0700
Subject: [PATCH] make maxAttempts configurable

---
 packages/template/package.json                |  3 ++-
 .../apps/implementations/client-app-impl.ts   | 26 +++++++++----------
 pnpm-lock.yaml                                |  3 +++
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/packages/template/package.json b/packages/template/package.json
index dd7c573ea..1a00f79b2 100644
--- a/packages/template/package.json
+++ b/packages/template/package.json
@@ -45,6 +45,7 @@
   ],
   "dependencies": {
     "@hookform/resolvers": "^3.3.4",
+    "@oslojs/otp": "^1.1.0",
     "@simplewebauthn/browser": "^11.0.0",
     "@stackframe/stack-sc": "workspace:*",
     "@stackframe/stack-shared": "workspace:*",
@@ -57,7 +58,7 @@
     "js-cookie": "^3.0.5",
     "lucide-react": "^0.378.0",
     "oauth4webapi": "^2.10.3",
-    "@oslojs/otp": "^1.1.0",
+    "open": "^10.1.0",
     "qrcode": "^1.5.4",
     "react-avatar-editor": "^13.0.2",
     "react-hook-form": "^7.51.4",
diff --git a/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts b/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts
index b34f016c7..08a4561ab 100644
--- a/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts
+++ b/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts
@@ -1592,7 +1592,7 @@ export class _StackClientAppImplIncomplete<HasTokenStore extends boolean, Projec
    * @param options.expiresInMillis Optional duration in milliseconds before the auth attempt expires (default: 2 hours)
    * @returns Result containing either the refresh token or an error
    */
-  async promptCliLogin(options: { appUrl: string, expiresInMillis?: number }): Promise<Result<string, KnownErrors["CliAuthError"] | KnownErrors["CliAuthExpiredError"] | KnownErrors["CliAuthUsedError"]>> {
+  async promptCliLogin(options: { appUrl: string, expiresInMillis?: number, maxAttempts?: number, waitTimeMillis?: number }): Promise<Result<string, KnownErrors["CliAuthError"] | KnownErrors["CliAuthExpiredError"] | KnownErrors["CliAuthUsedError"]>> {
     // Step 1: Initiate the CLI auth process
     const response = await this._interface.sendClientRequest(
       "/auth/cli",
@@ -1627,9 +1627,7 @@ export class _StackClientAppImplIncomplete<HasTokenStore extends boolean, Projec
 
     // Step 3: Poll for the token
     let attempts = 0;
-    const maxAttempts = 300; // 10 minutes with 2-second intervals
-
-    while (attempts < maxAttempts) {
+    while (attempts < (options.maxAttempts ?? Infinity)) {
       attempts++;
       const pollResponse = await this._interface.sendClientRequest("/auth/cli/poll", {
         method: "POST",
@@ -1645,16 +1643,18 @@ export class _StackClientAppImplIncomplete<HasTokenStore extends boolean, Projec
 
       if (pollResponse.status === 201 && pollResult.status === "success") {
         return Result.ok(pollResult.refresh_token);
-      } else if (pollResult.status === "waiting") {
-        // Wait for 2 seconds before polling again
-        await wait(2000);
-      } else if (pollResult.status === "expired") {
-        return Result.error(new KnownErrors.CliAuthExpiredError("CLI authentication request expired. Please try again."));
-      } else if (pollResult.status === "used") {
-        return Result.error(new KnownErrors.CliAuthUsedError("This authentication token has already been used."));
-      } else {
-        return Result.error(new KnownErrors.CliAuthError(`Unexpected status from CLI auth polling: ${pollResult.status}`));
       }
+      if (pollResult.status === "waiting") {
+        await wait(options.waitTimeMillis ?? 2000);
+        continue;
+      }
+      if (pollResult.status === "expired") {
+        return Result.error(new KnownErrors.CliAuthExpiredError("CLI authentication request expired. Please try again."));
+      }
+      if (pollResult.status === "used") {
+        return Result.error(new KnownErrors.CliAuthUsedError("This authentication token has already been used."));
+      }
+      return Result.error(new KnownErrors.CliAuthError(`Unexpected status from CLI auth polling: ${pollResult.status}`));
     }
 
     return Result.error(new KnownErrors.CliAuthError("Timed out waiting for CLI authentication."));
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a144c0535..0a060f08e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1551,6 +1551,9 @@ importers:
       oauth4webapi:
         specifier: ^2.10.3
         version: 2.10.4
+      open:
+        specifier: ^10.1.0
+        version: 10.1.0
       qrcode:
         specifier: ^1.5.4
         version: 1.5.4