TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 19:17: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

10
internal/repository/user/human.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -128,7 +128,7 @@ func HumanAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
}
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-vGlhy", "unable to unmarshal human added")
return nil, zerrors.ThrowInternal(err, "USER-vGlhy", "unable to unmarshal human added")
}
return humanAdded, nil
@@ -233,7 +233,7 @@ func HumanRegisteredEventMapper(event eventstore.Event) (eventstore.Event, error
}
err := event.Unmarshal(humanRegistered)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-3Vm9s", "unable to unmarshal human registered")
return nil, zerrors.ThrowInternal(err, "USER-3Vm9s", "unable to unmarshal human registered")
}
return humanRegistered, nil
@@ -282,7 +282,7 @@ func HumanInitialCodeAddedEventMapper(event eventstore.Event) (eventstore.Event,
}
err := event.Unmarshal(humanRegistered)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-bM9se", "unable to unmarshal human initial code added")
return nil, zerrors.ThrowInternal(err, "USER-bM9se", "unable to unmarshal human initial code added")
}
return humanRegistered, nil
@@ -407,7 +407,7 @@ func HumanSignedOutEventMapper(event eventstore.Event) (eventstore.Event, error)
}
err := event.Unmarshal(signedOut)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-WFS3g", "unable to unmarshal human signed out")
return nil, zerrors.ThrowInternal(err, "USER-WFS3g", "unable to unmarshal human signed out")
}
return signedOut, nil

6
internal/repository/user/human_address.go
View File

@@ -3,8 +3,8 @@ package user
import (
"context"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -36,7 +36,7 @@ func NewAddressChangedEvent(
changes []AddressChanges,
) (*HumanAddressChangedEvent, error) {
if len(changes) == 0 {
return nil, errors.ThrowPreconditionFailed(nil, "USER-3n8fs", "Errors.NoChangesFound")
return nil, zerrors.ThrowPreconditionFailed(nil, "USER-3n8fs", "Errors.NoChangesFound")
}
changeEvent := &HumanAddressChangedEvent{
BaseEvent: *eventstore.NewBaseEventForPush(
@@ -89,7 +89,7 @@ func HumanAddressChangedEventMapper(event eventstore.Event) (eventstore.Event, e
}
err := event.Unmarshal(addressChanged)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human address changed")
return nil, zerrors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human address changed")
}
return addressChanged, nil

6
internal/repository/user/human_email.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -52,7 +52,7 @@ func HumanEmailChangedEventMapper(event eventstore.Event) (eventstore.Event, err
}
err := event.Unmarshal(emailChangedEvent)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed")
return nil, zerrors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed")
}
return emailChangedEvent, nil
@@ -177,7 +177,7 @@ func HumanEmailCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, e
}
err := event.Unmarshal(codeAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-3M0sd", "unable to unmarshal human email code added")
return nil, zerrors.ThrowInternal(err, "USER-3M0sd", "unable to unmarshal human email code added")
}
return codeAdded, nil

10
internal/repository/user/human_external_idp.go
View File

@@ -3,8 +3,8 @@ package user
import (
"context"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -75,7 +75,7 @@ func UserIDPLinkAddedEventMapper(event eventstore.Event) (eventstore.Event, erro
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-6M9sd", "unable to unmarshal user external idp added")
return nil, zerrors.ThrowInternal(err, "USER-6M9sd", "unable to unmarshal user external idp added")
}
return e, nil
@@ -120,7 +120,7 @@ func UserIDPLinkRemovedEventMapper(event eventstore.Event) (eventstore.Event, er
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-eAWoT", "unable to unmarshal user external idp removed")
return nil, zerrors.ThrowInternal(err, "USER-eAWoT", "unable to unmarshal user external idp removed")
}
return e, nil
@@ -165,7 +165,7 @@ func UserIDPLinkCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Ev
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-dKGqO", "unable to unmarshal user external idp cascade removed")
return nil, zerrors.ThrowInternal(err, "USER-dKGqO", "unable to unmarshal user external idp cascade removed")
}
return e, nil
@@ -205,7 +205,7 @@ func UserIDPCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event,
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-oikSS", "unable to unmarshal user external idp check succeeded")
return nil, zerrors.ThrowInternal(err, "USER-oikSS", "unable to unmarshal user external idp check succeeded")
}
return e, nil

