Skip to content

Commit 26e4b5a

Browse files
Replace auth error with custom error
1 parent 8d7da16 commit 26e4b5a

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

internal/pkg/auth/user_token_flow.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"github.com/golang-jwt/jwt/v5"
1212
"github.com/spf13/cobra"
13+
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1314
"github.com/stackitcloud/stackit-sdk-go/core/clients"
1415
)
1516

@@ -37,19 +38,19 @@ func UserTokenFlow(cmd *cobra.Command) *userTokenFlow {
3738
func (utf *userTokenFlow) RoundTrip(req *http.Request) (*http.Response, error) {
3839
err := loadVarsFromStorage(utf)
3940
if err != nil {
40-
return nil, err
41+
return nil, &errors.AuthError{}
4142
}
4243
if utf.authFlow != AUTH_FLOW_USER_TOKEN {
43-
return nil, fmt.Errorf("auth flow is not user token")
44+
return nil, &errors.AuthError{}
4445
}
4546

4647
accessTokenValid := false
4748
if accessTokenExpired, err := tokenExpired(utf.accessToken); err != nil {
48-
return nil, fmt.Errorf("check if access token has expired: %w", err)
49+
return nil, &errors.AuthError{}
4950
} else if !accessTokenExpired {
5051
accessTokenValid = true
5152
} else if refreshTokenExpired, err := tokenExpired(utf.refreshToken); err != nil {
52-
return nil, fmt.Errorf("check if refresh token has expired: %w", err)
53+
return nil, &errors.AuthError{}
5354
} else if !refreshTokenExpired {
5455
err = refreshTokens(utf)
5556
if err == nil {
@@ -61,7 +62,7 @@ func (utf *userTokenFlow) RoundTrip(req *http.Request) (*http.Response, error) {
6162
utf.cmd.Println("Session expired, logging in again...")
6263
err = reauthenticateUser(utf)
6364
if err != nil {
64-
return nil, fmt.Errorf("reauthenticate user: %w", err)
65+
return nil, &errors.AuthError{}
6566
}
6667
}
6768

0 commit comments

Comments
 (0)