serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-26 16:33:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

webaccount: change xcheckf to handle mox.ErrConfig as user error

Browse source 
like in webadmin
This commit is contained in:
Mechiel Lukkien 2024-05-09 22:45:44 +02:00
parent 3f000fd4e0
commit 3e4cce826e
No known key found for this signature in database
1 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
webaccount/account.go
View file

@ -104,6 +104,11 @@ func xcheckf(ctx context.Context, err error, format string, args ...any) {
if err == nil { if err == nil {
return return
} }
// If caller tried saving a config that is invalid, or because of a bad request, cause a user error.
if errors.Is(err, mox.ErrConfig) || errors.Is(err, mox.ErrRequest) {
xcheckuserf(ctx, err, format, args...)
}
msg := fmt.Sprintf(format, args...) msg := fmt.Sprintf(format, args...)
errmsg := fmt.Sprintf("%s: %s", msg, err) errmsg := fmt.Sprintf("%s: %s", msg, err)
pkglog.WithContext(ctx).Errorx(msg, err) pkglog.WithContext(ctx).Errorx(msg, err)
@ -516,9 +521,6 @@ func (Account) OutgoingWebhookSave(ctx context.Context, url, authorization strin
acc.OutgoingWebhook = &config.OutgoingWebhook{URL: url, Authorization: authorization, Events: events} acc.OutgoingWebhook = &config.OutgoingWebhook{URL: url, Authorization: authorization, Events: events}
} }
}) })
if err != nil && errors.Is(err, mox.ErrConfig) {
xcheckuserf(ctx, err, "saving account outgoing webhook")
}
xcheckf(ctx, err, "saving account outgoing webhook") xcheckf(ctx, err, "saving account outgoing webhook")
} }
@ -558,9 +560,6 @@ func (Account) IncomingWebhookSave(ctx context.Context, url, authorization strin
acc.IncomingWebhook = &config.IncomingWebhook{URL: url, Authorization: authorization} acc.IncomingWebhook = &config.IncomingWebhook{URL: url, Authorization: authorization}
} }
}) })
if err != nil && errors.Is(err, mox.ErrConfig) {
xcheckuserf(ctx, err, "saving account incoming webhook")
}
xcheckf(ctx, err, "saving account incoming webhook") xcheckf(ctx, err, "saving account incoming webhook")
} }
@ -602,9 +601,6 @@ func (Account) FromIDLoginAddressesSave(ctx context.Context, loginAddresses []st
err := mox.AccountSave(ctx, reqInfo.AccountName, func(acc *config.Account) { err := mox.AccountSave(ctx, reqInfo.AccountName, func(acc *config.Account) {
acc.FromIDLoginAddresses = loginAddresses acc.FromIDLoginAddresses = loginAddresses
}) })
if err != nil && errors.Is(err, mox.ErrConfig) {
xcheckuserf(ctx, err, "saving account fromid login addresses")
}
xcheckf(ctx, err, "saving account fromid login addresses") xcheckf(ctx, err, "saving account fromid login addresses")
} }
@ -615,9 +611,6 @@ func (Account) KeepRetiredPeriodsSave(ctx context.Context, keepRetiredMessagePer
acc.KeepRetiredMessagePeriod = keepRetiredMessagePeriod acc.KeepRetiredMessagePeriod = keepRetiredMessagePeriod
acc.KeepRetiredWebhookPeriod = keepRetiredWebhookPeriod acc.KeepRetiredWebhookPeriod = keepRetiredWebhookPeriod
}) })
if err != nil && errors.Is(err, mox.ErrConfig) {
xcheckuserf(ctx, err, "saving account keep retired periods")
}
xcheckf(ctx, err, "saving account keep retired periods") xcheckf(ctx, err, "saving account keep retired periods")
} }
@ -633,9 +626,6 @@ func (Account) AutomaticJunkFlagsSave(ctx context.Context, enabled bool, junkReg
NotJunkMailboxRegexp: notJunkRegexp, NotJunkMailboxRegexp: notJunkRegexp,
} }
}) })
if err != nil && errors.Is(err, mox.ErrConfig) {
xcheckuserf(ctx, err, "saving account automatic junk flags")
}
xcheckf(ctx, err, "saving account automatic junk flags") xcheckf(ctx, err, "saving account automatic junk flags")
} }
@ -655,9 +645,6 @@ func (Account) JunkFilterSave(ctx context.Context, junkFilter *config.JunkFilter
acc.JunkFilter.Params.Threegrams = old.Params.Threegrams acc.JunkFilter.Params.Threegrams = old.Params.Threegrams
} }
}) })
if err != nil && errors.Is(err, mox.ErrConfig) {
xcheckuserf(ctx, err, "saving account junk filter settings")
}
xcheckf(ctx, err, "saving account junk filter settings") xcheckf(ctx, err, "saving account junk filter settings")
} }
@ -668,8 +655,5 @@ func (Account) RejectsSave(ctx context.Context, mailbox string, keep bool) {
acc.RejectsMailbox = mailbox acc.RejectsMailbox = mailbox
acc.KeepRejects = keep acc.KeepRejects = keep
}) })
if err != nil && errors.Is(err, mox.ErrConfig) {
xcheckuserf(ctx, err, "saving account rejects settings")
}
xcheckf(ctx, err, "saving account rejects settings") xcheckf(ctx, err, "saving account rejects settings")
} }