8
internal/repository/user/human_mfa_otp.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -68,7 +68,7 @@ func HumanOTPAddedEventMapper(event eventstore.Event) (eventstore.Event, error)
}
err := event.Unmarshal(otpAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp added")
return nil, zerrors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp added")
}
return otpAdded, nil
}
@@ -172,7 +172,7 @@ func HumanOTPCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event
}
err := event.Unmarshal(otpAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check succeeded")
return nil, zerrors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check succeeded")
}
return otpAdded, nil
}
@@ -211,7 +211,7 @@ func HumanOTPCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, e
}
err := event.Unmarshal(otpAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check failed")
return nil, zerrors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check failed")
}
return otpAdded, nil
}

12
internal/repository/user/human_mfa_passwordless.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -308,7 +308,7 @@ func HumanPasswordlessInitCodeAddedEventMapper(event eventstore.Event) (eventsto
}
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-BDf32", "unable to unmarshal human passwordless code added")
return nil, zerrors.ThrowInternal(err, "USER-BDf32", "unable to unmarshal human passwordless code added")
}
return webAuthNAdded, nil
}
@@ -366,7 +366,7 @@ func HumanPasswordlessInitCodeRequestedEventMapper(event eventstore.Event) (even
}
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-VGfg3", "unable to unmarshal human passwordless code delivery added")
return nil, zerrors.ThrowInternal(err, "USER-VGfg3", "unable to unmarshal human passwordless code delivery added")
}
return webAuthNAdded, nil
}
@@ -406,7 +406,7 @@ func HumanPasswordlessInitCodeSentEventMapper(event eventstore.Event) (eventstor
}
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code sent")
return nil, zerrors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code sent")
}
return webAuthNAdded, nil
}
@@ -446,7 +446,7 @@ func HumanPasswordlessInitCodeCodeCheckFailedEventMapper(event eventstore.Event)
}
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check failed")
return nil, zerrors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check failed")
}
return webAuthNAdded, nil
}
@@ -486,7 +486,7 @@ func HumanPasswordlessInitCodeCodeCheckSucceededEventMapper(event eventstore.Eve
}
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check succeeded")
return nil, zerrors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check succeeded")
}
return webAuthNAdded, nil
}

16
internal/repository/user/human_mfa_web_auth_n.go
View File

