TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 20:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename package errors to zerrors (#7039)

Browse Source 
* chore: rename package errors to zerrors

* rename package errors to gerrors

* fix error related linting issues

* fix zitadel error assertion

* fix gosimple linting issues

* fix deprecated linting issues

* resolve gci linting issues

* fix import structure

---------

Co-authored-by: Elio Bischof <elio@zitadel.com>
This commit is contained in:
Tim Möhlmann
2023-12-08 16:30:55 +02:00
committed by GitHub
parent ddbea119f1
commit f680dd934d
798 changed files with 5809 additions and 5813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
internal/command/user_human_refresh_token_test.go
View File

@@ -12,12 +12,12 @@ import (
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain"
caos_errs "github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
"github.com/zitadel/zitadel/internal/id"
id_mock "github.com/zitadel/zitadel/internal/id/mock"
"github.com/zitadel/zitadel/internal/repository/user"
"github.com/zitadel/zitadel/internal/zerrors"
)
func TestCommands_AddAccessAndRefreshToken(t *testing.T) {
@@ -59,7 +59,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) {
},
args: args{},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -84,7 +84,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) {
clientID: "clientID",
},
res: res{
err: caos_errs.IsNotFound,
err: zerrors.IsNotFound,
},
},
{
@@ -98,7 +98,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) {
refreshToken: "invalid",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -114,7 +114,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) {
refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID2:tokenID:token")),
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -152,7 +152,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) {
refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID:tokenID:token")),
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -185,7 +185,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) {
refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID:tokenID:tokenID")),
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
//fails because of timestamp equality
@@ -240,7 +240,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) {
// )),
// ),
// expectPushFailed(
// caos_errs.ThrowInternal(nil, "ERROR", "internal"),
// zerrors.ThrowInternal(nil, "ERROR", "internal"),
// []*repository.Event{
// eventFromEventPusher(user.NewUserTokenAddedEvent(
// context.Background(),
@@ -280,7 +280,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) {
// authTime: time.Now(),
// },
// res: res{
// err: caos_errs.IsInternal,
// err: zerrors.IsInternal,
// },
//},
}
@@ -334,7 +334,7 @@ func TestCommands_RevokeRefreshToken(t *testing.T) {
},
args{},
res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -351,7 +351,7 @@ func TestCommands_RevokeRefreshToken(t *testing.T) {
"tokenID",
},
res{
err: caos_errs.IsNotFound,
err: zerrors.IsNotFound,
},
},
{
@@ -374,7 +374,7 @@ func TestCommands_RevokeRefreshToken(t *testing.T) {
10*time.Hour,
)),
),
expectPushFailed(caos_errs.ThrowInternal(nil, "ERROR", "internal"),
expectPushFailed(zerrors.ThrowInternal(nil, "ERROR", "internal"),
user.NewHumanRefreshTokenRemovedEvent(
context.Background(),
&user.NewAggregate("userID", "orgID").Aggregate,
@@ -390,7 +390,7 @@ func TestCommands_RevokeRefreshToken(t *testing.T) {
"tokenID",
},
res{
err: caos_errs.IsInternal,
err: zerrors.IsInternal,
},
},
{
@@ -485,7 +485,7 @@ func TestCommands_RevokeRefreshTokens(t *testing.T) {
nil,
},
res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -518,7 +518,7 @@ func TestCommands_RevokeRefreshTokens(t *testing.T) {
[]string{"tokenID", "tokenID2"},
},
res{
err: caos_errs.IsNotFound,
err: zerrors.IsNotFound,
},
},
{
@@ -557,7 +557,7 @@ func TestCommands_RevokeRefreshTokens(t *testing.T) {
10*time.Hour,
)),
),
expectPushFailed(caos_errs.ThrowInternal(nil, "ERROR", "internal"),
expectPushFailed(zerrors.ThrowInternal(nil, "ERROR", "internal"),
user.NewHumanRefreshTokenRemovedEvent(
context.Background(),
&user.NewAggregate("userID", "orgID").Aggregate,
@@ -578,7 +578,7 @@ func TestCommands_RevokeRefreshTokens(t *testing.T) {
[]string{"tokenID", "tokenID2"},
},
res{
err: caos_errs.IsInternal,
err: zerrors.IsInternal,
},
},
{
@@ -670,7 +670,7 @@ func refreshTokenEncryptionAlgorithm(ctrl *gomock.Controller) crypto.EncryptionA
mCrypto.EXPECT().Decrypt(gomock.Any(), gomock.Any()).AnyTimes().DoAndReturn(
func(refrehToken []byte, keyID string) ([]byte, error) {
if keyID != "id" {
return nil, caos_errs.ThrowInternal(nil, "id", "invalid key id")
return nil, zerrors.ThrowInternal(nil, "id", "invalid key id")
}
return refrehToken, nil
},
@@ -805,7 +805,7 @@ func TestCommands_renewRefreshToken(t *testing.T) {
ctx: context.Background(),
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -819,7 +819,7 @@ func TestCommands_renewRefreshToken(t *testing.T) {
refreshToken: "invalid",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -835,7 +835,7 @@ func TestCommands_renewRefreshToken(t *testing.T) {
refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID2:tokenID:token")),
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -873,7 +873,7 @@ func TestCommands_renewRefreshToken(t *testing.T) {
refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID:tokenID:token")),
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -906,7 +906,7 @@ func TestCommands_renewRefreshToken(t *testing.T) {
refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID:tokenID:tokenID")),
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -946,7 +946,7 @@ func TestCommands_renewRefreshToken(t *testing.T) {
idleExpiration: 1 * time.Hour,
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{
@@ -987,7 +987,7 @@ func TestCommands_renewRefreshToken(t *testing.T) {
idleExpiration: 1 * time.Hour,
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zerrors.IsErrorInvalidArgument,
},
},
{