Add Login + 2FA #725
Add Login + 2FA #725
Conversation
| case l.Token != "": | ||
| auth = l.Token | ||
|
|
||
| case l.Email == "" && l.Password == "": |
There was a problem hiding this comment.
Should this comparison be a logical OR instead of AND? E.g., what happens if l.Email != nil, but l.Password == nil?
| case l.Email == "" && l.Password == "": | |
| case l.Email == "" || l.Password == "": |
| @@ -119,6 +120,20 @@ type Session struct { | |||
| wsMutex sync.Mutex | |||
| } | |||
|
|
|||
| type TOTP struct { | |||
There was a problem hiding this comment.
Exported structs should have leading comment for godoc documentation.
| Ticket string `json:"ticket"` | ||
| } | ||
|
|
||
| type LoginResponse struct { |
There was a problem hiding this comment.
Exported structs should have leading comment for godoc documentation.
| } | ||
| return | ||
| if err = s.LoginMFA(auth, pass, mfa); err != nil { | ||
| return nil, fmt.Errorf(ErrFailedToken.Error()+". %v", err) |
There was a problem hiding this comment.
This statement could be rewritten as:
| return nil, fmt.Errorf(ErrFailedToken.Error()+". %v", err) | |
| return nil, fmt.Errorf("%s: %s", ErrFailedToken, err) |
| // ErrFailedToken is returned if the Token is empty after authenticating. | ||
| var ErrFailedToken = errors.New("Unable to fetch discord authentication token") | ||
|
|
||
| type Login struct { |
There was a problem hiding this comment.
Exported structs should have leading comment for godoc documentation.
| @@ -222,6 +221,76 @@ func (s *Session) Login(email, password string) (err error) { | |||
| return | |||
| } | |||
|
|
|||
| // LoginMFA tries to log in with or without a 2FA code. Only email and password | |||
| // and required. | |||
There was a problem hiding this comment.
[Nit] Typo in function comment.
| // and required. | |
| // are required. |
|
|
||
| // TOTP finishes logging in by sending over the final 2FA code. | ||
| func (s *Session) TOTP(ticket, code string) (*LoginResponse, error) { | ||
| totp := TOTP{code, nil, nil, ticket} |
There was a problem hiding this comment.
[Nit] This could be rewritten with field names for clarity:
| totp := TOTP{code, nil, nil, ticket} | |
| totp := TOTP{ | |
| Code: code, | |
| GiftCodeSkuID: nil, | |
| LoginSource: nil, | |
| Ticket: ticket, | |
| } |
| // ErrFailedToken is returned if the Token is empty after authenticating. | ||
| var ErrFailedToken = errors.New("Unable to fetch discord authentication token") | ||
|
|
||
| type Login struct { |
There was a problem hiding this comment.
I like this new Login struct and that it takes care of a TODO 👍
| // LoginMFA tries to log in with or without a 2FA code. Only email and password | ||
| // and required. | ||
| func (s *Session) LoginMFA(email, password, mfa string) (err error) { | ||
| var login LoginResponse |
There was a problem hiding this comment.
[Nit] This variable could be renamed for clarity to avoid confusion when reading it later in the function with the new Login struct. E.g:
| var login LoginResponse | |
| var loginResponse LoginResponse |
| return nil, err | ||
| } | ||
|
|
||
| var login LoginResponse |
There was a problem hiding this comment.
[Nit] This variable could be renamed for clarity to avoid confusion when reading it later in the functiion with the new Login struct. E.g:
| var login LoginResponse | |
| var loginResponse LoginResponse |
New Login struct doesn't break existing bots. ErrMFA is kept.
Potentially fixes #649.