diff options
| author | Loïck Bonniot <git@lesterpig.com> | 2020-10-02 16:05:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 15:05:23 +0100 |
| commit | 439bc235d7855d7efe7aed864eef7c6ee9eef88c (patch) | |
| tree | c20906dd05259066228242d6b1158ee0d4116d24 /clientapi/auth | |
| parent | fb9a8f215b0af25c02d62c6f44ed91adc3349a6e (diff) | |
Add 'completed' field in Interactive Auth API (#1469)
This field must be present even after authentication failure, as
tested by sytest. This is needed by #1455.
Signed-off-by: Loïck Bonniot <git@lesterpig.com>
Diffstat (limited to 'clientapi/auth')
| -rw-r--r-- | clientapi/auth/user_interactive.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/clientapi/auth/user_interactive.go b/clientapi/auth/user_interactive.go index c67eba15..b7414ebe 100644 --- a/clientapi/auth/user_interactive.go +++ b/clientapi/auth/user_interactive.go @@ -103,7 +103,8 @@ type userInteractiveFlow struct { // the user already has a valid access token, but we want to double-check // that it isn't stolen by re-authenticating them. type UserInteractive struct { - Flows []userInteractiveFlow + Completed []string + Flows []userInteractiveFlow // Map of login type to implementation Types map[string]Type // Map of session ID to completed login types, will need to be extended in future @@ -117,6 +118,7 @@ func NewUserInteractive(getAccByPass GetAccountByPassword, cfg *config.ClientAPI } // TODO: Add SSO login return &UserInteractive{ + Completed: []string{}, Flows: []userInteractiveFlow{ { Stages: []string{typePassword.Name()}, @@ -140,6 +142,7 @@ func (u *UserInteractive) IsSingleStageFlow(authType string) bool { func (u *UserInteractive) AddCompletedStage(sessionID, authType string) { // TODO: Handle multi-stage flows + u.Completed = append(u.Completed, authType) delete(u.Sessions, sessionID) } @@ -148,11 +151,13 @@ func (u *UserInteractive) Challenge(sessionID string) *util.JSONResponse { return &util.JSONResponse{ Code: 401, JSON: struct { - Flows []userInteractiveFlow `json:"flows"` - Session string `json:"session"` + Completed []string `json:"completed"` + Flows []userInteractiveFlow `json:"flows"` + Session string `json:"session"` // TODO: Return any additional `params` Params map[string]interface{} `json:"params"` }{ + u.Completed, u.Flows, sessionID, make(map[string]interface{}), |