mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 14:27:30 +00:00
fix: minor change
This commit is contained in:
@@ -529,7 +529,6 @@ func browserCliLogin() (models.UserCredentials, error) {
|
|||||||
quit := make(chan bool)
|
quit := make(chan bool)
|
||||||
|
|
||||||
//
|
//
|
||||||
done := false
|
|
||||||
|
|
||||||
//create handler
|
//create handler
|
||||||
c := cors.New(cors.Options{
|
c := cors.New(cors.Options{
|
||||||
@@ -542,24 +541,21 @@ func browserCliLogin() (models.UserCredentials, error) {
|
|||||||
corsHandler := c.Handler(browserLoginHandler(success, failure))
|
corsHandler := c.Handler(browserLoginHandler(success, failure))
|
||||||
|
|
||||||
log.Debug().Msgf("Callback server listening on port %d", callbackPort)
|
log.Debug().Msgf("Callback server listening on port %d", callbackPort)
|
||||||
go quitBrowserLogin(quit, &done)
|
go quitBrowserLogin(quit)
|
||||||
go http.Serve(listener, corsHandler)
|
go http.Serve(listener, corsHandler)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case loginResponse := <-success:
|
case loginResponse := <-success:
|
||||||
err = closeListener(&listener)
|
err = closeListener(&listener)
|
||||||
done = true
|
|
||||||
return loginResponse, nil
|
return loginResponse, nil
|
||||||
|
|
||||||
case err = <-failure:
|
case err = <-failure:
|
||||||
err = closeListener(&listener)
|
err = closeListener(&listener)
|
||||||
done = true
|
|
||||||
return models.UserCredentials{}, err
|
return models.UserCredentials{}, err
|
||||||
|
|
||||||
case _ = <-timeout:
|
case _ = <-timeout:
|
||||||
err = closeListener(&listener)
|
err = closeListener(&listener)
|
||||||
done = true
|
|
||||||
return models.UserCredentials{}, errors.New("server timeout")
|
return models.UserCredentials{}, errors.New("server timeout")
|
||||||
|
|
||||||
case _ = <-quit:
|
case _ = <-quit:
|
||||||
@@ -571,7 +567,7 @@ func browserCliLogin() (models.UserCredentials, error) {
|
|||||||
|
|
||||||
// listens to 'q' input on terminal and
|
// listens to 'q' input on terminal and
|
||||||
// sends 'true' to 'quit' channel
|
// sends 'true' to 'quit' channel
|
||||||
func quitBrowserLogin(quit chan bool, done *bool) {
|
func quitBrowserLogin(quit chan bool) {
|
||||||
//
|
//
|
||||||
oldState, err := term.MakeRaw(int(os.Stdin.Fd()))
|
oldState, err := term.MakeRaw(int(os.Stdin.Fd()))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -586,10 +582,6 @@ func quitBrowserLogin(quit chan bool, done *bool) {
|
|||||||
quit <- true
|
quit <- true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if *done {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user