登录支持用户选择邮箱或手机动态码并消除同步发信等待
This commit is contained in:
1 parent
9706e52a29
commit
7553b27cb2
25 files changed
+1223
-207
No files matched your search
@@ -112,6 +112,7 @@ func (s *Service) BeginEnrollment(userID int, account string) (*Enrollment, erro
|
||||
}
|
||||
id := base64.RawURLEncoding.EncodeToString(idBytes)
|
||||
expiresAt := s.now().UTC().Add(EnrollmentTTL)
|
||||
encodedSecret := base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(secret)
|
||||
|
||||
s.mu.Lock()
|
||||
s.cleanupEnrollmentsLocked(s.now().UTC())
|
||||
@@ -129,7 +130,6 @@ func (s *Service) BeginEnrollment(userID int, account string) (*Enrollment, erro
|
||||
s.enrollments[id] = enrollmentItem{userID: userID, secret: secret, expiresAt: expiresAt}
|
||||
s.mu.Unlock()
|
||||
|
||||
encodedSecret := base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(secret)
|
||||
return &Enrollment{
|
||||
ID: id,
|
||||
Secret: encodedSecret,
|
||||
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
type SecurityMode string
|
||||
|
||||
const (
|
||||
MailDeliveryTimeout = 45 * time.Second
|
||||
MailDeliveryTimeout = 45 * time.Second
|
||||
SecurityStartTLS SecurityMode = "starttls"
|
||||
SecurityImplicitTLS SecurityMode = "tls"
|
||||
SecurityPlain SecurityMode = "plain"
|
||||
@@ -55,6 +55,18 @@ func NewSMTPDelivery(settings SMTPSettings) (*SMTPDelivery, error) {
|
||||
return &SMTPDelivery{settings: settings, send: sendSMTPMessage}, nil
|
||||
}
|
||||
|
||||
// NewSMTPDeliveryContext 将中继投递纳入调用方的总时限。
|
||||
func NewSMTPDeliveryContext(ctx context.Context, settings SMTPSettings) (*SMTPDelivery, error) {
|
||||
delivery, err := NewSMTPDelivery(settings)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
delivery.send = func(settings SMTPSettings, recipient string, message []byte) error {
|
||||
return SendSMTPMessageContext(ctx, settings, recipient, message)
|
||||
}
|
||||
return delivery, nil
|
||||
}
|
||||
|
||||
func (d *SMTPDelivery) Delivery() Delivery {
|
||||
return func(challenge Challenge, code string) error {
|
||||
if d == nil || d.send == nil || challenge.Email == "" || code == "" {
|
||||
|
||||
Reference in new issue
Block a user