@@ -2,8 +2,8 @@ package user
import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
type HumanWebAuthNAddedEvent struct {
@@ -42,7 +42,7 @@ func HumanWebAuthNAddedEventMapper(event eventstore.Event) (eventstore.Event, er
}
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-tB8sf", "unable to unmarshal human webAuthN added")
return nil, zerrors.ThrowInternal(err, "USER-tB8sf", "unable to unmarshal human webAuthN added")
}
return webAuthNAdded, nil
}
@@ -98,7 +98,7 @@ func HumanWebAuthNVerifiedEventMapper(event eventstore.Event) (eventstore.Event,
}
err := event.Unmarshal(webauthNVerified)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-B0zDs", "unable to unmarshal human webAuthN verified")
return nil, zerrors.ThrowInternal(err, "USER-B0zDs", "unable to unmarshal human webAuthN verified")
}
return webauthNVerified, nil
}
@@ -136,7 +136,7 @@ func HumanWebAuthNSignCountChangedEventMapper(event eventstore.Event) (eventstor
}
err := event.Unmarshal(webauthNVerified)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5Gm0s", "unable to unmarshal human webAuthN sign count")
return nil, zerrors.ThrowInternal(err, "USER-5Gm0s", "unable to unmarshal human webAuthN sign count")
}
return webauthNVerified, nil
}
@@ -172,7 +172,7 @@ func HumanWebAuthNRemovedEventMapper(event eventstore.Event) (eventstore.Event,
}
err := event.Unmarshal(webauthNVerified)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-gM9sd", "unable to unmarshal human webAuthN token removed")
return nil, zerrors.ThrowInternal(err, "USER-gM9sd", "unable to unmarshal human webAuthN token removed")
}
return webauthNVerified, nil
}
@@ -210,7 +210,7 @@ func HumanWebAuthNBeginLoginEventMapper(event eventstore.Event) (eventstore.Even
}
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-rMb8x", "unable to unmarshal human webAuthN begin login")
return nil, zerrors.ThrowInternal(err, "USER-rMb8x", "unable to unmarshal human webAuthN begin login")
}
return webAuthNAdded, nil
}
@@ -243,7 +243,7 @@ func HumanWebAuthNCheckSucceededEventMapper(event eventstore.Event) (eventstore.
}
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-2M0fg", "unable to unmarshal human webAuthN check succeeded")
return nil, zerrors.ThrowInternal(err, "USER-2M0fg", "unable to unmarshal human webAuthN check succeeded")
}
return webAuthNAdded, nil
}
@@ -276,7 +276,7 @@ func HumanWebAuthNCheckFailedEventMapper(event eventstore.Event) (eventstore.Eve
}
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-O0dse", "unable to unmarshal human webAuthN check failed")
return nil, zerrors.ThrowInternal(err, "USER-O0dse", "unable to unmarshal human webAuthN check failed")
}
return webAuthNAdded, nil
}

10
internal/repository/user/human_password.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -72,7 +72,7 @@ func HumanPasswordChangedEventMapper(event eventstore.Event) (eventstore.Event,
}
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed")
return nil, zerrors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed")
}
return humanAdded, nil
@@ -141,7 +141,7 @@ func HumanPasswordCodeAddedEventMapper(event eventstore.Event) (eventstore.Event
}
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Ms90d", "unable to unmarshal human password code added")
return nil, zerrors.ThrowInternal(err, "USER-Ms90d", "unable to unmarshal human password code added")
}
return humanAdded, nil
@@ -237,7 +237,7 @@ func HumanPasswordCheckSucceededEventMapper(event eventstore.Event) (eventstore.
}
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5M9sd", "unable to unmarshal human password check succeeded")
return nil, zerrors.ThrowInternal(err, "USER-5M9sd", "unable to unmarshal human password check succeeded")
}
return humanAdded, nil
@@ -277,7 +277,7 @@ func HumanPasswordCheckFailedEventMapper(event eventstore.Event) (eventstore.Eve
}
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4m9fs", "unable to unmarshal human password check failed")
return nil, zerrors.ThrowInternal(err, "USER-4m9fs", "unable to unmarshal human password check failed")
}
return humanAdded, nil

6
internal/repository/user/human_phone.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -52,7 +52,7 @@ func HumanPhoneChangedEventMapper(event eventstore.Event) (eventstore.Event, err
}
err := event.Unmarshal(phoneChangedEvent)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human phone changed")
return nil, zerrors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human phone changed")
}
return phoneChangedEvent, nil
@@ -200,7 +200,7 @@ func HumanPhoneCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, e
}
err := event.Unmarshal(codeAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-6Ms9d", "unable to unmarshal human phone code added")
return nil, zerrors.ThrowInternal(err, "USER-6Ms9d", "unable to unmarshal human phone code added")
}
return codeAdded, nil

6
internal/repository/user/human_profile.go
View File

