Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion login_auto.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const (

idUnknownBrowser = `#enter_code_app_root`
idDigitN = `[aria-label="digit %d of 6"]`
idCodeError = `[data-qa="2fa_code_error_alert"]`

debugDelay = 1 * time.Second
)
Expand Down Expand Up @@ -235,7 +236,13 @@ func (c *Client) doAutoLogin(ctx context.Context, page *rod.Page, email, passwor
if err := enterCode(wrapped, code); err != nil {
return ErrBrowser{Err: err, FailedTo: "enter challenge code"}
}
return nil
_, err = page.Race().
Element(idRedirect).Handle(click).
Element(idCodeError).Handle(
func(e *rod.Element) error {
return ErrInvalidChallengeCode
}).Do()
return err
}).Element(idRedirect).Handle(click) // success
if _, err := rctx.Do(); err != nil {
return ErrBrowser{Err: err, FailedTo: "wait for login to complete"}
Expand Down
2 changes: 2 additions & 0 deletions slackauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ var (
ErrLoginError = errors.New("slack reported an error during login")
// ErrWorkspaceNotFound indicates that the workspace name was invalid.
ErrWorkspaceNotFound = errors.New("workspace not found")
// ErrInvalidChallengeCode indicates that the challenge code was invalid.
ErrInvalidChallengeCode = errors.New("invalid challenge code")
)

// ErrBadWorkspace is returned when the workspace name is invalid.
Expand Down
Loading