diff options
Diffstat (limited to 'backend/auth/fortee')
| -rw-r--r-- | backend/auth/fortee/fortee.go | 18 | ||||
| -rw-r--r-- | backend/auth/fortee/generated.go | 6 |
2 files changed, 17 insertions, 7 deletions
diff --git a/backend/auth/fortee/fortee.go b/backend/auth/fortee/fortee.go index 7f9d816..25ca9c5 100644 --- a/backend/auth/fortee/fortee.go +++ b/backend/auth/fortee/fortee.go @@ -14,25 +14,29 @@ var ( ErrLoginFailed = errors.New("fortee login failed") ) -func LoginFortee(ctx context.Context, username string, password string) error { +func LoginFortee(ctx context.Context, username string, password string) (string, error) { client, err := NewClientWithResponses(apiEndpoint, WithRequestEditorFn(addAcceptHeader)) if err != nil { - return err + return "", err } res, err := client.PostLoginWithFormdataBodyWithResponse(ctx, PostLoginFormdataRequestBody{ Username: username, Password: password, }) if err != nil { - return err + return "", err } if res.StatusCode() != http.StatusOK { - return ErrLoginFailed + return "", ErrLoginFailed } - if !res.JSON200.LoggedIn { - return ErrLoginFailed + resOk := res.JSON200 + if !resOk.LoggedIn { + return "", ErrLoginFailed } - return nil + if resOk.User == nil { + return "", ErrLoginFailed + } + return resOk.User.Username, nil } // fortee API denies requests without Accept header. diff --git a/backend/auth/fortee/generated.go b/backend/auth/fortee/generated.go index e2fd920..53529f9 100644 --- a/backend/auth/fortee/generated.go +++ b/backend/auth/fortee/generated.go @@ -221,6 +221,9 @@ type PostLoginResponse struct { HTTPResponse *http.Response JSON200 *struct { LoggedIn bool `json:"loggedIn"` + User *struct { + Username string `json:"username"` + } `json:"user,omitempty"` } } @@ -274,6 +277,9 @@ func ParsePostLoginResponse(rsp *http.Response) (*PostLoginResponse, error) { case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200: var dest struct { LoggedIn bool `json:"loggedIn"` + User *struct { + Username string `json:"username"` + } `json:"user,omitempty"` } if err := json.Unmarshal(bodyBytes, &dest); err != nil { return nil, err |
