Skip to content
Merged
Changes from 1 commit
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
Next Next commit
Replace auth error with custom error
  • Loading branch information
vicentepinto98 committed Feb 8, 2024
commit 26e4b5a967f47bbe06e22fe0638685f2809ba1bb
11 changes: 6 additions & 5 deletions internal/pkg/auth/user_token_flow.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/golang-jwt/jwt/v5"
"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
"github.com/stackitcloud/stackit-sdk-go/core/clients"
)

Expand Down Expand Up @@ -37,19 +38,19 @@ func UserTokenFlow(cmd *cobra.Command) *userTokenFlow {
func (utf *userTokenFlow) RoundTrip(req *http.Request) (*http.Response, error) {
err := loadVarsFromStorage(utf)
if err != nil {
return nil, err
return nil, &errors.AuthError{}
}
if utf.authFlow != AUTH_FLOW_USER_TOKEN {
return nil, fmt.Errorf("auth flow is not user token")
return nil, &errors.AuthError{}
}

accessTokenValid := false
if accessTokenExpired, err := tokenExpired(utf.accessToken); err != nil {
return nil, fmt.Errorf("check if access token has expired: %w", err)
return nil, &errors.AuthError{}
} else if !accessTokenExpired {
accessTokenValid = true
} else if refreshTokenExpired, err := tokenExpired(utf.refreshToken); err != nil {
return nil, fmt.Errorf("check if refresh token has expired: %w", err)
return nil, &errors.AuthError{}
} else if !refreshTokenExpired {
err = refreshTokens(utf)
if err == nil {
Expand All @@ -61,7 +62,7 @@ func (utf *userTokenFlow) RoundTrip(req *http.Request) (*http.Response, error) {
utf.cmd.Println("Session expired, logging in again...")
err = reauthenticateUser(utf)
if err != nil {
return nil, fmt.Errorf("reauthenticate user: %w", err)
return nil, &errors.AuthError{}
}
}

Expand Down