Rename, better error handling

codetheweb · codetheweb · commit d3f9487b9ba5 · 2022-03-29T12:26:13.000-04:00
diff --git a/src/cli/lib/interactive-login/complete-interactive-login.ts b/src/cli/lib/interactive-login/complete-interactive-login.ts
@@ -19,7 +19,7 @@ const completeInteractiveLogin = async (
     spinner = ora.default("Logging in...")
   }
 
-  let submit_props: any
+  let submit_args: any
   while (true) {
     console.clear()
 
@@ -29,14 +29,18 @@ const completeInteractiveLogin = async (
         "/internal/connect_webviews/login/next",
         {
           connect_webview_id: connectWebviewId,
-          submit_props,
+          submit_args,
         }
       )
       spinner?.stop()
 
       const currentPane = data.pane
 
       if (currentPane.name === "finished_pane") {
+        if (currentPane.render_props.error_msg) {
+          throw new Error(currentPane.render_props.error_msg)
+        }
+
         break
       }
 
@@ -49,7 +53,7 @@ const completeInteractiveLogin = async (
         console.error(formatErrorMsg(currentPane.render_props.error_msg))
       }
 
-      submit_props = await handler.getInput(currentPane.render_props)
+      submit_args = await handler.getInput(currentPane.render_props)
     } catch (error) {
       if (spinner) {
         spinner.fail((error as Error).message)

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ const completeInteractiveLogin = async (`
`19`	`19`	`spinner = ora.default("Logging in...")`
`20`	`20`	`}`
`21`	`21`
`22`		`- let submit_props: any`
	`22`	`+ let submit_args: any`
`23`	`23`	`while (true) {`
`24`	`24`	`console.clear()`
`25`	`25`
`@@ -29,14 +29,18 @@ const completeInteractiveLogin = async (`
`29`	`29`	`"/internal/connect_webviews/login/next",`
`30`	`30`	`{`
`31`	`31`	`connect_webview_id: connectWebviewId,`
`32`		`- submit_props,`
	`32`	`+ submit_args,`
`33`	`33`	`}`
`34`	`34`	`)`
`35`	`35`	`spinner?.stop()`
`36`	`36`
`37`	`37`	`const currentPane = data.pane`
`38`	`38`
`39`	`39`	`if (currentPane.name === "finished_pane") {`
	`40`	`+ if (currentPane.render_props.error_msg) {`
	`41`	`+ throw new Error(currentPane.render_props.error_msg)`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`break`
`41`	`45`	`}`
`42`	`46`
`@@ -49,7 +53,7 @@ const completeInteractiveLogin = async (`
`49`	`53`	`console.error(formatErrorMsg(currentPane.render_props.error_msg))`
`50`	`54`	`}`
`51`	`55`
`52`		`- submit_props = await handler.getInput(currentPane.render_props)`
	`56`	`+ submit_args = await handler.getInput(currentPane.render_props)`
`53`	`57`	`} catch (error) {`
`54`	`58`	`if (spinner) {`
`55`	`59`	`spinner.fail((error as Error).message)`