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
3 changes: 2 additions & 1 deletion internal/cmd/auth/get-access-token/get_access_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ func NewCmd(params *params.CmdParams) *cobra.Command {

accessToken, err := auth.GetValidAccessToken(params.Printer)
if err != nil {
return err
params.Printer.Debug(print.ErrorLevel, "get valid access token: %v", err)
return &cliErr.SessionExpiredError{}
}

switch model.OutputFormat {
Expand Down
13 changes: 3 additions & 10 deletions internal/cmd/curl/curl.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,10 @@ func getBearerToken(p *print.Printer) (string, error) {
return "", &errors.SessionExpiredError{}
}

accessToken, err := auth.GetAccessToken()
accessToken, err := auth.GetValidAccessToken(p)
if err != nil {
return "", err
}

accessTokenExpired, err := auth.TokenExpired(accessToken)
if err != nil {
return "", err
}
if accessTokenExpired {
return "", &errors.AccessTokenExpiredError{}
p.Debug(print.ErrorLevel, "get valid access token: %v", err)
return "", &errors.SessionExpiredError{}
}

return accessToken, nil
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func GetValidAccessToken(p *print.Printer) (string, error) {
// Refresh the tokens
err = refreshTokens(utf)
if err != nil {
return "", fmt.Errorf("refresh access token: %w", err)
return "", fmt.Errorf("access token and refresh token expired: %w", err)
}

// Return the new access token
Expand Down
Loading