mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 03:24:26 +00:00
14e2aba1bc
# Which Problems Are Solved Twilio supports a robust, multi-channel verification service that notably supports multi-region SMS sender numbers required for our use case. Currently, Zitadel does much of the work of the Twilio Verify (eg. localization, code generation, messaging) but doesn't support the pool of sender numbers that Twilio Verify does. # How the Problems Are Solved To support this API, we need to be able to store the Twilio Service ID and send that in a verification request where appropriate: phone number verification and SMS 2FA code paths. This PR does the following: - Adds the ability to use Twilio Verify of standard messaging through Twilio - Adds support for international numbers and more reliable verification messages sent from multiple numbers - Adds a new Twilio configuration option to support Twilio Verify in the admin console - Sends verification SMS messages through Twilio Verify - Implements Twilio Verification Checks for codes generated through the same # Additional Changes # Additional Context - base was implemented by @zhirschtritt in https://github.com/zitadel/zitadel/pull/8268 ❤️ - closes https://github.com/zitadel/zitadel/issues/8581 --------- Co-authored-by: Zachary Hirschtritt <zachary.hirschtritt@klaviyo.com> Co-authored-by: Joey Biscoglia <joey.biscoglia@klaviyo.com>
129 lines
3.9 KiB
Go
129 lines
3.9 KiB
Go
package command
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/user"
|
|
)
|
|
|
|
type HumanPasswordWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
EncodedHash string
|
|
SecretChangeRequired bool
|
|
|
|
Code *crypto.CryptoValue
|
|
CodeCreationDate time.Time
|
|
CodeExpiry time.Duration
|
|
PasswordCheckFailedCount uint64
|
|
GeneratorID string
|
|
VerificationID string
|
|
|
|
UserState domain.UserState
|
|
}
|
|
|
|
func NewHumanPasswordWriteModel(userID, resourceOwner string) *HumanPasswordWriteModel {
|
|
return &HumanPasswordWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: userID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
}
|
|
}
|
|
|
|
func (wm *HumanPasswordWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *user.HumanAddedEvent:
|
|
wm.EncodedHash = crypto.SecretOrEncodedHash(e.Secret, e.EncodedHash)
|
|
wm.SecretChangeRequired = e.ChangeRequired
|
|
wm.UserState = domain.UserStateActive
|
|
case *user.HumanRegisteredEvent:
|
|
wm.EncodedHash = crypto.SecretOrEncodedHash(e.Secret, e.EncodedHash)
|
|
wm.SecretChangeRequired = e.ChangeRequired
|
|
wm.UserState = domain.UserStateActive
|
|
case *user.HumanInitialCodeAddedEvent:
|
|
wm.UserState = domain.UserStateInitial
|
|
case *user.HumanInitializedCheckSucceededEvent:
|
|
wm.UserState = domain.UserStateActive
|
|
case *user.HumanPasswordChangedEvent:
|
|
wm.EncodedHash = crypto.SecretOrEncodedHash(e.Secret, e.EncodedHash)
|
|
wm.SecretChangeRequired = e.ChangeRequired
|
|
wm.Code = nil
|
|
wm.PasswordCheckFailedCount = 0
|
|
case *user.HumanPasswordCodeAddedEvent:
|
|
wm.Code = e.Code
|
|
wm.CodeCreationDate = e.CreationDate()
|
|
wm.CodeExpiry = e.Expiry
|
|
wm.GeneratorID = e.GeneratorID
|
|
case *user.HumanPasswordCodeSentEvent:
|
|
wm.GeneratorID = e.GeneratorInfo.GetID()
|
|
wm.VerificationID = e.GeneratorInfo.GetVerificationID()
|
|
case *user.HumanEmailVerifiedEvent:
|
|
if wm.UserState == domain.UserStateInitial {
|
|
wm.UserState = domain.UserStateActive
|
|
}
|
|
case *user.HumanPasswordCheckFailedEvent:
|
|
wm.PasswordCheckFailedCount += 1
|
|
case *user.HumanPasswordCheckSucceededEvent:
|
|
wm.PasswordCheckFailedCount = 0
|
|
case *user.UserLockedEvent:
|
|
wm.UserState = domain.UserStateLocked
|
|
case *user.UserUnlockedEvent:
|
|
wm.PasswordCheckFailedCount = 0
|
|
if wm.UserState != domain.UserStateDeleted {
|
|
wm.UserState = domain.UserStateActive
|
|
}
|
|
case *user.UserRemovedEvent:
|
|
wm.UserState = domain.UserStateDeleted
|
|
case *user.HumanPasswordHashUpdatedEvent:
|
|
wm.EncodedHash = e.EncodedHash
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *HumanPasswordWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AddQuery().
|
|
AggregateTypes(user.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(user.HumanAddedType,
|
|
user.HumanRegisteredType,
|
|
user.HumanInitialCodeAddedType,
|
|
user.HumanInitializedCheckSucceededType,
|
|
user.HumanPasswordChangedType,
|
|
user.HumanPasswordCodeAddedType,
|
|
user.HumanPasswordCodeSentType,
|
|
user.HumanEmailVerifiedType,
|
|
user.HumanPasswordCheckFailedType,
|
|
user.HumanPasswordCheckSucceededType,
|
|
user.HumanPasswordHashUpdatedType,
|
|
user.UserRemovedType,
|
|
user.UserLockedType,
|
|
user.UserUnlockedType,
|
|
user.UserV1AddedType,
|
|
user.UserV1RegisteredType,
|
|
user.UserV1InitialCodeAddedType,
|
|
user.UserV1InitializedCheckSucceededType,
|
|
user.UserV1PasswordChangedType,
|
|
user.UserV1PasswordCodeAddedType,
|
|
user.UserV1PasswordCodeSentType,
|
|
user.UserV1EmailVerifiedType,
|
|
user.UserV1PasswordCheckFailedType,
|
|
user.UserV1PasswordCheckSucceededType,
|
|
).
|
|
Builder()
|
|
|
|
if wm.ResourceOwner != "" {
|
|
query.ResourceOwner(wm.ResourceOwner)
|
|
}
|
|
if wm.WriteModel.ProcessedSequence != 0 {
|
|
query.SequenceGreater(wm.WriteModel.ProcessedSequence)
|
|
}
|
|
return query
|
|
}
|