mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 19:14:23 +00:00
077a9a628e
* fix: typo ZITADEL uppercase for OTP Issuer * fix: password validation after change in current user agent * fix: otp validation after setup in current user agent * add waiting * add waiting * show u2f state * regenerate css * add useragentID to webauthn verify * return mfa attribute in mgmt * switch between providers * use preferredLoginName for webauthn display * some fixes * correct translations for login * add some missing event translations * fix usersession test * remove unnecessary cancel button on password change done
71 lines
1.7 KiB
Go
71 lines
1.7 KiB
Go
package model
|
|
|
|
import (
|
|
"encoding/json"
|
|
"github.com/caos/logging"
|
|
|
|
"github.com/caos/zitadel/internal/crypto"
|
|
caos_errs "github.com/caos/zitadel/internal/errors"
|
|
es_models "github.com/caos/zitadel/internal/eventstore/models"
|
|
"github.com/caos/zitadel/internal/user/model"
|
|
)
|
|
|
|
type OTP struct {
|
|
es_models.ObjectRoot
|
|
|
|
Secret *crypto.CryptoValue `json:"otpSecret,omitempty"`
|
|
State int32 `json:"-"`
|
|
}
|
|
|
|
type OTPVerified struct {
|
|
UserAgentID string `json:"userAgentID,omitempty"`
|
|
}
|
|
|
|
func OTPFromModel(otp *model.OTP) *OTP {
|
|
return &OTP{
|
|
ObjectRoot: otp.ObjectRoot,
|
|
Secret: otp.Secret,
|
|
State: int32(otp.State),
|
|
}
|
|
}
|
|
|
|
func OTPToModel(otp *OTP) *model.OTP {
|
|
return &model.OTP{
|
|
ObjectRoot: otp.ObjectRoot,
|
|
Secret: otp.Secret,
|
|
State: model.MFAState(otp.State),
|
|
}
|
|
}
|
|
|
|
func (u *Human) appendOTPAddedEvent(event *es_models.Event) error {
|
|
u.OTP = &OTP{
|
|
State: int32(model.MFAStateNotReady),
|
|
}
|
|
return u.OTP.setData(event)
|
|
}
|
|
|
|
func (u *Human) appendOTPVerifiedEvent() {
|
|
u.OTP.State = int32(model.MFAStateReady)
|
|
}
|
|
|
|
func (u *Human) appendOTPRemovedEvent() {
|
|
u.OTP = nil
|
|
}
|
|
|
|
func (o *OTP) setData(event *es_models.Event) error {
|
|
o.ObjectRoot.AppendEvent(event)
|
|
if err := json.Unmarshal(event.Data, o); err != nil {
|
|
logging.Log("EVEN-d9soe").WithError(err).Error("could not unmarshal event data")
|
|
return caos_errs.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (o *OTPVerified) SetData(event *es_models.Event) error {
|
|
if err := json.Unmarshal(event.Data, o); err != nil {
|
|
logging.Log("EVEN-BF421").WithError(err).Error("could not unmarshal event data")
|
|
return caos_errs.ThrowInternal(err, "MODEL-GB6hj", "could not unmarshal event")
|
|
}
|
|
return nil
|
|
}
|