@@ -4,8 +4,8 @@ import (
"context"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
"golang.org/x/text/language"
)
@@ -39,7 +39,7 @@ func NewHumanProfileChangedEvent(
changes []ProfileChanges,
) (*HumanProfileChangedEvent, error) {
if len(changes) == 0 {
return nil, errors.ThrowPreconditionFailed(nil, "USER-33n8F", "Errors.NoChangesFound")
return nil, zerrors.ThrowPreconditionFailed(nil, "USER-33n8F", "Errors.NoChangesFound")
}
changeEvent := &HumanProfileChangedEvent{
BaseEvent: *eventstore.NewBaseEventForPush(
@@ -98,7 +98,7 @@ func HumanProfileChangedEventMapper(event eventstore.Event) (eventstore.Event, e
}
err := event.Unmarshal(profileChanged)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human profile changed")
return nil, zerrors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human profile changed")
}
return profileChanged, nil

8
internal/repository/user/human_refresh_token.go
View File

@@ -4,8 +4,8 @@ import (
"context"
"time"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -81,7 +81,7 @@ func HumanRefreshTokenAddedEventMapper(event eventstore.Event) (eventstore.Event
}
err := event.Unmarshal(refreshTokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-DGr14", "unable to unmarshal refresh token added")
return nil, zerrors.ThrowInternal(err, "USER-DGr14", "unable to unmarshal refresh token added")
}
return refreshTokenAdded, nil
@@ -132,7 +132,7 @@ func HumanRefreshTokenRenewedEventEventMapper(event eventstore.Event) (eventstor
}
err := event.Unmarshal(tokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-GBt21", "unable to unmarshal refresh token renewed")
return nil, zerrors.ThrowInternal(err, "USER-GBt21", "unable to unmarshal refresh token renewed")
}
return tokenAdded, nil
@@ -177,7 +177,7 @@ func HumanRefreshTokenRemovedEventEventMapper(event eventstore.Event) (eventstor
}
err := event.Unmarshal(tokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Dggs2", "unable to unmarshal refresh token removed")
return nil, zerrors.ThrowInternal(err, "USER-Dggs2", "unable to unmarshal refresh token removed")
}
return tokenAdded, nil

8
internal/repository/user/machine.go
View File

@@ -4,8 +4,8 @@ import (
"context"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -62,7 +62,7 @@ func MachineAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
}
err := event.Unmarshal(machineAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-tMv9s", "unable to unmarshal machine added")
return nil, zerrors.ThrowInternal(err, "USER-tMv9s", "unable to unmarshal machine added")
}
return machineAdded, nil
@@ -90,7 +90,7 @@ func NewMachineChangedEvent(
changes []MachineChanges,
) (*MachineChangedEvent, error) {
if len(changes) == 0 {
return nil, errors.ThrowPreconditionFailed(nil, "USER-3M9fs", "Errors.NoChangesFound")
return nil, zerrors.ThrowPreconditionFailed(nil, "USER-3M9fs", "Errors.NoChangesFound")
}
changeEvent := &MachineChangedEvent{
BaseEvent: *eventstore.NewBaseEventForPush(
@@ -131,7 +131,7 @@ func MachineChangedEventMapper(event eventstore.Event) (eventstore.Event, error)
}
err := event.Unmarshal(machineChanged)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4M9ds", "unable to unmarshal machine changed")
return nil, zerrors.ThrowInternal(err, "USER-4M9ds", "unable to unmarshal machine changed")
}
return machineChanged, nil

6
internal/repository/user/machine_key.go
View File

@@ -6,8 +6,8 @@ import (
"time"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -65,7 +65,7 @@ func MachineKeyAddedEventMapper(event eventstore.Event) (eventstore.Event, error
if unwrapErr, ok := err.(*json.UnmarshalTypeError); ok && unwrapErr.Field == "publicKey" {
return machineKeyAdded, nil
}
return nil, errors.ThrowInternal(err, "USER-p0ovS", "unable to unmarshal machine key added")
return nil, zerrors.ThrowInternal(err, "USER-p0ovS", "unable to unmarshal machine key added")
}
return machineKeyAdded, nil
@@ -106,7 +106,7 @@ func MachineKeyRemovedEventMapper(event eventstore.Event) (eventstore.Event, err
}
err := event.Unmarshal(machineRemoved)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5Gm9s", "unable to unmarshal machine key removed")
return nil, zerrors.ThrowInternal(err, "USER-5Gm9s", "unable to unmarshal machine key removed")
}
return machineRemoved, nil

10
internal/repository/user/machine_secret.go
View File

@@ -4,8 +4,8 @@ import (
"context"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -51,7 +51,7 @@ func MachineSecretSetEventMapper(event eventstore.Event) (eventstore.Event, erro
}
err := event.Unmarshal(credentialsSet)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-lopbqu", "unable to unmarshal machine secret set")
return nil, zerrors.ThrowInternal(err, "USER-lopbqu", "unable to unmarshal machine secret set")
}
return credentialsSet, nil
@@ -88,7 +88,7 @@ func MachineSecretRemovedEventMapper(event eventstore.Event) (eventstore.Event,
}
err := event.Unmarshal(credentialsRemoved)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-quox9j2", "unable to unmarshal machine secret removed")
return nil, zerrors.ThrowInternal(err, "USER-quox9j2", "unable to unmarshal machine secret removed")
}
return credentialsRemoved, nil
@@ -125,7 +125,7 @@ func MachineSecretCheckSucceededEventMapper(event eventstore.Event) (eventstore.
}
err := event.Unmarshal(check)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-x002n1p", "unable to unmarshal machine secret check succeeded")
return nil, zerrors.ThrowInternal(err, "USER-x002n1p", "unable to unmarshal machine secret check succeeded")
}
return check, nil
@@ -162,7 +162,7 @@ func MachineSecretCheckFailedEventMapper(event eventstore.Event) (eventstore.Eve
}
err := event.Unmarshal(check)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-x7901b1l", "unable to unmarshal machine secret check failed")
return nil, zerrors.ThrowInternal(err, "USER-x7901b1l", "unable to unmarshal machine secret check failed")
}
return check, nil

6
internal/repository/user/personal_access_token.go
View File

@@ -4,8 +4,8 @@ import (
"context"
"time"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -55,7 +55,7 @@ func PersonalAccessTokenAddedEventMapper(event eventstore.Event) (eventstore.Eve
}
err := event.Unmarshal(tokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Dbges", "unable to unmarshal token added")
return nil, zerrors.ThrowInternal(err, "USER-Dbges", "unable to unmarshal token added")
}
return tokenAdded, nil
@@ -96,7 +96,7 @@ func PersonalAccessTokenRemovedEventMapper(event eventstore.Event) (eventstore.E
}
err := event.Unmarshal(tokenRemoved)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Dbneg", "unable to unmarshal token removed")
return nil, zerrors.ThrowInternal(err, "USER-Dbneg", "unable to unmarshal token removed")
}
return tokenRemoved, nil

10
internal/repository/user/user.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/zerrors"
)
const (
@@ -262,7 +262,7 @@ func UserTokenAddedEventMapper(event eventstore.Event) (eventstore.Event, error)
}
err := event.Unmarshal(tokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added")
return nil, zerrors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added")
}
return tokenAdded, nil
@@ -303,7 +303,7 @@ func UserTokenRemovedEventMapper(event eventstore.Event) (eventstore.Event, erro
}
err := event.Unmarshal(tokenRemoved)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added")
return nil, zerrors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added")
}
return tokenRemoved, nil
@@ -359,7 +359,7 @@ func DomainClaimedEventMapper(event eventstore.Event) (eventstore.Event, error)
}
err := event.Unmarshal(domainClaimed)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-aR8jc", "unable to unmarshal domain claimed")
return nil, zerrors.ThrowInternal(err, "USER-aR8jc", "unable to unmarshal domain claimed")
}
return domainClaimed, nil
@@ -457,7 +457,7 @@ func UsernameChangedEventMapper(event eventstore.Event) (eventstore.Event, error
}
err := event.Unmarshal(domainClaimed)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4Bm9s", "unable to unmarshal username changed")
return nil, zerrors.ThrowInternal(err, "USER-4Bm9s", "unable to unmarshal username changed")
}
return domainClaimed, nil