fix: improve login UX in dashboard - reload tray status, prevent cancel errors, and clarify login option naming (#931)

* retry tray. delete cancelpkce

* rename

* keep same

Author: evanliu048

crates/fig_desktop_api/src/handler.rs

@@ -258,7 +258,11 @@ where
                 AuthBuilderIdStartDeviceAuthorizationRequest(request) => {
                     auth::builder_id_start_device_authorization(request, &ctx).await
                 },
-                AuthStartUnifiedPortalRequest(request) => auth::start_unified_portal(request).await,
+                AuthStartUnifiedPortalRequest(request) => {
+                    let result = auth::start_unified_portal(request).await;
+                    event_handler.user_logged_in_callback(ctx).await;
+                    result
+                },
                 AuthBuilderIdPollCreateTokenRequest(request) => auth::builder_id_poll_create_token(request, &ctx).await,
                 // codewhisperer api
                 CodewhispererListCustomizationRequest(request) => codewhisperer::list_customization(request).await,

crates/q_cli/src/cli/user.rs

@@ -131,10 +131,10 @@ enum AuthMethod {
 impl Display for AuthMethod {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            AuthMethod::BuilderId => write!(f, "Use for Free with Builder ID"),
+            AuthMethod::BuilderId => write!(f, "Use with Builder ID"),
             AuthMethod::Social(SocialProvider::Google) => write!(f, "Use with Google"),
             AuthMethod::Social(SocialProvider::Github) => write!(f, "Use with GitHub"),
-            AuthMethod::IdentityCenter => write!(f, "Use with Pro license"),
+            AuthMethod::IdentityCenter => write!(f, "Use with IDC Account"),
         }
     }
 }

packages/dashboard-app/src/components/installs/modal/login/index.tsx

@@ -72,6 +72,8 @@ export default function LoginModal({ next }: { next: () => void }) {
       setError(null);
       setLoginState("loading");
       const res = await Auth.startUnifiedPortal({});
+      setPkceTimedOut(false);
+      setAuthRequestId(undefined);
 
       // Handle social login (Google/GitHub)
       if (res.kind === "social") {
@@ -90,9 +92,6 @@ export default function LoginModal({ next }: { next: () => void }) {
 
       if (isSsoKind && res.issuerUrl && res.idcRegion) {
         // Start PKCE auth
-        setPkceTimedOut(false);
-        setAuthRequestId(undefined);
-
         const init = await Auth.startPkceAuthorization({
           issuerUrl: res.issuerUrl,
           region: res.idcRegion,
@@ -295,7 +294,6 @@ export default function LoginModal({ next }: { next: () => void }) {
                   setLoginMethod("deviceCode");
                   setLoginState("not started");
                   setError(null);
-                  Auth.cancelPkceAuthorization().catch(console.error);
                 }}
               >
                 Login with Device Code
@@ -322,7 +320,6 @@ export default function LoginModal({ next }: { next: () => void }) {
                       setLoginMethod("deviceCode");
                       setLoginState("not started");
                       setError(null);
-                      Auth.cancelPkceAuthorization().catch(console.error);
                     }}
                   >
                     Try authenticating with device code
@@ -336,6 +333,7 @@ export default function LoginModal({ next }: { next: () => void }) {
                 onClick={() => {
                   setLoginState("not started");
                   setError(null);
+                  setAuthRequestId(undefined);
                   Auth.cancelPkceAuthorization().catch(console.error);
                 }}
               >
@@ -357,7 +355,13 @@ export default function LoginModal({ next }: { next: () => void }) {
                     ? () => setTab("iam")
                     : () => setTab("builderId")
                 }
-                signInText={completedOnboarding ? "Log back in" : "Sign in"}
+                signInText={
+                  completedOnboarding
+                    ? tab === "builderId"
+                      ? "Login with Builder ID"
+                      : "Login with IDC"
+                    : "Sign in"
+                }
               />
               <Button
                 variant="ghost"
@@ -563,7 +567,13 @@ export default function LoginModal({ next }: { next: () => void }) {
                 ? () => setTab("iam")
                 : () => setTab("builderId")
             }
-            signInText={completedOnboarding ? "Log back in" : "Sign in"}
+            signInText={
+              completedOnboarding
+                ? tab === "builderId"
+                  ? "Login with Builder ID"
+                  : "Login with IDC"
+                : "Sign in"
+            }
           />
         )}
       </div>

packages/dashboard-app/src/components/installs/modal/login/tabs.tsx

@@ -39,7 +39,7 @@ function BuilderIdTab({
         variant={"ghost"}
         onClick={toggleTab}
       >
-        <span className="text-xs">Use with Pro license</span>
+        <span className="text-xs">Use with IDC Account</span>
       </Button>
     </div>
   );
@@ -232,7 +232,7 @@ function IamTab({
           variant={"ghost"}
           onClick={toggleTab}
         >
-          <span className="text-xs">Use for Free with Builder ID</span>
+          <span className="text-xs">Use with Builder ID</span>
         </Button>
       </div>
     </div>