Compare commits
22
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
464bd2d565 | ||
|
|
f1ff40d072 | ||
|
|
417e6d96b6 | ||
|
|
e84d2d1ad3 | ||
|
|
fa7b75d1b8 | ||
|
|
a587cbbc24 | ||
|
|
5f3b443e7b | ||
|
|
30f06c2f8f | ||
|
|
4c4b639321 | ||
|
|
13cc9c302e | ||
|
|
021bd04324 | ||
|
|
4844fb5bc9 | ||
|
|
3aeea9aa77 | ||
|
|
69fba8df70 | ||
|
|
b36eb72c23 | ||
|
|
3e4e496037 | ||
|
|
c1d28e705e | ||
|
|
abca15f047 | ||
|
|
c6ab4680fd | ||
|
|
86b6aafe7d | ||
|
|
bd675357bb | ||
|
|
24af794112 |
No files matched your search
@@ -11,6 +11,12 @@ classifies delivery outcomes and never logs provider response bodies. Sendico's
|
||||
builders, dynamic-template dependency, notification events and unused producer
|
||||
were removed. Resend is a new driver using the same contract.
|
||||
|
||||
SMTP is an owned adapter using Go's standard `net/smtp`, verified `crypto/tls`
|
||||
connections and standard MIME encoders. Its implicit-TLS connection configuration
|
||||
matches Sendico's existing mail client, without importing its modules or copying
|
||||
its keepalive/reconnect behavior. Local mailbox credentials are provisioned into
|
||||
SXCHNGE Vault explicitly; the application does not read Sendico files or secrets.
|
||||
|
||||
Shared messaging was selected from that same Sendico revision's
|
||||
`api/pkg/messaging`: `config.go`, `capability/errors.go`, `reliable/transport.go`,
|
||||
`reliable/durable_settings.go`, `reliable/durable_settings_behavior.go`,
|
||||
|
||||
@@ -12,12 +12,35 @@ pending-work state atomically in one document through the shared DB wrapper.
|
||||
The outbox dispatcher publishes opaque IDs using shared messaging's durable
|
||||
transport, adapted from Sendico. A durable NATS worker claims the notification
|
||||
with an atomic conditional patch and saves the outcome before acknowledging.
|
||||
`DriverConfig` selects the email driver: `sendgrid` or `resend`.
|
||||
`DriverConfig` selects the email driver: `sendgrid`, `resend` or `smtp`.
|
||||
|
||||
Email adapters only map rendered email models to provider wire payloads. SendGrid
|
||||
uses adapted Sendico SDK construction; Resend uses its email HTTP API. Both support
|
||||
subject, text and HTML, bounded timeouts and safe error classification.
|
||||
|
||||
The owned SMTP adapter uses authenticated implicit TLS (normally port 465),
|
||||
verified server certificates and context-bounded connections. It sends MIME
|
||||
multipart/alternative with quoted-printable UTF-8 text/HTML and encoded subjects.
|
||||
It uses Go's standard SMTP client and does not import Sendico modules or share a
|
||||
mutable connection between workers. Configure it with:
|
||||
|
||||
```yaml
|
||||
email:
|
||||
driver: smtp
|
||||
settings:
|
||||
host: mail.example.com
|
||||
port: 465
|
||||
username: notifications@example.com
|
||||
password_env: SMTP_PASSWORD
|
||||
sender_address: notifications@example.com
|
||||
sender_name: SXCHNGE
|
||||
network_timeout: 10
|
||||
```
|
||||
|
||||
`network_timeout` must be 1–20 seconds; the worker's expiry/shutdown context also
|
||||
bounds every operation. Only the password belongs in Vault. There is no plaintext
|
||||
fallback or certificate-verification bypass.
|
||||
|
||||
## Run
|
||||
|
||||
Requires Go 1.27, protoc, an SXCHNGE MongoDB database and a NATS server with
|
||||
@@ -75,13 +98,41 @@ remaining status and request fingerprints expire through a seven-day TTL.
|
||||
- Resend receives the notification ID as its provider idempotency key. Its window
|
||||
is 24 hours. SendGrid has no equivalent guarantee; exactly-once external email
|
||||
delivery is not promised.
|
||||
- SMTP acceptance requires the final DATA 250 reply. A later QUIT failure cannot
|
||||
undo acceptance. Explicit SMTP 4xx replies become retryable
|
||||
`provider_temporarily_unavailable`; 5xx replies are terminal (authentication
|
||||
failures retain `provider_authentication_failed`). Transport/TLS errors and a
|
||||
lost final DATA reply become UNKNOWN. No immediate reconnect/resend occurs.
|
||||
A stable Message-ID is included for correlation, not an exactly-once promise.
|
||||
- Changing the configured driver fails queued jobs pinned to the old driver with
|
||||
`driver_changed`. Drain queued jobs before changing sender credentials/config.
|
||||
- Callers authorize recipients and preferences. No direct customer-database access,
|
||||
bulk campaigns, provider failover, SMS, push or Telegram delivery is included.
|
||||
|
||||
Structured logs report notification IDs, driver, state and attempt count; message
|
||||
content, template values, addresses and provider response bodies are excluded.
|
||||
Structured logs report notification IDs, driver, state and attempt count. Provider
|
||||
HTTP outcomes include `provider_status`; failures also include `provider_error`
|
||||
and `provider_message` when available. The adapter reads at most 16 KiB plus an
|
||||
overflow byte and extracts only the Resend `name`/`message` or first SendGrid
|
||||
`errors[].message`. Diagnostic messages are bounded to 512 Unicode characters
|
||||
plus an ellipsis. Credentials, idempotency keys, outgoing request string values,
|
||||
email addresses, URLs, long token-like strings and numeric verification/account
|
||||
values embedded in the request are redacted; controls and formatting characters
|
||||
are normalized. Malformed, incomplete and oversized error
|
||||
responses produce a diagnostic fallback instead of raw content. Successful
|
||||
response bodies are not logged. Diagnostic fields are transient: they are neither
|
||||
persisted in notifications nor exposed in gRPC responses. The existing bounded
|
||||
failure codes and delivery/retry decisions remain unchanged. Transport failures
|
||||
include a sanitized cause. Provider outcome logging happens before the result
|
||||
write so a storage failure cannot discard the only provider diagnostic.
|
||||
|
||||
Message content, template values, addresses and raw provider bodies must remain
|
||||
excluded from logs. Provider text is sanitized external diagnostic data, never
|
||||
an instruction. Use `provider_status`, `provider_error` and `provider_message`
|
||||
together: the generic `provider_authentication_failed` category combines HTTP
|
||||
401 and 403, including sender/domain authorization failures. A sending-only
|
||||
Resend key is valid for sending, but cannot read the provider's log API.
|
||||
SMTP outcomes use `provider_smtp_status` for protocol reply codes and the same
|
||||
sanitized provider error/message fields, including password/auth-payload redaction.
|
||||
Monitor pending age, UNKNOWN/FAILED states and repeated outbox/worker warnings.
|
||||
|
||||
## Validate and distribute
|
||||
|
||||
@@ -45,8 +45,6 @@ func Run(ctx context.Context, c Config, logger mlogger.Logger) error {
|
||||
defer cancel()
|
||||
_ = client.Disconnect(cleanup)
|
||||
}()
|
||||
startup, cancel := context.WithTimeout(ctx, 20*time.Second)
|
||||
defer cancel()
|
||||
repo, err := store.New(logger, client.Database())
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -57,7 +55,7 @@ func Run(ctx context.Context, c Config, logger mlogger.Logger) error {
|
||||
}
|
||||
defer rt.Close()
|
||||
svc := service.New(repo, catalog, sender, string(c.Email.Driver), logger)
|
||||
broker, err := bus.New(startup, rt.Durable, rt.DurableAdmin, repo, svc, logger, c.Queue)
|
||||
broker, err := bus.New(ctx, rt.Durable, rt.DurableAdmin, repo, svc, logger, c.Queue)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -35,9 +35,13 @@ func New(ctx context.Context, transport reliable.Transport, admin reliable.Admin
|
||||
}
|
||||
settings := reliable.DurableSettings{Enabled: true, Stream: config.Stream, Provisioning: config.Provisioning}
|
||||
consumer := reliable.DurableConsumerSettings{Durable: "email", Subject: subject, AckWaitSeconds: 60, MaxDeliver: -1, DeliverPolicy: reliable.DurableDeliverAll}
|
||||
if err := admin.EnsureConsumerResources(ctx, settings, consumer); err != nil {
|
||||
startup, cancel := context.WithTimeout(ctx, 20*time.Second)
|
||||
defer cancel()
|
||||
if err := admin.EnsureConsumerResources(startup, settings, consumer); err != nil {
|
||||
return nil, merrors.OpaqueWrap(merrors.ErrServiceUnavailable, err, "configure notification messaging")
|
||||
}
|
||||
// NATS retains this context and unsubscribes when it ends. The worker must
|
||||
// live until service shutdown, independently of the provisioning deadline.
|
||||
subscription, err := transport.OpenConsumer(ctx, settings, consumer)
|
||||
if err != nil {
|
||||
return nil, merrors.OpaqueWrap(merrors.ErrServiceUnavailable, err, "subscribe notification worker")
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
merrors "git.sendico.io/tech/sxchnge/shared/errors"
|
||||
"git.sendico.io/tech/sxchnge/shared/messaging/reliable"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
type outbox struct{ jobs []model.Notification }
|
||||
@@ -23,6 +24,50 @@ type publisher struct {
|
||||
records []reliable.Record
|
||||
}
|
||||
|
||||
type consumerTransport struct {
|
||||
reliable.Transport
|
||||
reliable.Subscription
|
||||
ctx context.Context
|
||||
}
|
||||
|
||||
func (t *consumerTransport) OpenConsumer(ctx context.Context, _ reliable.DurableSettings, _ reliable.DurableConsumerSettings) (reliable.Subscription, error) {
|
||||
t.ctx = ctx
|
||||
return t.Subscription, nil
|
||||
}
|
||||
|
||||
type consumerAdmin struct {
|
||||
reliable.Admin
|
||||
ctx context.Context
|
||||
}
|
||||
|
||||
func (a *consumerAdmin) EnsureConsumerResources(ctx context.Context, _ reliable.DurableSettings, _ reliable.DurableConsumerSettings) error {
|
||||
a.ctx = ctx
|
||||
return nil
|
||||
}
|
||||
|
||||
func TestSubscriptionOutlivesProvisioning(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
transport := &consumerTransport{}
|
||||
admin := &consumerAdmin{}
|
||||
if _, err := New(ctx, transport, admin, &outbox{}, nil, zap.NewNop(), DefaultConfig()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if admin.ctx.Err() != context.Canceled {
|
||||
t.Fatal("provisioning context was not released")
|
||||
}
|
||||
if _, ok := admin.ctx.Deadline(); !ok {
|
||||
t.Fatal("provisioning has no deadline")
|
||||
}
|
||||
if err := transport.ctx.Err(); err != nil {
|
||||
t.Fatalf("subscription ended with provisioning: %v", err)
|
||||
}
|
||||
cancel()
|
||||
if transport.ctx.Err() != context.Canceled {
|
||||
t.Fatal("subscription does not follow service shutdown")
|
||||
}
|
||||
}
|
||||
|
||||
func (p *publisher) Publish(_ context.Context, r reliable.Record) error {
|
||||
if p.fail {
|
||||
return merrors.ServiceUnavailable("offline")
|
||||
|
||||
@@ -13,7 +13,7 @@ messaging:
|
||||
reconnect_wait: 2
|
||||
templates: "templates.example.json"
|
||||
email:
|
||||
driver: resend # sendgrid or resend
|
||||
driver: resend # sendgrid or resend; see README for authenticated SMTP settings
|
||||
settings:
|
||||
api_key_env: "RESEND_API_KEY" # SENDGRID_API_KEY when driver is sendgrid
|
||||
sender_address: "notifications@example.com"
|
||||
|
||||
@@ -19,6 +19,7 @@ type Driver string
|
||||
const (
|
||||
SendGrid Driver = "sendgrid"
|
||||
Resend Driver = "resend"
|
||||
SMTP Driver = "smtp"
|
||||
)
|
||||
|
||||
type Config = sharedmodel.DriverConfig[Driver]
|
||||
@@ -33,6 +34,11 @@ type Outcome struct {
|
||||
State model.State
|
||||
Code string
|
||||
RetryAfter time.Duration
|
||||
// Provider diagnostics are sanitized operational data, not public failures.
|
||||
HTTPStatus int
|
||||
SMTPStatus int
|
||||
ProviderError string
|
||||
ProviderMessage string
|
||||
}
|
||||
type Sender interface {
|
||||
Send(context.Context, string, model.Email) Outcome
|
||||
@@ -46,6 +52,9 @@ type client struct {
|
||||
}
|
||||
|
||||
func New(config Config) (Sender, error) {
|
||||
if config.Driver == SMTP {
|
||||
return newSMTP(config)
|
||||
}
|
||||
var s Settings
|
||||
decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{Result: &s, ErrorUnused: true, TagName: "mapstructure"})
|
||||
if err != nil {
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
package email
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"regexp"
|
||||
"sort"
|
||||
"strings"
|
||||
"unicode"
|
||||
)
|
||||
|
||||
const maxErrorBody = 16 << 10
|
||||
const maxErrorMessage = 512
|
||||
|
||||
var (
|
||||
errorName = regexp.MustCompile(`^[a-zA-Z0-9_.-]{1,64}$`)
|
||||
addresses = regexp.MustCompile(`[^\s<>"'(),;:]+@[^\s<>"'(),;:]+`)
|
||||
urls = regexp.MustCompile(`(?i)https?://[^\s<>"']+`)
|
||||
tokens = regexp.MustCompile(`[a-zA-Z0-9_+/-]{32,}={0,2}`)
|
||||
numbers = regexp.MustCompile(`[0-9]{4,}`)
|
||||
)
|
||||
|
||||
// Only the documented human-readable error fields cross the adapter boundary.
|
||||
// Full bodies, headers and request data must never reach logs or public failures.
|
||||
func providerFailure(body, request []byte, secrets ...string) (string, string) {
|
||||
var dto struct {
|
||||
Name string `json:"name"`
|
||||
Message string `json:"message"`
|
||||
Errors []struct {
|
||||
Message string `json:"message"`
|
||||
} `json:"errors"`
|
||||
}
|
||||
if err := json.Unmarshal(body, &dto); err != nil {
|
||||
return "", "Provider error details unavailable: invalid JSON response"
|
||||
}
|
||||
if dto.Message == "" && len(dto.Errors) > 0 {
|
||||
dto.Message = dto.Errors[0].Message
|
||||
}
|
||||
// Providers can echo any scalar string from their request DTOs. Strip those
|
||||
// values before truncation, in addition to credentials and embedded tokens.
|
||||
var payload any
|
||||
if json.Unmarshal(request, &payload) == nil {
|
||||
for _, value := range requestStrings(payload) {
|
||||
secrets = append(secrets, value)
|
||||
// Rendered login/verification codes and numeric account references
|
||||
// can be echoed as fragments of an otherwise longer email body.
|
||||
secrets = append(secrets, numbers.FindAllString(value, -1)...)
|
||||
}
|
||||
}
|
||||
name := safeErrorText(dto.Name, secrets)
|
||||
if !errorName.MatchString(name) {
|
||||
name = ""
|
||||
}
|
||||
message := safeErrorText(dto.Message, secrets)
|
||||
if message == "" {
|
||||
message = "Provider did not include an error message"
|
||||
}
|
||||
return name, message
|
||||
}
|
||||
|
||||
func requestStrings(value any) []string {
|
||||
var values []string
|
||||
switch value := value.(type) {
|
||||
case string:
|
||||
values = append(values, value)
|
||||
case []any:
|
||||
for _, item := range value {
|
||||
values = append(values, requestStrings(item)...)
|
||||
}
|
||||
case map[string]any:
|
||||
for _, item := range value {
|
||||
values = append(values, requestStrings(item)...)
|
||||
}
|
||||
}
|
||||
return values
|
||||
}
|
||||
|
||||
func safeErrorText(text string, secrets []string) string {
|
||||
sort.Slice(secrets, func(i, j int) bool { return len(secrets[i]) > len(secrets[j]) })
|
||||
var replacements []string
|
||||
for _, secret := range secrets {
|
||||
if secret != "" {
|
||||
replacements = append(replacements, secret, "[redacted]")
|
||||
}
|
||||
}
|
||||
text = strings.NewReplacer(replacements...).Replace(text)
|
||||
text = addresses.ReplaceAllString(text, "[redacted-address]")
|
||||
text = urls.ReplaceAllString(text, "[redacted-url]")
|
||||
text = tokens.ReplaceAllString(text, "[redacted-token]")
|
||||
text = strings.Join(strings.FieldsFunc(text, func(r rune) bool {
|
||||
return unicode.IsSpace(r) || unicode.IsControl(r) || unicode.Is(unicode.Cf, r)
|
||||
}), " ")
|
||||
runes := []rune(text)
|
||||
if len(runes) > maxErrorMessage {
|
||||
text = string(runes[:maxErrorMessage]) + "…"
|
||||
}
|
||||
return text
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
package email
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
"unicode/utf8"
|
||||
|
||||
"git.sendico.io/tech/sxchnge/notifications/model"
|
||||
)
|
||||
|
||||
func TestProviderErrorDiagnostics(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name, body, code, message string
|
||||
}{
|
||||
{"resend", `{"name":"validation_error","message":"The sxchnge.com domain is not verified"}`, "validation_error", "The sxchnge.com domain is not verified"},
|
||||
{"sendgrid", `{"errors":[{"message":"The sender identity is not verified","field":"from","help":"private URL"}]}`, "", "The sender identity is not verified"},
|
||||
{"no message", `{"unrecognized":"private response"}`, "", "Provider did not include an error message"},
|
||||
{"malformed", `{"message":"private response"`, "", "Provider error details unavailable: invalid JSON response"},
|
||||
{"wrong type", `{"message":{"secret":"private response"}}`, "", "Provider error details unavailable: invalid JSON response"},
|
||||
{"trailing", `{"message":"private response"} {}`, "", "Provider error details unavailable: invalid JSON response"},
|
||||
{"oversized", `{"message":"` + strings.Repeat("x", maxErrorBody) + `"}`, "", "Provider error details unavailable: incomplete or oversized response"},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
|
||||
w.WriteHeader(http.StatusForbidden)
|
||||
_, _ = io.WriteString(w, tc.body)
|
||||
}))
|
||||
defer server.Close()
|
||||
c := client{http: server.Client(), endpoint: server.URL}
|
||||
out := c.post(context.Background(), "", struct{}{})
|
||||
if out.State != model.Failed || out.Code != "provider_authentication_failed" || out.HTTPStatus != 403 || out.ProviderError != tc.code || out.ProviderMessage != tc.message {
|
||||
t.Fatalf("unexpected provider outcome: %+v", out)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestProviderDiagnosticsRedactRequestDataBeforeTruncation(t *testing.T) {
|
||||
key := "re_credential-secret"
|
||||
request := []byte(`{"from":"Sender <sender@example.com>","to":["recipient@example.com"],"personalizations":[{"dynamic_template_data":{"secret":"short-private-value"}}],"subject":"Private subject","text":"Private text","html":"<p>Private HTML</p>","content":[{"value":"Your verification code is 123456; account 9876543210"}]}`)
|
||||
token := strings.Repeat("a", 43)
|
||||
message := "Credential " + key + "; recipient@example.com; Private subject; Private text; <p>Private HTML</p>; short-private-value; https://example.com/verify?token=" + token + "; " + token + "; 123456; 9876543210; job-secret\n\r\x00\u202eforged-log"
|
||||
body, err := json.Marshal(map[string]string{"name": "validation_error", "message": message})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
name, result := providerFailure(body, request, key, "job-secret")
|
||||
if name != "validation_error" || !strings.Contains(result, "forged-log") || !strings.Contains(result, "[redacted]") {
|
||||
t.Fatal("lost useful diagnostic", name, result)
|
||||
}
|
||||
for _, forbidden := range []string{key, "recipient@example.com", "Private subject", "Private text", "Private HTML", "short-private-value", "https://", token, "123456", "9876543210", "job-secret", "\n", "\r", "\x00", "\u202e"} {
|
||||
if strings.Contains(result, forbidden) {
|
||||
t.Fatalf("diagnostic contains sensitive value or control %q", forbidden)
|
||||
}
|
||||
}
|
||||
body, err = json.Marshal(map[string]string{"name": "validation_error", "message": strings.Repeat("ą", maxErrorMessage+20) + key})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
_, result = providerFailure(body, request, key)
|
||||
if !utf8.ValidString(result) || utf8.RuneCountInString(result) != maxErrorMessage+1 || !strings.HasSuffix(result, "…") || strings.Contains(result, "re_") {
|
||||
t.Fatal("invalid or unbounded diagnostic")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSuccessfulResponsesDoNotExposeProviderContent(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
|
||||
_, _ = io.WriteString(w, `{"name":"private","message":"private provider response"}`)
|
||||
}))
|
||||
defer server.Close()
|
||||
c := client{http: server.Client(), endpoint: server.URL}
|
||||
if out := c.post(context.Background(), "", struct{}{}); out.State != model.Accepted || out.HTTPStatus != 200 || out.ProviderMessage != "" || out.ProviderError != "" {
|
||||
t.Fatal("success leaked provider content", out)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTransportFailureHasSanitizedDiagnostic(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel()
|
||||
c := client{http: http.DefaultClient, key: "credential-secret", endpoint: "https://example.com/emails?credential=credential-secret"}
|
||||
out := c.post(ctx, "job-secret", struct{}{})
|
||||
if out.State != model.Unknown || !strings.Contains(out.ProviderMessage, "context canceled") || strings.Contains(out.ProviderMessage, "credential-secret") || strings.Contains(out.ProviderMessage, "https://") {
|
||||
t.Fatal("transport cause missing or unsafe", out)
|
||||
}
|
||||
}
|
||||
@@ -28,14 +28,15 @@ func (c *client) post(ctx context.Context, key string, payload any) Outcome {
|
||||
}
|
||||
resp, err := c.http.Do(req)
|
||||
if err != nil {
|
||||
return Outcome{State: model.Unknown, Code: "provider_outcome_unknown"}
|
||||
return Outcome{State: model.Unknown, Code: "provider_outcome_unknown", ProviderMessage: safeErrorText(err.Error(), []string{c.key, key})}
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
// Discard a bounded response without logging provider-controlled content.
|
||||
_, _ = io.Copy(io.Discard, io.LimitReader(resp.Body, 64<<10))
|
||||
// Never pass raw provider bodies through the outcome or log them directly.
|
||||
details, readErr := io.ReadAll(io.LimitReader(resp.Body, maxErrorBody+1))
|
||||
outcome := Outcome{HTTPStatus: resp.StatusCode}
|
||||
switch {
|
||||
case resp.StatusCode >= 200 && resp.StatusCode < 300:
|
||||
return Outcome{State: model.Accepted}
|
||||
outcome.State = model.Accepted
|
||||
case resp.StatusCode == 429:
|
||||
delay := time.Minute
|
||||
if n, e := strconv.Atoi(resp.Header.Get("Retry-After")); e == nil && n > 0 && n <= 86400 {
|
||||
@@ -43,12 +44,20 @@ func (c *client) post(ctx context.Context, key string, payload any) Outcome {
|
||||
} else if date, e := http.ParseTime(resp.Header.Get("Retry-After")); e == nil && time.Until(date) > 0 {
|
||||
delay = time.Until(date)
|
||||
}
|
||||
return Outcome{State: model.RetryWait, Code: "provider_rate_limited", RetryAfter: delay}
|
||||
outcome.State, outcome.Code, outcome.RetryAfter = model.RetryWait, "provider_rate_limited", delay
|
||||
case resp.StatusCode >= 500 || resp.StatusCode == 408:
|
||||
return Outcome{State: model.Unknown, Code: "provider_outcome_unknown"}
|
||||
outcome.State, outcome.Code = model.Unknown, "provider_outcome_unknown"
|
||||
case resp.StatusCode == 401 || resp.StatusCode == 403:
|
||||
return Outcome{State: model.Failed, Code: "provider_authentication_failed"}
|
||||
outcome.State, outcome.Code = model.Failed, "provider_authentication_failed"
|
||||
default:
|
||||
return Outcome{State: model.Failed, Code: "provider_rejected"}
|
||||
outcome.State, outcome.Code = model.Failed, "provider_rejected"
|
||||
}
|
||||
if outcome.State != model.Accepted {
|
||||
if readErr != nil || len(details) > maxErrorBody {
|
||||
outcome.ProviderMessage = "Provider error details unavailable: incomplete or oversized response"
|
||||
} else {
|
||||
outcome.ProviderError, outcome.ProviderMessage = providerFailure(details, body, c.key, key)
|
||||
}
|
||||
}
|
||||
return outcome
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package email
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/sha256"
|
||||
"fmt"
|
||||
"mime"
|
||||
"mime/multipart"
|
||||
"mime/quotedprintable"
|
||||
"net/mail"
|
||||
"net/textproto"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"git.sendico.io/tech/sxchnge/notifications/model"
|
||||
merrors "git.sendico.io/tech/sxchnge/shared/errors"
|
||||
)
|
||||
|
||||
func smtpMessage(s smtpSettings, key string, email model.Email) ([]byte, error) {
|
||||
if !ValidAddress(email.Address) || strings.ContainsAny(email.Subject, "\r\n") || (email.Text == "" && email.HTML == "") {
|
||||
return nil, merrors.InvalidArgument("invalid email content")
|
||||
}
|
||||
var body bytes.Buffer
|
||||
parts := multipart.NewWriter(&body)
|
||||
for _, part := range []struct{ kind, value string }{{"text/plain", email.Text}, {"text/html", email.HTML}} {
|
||||
if part.value == "" {
|
||||
continue
|
||||
}
|
||||
writer, err := parts.CreatePart(textproto.MIMEHeader{"Content-Type": {part.kind + "; charset=utf-8"}, "Content-Transfer-Encoding": {"quoted-printable"}})
|
||||
if err != nil {
|
||||
return nil, merrors.InternalWrap(err, "create email MIME part")
|
||||
}
|
||||
encoded := quotedprintable.NewWriter(writer)
|
||||
if _, err = encoded.Write([]byte(part.value)); err != nil {
|
||||
return nil, merrors.InternalWrap(err, "encode email MIME part")
|
||||
}
|
||||
if err = encoded.Close(); err != nil {
|
||||
return nil, merrors.InternalWrap(err, "finish email MIME part")
|
||||
}
|
||||
}
|
||||
if err := parts.Close(); err != nil {
|
||||
return nil, merrors.InternalWrap(err, "finish email MIME body")
|
||||
}
|
||||
from := (&mail.Address{Name: s.SenderName, Address: s.SenderAddress}).String()
|
||||
to := (&mail.Address{Address: email.Address}).String()
|
||||
domain := s.SenderAddress[strings.LastIndex(s.SenderAddress, "@")+1:]
|
||||
headers := fmt.Sprintf("From: %s\r\nTo: %s\r\nSubject: %s\r\nDate: %s\r\nMessage-ID: <%x@%s>\r\nMIME-Version: 1.0\r\nContent-Type: multipart/alternative; boundary=%q\r\n\r\n", from, to, mime.QEncoding.Encode("utf-8", email.Subject), time.Now().UTC().Format(time.RFC1123Z), sha256.Sum256([]byte(key)), domain, parts.Boundary())
|
||||
return append([]byte(headers), body.Bytes()...), nil
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
package email
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"io"
|
||||
"net"
|
||||
"net/smtp"
|
||||
"net/textproto"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"git.sendico.io/tech/sxchnge/notifications/model"
|
||||
merrors "git.sendico.io/tech/sxchnge/shared/errors"
|
||||
"github.com/go-viper/mapstructure/v2"
|
||||
)
|
||||
|
||||
type smtpSettings struct {
|
||||
Host string `mapstructure:"host"`
|
||||
Port int `mapstructure:"port"`
|
||||
Username string `mapstructure:"username"`
|
||||
PasswordEnv string `mapstructure:"password_env"`
|
||||
SenderAddress string `mapstructure:"sender_address"`
|
||||
SenderName string `mapstructure:"sender_name"`
|
||||
NetworkTimeout int `mapstructure:"network_timeout"`
|
||||
}
|
||||
|
||||
type smtpSender struct {
|
||||
settings smtpSettings
|
||||
password string
|
||||
tls *tls.Config
|
||||
}
|
||||
|
||||
func newSMTP(config Config) (Sender, error) {
|
||||
var s smtpSettings
|
||||
decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{Result: &s, ErrorUnused: true, TagName: "mapstructure"})
|
||||
if err != nil {
|
||||
return nil, merrors.InternalWrap(err, "create SMTP settings decoder")
|
||||
}
|
||||
if decoder.Decode(config.Settings) != nil || s.Host == "" || strings.ContainsAny(s.Host, " /@\r\n\t") || s.Port < 1 || s.Port > 65535 || !ValidAddress(s.Username) || !ValidAddress(s.SenderAddress) || strings.ContainsAny(s.SenderName, "\r\n") || s.NetworkTimeout < 1 || s.NetworkTimeout > 20 {
|
||||
return nil, merrors.InvalidArgument("invalid SMTP settings")
|
||||
}
|
||||
password := os.Getenv(s.PasswordEnv)
|
||||
if s.PasswordEnv == "" || password == "" || strings.ContainsAny(password, "\r\n\x00") {
|
||||
return nil, merrors.FailedPrecondition("SMTP password environment variable is missing or invalid")
|
||||
}
|
||||
return &smtpSender{settings: s, password: password, tls: &tls.Config{ServerName: s.Host, MinVersion: tls.VersionTLS12}}, nil
|
||||
}
|
||||
|
||||
// SMTP uses a fresh authenticated TLS connection per attempt. No automatic
|
||||
// resend follows an uncertain result, since SMTP has no idempotency guarantee.
|
||||
func (s *smtpSender) Send(ctx context.Context, key string, email model.Email) Outcome {
|
||||
body, err := smtpMessage(s.settings, key, email)
|
||||
if err != nil {
|
||||
return Outcome{State: model.Failed, Code: "invalid_payload"}
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(ctx, time.Duration(s.settings.NetworkTimeout)*time.Second)
|
||||
defer cancel()
|
||||
dialer := tls.Dialer{NetDialer: &net.Dialer{}, Config: s.tls}
|
||||
conn, err := dialer.DialContext(ctx, "tcp", net.JoinHostPort(s.settings.Host, strconv.Itoa(s.settings.Port)))
|
||||
if err != nil {
|
||||
return s.failure(err, key, email)
|
||||
}
|
||||
defer conn.Close()
|
||||
stop := context.AfterFunc(ctx, func() { _ = conn.Close() })
|
||||
defer stop()
|
||||
deadline, _ := ctx.Deadline()
|
||||
if err = conn.SetDeadline(deadline); err != nil {
|
||||
return s.failure(err, key, email)
|
||||
}
|
||||
client, err := smtp.NewClient(conn, s.settings.Host)
|
||||
if err == nil {
|
||||
err = client.Auth(smtp.PlainAuth("", s.settings.Username, s.password, s.settings.Host))
|
||||
}
|
||||
if err == nil {
|
||||
err = client.Mail(s.settings.SenderAddress)
|
||||
}
|
||||
if err == nil {
|
||||
err = client.Rcpt(email.Address)
|
||||
}
|
||||
if err != nil {
|
||||
return s.failure(err, key, email)
|
||||
}
|
||||
writer, err := client.Data()
|
||||
if err != nil {
|
||||
return s.failure(err, key, email)
|
||||
}
|
||||
if _, err = io.Copy(writer, bytes.NewReader(body)); err == nil {
|
||||
err = writer.Close()
|
||||
}
|
||||
if err != nil {
|
||||
return s.failure(err, key, email)
|
||||
}
|
||||
// DATA's final 250 is acceptance. A later QUIT error cannot undo it.
|
||||
_ = client.Quit()
|
||||
return Outcome{State: model.Accepted, SMTPStatus: 250}
|
||||
}
|
||||
|
||||
func (s *smtpSender) failure(err error, key string, email model.Email) Outcome {
|
||||
secrets := []string{s.password, s.settings.Username, key, email.Address, email.Subject, email.HTML, email.Text}
|
||||
secrets = append(secrets, base64.StdEncoding.EncodeToString([]byte("\x00"+s.settings.Username+"\x00"+s.password)))
|
||||
secrets = append(secrets, numbers.FindAllString(email.Text+" "+email.HTML, -1)...)
|
||||
out := Outcome{State: model.Unknown, Code: "provider_outcome_unknown", ProviderError: "smtp", ProviderMessage: safeErrorText(err.Error(), secrets)}
|
||||
var reply *textproto.Error
|
||||
if errors.As(err, &reply) {
|
||||
out.SMTPStatus = reply.Code
|
||||
if reply.Code >= 400 && reply.Code < 500 {
|
||||
out.State, out.Code, out.RetryAfter = model.RetryWait, "provider_temporarily_unavailable", time.Minute
|
||||
} else if reply.Code >= 500 && reply.Code < 600 {
|
||||
out.State, out.Code = model.Failed, "provider_rejected"
|
||||
if reply.Code == 530 || reply.Code == 534 || reply.Code == 535 || reply.Code == 538 {
|
||||
out.Code = "provider_authentication_failed"
|
||||
}
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
@@ -0,0 +1,223 @@
|
||||
package email
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"io"
|
||||
"mime"
|
||||
"mime/multipart"
|
||||
"net"
|
||||
"net/http/httptest"
|
||||
"net/mail"
|
||||
"net/textproto"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.sendico.io/tech/sxchnge/notifications/model"
|
||||
)
|
||||
|
||||
type smtpFixture struct {
|
||||
settings smtpSettings
|
||||
root *x509.CertPool
|
||||
body chan []byte
|
||||
auth atomic.Bool
|
||||
}
|
||||
|
||||
func smtpServer(t *testing.T, reject string, code int) *smtpFixture {
|
||||
t.Helper()
|
||||
certServer := httptest.NewTLSServer(nil)
|
||||
cert := certServer.TLS.Certificates[0]
|
||||
root := x509.NewCertPool()
|
||||
root.AddCert(certServer.Certificate())
|
||||
certServer.Close()
|
||||
listener, err := tls.Listen("tcp", "127.0.0.1:0", &tls.Config{Certificates: []tls.Certificate{cert}, MinVersion: tls.VersionTLS12})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = listener.Close() })
|
||||
host, port, _ := net.SplitHostPort(listener.Addr().String())
|
||||
n, _ := strconv.Atoi(port)
|
||||
f := &smtpFixture{settings: smtpSettings{Host: host, Port: n, Username: "sender@example.com", SenderAddress: "sender@example.com", SenderName: "SXCHNGE", NetworkTimeout: 2}, root: root, body: make(chan []byte, 1)}
|
||||
go func() {
|
||||
conn, err := listener.Accept()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
defer conn.Close()
|
||||
_ = conn.SetDeadline(time.Now().Add(5 * time.Second))
|
||||
if reject == "greeting" {
|
||||
_ = conn.(*tls.Conn).Handshake()
|
||||
_, _ = io.Copy(io.Discard, conn)
|
||||
return
|
||||
}
|
||||
c := textproto.NewConn(conn)
|
||||
if c.PrintfLine("220 localhost ESMTP") != nil {
|
||||
return
|
||||
}
|
||||
for {
|
||||
line, err := c.ReadLine()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
command := strings.SplitN(line, " ", 2)[0]
|
||||
if command == reject {
|
||||
_ = c.PrintfLine("%d rejected recipient user@example.com credential test-password", code)
|
||||
continue
|
||||
}
|
||||
switch command {
|
||||
case "EHLO":
|
||||
_ = c.PrintfLine("250-localhost\r\n250 AUTH PLAIN")
|
||||
case "AUTH":
|
||||
want := "AUTH PLAIN " + base64.StdEncoding.EncodeToString([]byte("\x00sender@example.com\x00test-password"))
|
||||
f.auth.Store(line == want)
|
||||
_ = c.PrintfLine("235 authenticated")
|
||||
case "MAIL", "RCPT":
|
||||
_ = c.PrintfLine("250 OK")
|
||||
case "DATA":
|
||||
_ = c.PrintfLine("354 send message")
|
||||
body, err := c.ReadDotBytes()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
f.body <- body
|
||||
if reject == "final" {
|
||||
_ = c.PrintfLine("%d final rejection", code)
|
||||
} else if reject == "disconnect" {
|
||||
return
|
||||
} else {
|
||||
_ = c.PrintfLine("250 queued")
|
||||
}
|
||||
case "QUIT":
|
||||
// A lost QUIT reply must not turn accepted DATA into UNKNOWN.
|
||||
return
|
||||
default:
|
||||
_ = c.PrintfLine("500 unexpected command")
|
||||
}
|
||||
}
|
||||
}()
|
||||
return f
|
||||
}
|
||||
|
||||
func (f *smtpFixture) sender() *smtpSender {
|
||||
return &smtpSender{settings: f.settings, password: "test-password", tls: &tls.Config{ServerName: f.settings.Host, RootCAs: f.root, MinVersion: tls.VersionTLS12}}
|
||||
}
|
||||
|
||||
func TestSMTPAcceptanceAndMIME(t *testing.T) {
|
||||
f := smtpServer(t, "", 0)
|
||||
sender := f.sender()
|
||||
email := model.Email{Address: "user@example.com", Subject: "Подтвердите почту", Text: "Confirm code 123456\n.line", HTML: "<p>Confirm code 123456</p>"}
|
||||
out := sender.Send(context.Background(), "notification-id", email)
|
||||
if out.State != model.Accepted || out.SMTPStatus != 250 || !f.auth.Load() {
|
||||
t.Fatal("SMTP acceptance/authentication failed", out)
|
||||
}
|
||||
msg, err := mail.ReadMessage(strings.NewReader(string(<-f.body)))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
subject, err := new(mime.WordDecoder).DecodeHeader(msg.Header.Get("Subject"))
|
||||
if err != nil || subject != email.Subject {
|
||||
t.Fatal("wrong MIME subject", subject, err)
|
||||
}
|
||||
if msg.Header.Get("From") != "\"SXCHNGE\" <sender@example.com>" || !strings.HasSuffix(msg.Header.Get("Message-ID"), "@example.com>") {
|
||||
t.Fatal("invalid sender/message identifier")
|
||||
}
|
||||
kind, params, err := mime.ParseMediaType(msg.Header.Get("Content-Type"))
|
||||
if err != nil || kind != "multipart/alternative" {
|
||||
t.Fatal("wrong MIME type", kind, err)
|
||||
}
|
||||
parts := multipart.NewReader(msg.Body, params["boundary"])
|
||||
for _, want := range []string{email.Text, email.HTML} {
|
||||
part, err := parts.NextPart()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
body, err := io.ReadAll(part)
|
||||
if err != nil || strings.ReplaceAll(string(body), "\r\n", "\n") != want {
|
||||
t.Fatal("incorrect MIME content", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSMTPFailureSafety(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
stage string
|
||||
code int
|
||||
state model.State
|
||||
failure string
|
||||
}{
|
||||
{"AUTH", 535, model.Failed, "provider_authentication_failed"},
|
||||
{"RCPT", 550, model.Failed, "provider_rejected"},
|
||||
{"final", 451, model.RetryWait, "provider_temporarily_unavailable"},
|
||||
{"disconnect", 0, model.Unknown, "provider_outcome_unknown"},
|
||||
} {
|
||||
t.Run(fmt.Sprintf("%s-%d", tc.stage, tc.code), func(t *testing.T) {
|
||||
f := smtpServer(t, tc.stage, tc.code)
|
||||
out := f.sender().Send(context.Background(), "id", model.Email{Address: "user@example.com", Subject: "Subject", Text: "Body"})
|
||||
if out.State != tc.state || out.Code != tc.failure || out.SMTPStatus != tc.code {
|
||||
t.Fatal("incorrect SMTP classification", out)
|
||||
}
|
||||
if strings.Contains(out.ProviderMessage, "test-password") || strings.Contains(out.ProviderMessage, "user@example.com") {
|
||||
t.Fatal("SMTP rejection leaked private data")
|
||||
}
|
||||
if tc.code == 451 && out.RetryAfter <= 0 {
|
||||
t.Fatal("temporary rejection did not schedule retry")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestSMTPCertificateAndCancellation(t *testing.T) {
|
||||
t.Run("untrusted certificate", func(t *testing.T) {
|
||||
f := smtpServer(t, "", 0)
|
||||
sender := f.sender()
|
||||
sender.tls.RootCAs = x509.NewCertPool()
|
||||
if out := sender.Send(context.Background(), "id", model.Email{Address: "user@example.com", Text: "Body"}); out.State != model.Unknown || f.auth.Load() {
|
||||
t.Fatal("untrusted TLS accepted", out)
|
||||
}
|
||||
})
|
||||
t.Run("cancel blocked greeting", func(t *testing.T) {
|
||||
f := smtpServer(t, "greeting", 0)
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
|
||||
defer cancel()
|
||||
started := time.Now()
|
||||
if out := f.sender().Send(ctx, "id", model.Email{Address: "user@example.com", Text: "Body"}); out.State != model.Unknown || time.Since(started) > time.Second {
|
||||
t.Fatal("SMTP ignored cancellation", out)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestSMTPConfigAndHeaderValidation(t *testing.T) {
|
||||
t.Setenv("TEST_SMTP_PASSWORD", "test-password")
|
||||
valid := map[string]any{"host": "mail.example.com", "port": 465, "username": "sender@example.com", "password_env": "TEST_SMTP_PASSWORD", "sender_address": "sender@example.com", "network_timeout": 10}
|
||||
if _, err := New(Config{Driver: SMTP, Settings: valid}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for field, value := range map[string]any{"port": 0, "host": "https://bad", "username": "bad", "network_timeout": 0, "password_env": "MISSING_SMTP_PASSWORD", "typo": true} {
|
||||
settings := map[string]any{}
|
||||
for key, item := range valid {
|
||||
settings[key] = item
|
||||
}
|
||||
settings[field] = value
|
||||
if _, err := New(Config{Driver: SMTP, Settings: settings}); err == nil {
|
||||
t.Fatalf("invalid setting %s accepted", field)
|
||||
}
|
||||
}
|
||||
if _, err := smtpMessage(smtpSettings{}, "id", model.Email{Address: "user@example.com", Subject: "Subject\r\nBcc: stolen@example.com", Text: "Body"}); err == nil {
|
||||
t.Fatal("header injection accepted")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSMTPAuthenticationDiagnosticRedactsEncodedCredential(t *testing.T) {
|
||||
f := &smtpSender{settings: smtpSettings{Username: "sender@example.com"}, password: "a"}
|
||||
auth := base64.StdEncoding.EncodeToString([]byte("\x00sender@example.com\x00a"))
|
||||
out := f.failure(&textproto.Error{Code: 535, Msg: "Rejected AUTH " + auth}, "id", model.Email{})
|
||||
if out.SMTPStatus != 535 || strings.Contains(out.ProviderMessage, auth) || !strings.Contains(out.ProviderMessage, "AUTH [redacted]") {
|
||||
t.Fatalf("encoded SMTP credential was not fully redacted: %q", out.ProviderMessage)
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"git.sendico.io/tech/sxchnge/notifications/email"
|
||||
"git.sendico.io/tech/sxchnge/notifications/model"
|
||||
merrors "git.sendico.io/tech/sxchnge/shared/errors"
|
||||
"go.uber.org/zap"
|
||||
@@ -23,6 +24,7 @@ func (s *Service) Dispatch(ctx context.Context, id string) (bool, error) {
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
var outcome email.Outcome
|
||||
switch {
|
||||
case !n.ExpiresAt.After(now):
|
||||
n.State = model.Expired
|
||||
@@ -36,7 +38,7 @@ func (s *Service) Dispatch(ctx context.Context, id string) (bool, error) {
|
||||
deadline = n.ExpiresAt
|
||||
}
|
||||
sendCtx, cancel := context.WithDeadline(ctx, deadline)
|
||||
outcome := s.sender.Send(sendCtx, n.ID.Hex(), n.Email)
|
||||
outcome = s.sender.Send(sendCtx, n.ID.Hex(), n.Email)
|
||||
cancel()
|
||||
n.State = outcome.State
|
||||
n.FailureCode = outcome.Code
|
||||
@@ -62,14 +64,27 @@ func (s *Service) Dispatch(ctx context.Context, id string) (bool, error) {
|
||||
// Persist the result even when shutdown canceled the provider request.
|
||||
finishCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 5*time.Second)
|
||||
defer cancel()
|
||||
if err = s.repo.Finish(finishCtx, n); err != nil {
|
||||
return true, err
|
||||
}
|
||||
fields := []zap.Field{zap.String("notification_id", n.ID.Hex()), zap.String("driver", n.Driver), zap.String("state", string(n.State)), zap.Uint32("attempts", n.Attempts), zap.String("failure_code", n.FailureCode)}
|
||||
if outcome.HTTPStatus != 0 {
|
||||
fields = append(fields, zap.Int("provider_status", outcome.HTTPStatus))
|
||||
}
|
||||
if outcome.SMTPStatus != 0 {
|
||||
fields = append(fields, zap.Int("provider_smtp_status", outcome.SMTPStatus))
|
||||
}
|
||||
if outcome.ProviderError != "" {
|
||||
fields = append(fields, zap.String("provider_error", outcome.ProviderError))
|
||||
}
|
||||
if outcome.ProviderMessage != "" {
|
||||
fields = append(fields, zap.String("provider_message", outcome.ProviderMessage))
|
||||
}
|
||||
// Keep the provider outcome observable even if its local result write fails.
|
||||
if n.State == model.Accepted {
|
||||
s.logger.Info("Email accepted by provider", fields...)
|
||||
} else {
|
||||
s.logger.Warn("Email delivery attempt finished", fields...)
|
||||
}
|
||||
if err = s.repo.Finish(finishCtx, n); err != nil {
|
||||
return true, err
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
@@ -2,18 +2,23 @@ package service
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.sendico.io/tech/sxchnge/notifications/email"
|
||||
"git.sendico.io/tech/sxchnge/notifications/model"
|
||||
merrors "git.sendico.io/tech/sxchnge/shared/errors"
|
||||
"go.uber.org/zap"
|
||||
"go.uber.org/zap/zaptest/observer"
|
||||
)
|
||||
|
||||
type workerRepo struct {
|
||||
Repository
|
||||
job model.Notification
|
||||
saved *model.Notification
|
||||
job model.Notification
|
||||
saved *model.Notification
|
||||
finishErr error
|
||||
}
|
||||
|
||||
func (r *workerRepo) Recover(context.Context, time.Time) error { return nil }
|
||||
@@ -21,7 +26,10 @@ func (r *workerRepo) Claim(context.Context, string, time.Time) (*model.Notificat
|
||||
n := r.job
|
||||
return &n, nil
|
||||
}
|
||||
func (r *workerRepo) Finish(_ context.Context, n *model.Notification) error { r.saved = n; return nil }
|
||||
func (r *workerRepo) Finish(_ context.Context, n *model.Notification) error {
|
||||
r.saved = n
|
||||
return r.finishErr
|
||||
}
|
||||
|
||||
type workerSender struct {
|
||||
calls int
|
||||
@@ -62,3 +70,36 @@ func TestWorkerTerminalAndRetryOutcomes(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestWorkerLogsProviderFailureOnce(t *testing.T) {
|
||||
for _, failPersistence := range []bool{false, true} {
|
||||
t.Run(fmt.Sprint(failPersistence), func(t *testing.T) {
|
||||
core, logs := observer.New(zap.WarnLevel)
|
||||
repo := &workerRepo{job: model.Notification{Driver: "resend", ExpiresAt: time.Now().Add(time.Hour), Attempts: 1, Email: model.Email{Address: "private@example.com", Subject: "Private subject", Text: "Private text"}}}
|
||||
if failPersistence {
|
||||
repo.finishErr = merrors.ServiceUnavailable("storage offline")
|
||||
}
|
||||
sender := &workerSender{outcome: email.Outcome{State: model.Failed, Code: "provider_authentication_failed", HTTPStatus: 403, ProviderError: "validation_error", ProviderMessage: "The sxchnge.com domain is not verified"}}
|
||||
svc := New(repo, nil, sender, "resend", zap.New(core))
|
||||
if _, err := svc.Dispatch(context.Background(), "id"); !errors.Is(err, repo.finishErr) {
|
||||
t.Fatal("unexpected persistence error", err)
|
||||
}
|
||||
entries := logs.All()
|
||||
if len(entries) != 1 || entries[0].Message != "Email delivery attempt finished" {
|
||||
t.Fatal("expected one provider outcome log", entries)
|
||||
}
|
||||
fields := entries[0].ContextMap()
|
||||
if fields["provider_status"] != int64(403) || fields["provider_error"] != "validation_error" || fields["provider_message"] != "The sxchnge.com domain is not verified" {
|
||||
t.Fatal("provider diagnostic missing", fields)
|
||||
}
|
||||
if repo.saved.FailureCode != "provider_authentication_failed" {
|
||||
t.Fatal("public failure code changed", repo.saved.FailureCode)
|
||||
}
|
||||
for _, field := range []string{"address", "email", "subject", "text", "html", "parameters"} {
|
||||
if _, ok := fields[field]; ok {
|
||||
t.Fatalf("private notification field %s logged", field)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -179,10 +179,11 @@ func (s *Service) sendActivation(ctx context.Context, a *customer.Account, key s
|
||||
err = s.Sender.Send(ctx, notifications.Message{Key: secretKey, UserID: a.ID.Hex(), Email: a.Login, Locale: locale, Template: "auth.activation", ExpiresAt: result.ExpiresAt, Parameters: map[string]string{"url": u.String()}})
|
||||
return result.ExpiresAt, err
|
||||
}
|
||||
func (s *Service) Activate(ctx context.Context, raw string) error {
|
||||
func (s *Service) Activate(ctx context.Context, raw string) (string, error) {
|
||||
if len(raw) != 43 {
|
||||
return verification.ErorrTokenNotFound()
|
||||
return "", verification.ErorrTokenNotFound()
|
||||
}
|
||||
var email string
|
||||
_, err := s.Transactions.CreateTransaction().Execute(ctx, func(tx context.Context) (any, error) {
|
||||
token, err := s.Tokens.Consume(tx, bson.NilObjectID, verificationmodel.PurposeAccountActivation, "", raw)
|
||||
if err != nil {
|
||||
@@ -200,7 +201,14 @@ func (s *Service) Activate(ctx context.Context, raw string) error {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return nil, s.Accounts.Patch(tx, a.ID, repository.Patch().Set(repository.Field("status"), customer.AccountActive))
|
||||
if err := s.Accounts.Patch(tx, a.ID, repository.Patch().Set(repository.Field("status"), customer.AccountActive)); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
email = a.Login
|
||||
return nil, nil
|
||||
})
|
||||
return err
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return email, nil
|
||||
}
|
||||
@@ -139,11 +139,15 @@ func (pr *PublicRouter) activate(r *http.Request) http.HandlerFunc {
|
||||
if err := decodeFlow(r, &req); err != nil {
|
||||
return pr.flowError(err)
|
||||
}
|
||||
if err := pr.flow.Activate(r.Context(), req.Token); err != nil {
|
||||
email, err := pr.flow.Activate(r.Context(), req.Token)
|
||||
if err != nil {
|
||||
return pr.flowError(err)
|
||||
}
|
||||
pr.logger.Info("Account activation completed")
|
||||
return response.Accepted(pr.logger, map[string]bool{"verified": true})
|
||||
return response.Accepted(pr.logger, struct {
|
||||
Verified bool `json:"verified"`
|
||||
Email string `json:"email"`
|
||||
}{Verified: true, Email: email})
|
||||
}
|
||||
func challengeScope(raw string) string {
|
||||
h := sha256.Sum256([]byte(raw))
|
||||
|
||||
@@ -152,17 +152,33 @@ func TestSignupActivationAndLoginEmailFlow(t *testing.T) {
|
||||
require.NoError(t, service.Facts.Ready(ctx, a.ID))
|
||||
login := map[string]any{"login": map[string]string{"login": "user@example.com", "password": " correct password "}, "clientId": "web", "deviceId": "browser"}
|
||||
require.Equal(t, 403, post("login", login).Code)
|
||||
require.Equal(t, 400, post("verification/confirm", map[string]string{"token": "invalid"}).Code)
|
||||
invalid := post("verification/confirm", map[string]string{"token": "invalid"})
|
||||
require.Equal(t, 400, invalid.Code)
|
||||
require.NotContains(t, invalid.Body.String(), a.Login)
|
||||
guard := &activationGuard{SignupFacts: service.Facts, block: true}
|
||||
service.Facts = guard
|
||||
require.Equal(t, 503, post("verification/confirm", map[string]string{"token": activation}).Code)
|
||||
blocked := post("verification/confirm", map[string]string{"token": activation})
|
||||
require.Equal(t, 503, blocked.Code)
|
||||
require.NotContains(t, blocked.Body.String(), a.Login)
|
||||
a, err = stores.Accounts.GetByEmail(ctx, a.Login)
|
||||
require.NoError(t, err)
|
||||
require.False(t, a.IsActive())
|
||||
guard.block = false
|
||||
w = post("verification/confirm", map[string]string{"token": activation})
|
||||
require.Equal(t, 202, w.Code, w.Body.String())
|
||||
require.Equal(t, 400, post("verification/confirm", map[string]string{"token": activation}).Code)
|
||||
require.Equal(t, "no-store", w.Header().Get("Cache-Control"))
|
||||
var confirmed struct {
|
||||
Data struct {
|
||||
Verified bool `json:"verified"`
|
||||
Email string `json:"email"`
|
||||
} `json:"data"`
|
||||
}
|
||||
require.NoError(t, json.Unmarshal(w.Body.Bytes(), &confirmed))
|
||||
require.True(t, confirmed.Data.Verified)
|
||||
require.Equal(t, a.Login, confirmed.Data.Email)
|
||||
used := post("verification/confirm", map[string]string{"token": activation})
|
||||
require.Equal(t, 400, used.Code)
|
||||
require.NotContains(t, used.Body.String(), a.Login)
|
||||
a, err = stores.Accounts.GetByEmail(ctx, a.Login)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, customer.AccountActive, a.Status)
|
||||
|
||||
@@ -12,7 +12,7 @@ import (
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
)
|
||||
|
||||
func (c *Client) post(ctx context.Context, resource, requestRef string, payload any) (receiptDTO, error) {
|
||||
func (c *Client) post(ctx context.Context, resource, requestRef string, payload any, expectedStatus int) (receiptDTO, error) {
|
||||
var receipt receiptDTO
|
||||
token, err := c.token()
|
||||
if err != nil {
|
||||
@@ -38,7 +38,7 @@ func (c *Client) post(ctx context.Context, resource, requestRef string, payload
|
||||
}
|
||||
defer func() { _ = response.Body.Close() }()
|
||||
// Never decode or expose upstream error bodies, which can contain assertions.
|
||||
if response.StatusCode != http.StatusOK {
|
||||
if response.StatusCode != expectedStatus {
|
||||
return receipt, merrors.ServiceUnavailable("Sendico request was not accepted")
|
||||
}
|
||||
decoder := json.NewDecoder(io.LimitReader(response.Body, 16385))
|
||||
@@ -54,14 +54,14 @@ func (c *Client) post(ctx context.Context, resource, requestRef string, payload
|
||||
}
|
||||
|
||||
func (c *Client) Register(ctx context.Context, requestRef string) (string, error) {
|
||||
dto, err := c.post(ctx, "individuals", requestRef, nil)
|
||||
dto, err := c.post(ctx, "individuals", requestRef, nil, http.StatusCreated)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return mapSubject(dto)
|
||||
}
|
||||
func (c *Client) Submit(ctx context.Context, subject, source string, facts identity.Facts) (identity.Receipt, error) {
|
||||
dto, err := c.post(ctx, "identity_facts", bson.NewObjectID().Hex(), mapFacts(subject, source, facts))
|
||||
dto, err := c.post(ctx, "identity_facts", bson.NewObjectID().Hex(), mapFacts(subject, source, facts), http.StatusOK)
|
||||
if err != nil {
|
||||
return identity.Receipt{}, err
|
||||
}
|
||||
|
||||
@@ -48,6 +48,7 @@ func TestSignupWireContractAndCredentialRotation(t *testing.T) {
|
||||
if strings.Contains(r.URL.Path, "/individuals/") {
|
||||
require.Equal(t, "registration-request", r.Header.Get("X-Request-ID"))
|
||||
require.Empty(t, body)
|
||||
w.WriteHeader(http.StatusCreated)
|
||||
_, _ = fmt.Fprintf(w, `{"status":"success","data":{"subject_ref":%q,"registered_at":"2026-10-07T10:30:00.123Z"}}`, subject)
|
||||
} else {
|
||||
require.JSONEq(t, `{"subject_ref":"`+subject+`","source_submission_ref":"signup-1","facts":{"full_name":"Ada Lovelace","email":"ada@example.com","external_customer_ref":"local-user"}}`, string(body))
|
||||
@@ -95,6 +96,36 @@ func TestRejectInvalidConfiguration(t *testing.T) {
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
func TestSignupReceiptsRequireOperationStatus(t *testing.T) {
|
||||
for _, status := range []int{200, 201, 202, 204, 206, 300, 403, 409, 503} {
|
||||
t.Run(http.StatusText(status), func(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(status)
|
||||
_, _ = fmt.Fprintf(w, `{"status":"success","data":{"subject_ref":%q,"registered_at":"2026-10-07T10:30:00Z","submission_ref":%q,"accepted_at":"2026-10-07T10:30:00Z"}}`, subject, submission)
|
||||
}))
|
||||
defer server.Close()
|
||||
client, err := Open(config(t, server.URL))
|
||||
require.NoError(t, err)
|
||||
ref, err := client.Register(context.Background(), "registration-request")
|
||||
if status == http.StatusCreated {
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, subject, ref)
|
||||
} else {
|
||||
require.Error(t, err)
|
||||
require.Empty(t, ref)
|
||||
}
|
||||
receipt, err := client.Submit(context.Background(), subject, "key", identity.Facts{})
|
||||
if status == http.StatusOK {
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, submission, receipt.SubmissionRef)
|
||||
} else {
|
||||
require.Error(t, err)
|
||||
require.Empty(t, receipt)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestUpstreamFailuresNeverProduceReceiptsOrLeakBodies(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
@@ -113,7 +144,11 @@ func TestUpstreamFailuresNeverProduceReceiptsOrLeakBodies(t *testing.T) {
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(tc.status)
|
||||
status := tc.status
|
||||
if status == http.StatusOK && strings.Contains(r.URL.Path, "/individuals/") {
|
||||
status = http.StatusCreated
|
||||
}
|
||||
w.WriteHeader(status)
|
||||
_, _ = io.WriteString(w, tc.body)
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
@@ -968,3 +968,35 @@ remain separate capabilities. Unrelated notifications runtime changes are exclud
|
||||
Delivered in [PR #51](https://git.sendico.io/tech/sxchnge/pulls/51), targeting
|
||||
`identity-verification-48`. Merge order is #47 → #49 → #51; deploy Sendico #2897
|
||||
before SXCHNGE #51. Both implementation branches are pushed and remain unmerged.
|
||||
|
||||
## Saved payout destinations UX — #54
|
||||
|
||||
Branch `payout-destinations-54`, based on `local-stand-52`. Implements Settings
|
||||
creation, details, rename, replacement and removal; explicit payout selection;
|
||||
optional saving and one-time preparation for crypto, cards and Russian personal
|
||||
accounts. Shared typed service/model/provider layers separate destination identity,
|
||||
metadata/execution revisions, ownership, provider bindings, contextual eligibility,
|
||||
save outcomes and financial outcomes. The customer-scoped demo replays stable
|
||||
created/duplicate results, preserves immutable quote/history snapshots, rechecks at
|
||||
acceptance, and demonstrates card-binding restoration without creating a second
|
||||
card. Bank directory/paste handling follows the reviewed Sendico interface.
|
||||
|
||||
EN/RU and 320 px/1.6× layouts are tested. Formatting (44 changed Dart files),
|
||||
analysis of app/wallet/analytics, `make test-frontend` (including 89 app tests), and
|
||||
`flutter build web` with Wasm dry run passed. Browser smoke inspection confirmed
|
||||
bank form rendering, labeled controls and keyboard focus. Full assistive-technology
|
||||
and real-provider audits were not performed. No security scans were requested/run.
|
||||
|
||||
Persistence and bindings in this delivery are simulated and reset on reload.
|
||||
Authenticated live mode retains explicit use of its provisioned payout destination;
|
||||
new types fail closed until the backend supplies the documented capabilities and
|
||||
registry/atomic-acceptance contracts. No routing, ownership-verification system,
|
||||
provider integration or financial engine was added. See
|
||||
[the specification and integration boundary](ux/payout-destinations.md).
|
||||
|
||||
Stacked merge order: #47 → #49 → #51 → #53 → this contribution. The unrelated
|
||||
notifications runtime edit is preserved outside task commits. Delivery links follow.
|
||||
|
||||
Delivery: [task #54](https://git.sendico.io/tech/sxchnge/issues/54) and
|
||||
[PR #55](https://git.sendico.io/tech/sxchnge/pulls/55). Implementation commit
|
||||
`24af794`; PR base `local-stand-52`. No merge performed.
|
||||
+33
-17
@@ -27,10 +27,17 @@ project directory. Dockerfiles are in `infra/images/`. Runtime and startup files
|
||||
are grouped by service under `infra/local/`. The stack consists of Vault, Mongo,
|
||||
NATS, notifications, BFF and Caddy serving the frontend.
|
||||
|
||||
The frontend container uses Compose `init: true` to reap orphaned `ssl_client`
|
||||
children created by BusyBox's HTTPS `wget` health probe. Keep this enabled:
|
||||
Caddy alone does not reap those children when it runs as PID 1, and repeated
|
||||
probes can accumulate thousands of zombie processes. Recreate the frontend
|
||||
container when applying this setting; restarting an old container does not
|
||||
change its init configuration.
|
||||
|
||||
On first startup, bootstrap initializes/unseals persistent Vault, provisions
|
||||
AppRoles and secrets, initializes Mongo replica set `rs0`, configures Vault's Mongo
|
||||
plugin, and starts authenticated NATS JetStream. Product startup fails explicitly
|
||||
until Resend credentials exist. Infrastructure remains available for provisioning.
|
||||
until the SMTP mailbox password exists. Infrastructure remains available for provisioning.
|
||||
|
||||
After all services pass their startup health checks and the public Caddy CA is
|
||||
exported, `make up` prints a Sendico-style completion message with the frontend,
|
||||
@@ -56,7 +63,7 @@ kv/
|
||||
├── services/
|
||||
│ ├── bff/jwt # jwt
|
||||
│ └── notifications/
|
||||
│ └── email/resend # api_key only
|
||||
│ └── email/smtp # password only
|
||||
└── infrastructure/
|
||||
├── nats/auth # token; read by NATS and notifications
|
||||
└── mongo/bootstrap # local administrator and replica-set bootstrap material
|
||||
@@ -74,29 +81,35 @@ There are no frontend certificates, notification certificates or generic `tls`
|
||||
entries in KV. Browser certificates belong to Caddy; internal gRPC is plaintext
|
||||
on the trusted private Docker network without caller authentication.
|
||||
|
||||
## Resend
|
||||
## Local SMTP mail
|
||||
|
||||
Open [Vault](http://127.0.0.1:18200) and edit
|
||||
`kv/services/notifications/email/resend`:
|
||||
`kv/services/notifications/email/smtp`:
|
||||
|
||||
| Field | Value |
|
||||
| --- | --- |
|
||||
| `api_key` | Your Resend API key |
|
||||
| `password` | Password for the configured SMTP mailbox |
|
||||
|
||||
The driver and sender settings belong in `infra/local/notifications/runtime.yml`:
|
||||
|
||||
```yaml
|
||||
email:
|
||||
driver: resend
|
||||
driver: smtp
|
||||
settings:
|
||||
api_key_env: EMAIL_API_KEY
|
||||
sender_address: "your-verified-sender@example.com"
|
||||
host: mail.sendico.io
|
||||
port: 465
|
||||
username: no-reply@sendico.io
|
||||
password_env: SMTP_PASSWORD
|
||||
network_timeout: 10
|
||||
sender_address: no-reply@sendico.io
|
||||
sender_name: "SXCHNGE"
|
||||
```
|
||||
|
||||
Set your verified address in that file and rebuild. It is intentionally empty by
|
||||
default, so notifications cannot start with an unconfigured sender. Vault Agent
|
||||
injects only the API key; it does not generate email configuration.
|
||||
The local stack uses Sendico's existing `no-reply@sendico.io` mailbox with
|
||||
authenticated implicit TLS on port 465 and certificate verification enabled.
|
||||
Vault Agent injects only the password; host, username and sender are non-secret
|
||||
runtime settings. Credentials are provisioned into SXCHNGE's own Vault; the
|
||||
notification service does not read Sendico configuration or secrets at runtime.
|
||||
|
||||
Local administrator login material is in private `.local/dev/admin/init.json`.
|
||||
Product containers cannot access it. Alternatively use the hidden terminal prompt:
|
||||
@@ -106,12 +119,15 @@ make email
|
||||
make build && make up
|
||||
```
|
||||
|
||||
No placeholder key or delivery fallback is installed. Startup validates presence;
|
||||
it does not send an email or validate domain ownership with Resend. Updating the
|
||||
API key causes Agent to restart notifications. Driver/sender changes require an
|
||||
image rebuild. Existing API keys survive bootstrap. Migration removes legacy
|
||||
driver/sender fields from the current Vault secret with a version-checked write;
|
||||
the preceding version is preserved in Vault history and the private archive.
|
||||
No placeholder password or delivery fallback is installed. Startup validates
|
||||
configuration and secret presence; the SMTP connection is opened on demand.
|
||||
Updating the password causes Agent to restart notifications. Driver/sender
|
||||
changes require an image rebuild. Old Resend secrets remain in Vault history
|
||||
but are not used or readable by the notifications AppRole. HTTP providers remain
|
||||
available for other deployments; switching one requires matching Agent/policy
|
||||
and runtime configuration. SMTP has no provider idempotency guarantee: explicit
|
||||
4xx rejections retry, 5xx rejections fail, and ambiguous transport outcomes require
|
||||
operator reconciliation before another send.
|
||||
|
||||
## Browser HTTPS and internal connections
|
||||
|
||||
|
||||
@@ -105,6 +105,27 @@ docker compose --project-directory . -f infra/local/compose.yml \
|
||||
-f infra/local/sendico/compose.yml --env-file .local/dev/images.env restart sendico
|
||||
```
|
||||
|
||||
A BFF container restart can leave its session worker in the old shared network
|
||||
namespace. The worker checks Vault DNS every ten seconds, with a five-second
|
||||
lookup limit. Three consecutive failures log a credential-free recovery reason
|
||||
and terminate the session process; Docker's restart policy then attaches it to
|
||||
the BFF's current namespace. A successful lookup resets the counter, so transient
|
||||
DNS failures do not immediately restart the worker.
|
||||
|
||||
Container recreation changes the BFF container ID as well as its namespace.
|
||||
Bootstrap and credential-rotation tooling recreate BFF and its configured session
|
||||
worker together. Compose also marks the session dependency for restart when BFF
|
||||
is explicitly updated. For a manual forced recreation, select both services:
|
||||
|
||||
```sh
|
||||
docker compose --project-directory . -f infra/local/compose.yml \
|
||||
-f infra/local/sendico/compose.yml --env-file .local/dev/images.env \
|
||||
up -d --no-deps --force-recreate --wait bff sendico
|
||||
```
|
||||
|
||||
The parent process cleans up its bridge, DNS monitor and renewal delay on exit.
|
||||
This recovery retains the configured provider URL, account and replay namespace.
|
||||
|
||||
`make test-dev` checks seven healthy services, verified browser TLS, the Vault
|
||||
layout and least-privilege identities, Mongo transactions/lease rotation, and
|
||||
authenticated Sendico currency and ledger reads through the same loopback
|
||||
@@ -130,6 +151,21 @@ and the established CA. A subsequent verified TLS check must succeed.
|
||||
|
||||
## Acceptance and operator UX review
|
||||
|
||||
Recovery follow-up for [task #57](https://git.sendico.io/tech/sxchnge/issues/57) /
|
||||
[PR #59](https://git.sendico.io/tech/sxchnge/pulls/59), validated on 2026-10-19:
|
||||
`make test-dev-tooling`, `make test-dev-rotation`, Compose configuration validation,
|
||||
`sh infra/local/tools.sh verify` and `git diff --check` pass. A BFF-only restart
|
||||
triggered automatic session restart and restored matching network namespaces;
|
||||
paired recreation also finished healthy. Rotation observed three real Vault
|
||||
pool replacements, an unchanged BFF process and 534 transaction-backed requests
|
||||
with zero failures. The final check verifies all seven SXCHNGE services, browser
|
||||
HTTPS, Vault/database boundaries and authenticated Sendico currency/ledger reads.
|
||||
An earlier check failed because Sendico's ledger announcement connection was
|
||||
closed; restoring Discovery and its service announcers in dependency order
|
||||
recovered that existing stand. No Sendico source or financial data was changed,
|
||||
and no email or payment was sent. This follow-up changes shell/Compose tooling;
|
||||
it does not rerun the earlier full Go/Flutter suite for unchanged product source.
|
||||
|
||||
Validated on 2026-10-16: `make build`, `make up`, `make test-dev-tooling`,
|
||||
`make test-dev-infra`, `make test-dev`, and `git diff --check` passed. Both product
|
||||
sites, Sendico Backoffice and both API health endpoints returned HTTP 200;
|
||||
|
||||
+216
-4
@@ -5,8 +5,191 @@ Task [#46](https://git.sendico.io/tech/sxchnge/issues/46), branch
|
||||
customer creation, runtime, shared database source and Flutter error feedback.
|
||||
Delivery: [PR #47](https://git.sendico.io/tech/sxchnge/pulls/47), targeting `main`.
|
||||
|
||||
## Registration response correction
|
||||
|
||||
Follow-up [#57](https://git.sendico.io/tech/sxchnge/issues/57), branch
|
||||
`identity-facts-57`, delivered in [PR #59](https://git.sendico.io/tech/sxchnge/pulls/59)
|
||||
against `main` (implementation `abca15f`), corrects the registration success status
|
||||
to HTTP 201 Created. The PR remains unmerged.
|
||||
Sendico's individual creation handler returns 201; the original adapter and test
|
||||
fixture incorrectly required 200. A successful registration therefore left a
|
||||
pending customer with an unresolved claim and `signup_attention_required`.
|
||||
The adapter now checks the exact status per operation before validating receipts:
|
||||
201 for registration and 200 for Facts intake. Other statuses, including other
|
||||
2xx responses, remain failures. Malformed receipts and uncertain registrations
|
||||
still require the existing recovery rules.
|
||||
|
||||
On 2026-10-17, the affected local signup was reconciled using its registration
|
||||
correlation in Sendico logs and an authenticated organization-scoped individual
|
||||
GET. A conditional majority write bound that confirmed individual to the existing
|
||||
local claim, preserving the saved facts, namespace and registration request.
|
||||
The rebuilt BFF resumed the public activation-resend flow: Facts intake returned
|
||||
a persisted receipt and the endpoint returned 202 after activation-email queue
|
||||
acceptance. No replacement individual was registered. The account remains
|
||||
pending until the customer confirms the email; queue acceptance does not prove
|
||||
inbox delivery.
|
||||
|
||||
Recovery also exposed a notification worker lifetime issue: its NATS subscription
|
||||
retained the 20-second startup context and was automatically unsubscribed after
|
||||
that deadline. Resource provisioning now has its own bounded context, while the
|
||||
subscription follows the service lifetime and closes at shutdown. A regression
|
||||
test checks that releasing provisioning leaves the subscription context active,
|
||||
and service cancellation still ends it.
|
||||
|
||||
The rebuilt worker processed the queued activation message. The live Resend
|
||||
provider rejected it with `provider_authentication_failed` (HTTP 401 or 403),
|
||||
leaving delivery in `failed` after one attempt. Later diagnostics below identify
|
||||
the unverified sender domain as the actual blocker. Correct domain authorization
|
||||
before activation resend with a new idempotency key. Credential rotation is not
|
||||
required by that error; if a separate rotation is needed, use `make email` and
|
||||
allow Vault Agent to refresh/restart the notification process. Do not replay the
|
||||
failed notification as a success or mark the customer active on their behalf.
|
||||
|
||||
Validation passed: `GOFLAGS=-p=2 make test` (all backend race tests and canonical
|
||||
frontend suites), `make lint-backend`, focused provider/identity race tests and
|
||||
notification bus/app race tests. The HTTP 201 regression first failed against the
|
||||
old adapter and passed after correction. An earlier full run hit a database
|
||||
credential-rotation timing failure at `rotation_test.go:249` during the Docker
|
||||
build; the isolated race-test retry and both subsequent full runs passed.
|
||||
Local BFF and notifications images were rebuilt with fresh upstream manifests
|
||||
and resolved stable digest pins; the BFF, session sidecar and notifications
|
||||
services are healthy. NATS shows the worker still waiting for deliveries beyond
|
||||
the startup deadline, with no pending or unacknowledged jobs. Live email delivery
|
||||
is blocked by provider authorization as described above. No security scans were
|
||||
requested or run. Unrelated notifications runtime settings are excluded from
|
||||
the task commits.
|
||||
|
||||
### Provider diagnostics follow-up
|
||||
|
||||
The same task/PR adds transient provider diagnostics to the worker's existing
|
||||
structured outcome log: `provider_status`, `provider_error` and
|
||||
`provider_message`. The adapter extracts bounded Resend/SendGrid error fields and
|
||||
redacts credentials, request values, addresses, URLs and token/code fragments.
|
||||
Transport errors have a sanitized cause; invalid or oversized responses have a
|
||||
safe fallback. Diagnostics remain outside stored notification models and public
|
||||
gRPC responses. The outcome is logged even when its result write fails. See
|
||||
the [notification logging contract](../backend/notifications/README.md).
|
||||
|
||||
Runtime inspection confirmed `email.driver: resend`, an API key in Vault, and
|
||||
sender `noreply@sxchnge.com`. A live diagnostic notification used Resend's
|
||||
documented `delivered+sxchnge-config@resend.dev` test mailbox, without retrying
|
||||
the customer's email. The rebuilt worker logged HTTP 403,
|
||||
`provider_error: validation_error`, and the sanitized message:
|
||||
`The sxchnge.com domain is not verified. Please, add and verify your domain on [redacted-url]`.
|
||||
The precise blocker is sender-domain verification, not missing local Resend
|
||||
configuration. A sending-only key is appropriate for sending; its inability to
|
||||
read Resend's logs API does not explain the original send failure. Verify the
|
||||
configured domain in Resend (and its required DNS records), or explicitly choose
|
||||
an already verified sender domain. No sender/domain/DNS setting was changed by
|
||||
this follow-up; the customer's account remains pending email confirmation.
|
||||
|
||||
Follow-up validation passed: `GOFLAGS=-p=2 make test`, `make lint-backend`, and
|
||||
`go -C backend/notifications test -race ./email ./service -count=1`. Coverage
|
||||
includes Resend/SendGrid messages, malformed/trailing/oversized response bodies,
|
||||
credential/content/code redaction, Unicode-safe truncation, sanitized transport
|
||||
errors, and exactly one provider outcome log even when persistence fails. The
|
||||
notifications image was rebuilt from fresh stable digest pins and deployed
|
||||
healthy; the live test verified both the diagnostic log and the unchanged generic
|
||||
gRPC failure response. No security scan or real customer email retry was run.
|
||||
|
||||
## Behavior and boundaries
|
||||
|
||||
### Local mail client
|
||||
|
||||
The user subsequently selected Sendico's existing mailbox instead of Resend for
|
||||
local notifications. The authoritative Sendico configuration resolves to
|
||||
`no-reply@sendico.io`, `mail.sendico.io:465`, authenticated implicit TLS and a
|
||||
10-second network timeout. SXCHNGE's owned `smtp` adapter consumes rendered email
|
||||
models through the existing sender contract and queue; it does not import or
|
||||
access Sendico business modules, databases or messaging. The password was copied
|
||||
once, without printing it, from the running Sendico notification environment into
|
||||
`services/notifications/email/smtp` in SXCHNGE Vault. Only `password` is stored
|
||||
there; host, port, username, display name and sender remain in runtime YAML.
|
||||
|
||||
The SMTP adapter verifies certificates, authenticates before submission, sends
|
||||
UTF-8 MIME alternatives, and requires the final DATA 250 reply for acceptance.
|
||||
SMTP 4xx replies retry through the existing worker policy; 5xx replies fail;
|
||||
ambiguous transport outcomes remain UNKNOWN and are not immediately resent.
|
||||
Message-ID is correlation only, not a provider idempotency guarantee. Existing
|
||||
failed Resend notifications are not replayed or rewritten. The unverified
|
||||
`sxchnge.com` Resend domain is no longer the selected local delivery path.
|
||||
|
||||
Live verified-TLS SMTP authentication and NOOP succeeded with reply 250 using
|
||||
the password from SXCHNGE Vault, without submitting email. SMTP adapter race
|
||||
tests, `make lint-backend`, `make test-dev-tooling` and `make test-dev-infra`
|
||||
pass, including canonical Vault layout, service permission isolation, database
|
||||
credential issuance/renewal/revocation and transactions. The final
|
||||
`GOFLAGS=-p=2 make test` passes all backend race tests and frontend suites.
|
||||
|
||||
Earlier attempts hit Docker archive-copy/reaper timeouts, Go proxy TLS failures
|
||||
and stalled cache extraction/container startup. The user authorized restarting
|
||||
Docker Desktop. After recovery, the normal Compose `build --pull notifications`
|
||||
succeeded with the resolved stable digest pins; no checks were disabled. The
|
||||
generator stage shares the existing BuildKit Go module/build caches and retains
|
||||
the pinned tools and canonical Make generation command. A discarded fallback
|
||||
compiler attempt also failed to access its checksum-state directory; it was not
|
||||
used for the deployed artifact.
|
||||
|
||||
The matching Vault Agent policy/template were applied, and notifications was
|
||||
recreated healthy. Its running image matches the rebuilt image
|
||||
`sha256:d4cbc0cb9005e9cef9381abdf2a13f672104d160536ee6d77ac73a909c0a8638`,
|
||||
and its startup log confirms `email_driver: smtp`. No customer email was sent or
|
||||
failed Resend job replayed; SMTP authentication is not a recipient-delivery
|
||||
check. Sendico's Vault sealed during the Docker restart and was unsealed with
|
||||
its existing local key, without reinitialization or exposing credentials.
|
||||
Its affected services were restarted in dependency order. The local Sendico
|
||||
session sidecar shares the BFF network namespace, so it was restarted after the
|
||||
BFF to restore Docker DNS and the loopback bridge. Final
|
||||
`sh infra/local/tools.sh verify` passes: seven healthy services, verified HTTPS
|
||||
for frontend/proxied BFF, authenticated Sendico currency/ledger reads and the
|
||||
Vault/database checks. No Sendico repository files were changed.
|
||||
|
||||
On October 18, the frontend had 15,897 processes, including 15,888 unreaped
|
||||
`ssl_client` zombie children of Caddy PID 1. The three-second HTTPS health
|
||||
probe used BusyBox `wget`, which left those children behind. This confirmed a
|
||||
recurring local infrastructure leak, independently of SMTP authentication.
|
||||
Compose now enables `init: true` for frontend, and only that container was
|
||||
recreated. PID 1 is now `docker-init`; 40 consecutive HTTPS probes completed
|
||||
with zero zombie processes and a bounded count of 15 processes afterward.
|
||||
Compose configuration validation and `make test-dev-tooling` pass. The API
|
||||
health endpoint returns HTTP 200; a diagnostic request using the existing
|
||||
account and a generated incorrect password returned HTTP 400 `email_in_use`
|
||||
without creating an account or sending email.
|
||||
|
||||
The contemporaneous full local verification attempt is blocked by MongoDB's
|
||||
five-second health-check timeout under continuing host load; it is not recorded
|
||||
as passing. The exact response to the reported Safari attempt was not captured,
|
||||
and the frontend's generic unavailable text also covers some HTTP 400 input
|
||||
errors. A fresh user retry is needed to confirm the visible signup outcome.
|
||||
|
||||
On October 19 the failing API was directly observed returning HTTP 502. The BFF
|
||||
had restarted while the session worker retained its old network namespace;
|
||||
`/proc/self/ns/net` differed between them, and the worker could not resolve
|
||||
Vault. Sendico's public API itself returned HTTP 200. Restarting only the worker
|
||||
reattached its namespace and restored SXCHNGE API HTTP 200. This is a confirmed
|
||||
cause of that 502, separate from the previous process leak and host-load finding.
|
||||
|
||||
The session now monitors bounded DNS failures and exits after three consecutive
|
||||
failures so Docker can reattach it automatically. Bootstrap and rotation pair
|
||||
BFF/session recreation, with Compose dependency restart enabled. Offline shell
|
||||
fixtures cover transient-failure reset, sustained-failure recovery, safe parent
|
||||
targeting and conditional service pairing. A live BFF-only restart automatically
|
||||
restarted the session and restored matching namespaces, fresh session readiness
|
||||
and API HTTP 200. A second live test recreated BFF and its session together and
|
||||
confirmed healthy services with matching namespaces. No provider bindings,
|
||||
customer records, credentials or Sendico source files were changed.
|
||||
|
||||
Final October 19 validation passes: `make test-dev-tooling`, Compose config
|
||||
validation, `make test-dev-rotation` (three real rotations, unchanged BFF process,
|
||||
534 transaction-backed requests and zero failures), and
|
||||
`sh infra/local/tools.sh verify`. The last confirms all seven healthy services,
|
||||
verified frontend/BFF HTTPS, Vault/database checks and authenticated Sendico
|
||||
currency/ledger reads. An initial ledger-read failure was resolved by restoring
|
||||
Sendico Discovery and its announcers in their documented dependency order after
|
||||
closed NATS connections. No email was sent during validation. The recovery fix
|
||||
and its validation are included in [PR #59](https://git.sendico.io/tech/sxchnge/pulls/59).
|
||||
|
||||
|
||||
With `api.sendico` configured, the product BFF creates the local pending customer
|
||||
and activation token atomically, then registers an independent individual through
|
||||
Sendico's public HTTP API and submits the sign-up assertions. It persists the
|
||||
@@ -18,7 +201,7 @@ backfilled or blocked at login.
|
||||
|
||||
The adapter consumes these existing Sendico contracts:
|
||||
|
||||
- `POST /individuals/{organization_ref}`, empty body, HTTP 200 registration
|
||||
- `POST /individuals/{organization_ref}`, empty body, HTTP 201 registration
|
||||
receipt containing `subject_ref` and `registered_at`.
|
||||
- `POST /identity_facts/{organization_ref}`, HTTP 200 immutable intake receipt
|
||||
containing `submission_ref`, `subject_ref` and `accepted_at`.
|
||||
@@ -73,9 +256,10 @@ the adapter rereads it on every request. Startup rejects missing, expired or
|
||||
mismatched credentials and rejects Sendico configuration without notifications.
|
||||
|
||||
HTTPS is required except for loopback HTTP test/development endpoints. Redirects
|
||||
are rejected and each HTTP call has a four-second timeout. Non-200 responses,
|
||||
malformed/truncated receipts, invalid identifiers, wrong subjects and unsuccessful
|
||||
envelopes never count as acceptance. Upstream error bodies are not surfaced.
|
||||
are rejected and each HTTP call has a four-second timeout. Unexpected response
|
||||
statuses (registration requires 201; Facts intake requires 200), malformed/truncated
|
||||
receipts, invalid identifiers, wrong subjects and unsuccessful envelopes never
|
||||
count as acceptance. Upstream error bodies are not surfaced.
|
||||
|
||||
Omitting `api.sendico` keeps existing local-only behavior. Enabling it also gates
|
||||
activation for previously pending customers; use activation resend to submit
|
||||
@@ -85,6 +269,34 @@ adapter fingerprint and blocks existing bindings for explicit reconciliation.
|
||||
Token rotation for the same account retains that fingerprint. Plan such changes
|
||||
as migrations; never reset a binding just to bypass the check.
|
||||
|
||||
## Local signup request diagnosis
|
||||
|
||||
The October 19 follow-up screenshot still shows the generic unavailable message
|
||||
after the network recovery. That screenshot alone does not establish a 503:
|
||||
the frontend also maps some rejected inputs and browser transport failures to
|
||||
that message. At the follow-up check the health endpoint returned 200, and BFF
|
||||
signup counters contained only the operator's two deliberately invalid probes.
|
||||
The user's current browser failure has not yet been reproduced or resolved.
|
||||
|
||||
Local Caddy now logs requests to exactly `/api/v1/accounts/signup` under
|
||||
`http.log.access.signup`, including HTTP status and duration. The complete
|
||||
request object, response headers and user identifier are removed before log
|
||||
encoding, so paths/queries, cookies, authorization, addresses and user-supplied
|
||||
headers cannot enter these access records. Bodies are never logged. Other
|
||||
requests, including health probes and email confirmation URLs, are skipped.
|
||||
Inspect with:
|
||||
|
||||
```sh
|
||||
docker logs --since 5m sxchnge-local-frontend-1 2>&1 |
|
||||
jq -Rrc 'fromjson? | select(.logger=="http.log.access.signup")'
|
||||
```
|
||||
|
||||
Validation: Caddy configuration validation and reload passed; a deliberately
|
||||
invalid signup returned 400 and produced the expected status/duration record.
|
||||
Sentinel query, cookie and custom-header values were absent from its log.
|
||||
The frontend was rebuilt with freshly resolved stable image pins. No real
|
||||
signup or customer email was submitted during this diagnostic work.
|
||||
|
||||
## Persistence, retries and recovery
|
||||
|
||||
The local `signup_facts` collection uses the customer ID as `_id`, so its unique
|
||||
|
||||
@@ -149,3 +149,150 @@ text uses a normal text node to remain exposed to assistive technology.
|
||||
Delivered in [PR #13](https://git.sendico.io/tech/sxchnge/pulls/13), branch
|
||||
`onboarding-12`. The final browser accessibility tree exposes the recipient text,
|
||||
demo status, status heading and recovery actions. PR is open for review.
|
||||
|
||||
## Browser credential autofill
|
||||
|
||||
Task: [#56](https://git.sendico.io/tech/sxchnge/issues/56), branch `auth-56`.
|
||||
Delivery: [PR #58](https://git.sendico.io/tech/sxchnge/pulls/58), implementation
|
||||
commit `86b6aaf`. Open for review; no merge or deployment is included.
|
||||
The consumer auth form groups its mounted inputs in one `AutofillGroup` and
|
||||
declares their purpose explicitly:
|
||||
|
||||
| Input | Flutter hints | Browser autocomplete |
|
||||
| --- | --- | --- |
|
||||
| Signup name | `name` with the name keyboard | `name` |
|
||||
| Account email | `username`, then `email`, with the email keyboard | `username` |
|
||||
| Login password | `password` | `current-password` |
|
||||
| Signup password and confirmation | `newPassword` on both | `new-password` |
|
||||
|
||||
Flutter uses the first hint on web and Apple platforms. Email is the credential
|
||||
username; the email keyboard remains configured separately. Visibility toggles
|
||||
keep the password role, so autofill does not depend on detecting masked input.
|
||||
The confirmation field participates in the same group as the first password,
|
||||
allowing the browser to fill both without copying one controller into the other.
|
||||
|
||||
Signup acceptance finalizes autofill before clearing password controllers and
|
||||
navigating to email verification. Login finalizes on success; when a second
|
||||
factor is required, it waits for verification and login completion. The password
|
||||
remains only in the existing form controller during that challenge, then clears
|
||||
on completed navigation or cancellation. Invalid input, rejected credentials and
|
||||
failed verification do not request saving. Switching auth mode, abandoning the
|
||||
form or leaving for unverified-account recovery cancels the autofill context.
|
||||
Provider/service/model boundaries and existing request/outcome telemetry are
|
||||
unchanged; no field events or credential telemetry are added. Browser popup
|
||||
display and pre-submit autofill abandonment remain outside current measurement.
|
||||
|
||||
### Verification and release check
|
||||
|
||||
Focused widget tests send a platform autofill response with all four signup
|
||||
values and check EN/RU controller updates, grouped credential metadata, visibility
|
||||
changes, mode switching and abandonment. Auth tests cover validation failures,
|
||||
service rejection/retry, stale responses, signup/login acceptance, unverified
|
||||
recovery, invalid second-factor codes and cancellation without premature saving.
|
||||
Existing narrow/desktop layouts and enlarged-text tests cover the unchanged UI.
|
||||
|
||||
Native Safari verification remains a release check: computer-control permission
|
||||
was unavailable in this session. On the deployed HTTPS origin with Safari
|
||||
AutoFill enabled, focus the signup email and password fields, choose a suggested
|
||||
strong password, verify that both password fields populate, then confirm that
|
||||
login offers the saved credential. Repeat after showing/hiding passwords and
|
||||
switching modes. Browser settings, stored credentials and browser heuristics
|
||||
determine whether suggestions appear; automated Flutter tests cannot establish
|
||||
that the system popup was displayed or that credentials were saved.
|
||||
|
||||
References: [Apple Password AutoFill](https://developer.apple.com/documentation/security/enabling-password-autofill-on-an-html-input-element),
|
||||
[Flutter autofill hints](https://api.flutter.dev/flutter/material/TextField/autofillHints.html),
|
||||
and [AutofillGroup](https://api.flutter.dev/flutter/widgets/AutofillGroup-class.html).
|
||||
|
||||
Recorded validation: `dart format --output=none --set-exit-if-changed` passes for
|
||||
all five changed Dart files; `flutter analyze` passes in `frontend/app`;
|
||||
`make test-frontend` passes all 212 tests across the app and shared packages.
|
||||
`flutter build web` passes. The built page's default rendering path was inspected
|
||||
in the in-app browser: login exposes `username`/`current-password` in one HTML
|
||||
form; signup exposes `username`, `name` and two `new-password` inputs in one form.
|
||||
This verifies the browser metadata, not Safari's credential popup. With Flutter
|
||||
web accessibility semantics enabled, unfocused semantic inputs initially use
|
||||
framework-default autocomplete values until focused; password-manager behavior
|
||||
with assistive technology still requires a native browser audit.
|
||||
|
||||
## Verification links and login handoff
|
||||
|
||||
Task: [#60](https://git.sendico.io/tech/sxchnge/issues/60), branch
|
||||
`email-verification-60`. Email links use `/verify-email?token=…`; the web entry
|
||||
point installs Flutter's path URL strategy before initializing the application.
|
||||
This matches Caddy's existing SPA fallback and preserves the path and query on a
|
||||
fresh page load. Previously the default hash strategy could start at login and
|
||||
never submit the activation token. Unknown routes retain the canonical login
|
||||
fallback; invalid, expired and failed confirmation attempts remain on the
|
||||
verification page with the existing recovery actions.
|
||||
|
||||
Activation consumes the token, checks the pending account and accepted signup
|
||||
facts, and activates the account in the existing database transaction. Only
|
||||
after a successful commit does the API return `{verified: true, email: ...}`.
|
||||
Failure responses do not disclose the account email. Responses retain the
|
||||
shared no-store policy. The frontend backend DTO and mapper produce a
|
||||
`VerificationResult`; the verification provider exposes that result only in the
|
||||
verified state and clears it on reset, loading and failure. A verified response
|
||||
from an older backend without the optional email can still show success.
|
||||
|
||||
Success stays visible until the user chooses **Continue to login**. This replaces
|
||||
the misleading workspace action that could redirect an unauthenticated visitor
|
||||
back to login. The verified email travels through transient router extras into
|
||||
the editable login controller; the password starts empty and receives focus.
|
||||
Normal password and second-factor checks remain required. The email is not
|
||||
added to URLs, serialized history, persistent storage or analytics. A link opened
|
||||
in another tab or device can receive the verified address from the API without
|
||||
depending on the originating signup form's memory.
|
||||
|
||||
Existing requested/succeeded/failed email-confirmation journey signals remain
|
||||
the measurement source. Success continues to mean that the confirmation service
|
||||
returned a verified result, with simulated outcomes kept separate. No field or
|
||||
prefill event is needed. Existing limits around pre-submit abandonment,
|
||||
cross-device journey correlation and the in-memory analytics sink still apply.
|
||||
|
||||
Regression coverage includes transactional activation and rollback, returned
|
||||
email and failure privacy, used-token rejection, backend response mapping,
|
||||
provider identity clearing, EN/RU success-to-login navigation, editable prefill,
|
||||
empty focused password, and exclusion of email from serialized navigation state.
|
||||
The supplied private diagnostic token is not a test fixture or documentation
|
||||
input; it is kept out of repository sources and tracker records.
|
||||
|
||||
### Validation and local release (#60)
|
||||
|
||||
Delivery: [PR #61](https://git.sendico.io/tech/sxchnge/pulls/61), implementation
|
||||
commit `5f3b443`. Reviewed the complete backend and frontend contribution against
|
||||
their module guidelines and the UX/observability checklists. No task-caused
|
||||
review findings remain. Existing recovery, loading and accessible status states
|
||||
are retained; EN/RU widget tests and existing small-screen/text-scale coverage
|
||||
pass. Browser startup was checked against a separately built demo with synthetic
|
||||
tokens: direct success remains visible, Continue to login shows the verified
|
||||
email with an empty focused password, and an expired link offers resend/back.
|
||||
Native Safari was unavailable to automation, so browser-specific helper behavior
|
||||
is not claimed as verified by this check.
|
||||
|
||||
On 2026-10-19, changed-file Dart formatting, `flutter analyze` in both affected
|
||||
packages (`frontend/app`, `frontend/packages/sxchnge_auth`), `make test-frontend`
|
||||
(217 tests), `GOFLAGS=-p=1 make test`, and `make lint-backend` passed. The focused
|
||||
transactional activation integration test also passed independently. Initial
|
||||
test-container startup and image-resolution attempts failed while Docker was
|
||||
stalled. After the user-authorized Docker Desktop restart, the unchanged checks
|
||||
passed; no assertions, timeouts or gates were weakened. No security scan was
|
||||
requested or run.
|
||||
|
||||
The task branch was integrated locally into the existing `identity-facts-57`
|
||||
stand checkout, preserving its unrelated configuration. Fresh stable image
|
||||
versions/digests were resolved successfully with `sh infra/local/tools.sh images`.
|
||||
Compose rebuilt BFF and frontend with `build --pull bff frontend`, then recreated
|
||||
them and the Sendico session sidecar (which shares BFF's network namespace).
|
||||
Docker restart recovery also unsealed Sendico's existing Vault with its saved
|
||||
local key and restarted affected existing services in dependency order.
|
||||
|
||||
The updated BFF, frontend and Sendico sidecar are healthy. The authenticated
|
||||
Sendico currency/ledger check passes. HTTPS serves the direct verification path;
|
||||
the served JavaScript matches the new frontend image with SHA-256
|
||||
`b194c0cf5dcc62634c13c7fd3d2f7e482272cb7abc1e470c62629400bf2d5d21`.
|
||||
A live synthetic invalid token returns HTTP 400 without an email. The supplied
|
||||
real token was checked read-only and remains unused and unexpired, with its
|
||||
account pending verification, ready for the user to reopen the link. PR #61 has
|
||||
not been merged into remote main; this local deployment does not imply a main
|
||||
branch merge.
|
||||
@@ -167,3 +167,47 @@ This is a display correction within the existing KYC journey, so no additional
|
||||
analytics events or financial data collection are introduced. Tests cover mapping
|
||||
without inferring remaining, unused/exhausted/over-cap/zero-cap ratios and EN/RU
|
||||
usage display at 320px with 1.6 text scaling.
|
||||
|
||||
## Residence country selection — task #64
|
||||
|
||||
Task [#64](https://git.sendico.io/tech/sxchnge/issues/64), branch `kyc-64`.
|
||||
Delivery: [PR #65](https://git.sendico.io/tech/sxchnge/pulls/65).
|
||||
The profile now shows a country name and opens a searchable country list instead
|
||||
of asking customers to type a two-letter code. Names follow the English/Russian
|
||||
app locale. Search accepts localized or English names and two-letter codes,
|
||||
ignoring case and surrounding whitespace. Selection updates only
|
||||
`IdentityProfile.residenceCountry` with the country code; the existing provider,
|
||||
service, mapper and transport contracts remain unchanged.
|
||||
|
||||
The `country_picker` dependency supplies bundled country data, code lookup and
|
||||
translations through `CountryService` and `CountryLocalizations`. Flutter Material
|
||||
controls provide the search interface, explicit no-results recovery, minimum
|
||||
touch targets, keyboard selection, a selected-state checkmark, Back and Escape.
|
||||
The package's built-in list omits explicit no-results feedback and uses shorter
|
||||
row targets, so its data/localizations are reused with standard Material controls.
|
||||
There is no remote lookup, copied country table or extra application provider.
|
||||
Cancelling preserves the current profile, prefilled codes display names, busy
|
||||
state disables opening the selector, and the search controller is disposed with
|
||||
its dialog. The list is a data catalogue; backend eligibility remains authoritative.
|
||||
|
||||
This change stays within the existing KYC preparation/submission journey and its
|
||||
measurement definitions above. No selector events, queries, names or country
|
||||
codes are added to telemetry. Existing acceptance/failure/retry/abandonment
|
||||
signals and documented server-side review measurement gaps still apply.
|
||||
|
||||
Focused widget checks cover name/code search, code-only updates, reselection,
|
||||
cancel, no-results recovery, clearing search, saved values, locale changes,
|
||||
Russian names, disabled state, keyboard activation/selection/Escape and labeled
|
||||
touch targets. A long country name fits at 320px with 1.6 text scale. Existing
|
||||
EN/RU verification journeys now select a country and assert the profile code
|
||||
before continuing through document submission. Native screen-reader and device
|
||||
keyboard testing remain release checks; widget semantics checks do not establish
|
||||
those device outcomes.
|
||||
|
||||
Validation: five changed Dart files passed the format check; `flutter analyze`
|
||||
in `frontend/app` reported no issues; `make test-frontend` passed all 222 tests;
|
||||
and `flutter build web` passed, including its Wasm compatibility dry run. Browser
|
||||
smoke testing on the local demo opened the selector, searched for Poland and
|
||||
confirmed that the profile displays Poland after selection. Focused and full
|
||||
journey tests verify the stored `PL` code. Generated localization/build outputs
|
||||
remain ignored and uncommitted.
|
||||
@@ -0,0 +1,256 @@
|
||||
# Saved payout destinations
|
||||
|
||||
Task: tech/sxchnge#54. Branch: `payout-destinations-54`.
|
||||
|
||||
## Delivery and integration boundary
|
||||
|
||||
The Flutter app implements Settings management and payout selection/new/one-time
|
||||
flows with the injectable `DestinationService` in `sxchnge_wallet`. The included
|
||||
customer-scoped **demo** service is process-local: reload discards its saved
|
||||
records, attempts, directory fixtures and audit. No real card data may be entered.
|
||||
The existing live wallet remains connected to provisioned Sendico destinations,
|
||||
which now require explicit selection. Its existing financial adapter is unchanged.
|
||||
|
||||
This is UX and supporting contract implementation, not a production destination
|
||||
registry or new payment-provider integration. Live mode never falls back to a
|
||||
simulated destination store. It exposes no new destination creation capabilities
|
||||
until the BFF implements the contract below. `BackendWalletService` explicitly
|
||||
rejects new typed inputs rather than dropping them or using a different destination.
|
||||
Actual persistent storage, public Sendico capability/directory adapters, secure
|
||||
card collection, binding recovery and atomic financial acceptance are integration
|
||||
requirements, not claims established by client tests. The injected service boundary
|
||||
lets a production implementation replace the demo without DTO/networking in widgets.
|
||||
|
||||
## Screen annotations
|
||||
|
||||
The four primary destinations remain Accounts, Activity, Limits and Settings.
|
||||
|
||||
```text
|
||||
Settings → Payout methods
|
||||
Add payout method [primary action]
|
||||
Search saved methods [nickname and safe display metadata]
|
||||
Crypto addresses [type group; recently used first]
|
||||
nickname / asset · network · shortened address
|
||||
availability / required action [text, not color alone]
|
||||
Bank cards
|
||||
nickname / brand · masked suffix
|
||||
Russian bank accounts
|
||||
nickname / bank · masked suffix
|
||||
```
|
||||
|
||||
```text
|
||||
Add payout method
|
||||
Type [explicit selection]
|
||||
Type-specific destination fields [labels and inline validation]
|
||||
Save for future payouts [payout only; unchecked]
|
||||
Name for this method (optional) [Settings or saving enabled]
|
||||
Validation / eligibility / saving [separate feedback]
|
||||
Save payout method | Continue [no ordinary confirmation dialog]
|
||||
```
|
||||
|
||||
```text
|
||||
Pay out
|
||||
Source account / available funds
|
||||
Payout destination [explicit selection every time]
|
||||
Saved methods | New destination
|
||||
Amount [preserved during navigation/recovery]
|
||||
Review
|
||||
full destination, source debit, fee, receiving amount/asset
|
||||
network and memo/tag for crypto; card remains masked
|
||||
Pay out [amount/currency] [explicit consequential confirmation]
|
||||
Processing → confirmed settlement [existing separate wallet states]
|
||||
```
|
||||
|
||||
Settings: select type → details → Save. Payout: new destination → details → optional
|
||||
saving → Continue. Reuse: select saved method → amount → review → confirm. No
|
||||
mandatory nickname, routine ownership warning, automatic selection/substitution,
|
||||
or extra verification screen is added. Removal has a consequential confirmation.
|
||||
A replacement creates a new record; the original remains until explicitly removed.
|
||||
|
||||
Lists group by destination type, sort recent use within groups and search safe
|
||||
labels. Empty category, search no-match, unavailable data and no eligible methods
|
||||
are distinct. Opening creation/management uses transient Navigator state, preserving
|
||||
payout input without destination details in URLs or serialized browser history.
|
||||
|
||||
## Domain and service contract
|
||||
|
||||
`DestinationInput` is `SavedReference(id, executionRevision)` or
|
||||
`OneTimeDestination(details)`. Validation and contextual eligibility apply equally
|
||||
to both; quoting/submitting a one-time input must not create a reusable record.
|
||||
|
||||
A destination has a customer-owned opaque ID independent of provider bindings.
|
||||
Ownership declaration, service verification and payout eligibility are separate.
|
||||
Unverified details may be saved when saving policy permits. Ownership status is
|
||||
shown only when required/actionable. Format checks never establish ownership or
|
||||
receiving capability, and successful persistence never establishes payout eligibility.
|
||||
|
||||
`metadataRevision` protects nickname updates; `executionRevision` protects identity,
|
||||
lifecycle and binding changes. Rename cannot invalidate a valid execution quote.
|
||||
Removal and binding changes require execution revalidation. Immutable identities
|
||||
are changed by replacement. Last-use ordering is not an execution change.
|
||||
|
||||
Required service operations: capabilities; list/get; typed field validation;
|
||||
contextual assessment; create; creation-attempt lookup; duplicate resolution;
|
||||
rename with expected metadata revision; replacement; removal with expected
|
||||
revisions; bank lookup with cancellation; immutable quote preparation. Remediation
|
||||
capabilities must come from the service, never provider-specific widget logic.
|
||||
|
||||
Eligibility uses current capabilities, available routes, destination requirements,
|
||||
ownership/security policy, bindings and payout context including amount when relevant.
|
||||
States are eligible, temporarily unavailable, requires action and unsupported.
|
||||
Settings retains active unavailable methods. A contextless Settings assessment is
|
||||
informational and never proof of eligibility for a particular payout. Selection,
|
||||
quote preparation and acceptance revalidate independently. Losing eligibility or
|
||||
removal preserves inputs and requires explicit reselection; never substitute.
|
||||
|
||||
On Continue: validate fields; assess contextual eligibility; optionally persist
|
||||
under saving policy; proceed only if eligible. Persistence may succeed while the
|
||||
payout is ineligible. Definitive optional save failure allows retry or explicit
|
||||
one-time continuation. Unknown outcomes offer status lookup; eligible one-time
|
||||
continuation does not cancel/repeat a potentially successful save. Confirmation of
|
||||
saving, validation, submission and settlement are separate states.
|
||||
|
||||
### Canonical identities and duplicate outcomes
|
||||
|
||||
- Crypto: service-defined asset ID (including token-contract identity), canonical
|
||||
network ID, network-normalized address and applicable memo/tag. Identical address
|
||||
strings across networks/assets are distinct. Preserve presentation case and
|
||||
meaningful memo contents. Display enough metadata to distinguish same-symbol tokens.
|
||||
- Russian bank: service-normalized BIK, account number and holder identity. No
|
||||
frontend fuzzy matching or inference from an account prefix.
|
||||
- Card: reliable service/provider fingerprint where available, never brand/last-four,
|
||||
expiry or capture token. Provider-scoped fingerprints are not globally portable.
|
||||
Missing reliable fingerprint permits distinct records; never guess/merge.
|
||||
|
||||
Creation keys identify immutable payloads. Replay returns the same **created** or
|
||||
**duplicate** result even after the referenced record is renamed/removed. Attempt
|
||||
lookup distinguishes these outcomes. Concurrent creation must serialize duplicate
|
||||
resolution within the authenticated customer scope. Use existing method revalidates
|
||||
that record and never creates another. Existing nicknames remain unchanged.
|
||||
|
||||
The demo uses a synchronous customer-scoped mutation boundary; production needs
|
||||
persistent unique identity/idempotency constraints with transactions or equivalent.
|
||||
No duplicate endpoint may reveal another customer's destination or attempt.
|
||||
|
||||
### Bank input adapted from Sendico
|
||||
|
||||
Reviewed local Sendico checkout `c5a3440fa`, especially
|
||||
`docs/russian-bank-methods.md` and its form, lookup, parsing and validation tests.
|
||||
The form has Account holder, Bank details and optional nickname sections. Structured
|
||||
first/last names and optional patronymic preserve compound names; arbitrary full
|
||||
names are shown unsplit. Business/tax selectors are excluded from personal-account UX.
|
||||
Bank search is debounced 350 ms from two characters, with cancellation and stale
|
||||
response rejection. Results identify name, BIK and city. Selected bank is compact,
|
||||
with Change bank and expandable correspondent details. Account number accepts
|
||||
whitespace and preserves leading zeros; 20-digit/control-key checking is not ownership
|
||||
verification. Prefix hints remain advisory.
|
||||
|
||||
Local paste import recognizes explicit EN/RU labels, previews recognized values,
|
||||
flags conflicts, preserves untouched fields and never persists/transmits raw pasted
|
||||
text. Directory/name/correspondent mismatches remain visible. Invalid BIK, unknown
|
||||
bank, unsupported institution and service failure are distinct. On reuse, cosmetic
|
||||
directory labels may refresh; execution-material changes require review/requote.
|
||||
Never silently replace BIK, account or holder. Mergers/BIK changes can require a
|
||||
replacement; discontinued banks remain saved but ineligible.
|
||||
|
||||
### Cards and binding lifecycle
|
||||
|
||||
Card saving requires reusable support or a defined restoration mechanism. An existing
|
||||
card remains saved after card/binding expiry, revocation or provider outage.
|
||||
Requires action means a supported recovery exists; operational outages are temporary;
|
||||
without a reusable binding or supported recovery the UI must not promise reuse.
|
||||
Bindings may be multiple, provider-scoped and nonportable. Re-tokenization requires
|
||||
trusted same-card identification; otherwise create a replacement. Secure capture is
|
||||
transient. Saved card details contain local identity/display metadata, and bindings
|
||||
contain separate opaque references; PAN/CVV never enter application storage.
|
||||
|
||||
## Acceptance, security and retention
|
||||
|
||||
The BFF's financial acceptance boundary must atomically validate current quote,
|
||||
customer authorization, execution revision, lifecycle, eligibility and requirements,
|
||||
then persist the accepted immutable snapshot/intent. A preceding API assessment or
|
||||
frontend check cannot guarantee financial correctness. Removal committed first rejects
|
||||
acceptance; acceptance committed first survives later removal. Rejection preserves
|
||||
drafts and returns reselect/review/refresh/requote actions. Expired or materially changed
|
||||
quotes need explicit confirmation of recalculated terms. This is a required backend
|
||||
contract; the demo's synchronous acceptance guard only demonstrates its semantics.
|
||||
|
||||
Removal from the active list, binding deactivation and data erasure are separate.
|
||||
Removed records cannot serve new payouts; accepted payouts retain immutable snapshots.
|
||||
Production retention must assign explicit expiry/cleanup policies to abandoned quotes,
|
||||
capture references, idempotency records and required financial history. Do not promise
|
||||
complete erasure of retained financial records. The demo stores no browser data and
|
||||
expires transient quote leases; all remaining simulation data ends on reload.
|
||||
|
||||
Authorize every operation server-side and audit actor, timestamp, opaque method/attempt,
|
||||
action and outcome, without destination details. Metadata edits use optimistic concurrency.
|
||||
Risk-based step-up is service-policy driven; no mandatory MFA is introduced. No raw
|
||||
destination, pasted text, nickname, amount or account data enters logs, analytics or replay.
|
||||
|
||||
## Localization, accessibility and measurement
|
||||
|
||||
EN/RU copy is maintained in the app ARB sources. Specific states cover saving,
|
||||
uncertainty, duplicate reuse, changed/removed methods, directory failures, binding
|
||||
authorization and quote recovery. Ordinary success says only "Payout method saved."
|
||||
Forms use associated labels, field errors, a focusable live feedback area, text status
|
||||
and keyboard controls. Names stack below 480 px in a 720 px maximum form. Review
|
||||
320 px layouts at 1.6× text scale, long labels, full-address wrapping and 48 px targets.
|
||||
|
||||
`JourneyKind.destination` / `destinationSave` measures service-confirmed saving/resolution
|
||||
separately from the existing payout quote/submission/settlement signals. Retries share
|
||||
recorder correlation; confirmed save closes its journey. Idle/discard attempts use the
|
||||
shared 30-minute inactivity/disposal rule. Simulation events are explicitly marked.
|
||||
No production persistence, cross-session funnel or financial outcome is inferred from
|
||||
the demo recorder. Actual outcome events and backend audit are integration requirements.
|
||||
|
||||
## Validation scenarios and recorded review
|
||||
|
||||
Tests exercise one-time nonpersistence, idempotent/repeated/concurrent creation, stable
|
||||
duplicate replay after rename/removal, lost-response reconciliation, customer isolation,
|
||||
metadata concurrency, execution invalidation at acceptance, asset/network/token identity,
|
||||
case/memo handling, fingerprint fallback, card binding recovery states, bank control keys,
|
||||
directory changes, paste conflicts and DTO mappings. Widget tests exercise Settings
|
||||
save/rename/remove, explicit selection, one-time payout, optional-save failure recovery,
|
||||
removal during review, privacy-safe outcomes and EN/RU narrow layouts. Existing auth,
|
||||
factor, wallet and workspace regressions are included in the required frontend suite.
|
||||
|
||||
Research: [Wise recipient management](https://wise.com/help/articles/2491526/how-do-i-add-or-delete-recipients),
|
||||
[Coinbase address books](https://help.coinbase.com/en/exchange/managing-my-account/how-does-the-address-book-work),
|
||||
[Coinbase memo/tag requirements](https://help.coinbase.com/en/coinbase/trading-and-funding/sending-or-receiving-cryptocurrency/destination-tag-memo-faq),
|
||||
[Stripe tokenization](https://docs.stripe.com/api/tokens),
|
||||
[W3C form validation](https://www.w3.org/WAI/tutorials/forms/validation/).
|
||||
|
||||
Final validation commands and PR links are recorded below at delivery.
|
||||
|
||||
### Completion review — 2026-10-16
|
||||
|
||||
- Applied `review-frontend-change`, UX Design and UX Observability reviews across
|
||||
app, wallet and analytics. Extracted form/search/selection/management providers;
|
||||
widgets consume typed models and provider actions. Fixed narrow bank-header
|
||||
overflow and bottom feedback overlapping management controls.
|
||||
- Added structured immutable destination review, explicit simulated receiving
|
||||
asset/amount/timing terms, independent card-binding restoration and a typed
|
||||
created/duplicate analytics outcome. Nickname edits do not change execution
|
||||
revisions. New typed inputs are explicitly rejected by the legacy live adapter.
|
||||
- `dart format --output=none --set-exit-if-changed` over 44 changed Dart files:
|
||||
passed, no changes. `git diff --check`: passed.
|
||||
- `flutter analyze` in `frontend/app`, `frontend/packages/sxchnge_wallet` and
|
||||
`frontend/packages/sxchnge_analytics`: passed, no issues.
|
||||
- `make test-frontend`: passed all seven package/application suites, including
|
||||
89 application tests and the destination domain/recovery/concurrency scenarios.
|
||||
- `flutter build web` in `frontend/app`: passed, including the Wasm dry run.
|
||||
- Browser smoke check on a temporary local web preview: method selection and bank
|
||||
form rendered; accessibility labels exposed; Tab moved from type to First name.
|
||||
Automated EN/RU forms at 320 px and 1.6× scale passed. A full assistive-technology
|
||||
audit and production/provider validation were not performed.
|
||||
- An exploratory repository-root `flutter analyze` also inspected the unrelated
|
||||
standalone `website/flutter/brand_palette.dart`, which lacks Flutter package
|
||||
context and reported `dart:ui` errors. The required affected-package analyses
|
||||
above passed; no unrelated website code or analyzer settings were changed.
|
||||
- No backend code or infrastructure changes, live payments, deployment, merge or
|
||||
security scanner runs were performed. Live persistence/atomic acceptance remain
|
||||
the explicitly documented integration boundary.
|
||||
|
||||
Delivery: [task #54](https://git.sendico.io/tech/sxchnge/issues/54),
|
||||
[PR #55](https://git.sendico.io/tech/sxchnge/pulls/55), implementation commit
|
||||
`24af794`. PR base is `local-stand-52`; merge after #47 → #49 → #51 → #53.
|
||||
+150
-119
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
@@ -18,7 +19,8 @@ import 'validation.dart';
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class AuthForm extends StatefulWidget {
|
||||
const AuthForm({super.key});
|
||||
const AuthForm({super.key, this.email});
|
||||
final String? email;
|
||||
|
||||
@override
|
||||
State<AuthForm> createState() => _AuthFormState();
|
||||
@@ -32,7 +34,7 @@ class _AuthFormState extends State<AuthForm> {
|
||||
bool _showPassword = false;
|
||||
bool _showConfirmation = false;
|
||||
bool _submitted = false;
|
||||
final _email = TextEditingController();
|
||||
late final _email = TextEditingController(text: widget.email);
|
||||
final _name = TextEditingController();
|
||||
|
||||
AuthProvider get _provider =>
|
||||
@@ -63,6 +65,8 @@ class _AuthFormState extends State<AuthForm> {
|
||||
|
||||
void _switch(bool signUp) {
|
||||
if (signUp == _signUp) return;
|
||||
FocusScope.of(context).unfocus();
|
||||
TextInput.finishAutofillContext(shouldSave: false);
|
||||
context.read<JourneyRecorder>().abandon(JourneyExit.modeChange);
|
||||
context.read<LoginProvider>().reset();
|
||||
context.read<SignupProvider>().reset();
|
||||
@@ -95,6 +99,7 @@ class _AuthFormState extends State<AuthForm> {
|
||||
return;
|
||||
}
|
||||
final email = _email.text.trim();
|
||||
TextInput.finishAutofillContext();
|
||||
_password.clear();
|
||||
_confirmation.clear();
|
||||
context.goNamed(AppRoutes.verificationSent, extra: email);
|
||||
@@ -107,13 +112,13 @@ class _AuthFormState extends State<AuthForm> {
|
||||
);
|
||||
if (!mounted || _signUp) return;
|
||||
if (login.state.error == AuthError.accountNotVerified) {
|
||||
TextInput.finishAutofillContext(shouldSave: false);
|
||||
_password.clear();
|
||||
context.goNamed(AppRoutes.verificationSent, extra: _email.text.trim());
|
||||
return;
|
||||
}
|
||||
final challenge = login.state.result?.challenge;
|
||||
if (challenge != null) {
|
||||
_password.clear();
|
||||
final grant = await verifyFactor(
|
||||
context,
|
||||
challenge: challenge,
|
||||
@@ -123,6 +128,8 @@ class _AuthFormState extends State<AuthForm> {
|
||||
);
|
||||
if (!mounted || _signUp) return;
|
||||
if (grant == null) {
|
||||
TextInput.finishAutofillContext(shouldSave: false);
|
||||
_password.clear();
|
||||
login.reset();
|
||||
context.read<JourneyRecorder>().abandon(JourneyExit.navigation);
|
||||
return;
|
||||
@@ -137,9 +144,13 @@ class _AuthFormState extends State<AuthForm> {
|
||||
!_signUp &&
|
||||
identical(login.state.result, accepted) &&
|
||||
login.state.status == AuthStatus.success) {
|
||||
TextInput.finishAutofillContext();
|
||||
_password.clear();
|
||||
context.go(offer ? '/identity?onboarding=1' : '/accounts');
|
||||
}
|
||||
}
|
||||
} else if (login.state.status == AuthStatus.success) {
|
||||
TextInput.finishAutofillContext();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -195,150 +206,170 @@ class _AuthFormState extends State<AuthForm> {
|
||||
expandedInsets: EdgeInsets.zero,
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
Form(
|
||||
key: _form,
|
||||
autovalidateMode: _submitted
|
||||
? AutovalidateMode.onUserInteraction
|
||||
: AutovalidateMode.disabled,
|
||||
onChanged: () {
|
||||
if (_provider.state.status == AuthStatus.success ||
|
||||
_provider.state.status == AuthStatus.error) {
|
||||
_provider.reset();
|
||||
}
|
||||
},
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
if (_signUp) ...[
|
||||
AutofillGroup(
|
||||
// Leaving an unfinished form must not offer to save its credentials.
|
||||
onDisposeAction: AutofillContextAction.cancel,
|
||||
child: Form(
|
||||
key: _form,
|
||||
autovalidateMode: _submitted
|
||||
? AutovalidateMode.onUserInteraction
|
||||
: AutovalidateMode.disabled,
|
||||
onChanged: () {
|
||||
if (_provider.state.status == AuthStatus.success ||
|
||||
_provider.state.status == AuthStatus.error) {
|
||||
_provider.reset();
|
||||
}
|
||||
},
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
if (_signUp) ...[
|
||||
TextFormField(
|
||||
key: const ValueKey('name'),
|
||||
controller: _name,
|
||||
enabled: !state.isLoading,
|
||||
decoration: InputDecoration(
|
||||
labelText: l.name,
|
||||
prefixIcon: Icon(Icons.person_outline),
|
||||
errorMaxLines: 3,
|
||||
),
|
||||
textInputAction: TextInputAction.next,
|
||||
keyboardType: TextInputType.name,
|
||||
autofillHints: const [AutofillHints.name],
|
||||
textCapitalization: TextCapitalization.words,
|
||||
validator: (value) => AuthValidation.name(value, l),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
],
|
||||
TextFormField(
|
||||
key: const ValueKey('name'),
|
||||
controller: _name,
|
||||
key: const ValueKey('email'),
|
||||
controller: _email,
|
||||
enabled: !state.isLoading,
|
||||
decoration: InputDecoration(
|
||||
labelText: l.name,
|
||||
prefixIcon: Icon(Icons.person_outline),
|
||||
labelText: l.email,
|
||||
hintText: l.emailHint,
|
||||
prefixIcon: Icon(Icons.alternate_email),
|
||||
errorMaxLines: 3,
|
||||
),
|
||||
keyboardType: TextInputType.emailAddress,
|
||||
autofillHints: const [
|
||||
AutofillHints.username,
|
||||
AutofillHints.email,
|
||||
],
|
||||
textInputAction: TextInputAction.next,
|
||||
textCapitalization: TextCapitalization.words,
|
||||
validator: (value) => AuthValidation.name(value, l),
|
||||
autocorrect: false,
|
||||
validator: (value) => AuthValidation.email(value, l),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
],
|
||||
TextFormField(
|
||||
key: const ValueKey('email'),
|
||||
controller: _email,
|
||||
enabled: !state.isLoading,
|
||||
decoration: InputDecoration(
|
||||
labelText: l.email,
|
||||
hintText: l.emailHint,
|
||||
prefixIcon: Icon(Icons.alternate_email),
|
||||
errorMaxLines: 3,
|
||||
),
|
||||
keyboardType: TextInputType.emailAddress,
|
||||
textInputAction: TextInputAction.next,
|
||||
autocorrect: false,
|
||||
validator: (value) => AuthValidation.email(value, l),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
TextFormField(
|
||||
key: const ValueKey('password'),
|
||||
enabled: !state.isLoading,
|
||||
controller: _password,
|
||||
obscureText: !_showPassword,
|
||||
autocorrect: false,
|
||||
enableSuggestions: false,
|
||||
textInputAction: _signUp
|
||||
? TextInputAction.next
|
||||
: TextInputAction.done,
|
||||
onFieldSubmitted: (_) {
|
||||
if (!_signUp) _submit();
|
||||
},
|
||||
decoration: InputDecoration(
|
||||
labelText: l.password,
|
||||
prefixIcon: const Icon(Icons.lock_outline),
|
||||
errorMaxLines: 3,
|
||||
helperText: _signUp ? l.passwordHint : null,
|
||||
helperMaxLines: 3,
|
||||
suffixIcon: IconButton(
|
||||
tooltip: _showPassword ? l.hidePassword : l.showPassword,
|
||||
onPressed: () =>
|
||||
setState(() => _showPassword = !_showPassword),
|
||||
icon: Icon(
|
||||
_showPassword
|
||||
? Icons.visibility_off_outlined
|
||||
: Icons.visibility_outlined,
|
||||
),
|
||||
),
|
||||
),
|
||||
validator: (value) =>
|
||||
AuthValidation.password(value, l, signUp: _signUp),
|
||||
),
|
||||
if (_signUp) ...[
|
||||
const SizedBox(height: 20),
|
||||
TextFormField(
|
||||
key: const ValueKey('confirmation'),
|
||||
key: const ValueKey('password'),
|
||||
enabled: !state.isLoading,
|
||||
controller: _confirmation,
|
||||
obscureText: !_showConfirmation,
|
||||
controller: _password,
|
||||
autofocus: widget.email?.isNotEmpty ?? false,
|
||||
obscureText: !_showPassword,
|
||||
autofillHints: [
|
||||
_signUp
|
||||
? AutofillHints.newPassword
|
||||
: AutofillHints.password,
|
||||
],
|
||||
autocorrect: false,
|
||||
enableSuggestions: false,
|
||||
textInputAction: TextInputAction.done,
|
||||
onFieldSubmitted: (_) => _submit(),
|
||||
textInputAction: _signUp
|
||||
? TextInputAction.next
|
||||
: TextInputAction.done,
|
||||
onFieldSubmitted: (_) {
|
||||
if (!_signUp) _submit();
|
||||
},
|
||||
decoration: InputDecoration(
|
||||
labelText: l.confirmPassword,
|
||||
labelText: l.password,
|
||||
prefixIcon: const Icon(Icons.lock_outline),
|
||||
errorMaxLines: 3,
|
||||
helperText: _signUp ? l.passwordHint : null,
|
||||
helperMaxLines: 3,
|
||||
suffixIcon: IconButton(
|
||||
tooltip: _showConfirmation
|
||||
? l.hideConfirmation
|
||||
: l.showConfirmation,
|
||||
onPressed: () => setState(
|
||||
() => _showConfirmation = !_showConfirmation,
|
||||
),
|
||||
tooltip: _showPassword ? l.hidePassword : l.showPassword,
|
||||
onPressed: () =>
|
||||
setState(() => _showPassword = !_showPassword),
|
||||
icon: Icon(
|
||||
_showConfirmation
|
||||
_showPassword
|
||||
? Icons.visibility_off_outlined
|
||||
: Icons.visibility_outlined,
|
||||
),
|
||||
),
|
||||
),
|
||||
validator: (value) =>
|
||||
AuthValidation.confirmation(value, _password.text, l),
|
||||
AuthValidation.password(value, l, signUp: _signUp),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 28),
|
||||
FilledButton(
|
||||
key: const ValueKey('submit'),
|
||||
onPressed: state.isLoading || state.status == AuthStatus.success
|
||||
? null
|
||||
: _submit,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 4),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
state.isLoading
|
||||
? l.authWorking
|
||||
: (_signUp ? l.createAccount : l.letsGo),
|
||||
textAlign: TextAlign.center,
|
||||
if (_signUp) ...[
|
||||
const SizedBox(height: 20),
|
||||
TextFormField(
|
||||
key: const ValueKey('confirmation'),
|
||||
enabled: !state.isLoading,
|
||||
controller: _confirmation,
|
||||
obscureText: !_showConfirmation,
|
||||
autofillHints: const [AutofillHints.newPassword],
|
||||
autocorrect: false,
|
||||
enableSuggestions: false,
|
||||
textInputAction: TextInputAction.done,
|
||||
onFieldSubmitted: (_) => _submit(),
|
||||
decoration: InputDecoration(
|
||||
labelText: l.confirmPassword,
|
||||
prefixIcon: const Icon(Icons.lock_outline),
|
||||
errorMaxLines: 3,
|
||||
suffixIcon: IconButton(
|
||||
tooltip: _showConfirmation
|
||||
? l.hideConfirmation
|
||||
: l.showConfirmation,
|
||||
onPressed: () => setState(
|
||||
() => _showConfirmation = !_showConfirmation,
|
||||
),
|
||||
icon: Icon(
|
||||
_showConfirmation
|
||||
? Icons.visibility_off_outlined
|
||||
: Icons.visibility_outlined,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
state.isLoading
|
||||
? const SizedBox(
|
||||
width: 20,
|
||||
height: 20,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
)
|
||||
: const Icon(Icons.arrow_forward, size: 20),
|
||||
],
|
||||
),
|
||||
validator: (value) =>
|
||||
AuthValidation.confirmation(value, _password.text, l),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 28),
|
||||
FilledButton(
|
||||
key: const ValueKey('submit'),
|
||||
onPressed:
|
||||
state.isLoading || state.status == AuthStatus.success
|
||||
? null
|
||||
: _submit,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 4),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
state.isLoading
|
||||
? l.authWorking
|
||||
: (_signUp ? l.createAccount : l.letsGo),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
state.isLoading
|
||||
? const SizedBox(
|
||||
width: 20,
|
||||
height: 20,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
),
|
||||
)
|
||||
: const Icon(Icons.arrow_forward, size: 20),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
if (state.status == AuthStatus.success ||
|
||||
|
||||
@@ -10,7 +10,8 @@ import 'form.dart';
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class AuthPage extends StatefulWidget {
|
||||
const AuthPage({super.key});
|
||||
const AuthPage({super.key, this.email});
|
||||
final String? email;
|
||||
|
||||
@override
|
||||
State<AuthPage> createState() => _AuthPageState();
|
||||
@@ -56,7 +57,7 @@ class _AuthPageState extends State<AuthPage> {
|
||||
Center(
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 440),
|
||||
child: AuthForm(key: _formKey),
|
||||
child: AuthForm(key: _formKey, email: widget.email),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -0,0 +1,225 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import 'paste.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class BankFields extends StatefulWidget {
|
||||
const BankFields({
|
||||
super.key,
|
||||
required this.onChanged,
|
||||
this.initial,
|
||||
this.errorField,
|
||||
});
|
||||
final ValueChanged<DestinationDetails?> onChanged;
|
||||
final RussianBankDestination? initial;
|
||||
final String? errorField;
|
||||
@override
|
||||
State<BankFields> createState() => _BankFieldsState();
|
||||
}
|
||||
|
||||
class _BankFieldsState extends State<BankFields> {
|
||||
late final first = TextEditingController(text: widget.initial?.firstName);
|
||||
late final last = TextEditingController(text: widget.initial?.lastName);
|
||||
late final patronymic = TextEditingController(
|
||||
text: widget.initial?.patronymic,
|
||||
);
|
||||
late final account = TextEditingController(text: widget.initial?.account);
|
||||
final query = TextEditingController();
|
||||
late final search = BankSearchProvider(
|
||||
context.read<DestinationsProvider>().service,
|
||||
);
|
||||
late Bank? bank = widget.initial?.bank;
|
||||
String? pastedHolder;
|
||||
bool conflict = false;
|
||||
Map<String, String> pasted = {};
|
||||
bool get mismatch =>
|
||||
bank != null &&
|
||||
((pasted['bank'] != null && pasted['bank'] != bank!.name) ||
|
||||
(pasted['correspondent'] != null &&
|
||||
pasted['correspondent'] != bank!.correspondent));
|
||||
void changed() => widget.onChanged(
|
||||
bank == null
|
||||
? null
|
||||
: RussianBankDestination(
|
||||
firstName: first.text,
|
||||
lastName: last.text,
|
||||
patronymic: patronymic.text,
|
||||
bank: bank!,
|
||||
account: account.text,
|
||||
),
|
||||
);
|
||||
Future<void> paste() async {
|
||||
final parsed = await showDialog<BankPaste>(
|
||||
context: context,
|
||||
builder: (_) => const BankPasteDialog(),
|
||||
);
|
||||
if (!mounted || parsed == null) return;
|
||||
for (final entry in {
|
||||
'firstName': first,
|
||||
'lastName': last,
|
||||
'patronymic': patronymic,
|
||||
'account': account,
|
||||
}.entries) {
|
||||
if (parsed.conflicts.contains(entry.key)) {
|
||||
entry.value.clear();
|
||||
} else if (parsed.values[entry.key] case final String value) {
|
||||
entry.value.text = value;
|
||||
}
|
||||
}
|
||||
setState(() {
|
||||
pasted = parsed.values;
|
||||
conflict = parsed.conflicts.isNotEmpty;
|
||||
pastedHolder = parsed.values['holder'];
|
||||
});
|
||||
if (parsed.conflicts.contains('bik')) {
|
||||
setState(() => bank = null);
|
||||
}
|
||||
if (parsed.values['bik'] case final String bik) {
|
||||
query.text = bik;
|
||||
search.search(bik);
|
||||
setState(() => bank = null);
|
||||
}
|
||||
changed();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
for (final c in [first, last, patronymic, account, query]) {
|
||||
c.dispose();
|
||||
}
|
||||
search.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Widget field(
|
||||
String label,
|
||||
TextEditingController c, {
|
||||
String? id,
|
||||
bool numeric = false,
|
||||
String? error,
|
||||
}) => Padding(
|
||||
padding: const EdgeInsets.only(bottom: 16),
|
||||
child: TextField(
|
||||
key: id == null ? null : ValueKey(id),
|
||||
controller: c,
|
||||
keyboardType: numeric ? TextInputType.number : TextInputType.name,
|
||||
decoration: InputDecoration(labelText: label, errorText: error),
|
||||
onChanged: (_) => changed(),
|
||||
),
|
||||
);
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text(l.dHolder, style: Theme.of(context).textTheme.titleMedium),
|
||||
const SizedBox(height: 16),
|
||||
LayoutBuilder(
|
||||
builder: (context, b) {
|
||||
final a = field(
|
||||
l.dFirst,
|
||||
first,
|
||||
id: 'destination-first',
|
||||
error: widget.errorField == 'holder' ? l.dInvalid : null,
|
||||
);
|
||||
final z = field(l.dLast, last, id: 'destination-last');
|
||||
return b.maxWidth >= 480
|
||||
? Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Expanded(child: a),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(child: z),
|
||||
],
|
||||
)
|
||||
: Column(children: [a, z]);
|
||||
},
|
||||
),
|
||||
field(l.dPatronymic, patronymic),
|
||||
if (pastedHolder != null) SelectableText(pastedHolder!),
|
||||
if (conflict) Text(l.dPasteConflict),
|
||||
Text(l.dBankDetails, style: Theme.of(context).textTheme.titleMedium),
|
||||
Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: TextButton.icon(
|
||||
onPressed: paste,
|
||||
icon: const Icon(Icons.content_paste),
|
||||
label: Text(l.dPaste),
|
||||
),
|
||||
),
|
||||
ListenableBuilder(
|
||||
listenable: search,
|
||||
builder: (context, _) => Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
if (bank == null) ...[
|
||||
TextField(
|
||||
controller: query,
|
||||
decoration: InputDecoration(labelText: l.dBankSearch),
|
||||
onChanged: search.search,
|
||||
),
|
||||
if (search.loading) const LinearProgressIndicator(),
|
||||
for (final b in search.results)
|
||||
ListTile(
|
||||
title: Text(b.name),
|
||||
subtitle: Text('${b.bik} · ${b.city}'),
|
||||
onTap: () {
|
||||
setState(() => bank = b);
|
||||
changed();
|
||||
},
|
||||
),
|
||||
if (search.error != null)
|
||||
Text(
|
||||
search.error == DestinationIssue.unavailable
|
||||
? l.dBankFailure
|
||||
: l.dBankUnknown,
|
||||
),
|
||||
if (search.error == DestinationIssue.unavailable)
|
||||
TextButton(
|
||||
onPressed: () => search.search(query.text),
|
||||
child: Text(l.wRefresh),
|
||||
),
|
||||
] else ...[
|
||||
ListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
title: Text(bank!.name),
|
||||
subtitle: Text('${l.dBik} ${bank!.bik}'),
|
||||
trailing: TextButton(
|
||||
onPressed: () {
|
||||
setState(() => bank = null);
|
||||
changed();
|
||||
},
|
||||
child: Text(l.dChangeBank),
|
||||
),
|
||||
),
|
||||
ExpansionTile(
|
||||
title: Text(l.dBankDetails),
|
||||
children: [
|
||||
SelectableText(
|
||||
'${l.dCorrespondent}: ${bank!.correspondent}',
|
||||
),
|
||||
],
|
||||
),
|
||||
if (!bank!.supported) Text(l.dUnsupported),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
field(
|
||||
l.dAccount,
|
||||
account,
|
||||
id: 'destination-account',
|
||||
numeric: true,
|
||||
error: widget.errorField == 'account' ? l.dInvalid : null,
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
String destinationType(AppLocalizations l, DestinationType type) =>
|
||||
switch (type) {
|
||||
DestinationType.crypto => l.dCrypto,
|
||||
DestinationType.card => l.dCard,
|
||||
DestinationType.russianBank => l.dBank,
|
||||
};
|
||||
String destinationIssue(AppLocalizations l, DestinationIssue issue) =>
|
||||
switch (issue) {
|
||||
DestinationIssue.invalid => l.dInvalid,
|
||||
DestinationIssue.unavailable => l.dTemporary,
|
||||
DestinationIssue.uncertain => l.dUncertain,
|
||||
DestinationIssue.conflict => l.dConflict,
|
||||
DestinationIssue.removed => l.dRemoved,
|
||||
DestinationIssue.expired => l.dCardExpired,
|
||||
DestinationIssue.bankChanged => l.dBankChanged,
|
||||
DestinationIssue.authorization => l.dAuthorization,
|
||||
DestinationIssue.unsupported => l.dUnsupported,
|
||||
DestinationIssue.duplicate => l.dDuplicate,
|
||||
DestinationIssue.replacementRequired => l.dReplacementRequired,
|
||||
};
|
||||
String eligibilityText(AppLocalizations l, PayoutEligibility e) =>
|
||||
e.reason != null
|
||||
? destinationIssue(l, e.reason!)
|
||||
: switch (e.state) {
|
||||
EligibilityState.eligible => l.dEligible,
|
||||
EligibilityState.temporarilyUnavailable => l.dTemporary,
|
||||
EligibilityState.requiresAction => l.dAction,
|
||||
EligibilityState.unsupported => l.dUnsupported,
|
||||
};
|
||||
@@ -0,0 +1,128 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class CryptoFields extends StatefulWidget {
|
||||
const CryptoFields({
|
||||
super.key,
|
||||
required this.capabilities,
|
||||
required this.onChanged,
|
||||
this.initial,
|
||||
this.errorField,
|
||||
});
|
||||
final DestinationCapabilities capabilities;
|
||||
final ValueChanged<DestinationDetails?> onChanged;
|
||||
final CryptoDestination? initial;
|
||||
final String? errorField;
|
||||
@override
|
||||
State<CryptoFields> createState() => _CryptoFieldsState();
|
||||
}
|
||||
|
||||
class _CryptoFieldsState extends State<CryptoFields> {
|
||||
late final address = TextEditingController(text: widget.initial?.address);
|
||||
late final memo = TextEditingController(text: widget.initial?.memo);
|
||||
late String? assetId = widget.initial?.assetId;
|
||||
late String? networkId = widget.initial?.networkId;
|
||||
void changed() {
|
||||
final a = widget.capabilities.assets
|
||||
.where((a) => a.id == assetId && a.networkId == networkId)
|
||||
.firstOrNull;
|
||||
widget.onChanged(
|
||||
a == null
|
||||
? null
|
||||
: CryptoDestination(
|
||||
assetId: a.id,
|
||||
networkId: a.networkId,
|
||||
address: address.text,
|
||||
memo: memo.text,
|
||||
assetLabel: a.label,
|
||||
networkLabel: a.networkLabel,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
address.dispose();
|
||||
memo.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
final assets = widget.capabilities.assets;
|
||||
final selected = assets
|
||||
.where((a) => a.id == assetId && a.networkId == networkId)
|
||||
.firstOrNull;
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
DropdownButtonFormField<String>(
|
||||
key: ValueKey('asset-$assetId'),
|
||||
initialValue: assets.any((a) => a.id == assetId) ? assetId : null,
|
||||
isExpanded: true,
|
||||
decoration: InputDecoration(labelText: l.dAsset),
|
||||
items: [
|
||||
for (final a in assets)
|
||||
DropdownMenuItem(value: a.id, child: Text(a.label)),
|
||||
],
|
||||
onChanged: (v) {
|
||||
setState(() {
|
||||
assetId = v;
|
||||
networkId = null;
|
||||
memo.clear();
|
||||
});
|
||||
changed();
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
DropdownButtonFormField<String>(
|
||||
key: ValueKey('network-$assetId-$networkId'),
|
||||
initialValue:
|
||||
assets.any((a) => a.id == assetId && a.networkId == networkId)
|
||||
? networkId
|
||||
: null,
|
||||
isExpanded: true,
|
||||
decoration: InputDecoration(labelText: l.dNetwork),
|
||||
items: [
|
||||
for (final a in assets.where((a) => a.id == assetId))
|
||||
DropdownMenuItem(value: a.networkId, child: Text(a.networkLabel)),
|
||||
],
|
||||
onChanged: (v) {
|
||||
setState(() => networkId = v);
|
||||
changed();
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
TextField(
|
||||
key: const ValueKey('destination-address'),
|
||||
controller: address,
|
||||
autocorrect: false,
|
||||
enableSuggestions: false,
|
||||
decoration: InputDecoration(
|
||||
labelText: l.dAddress,
|
||||
errorText: widget.errorField == 'address' ? l.dInvalid : null,
|
||||
),
|
||||
onChanged: (_) => changed(),
|
||||
),
|
||||
if (selected?.memoSupported == true) ...[
|
||||
const SizedBox(height: 16),
|
||||
TextField(
|
||||
key: const ValueKey('destination-memo'),
|
||||
controller: memo,
|
||||
decoration: InputDecoration(
|
||||
labelText: l.dMemo,
|
||||
errorText: widget.errorField == 'memo' ? l.dInvalid : null,
|
||||
),
|
||||
onChanged: (_) => changed(),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 12),
|
||||
Text(l.dCryptoHelp),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,161 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import 'copy.dart';
|
||||
import 'details.dart';
|
||||
import 'form.dart';
|
||||
import 'nickname.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class DestinationDetailPage extends StatefulWidget {
|
||||
const DestinationDetailPage({super.key, required this.destination});
|
||||
final SavedDestination destination;
|
||||
@override
|
||||
State<DestinationDetailPage> createState() => _DestinationDetailPageState();
|
||||
}
|
||||
|
||||
class _DestinationDetailPageState extends State<DestinationDetailPage> {
|
||||
late final p = DestinationManagementProvider(
|
||||
context.read<DestinationsProvider>().service,
|
||||
widget.destination,
|
||||
);
|
||||
late final nickname = TextEditingController(
|
||||
text: widget.destination.nickname,
|
||||
);
|
||||
Future<void> remove() async {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
final confirmed = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: Text(l.dRemoveTitle),
|
||||
content: Text(l.dRemoveHelp),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context, false),
|
||||
child: Text(l.wStay),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () => Navigator.pop(context, true),
|
||||
child: Text(l.dRemove),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (!mounted || confirmed != true) return;
|
||||
await p.remove();
|
||||
if (mounted && p.removed) Navigator.pop(context);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
p.dispose();
|
||||
nickname.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
return ListenableBuilder(
|
||||
listenable: p,
|
||||
builder: (context, _) => Scaffold(
|
||||
appBar: AppBar(title: Text(l.dDetails)),
|
||||
body: SingleChildScrollView(
|
||||
padding: const EdgeInsets.fromLTRB(24, 24, 24, 120),
|
||||
child: Center(
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 720),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
DestinationDetailsView(details: p.destination.details),
|
||||
const SizedBox(height: 24),
|
||||
DestinationNickname(
|
||||
controller: nickname,
|
||||
enabled: !p.busy,
|
||||
onChanged: (_) {},
|
||||
),
|
||||
if (p.busy) const LinearProgressIndicator(),
|
||||
if (p.error != null) ...[
|
||||
Semantics(
|
||||
liveRegion: true,
|
||||
child: Text(destinationIssue(l, p.error!)),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: p.busy ? null : p.refresh,
|
||||
child: Text(l.dReload),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 16),
|
||||
FilledButton(
|
||||
onPressed: p.busy
|
||||
? null
|
||||
: () async {
|
||||
await p.rename(nickname.text);
|
||||
if (context.mounted && p.error == null) {
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(SnackBar(content: Text(l.dSaved)));
|
||||
}
|
||||
},
|
||||
child: Text(l.dRename),
|
||||
),
|
||||
if (p.destination.details is CardDestination &&
|
||||
context
|
||||
.read<DestinationsProvider>()
|
||||
.capabilities
|
||||
?.cardRecovery ==
|
||||
true)
|
||||
OutlinedButton(
|
||||
onPressed: p.busy
|
||||
? null
|
||||
: () async {
|
||||
final restored =
|
||||
await Navigator.push<DestinationInput>(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (_) => DestinationFormPage(
|
||||
initial: p.destination.details,
|
||||
restoring: p.destination.input,
|
||||
),
|
||||
),
|
||||
);
|
||||
if (mounted && restored != null) {
|
||||
await p.refresh();
|
||||
}
|
||||
},
|
||||
child: Text(l.dUpdateAuthorization),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: p.busy
|
||||
? null
|
||||
: () async {
|
||||
await Navigator.push<DestinationInput>(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (_) => DestinationFormPage(
|
||||
initial: p.destination.details,
|
||||
replacing: p.destination.id,
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
child: Text(l.dReplace),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: p.busy ? null : remove,
|
||||
child: Text(l.dRemove),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
/// Structured review renders the immutable service snapshot, never a nickname.
|
||||
class DestinationDetailsView extends StatelessWidget {
|
||||
const DestinationDetailsView({super.key, required this.details});
|
||||
final DestinationDetails details;
|
||||
Widget field(String label, String value) => Padding(
|
||||
padding: const EdgeInsets.only(top: 12),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [Text(label), SelectableText(value)],
|
||||
),
|
||||
);
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: switch (details) {
|
||||
CryptoDestination d => [
|
||||
field(l.dAsset, d.assetLabel),
|
||||
field(l.dNetwork, d.networkLabel),
|
||||
field(l.dAddress, d.address),
|
||||
field(l.dMemo, d.memo.isEmpty ? l.dNoMemo : d.memo),
|
||||
],
|
||||
CardDestination d => [field(l.dCard, d.display)],
|
||||
RussianBankDestination d => [
|
||||
field(l.dHolder, d.holder),
|
||||
field(l.dBankSearch, d.bank.name),
|
||||
field(l.dBik, d.bank.bik),
|
||||
field(l.dAccount, d.account),
|
||||
field(l.dCorrespondent, d.bank.correspondent),
|
||||
],
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,292 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:sxchnge_analytics/sxchnge_analytics.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import 'bank.dart';
|
||||
import 'copy.dart';
|
||||
import 'crypto.dart';
|
||||
import 'nickname.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class DestinationFormPage extends StatefulWidget {
|
||||
const DestinationFormPage({
|
||||
super.key,
|
||||
this.payoutContext,
|
||||
this.initial,
|
||||
this.replacing,
|
||||
this.restoring,
|
||||
});
|
||||
final PayoutContext? payoutContext;
|
||||
final DestinationDetails? initial;
|
||||
final String? replacing;
|
||||
final SavedReference? restoring;
|
||||
@override
|
||||
State<DestinationFormPage> createState() => _DestinationFormPageState();
|
||||
}
|
||||
|
||||
class _DestinationFormPageState extends State<DestinationFormPage> {
|
||||
late final p = DestinationFormProvider(
|
||||
context.read<DestinationsProvider>().service,
|
||||
context.read<AnalyticsService>(),
|
||||
context: widget.payoutContext,
|
||||
initial: widget.initial,
|
||||
replacing: widget.replacing,
|
||||
restoring: widget.restoring,
|
||||
);
|
||||
late DestinationType? type = widget.initial?.type;
|
||||
final nickname = TextEditingController();
|
||||
final focus = FocusNode();
|
||||
Future<void> proceed({
|
||||
bool withoutSaving = false,
|
||||
bool existing = false,
|
||||
}) async {
|
||||
if (existing) {
|
||||
await p.useExisting();
|
||||
} else {
|
||||
await p.proceed(withoutSaving: withoutSaving);
|
||||
}
|
||||
if (!mounted) return;
|
||||
if (p.result != null) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
if (p.saved?.outcome == SaveOutcome.created || widget.restoring != null) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
widget.restoring == null ? l.dSaved : l.dAuthorizationUpdated,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
Navigator.pop(context, p.result);
|
||||
return;
|
||||
}
|
||||
focus.requestFocus();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
p.dispose();
|
||||
nickname.dispose();
|
||||
focus.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
final caps = context.watch<DestinationsProvider>().capabilities;
|
||||
return ListenableBuilder(
|
||||
listenable: p,
|
||||
builder: (context, _) => PopScope(
|
||||
canPop: !p.busy,
|
||||
child: Scaffold(
|
||||
appBar: AppBar(title: Text(l.dAdd)),
|
||||
body: SingleChildScrollView(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Center(
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 720),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
if (caps?.simulated == true) ...[
|
||||
Text(l.dDemo),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
Text(l.dOwn),
|
||||
const SizedBox(height: 20),
|
||||
if (caps == null || caps.types.isEmpty)
|
||||
Text(l.dNoCapabilities)
|
||||
else ...[
|
||||
DropdownButtonFormField<DestinationType>(
|
||||
initialValue: caps.types.contains(type) ? type : null,
|
||||
isExpanded: true,
|
||||
decoration: InputDecoration(labelText: l.dType),
|
||||
items: [
|
||||
for (final t in caps.types)
|
||||
DropdownMenuItem(
|
||||
value: t,
|
||||
child: Text(
|
||||
destinationType(l, t),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
],
|
||||
onChanged:
|
||||
p.busy || p.uncertain || widget.restoring != null
|
||||
? null
|
||||
: (v) {
|
||||
setState(() => type = v);
|
||||
p.change(null);
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
AbsorbPointer(
|
||||
absorbing: p.busy || p.uncertain,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
if (type == DestinationType.crypto)
|
||||
CryptoFields(
|
||||
capabilities: caps,
|
||||
initial: widget.initial is CryptoDestination
|
||||
? widget.initial as CryptoDestination
|
||||
: null,
|
||||
errorField: p.errorField,
|
||||
onChanged: p.change,
|
||||
),
|
||||
if (type == DestinationType.russianBank)
|
||||
BankFields(
|
||||
initial:
|
||||
widget.initial is RussianBankDestination
|
||||
? widget.initial as RussianBankDestination
|
||||
: null,
|
||||
errorField: p.errorField,
|
||||
onChanged: p.change,
|
||||
),
|
||||
if (type == DestinationType.card &&
|
||||
caps.simulated) ...[
|
||||
Text(l.dCardDemo),
|
||||
const SizedBox(height: 16),
|
||||
RadioGroup<String>(
|
||||
groupValue: p.details is CardDestination
|
||||
? (p.details as CardDestination).capture
|
||||
: null,
|
||||
onChanged: (value) {
|
||||
if (value != null) {
|
||||
p.change(
|
||||
CardDestination(
|
||||
capture: value,
|
||||
brand: 'Demo card',
|
||||
last4: '4242',
|
||||
expiryMonth: 12,
|
||||
expiryYear: 2030,
|
||||
),
|
||||
);
|
||||
}
|
||||
},
|
||||
child: Column(
|
||||
children: [
|
||||
RadioListTile<String>(
|
||||
value: 'demo-card-ready',
|
||||
title: Text(l.dCardReady),
|
||||
),
|
||||
RadioListTile<String>(
|
||||
value: 'demo-card-recover',
|
||||
title: Text(l.dCardRecover),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
if (type == DestinationType.card && !caps.simulated)
|
||||
Text(l.dNoCapabilities),
|
||||
if (widget.payoutContext != null) ...[
|
||||
const SizedBox(height: 16),
|
||||
CheckboxListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
value: p.save,
|
||||
onChanged: (v) => p.preferences(save: v),
|
||||
title: Text(l.dSaveFuture),
|
||||
),
|
||||
],
|
||||
if (widget.restoring == null &&
|
||||
(widget.payoutContext == null || p.save)) ...[
|
||||
const SizedBox(height: 16),
|
||||
DestinationNickname(
|
||||
controller: nickname,
|
||||
enabled: !p.busy && !p.uncertain,
|
||||
onChanged: (v) => p.preferences(nickname: v),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Focus(
|
||||
focusNode: focus,
|
||||
skipTraversal: true,
|
||||
child: Semantics(
|
||||
liveRegion: true,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
if (p.error != null)
|
||||
Text(
|
||||
p.uncertain
|
||||
? l.dUncertain
|
||||
: p.errorField != null
|
||||
? l.dInvalid
|
||||
: '${p.savingFailed ? '${l.dSaveFailed}\n' : ''}${destinationIssue(l, p.error!)}',
|
||||
key: const ValueKey('destination-error'),
|
||||
),
|
||||
if (p.eligibility != null &&
|
||||
!p.eligibility!.eligible)
|
||||
Text(
|
||||
'${p.saved != null ? '${l.dSavedIneligible}\n' : ''}${eligibilityText(l, p.eligibility!)}',
|
||||
),
|
||||
if (p.saved?.outcome ==
|
||||
SaveOutcome.duplicate) ...[
|
||||
Text(l.dDuplicate),
|
||||
TextButton(
|
||||
onPressed: p.busy
|
||||
? null
|
||||
: () => proceed(existing: true),
|
||||
child: Text(l.dUseExisting),
|
||||
),
|
||||
],
|
||||
if (p.saved?.outcome == SaveOutcome.created &&
|
||||
p.result == null)
|
||||
Text(l.dSaved),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
if (p.busy) const LinearProgressIndicator(),
|
||||
if (p.uncertain)
|
||||
TextButton(
|
||||
onPressed: p.busy ? null : () => proceed(),
|
||||
child: Text(l.dCheckSave),
|
||||
),
|
||||
if (p.savingFailed && widget.payoutContext != null)
|
||||
TextButton(
|
||||
onPressed: p.busy
|
||||
? null
|
||||
: () => proceed(withoutSaving: true),
|
||||
child: Text(l.dWithoutSave),
|
||||
),
|
||||
if (p.save && widget.payoutContext != null)
|
||||
Text(l.dSaveHelp),
|
||||
const SizedBox(height: 12),
|
||||
FilledButton(
|
||||
key: const ValueKey('destination-continue'),
|
||||
onPressed: p.busy || p.details == null
|
||||
? null
|
||||
: () => proceed(),
|
||||
child: Text(
|
||||
widget.restoring != null
|
||||
? l.dUpdateAuthorization
|
||||
: widget.payoutContext == null
|
||||
? l.dSave
|
||||
: p.error != null && !p.uncertain
|
||||
? l.dRetrySave
|
||||
: l.dContinue,
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,165 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import 'copy.dart';
|
||||
import 'detail.dart';
|
||||
import 'form.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class DestinationsPage extends StatefulWidget {
|
||||
const DestinationsPage({super.key, this.payoutContext});
|
||||
final PayoutContext? payoutContext;
|
||||
@override
|
||||
State<DestinationsPage> createState() => _DestinationsPageState();
|
||||
}
|
||||
|
||||
class _DestinationsPageState extends State<DestinationsPage> {
|
||||
String query = '';
|
||||
late final selection = DestinationSelectionProvider(
|
||||
context.read<DestinationsProvider>().service,
|
||||
widget.payoutContext ?? const PayoutContext(''),
|
||||
);
|
||||
Future<void> refresh() async {
|
||||
final p = context.read<DestinationsProvider>();
|
||||
await p.refresh();
|
||||
if (!mounted) return;
|
||||
await selection.assess(p.methods);
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) refresh();
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> add() async {
|
||||
final result = await Navigator.push<DestinationInput>(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (_) =>
|
||||
DestinationFormPage(payoutContext: widget.payoutContext),
|
||||
),
|
||||
);
|
||||
if (!mounted) return;
|
||||
if (result != null && widget.payoutContext != null) {
|
||||
Navigator.pop(context, result);
|
||||
} else {
|
||||
await refresh();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> choose(SavedDestination d) async {
|
||||
if (widget.payoutContext == null) {
|
||||
await Navigator.push<void>(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (_) => DestinationDetailPage(destination: d),
|
||||
),
|
||||
);
|
||||
if (mounted) await refresh();
|
||||
} else {
|
||||
final ref = await selection.select(d);
|
||||
if (mounted && ref != null) Navigator.pop(context, ref);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
selection.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
final p = context.watch<DestinationsProvider>();
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text(widget.payoutContext == null ? l.dTitle : l.dChoose),
|
||||
actions: [
|
||||
IconButton(
|
||||
tooltip: l.dReload,
|
||||
onPressed: p.loading ? null : refresh,
|
||||
icon: const Icon(Icons.refresh),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: ListenableBuilder(
|
||||
listenable: selection,
|
||||
builder: (context, _) => ListView(
|
||||
padding: const EdgeInsets.all(24),
|
||||
children: [
|
||||
if (p.capabilities?.simulated == true) ...[
|
||||
Text(l.dDemo),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
FilledButton.icon(
|
||||
onPressed: p.loading || (p.capabilities?.types.isEmpty ?? true)
|
||||
? null
|
||||
: add,
|
||||
icon: const Icon(Icons.add),
|
||||
label: Text(widget.payoutContext == null ? l.dAdd : l.dNew),
|
||||
),
|
||||
if (p.capabilities?.types.isEmpty == true)
|
||||
Text(l.dManagementUnavailable),
|
||||
const SizedBox(height: 20),
|
||||
TextField(
|
||||
decoration: InputDecoration(
|
||||
labelText: l.dSearch,
|
||||
prefixIcon: const Icon(Icons.search),
|
||||
),
|
||||
onChanged: (v) => setState(() => query = v),
|
||||
),
|
||||
if (p.loading || selection.busy) const LinearProgressIndicator(),
|
||||
if (p.failed) Text(l.dUnavailable),
|
||||
if (selection.error != null)
|
||||
Semantics(
|
||||
liveRegion: true,
|
||||
child: Text(destinationIssue(l, selection.error!)),
|
||||
),
|
||||
if (widget.payoutContext != null &&
|
||||
!p.loading &&
|
||||
p.methods.isNotEmpty &&
|
||||
!selection.assessments.values.any((a) => a.eligible))
|
||||
Text(l.dNoEligible),
|
||||
for (final type
|
||||
in p.capabilities?.types ?? <DestinationType>[]) ...[
|
||||
const SizedBox(height: 24),
|
||||
Text(
|
||||
destinationType(l, type),
|
||||
style: Theme.of(context).textTheme.titleLarge,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
if (p.search(query, type).isEmpty && !p.loading && !p.failed)
|
||||
Text(query.isEmpty ? l.dEmpty : l.dNoMatches),
|
||||
for (final d in p.search(query, type))
|
||||
Card(
|
||||
child: ListTile(
|
||||
contentPadding: const EdgeInsets.all(16),
|
||||
title: Text(d.label),
|
||||
subtitle: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
if (d.nickname.isNotEmpty) Text(d.details.display),
|
||||
if (selection.assessments[d.id]
|
||||
case final PayoutEligibility e)
|
||||
Text(eligibilityText(l, e)),
|
||||
],
|
||||
),
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
onTap: selection.busy ? null : () => choose(d),
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class DestinationNickname extends StatelessWidget {
|
||||
const DestinationNickname({
|
||||
super.key,
|
||||
required this.controller,
|
||||
required this.onChanged,
|
||||
this.enabled = true,
|
||||
});
|
||||
final TextEditingController controller;
|
||||
final ValueChanged<String> onChanged;
|
||||
final bool enabled;
|
||||
@override
|
||||
Widget build(BuildContext context) => TextField(
|
||||
key: const ValueKey('destination-nickname'),
|
||||
controller: controller,
|
||||
enabled: enabled,
|
||||
maxLength: 80,
|
||||
decoration: InputDecoration(
|
||||
labelText: AppLocalizations.of(context)!.dNickname,
|
||||
),
|
||||
onChanged: onChanged,
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class BankPasteDialog extends StatefulWidget {
|
||||
const BankPasteDialog({super.key});
|
||||
@override
|
||||
State<BankPasteDialog> createState() => _BankPasteDialogState();
|
||||
}
|
||||
|
||||
class _BankPasteDialogState extends State<BankPasteDialog> {
|
||||
final text = TextEditingController();
|
||||
BankPaste? result;
|
||||
@override
|
||||
void dispose() {
|
||||
text.clear();
|
||||
text.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
final labels = {
|
||||
'firstName': l.dFirst,
|
||||
'lastName': l.dLast,
|
||||
'patronymic': l.dPatronymic,
|
||||
'account': l.dAccount,
|
||||
'bik': 'BIK',
|
||||
'bank': l.dBankSearch,
|
||||
'holder': l.dHolder,
|
||||
'correspondent': l.dCorrespondent,
|
||||
};
|
||||
return AlertDialog(
|
||||
title: Text(l.dPaste),
|
||||
content: SizedBox(
|
||||
width: 480,
|
||||
child: SingleChildScrollView(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(l.dPasteHelp),
|
||||
const SizedBox(height: 12),
|
||||
TextField(
|
||||
controller: text,
|
||||
maxLines: 6,
|
||||
decoration: InputDecoration(labelText: l.dBankDetails),
|
||||
onChanged: (_) => setState(() => result = null),
|
||||
),
|
||||
if (result != null) ...[
|
||||
const SizedBox(height: 12),
|
||||
if (result!.conflicts.isNotEmpty) Text(l.dPasteConflict),
|
||||
for (final e in result!.values.entries)
|
||||
Text('${labels[e.key]}: ${e.value}'),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: Text(l.wClose),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: result == null
|
||||
? () => setState(() => result = BankPaste.parse(text.text))
|
||||
: result!.values.isEmpty
|
||||
? null
|
||||
: () => Navigator.pop(context, result),
|
||||
child: Text(result == null ? l.dPasteReview : l.dPasteApply),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,163 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
import 'package:country_picker/country_picker.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class CountryField extends StatelessWidget {
|
||||
const CountryField({
|
||||
super.key,
|
||||
required this.value,
|
||||
required this.onChanged,
|
||||
this.enabled = true,
|
||||
});
|
||||
|
||||
final String value;
|
||||
final ValueChanged<String> onChanged;
|
||||
final bool enabled;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
final country = CountryService().findByCode(value);
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text(l.kycCountry, style: Theme.of(context).textTheme.labelLarge),
|
||||
const SizedBox(height: 8),
|
||||
Semantics(
|
||||
label: l.kycCountry,
|
||||
child: OutlinedButton(
|
||||
onPressed: !enabled
|
||||
? null
|
||||
: () async {
|
||||
final code = await showDialog<String>(
|
||||
context: context,
|
||||
builder: (_) => _CountrySearch(selected: value),
|
||||
);
|
||||
if (context.mounted && code != null) onChanged(code);
|
||||
},
|
||||
style: OutlinedButton.styleFrom(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
country == null
|
||||
? l.kycCountrySelect
|
||||
: _name(context, country),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
const Icon(Icons.expand_more),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
String _name(BuildContext context, Country country) =>
|
||||
country.getTranslatedName(context) ?? country.name;
|
||||
|
||||
class _CountrySearch extends StatefulWidget {
|
||||
const _CountrySearch({required this.selected});
|
||||
|
||||
final String selected;
|
||||
|
||||
@override
|
||||
State<_CountrySearch> createState() => _CountrySearchState();
|
||||
}
|
||||
|
||||
class _CountrySearchState extends State<_CountrySearch> {
|
||||
final _query = TextEditingController();
|
||||
final _countries = {
|
||||
for (final country in CountryService().getAll())
|
||||
country.countryCode: country,
|
||||
}.values.toList();
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_query.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
return Focus(
|
||||
autofocus: true,
|
||||
onKeyEvent: (_, event) {
|
||||
if (event is KeyDownEvent &&
|
||||
event.logicalKey == LogicalKeyboardKey.escape) {
|
||||
Navigator.of(context).pop();
|
||||
return KeyEventResult.handled;
|
||||
}
|
||||
return KeyEventResult.ignored;
|
||||
},
|
||||
child: Dialog.fullscreen(
|
||||
child: Scaffold(
|
||||
appBar: AppBar(
|
||||
leading: BackButton(onPressed: () => Navigator.of(context).pop()),
|
||||
title: TextField(
|
||||
key: const ValueKey('country-search'),
|
||||
controller: _query,
|
||||
autofocus: true,
|
||||
decoration: InputDecoration(
|
||||
labelText: l.kycCountrySearch,
|
||||
prefixIcon: const Icon(Icons.search),
|
||||
),
|
||||
onChanged: (_) => setState(() {}),
|
||||
),
|
||||
toolbarHeight: 96,
|
||||
actions: [
|
||||
if (_query.text.isNotEmpty)
|
||||
IconButton(
|
||||
tooltip: l.kycCountryClearSearch,
|
||||
icon: const Icon(Icons.clear),
|
||||
onPressed: () => setState(_query.clear),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: _list(context),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _list(BuildContext context) {
|
||||
final search = _query.text.trim().toLowerCase();
|
||||
final countries = _countries.where((country) {
|
||||
return _name(context, country).toLowerCase().contains(search) ||
|
||||
country.name.toLowerCase().contains(search) ||
|
||||
country.countryCode.toLowerCase() == search;
|
||||
}).toList()..sort((a, b) => _name(context, a).compareTo(_name(context, b)));
|
||||
if (countries.isEmpty) {
|
||||
return Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Text(AppLocalizations.of(context)!.kycCountryEmpty),
|
||||
),
|
||||
);
|
||||
}
|
||||
return ListView.builder(
|
||||
itemCount: countries.length,
|
||||
itemBuilder: (context, index) {
|
||||
final country = countries[index];
|
||||
final isSelected = country.countryCode == widget.selected;
|
||||
return ListTile(
|
||||
title: Text(_name(context, country)),
|
||||
selected: isSelected,
|
||||
trailing: isSelected ? const Icon(Icons.check) : null,
|
||||
onTap: () => Navigator.of(context).pop(country.countryCode),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:sxchnge_kyc/sxchnge_kyc.dart';
|
||||
|
||||
import 'country.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
|
||||
class ProfileForm extends StatelessWidget {
|
||||
@@ -48,17 +50,11 @@ class ProfileForm extends StatelessWidget {
|
||||
onChanged: (value) => update(birth: value.trim()),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
TextFormField(
|
||||
CountryField(
|
||||
key: const ValueKey('kyc-country'),
|
||||
initialValue: p.profile.residenceCountry,
|
||||
value: p.profile.residenceCountry,
|
||||
enabled: !p.busy,
|
||||
maxLength: 2,
|
||||
textCapitalization: TextCapitalization.characters,
|
||||
decoration: InputDecoration(
|
||||
labelText: l.kycCountry,
|
||||
helperText: l.kycCountryHelp,
|
||||
),
|
||||
onChanged: (value) => update(country: value.trim().toUpperCase()),
|
||||
onChanged: (value) => update(country: value),
|
||||
),
|
||||
if (!p.profile.isComplete) Text(l.kycProfileRequired),
|
||||
],
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
"verificationRequest": "Send a new verification email",
|
||||
"verificationRetry": "Retry verification",
|
||||
"verificationBack": "Back to login",
|
||||
"verificationContinue": "Continue to login",
|
||||
"verificationHint": "No email? Check your spam folder or request another below.",
|
||||
"verificationDemoLink": "Continue to confirmation",
|
||||
"verificationStep": "CONFIRM YOUR EMAIL",
|
||||
@@ -270,8 +271,11 @@
|
||||
"kycBirth": "Date of birth",
|
||||
"kycBirthHelp": "YYYY-MM-DD, for example 1990-04-23",
|
||||
"kycCountry": "Country of residence",
|
||||
"kycCountryHelp": "Two-letter country code, for example PL or DE",
|
||||
"kycProfileRequired": "Enter your full name, a valid date of birth and a two-letter country code to continue.",
|
||||
"kycCountrySelect": "Select a country",
|
||||
"kycCountrySearch": "Search countries",
|
||||
"kycCountryEmpty": "No countries found. Try another name or country code.",
|
||||
"kycCountryClearSearch": "Clear search",
|
||||
"kycProfileRequired": "Enter your full name, a valid date of birth and select your country of residence to continue.",
|
||||
"kycContinue": "Continue to my account",
|
||||
"kycOperationMinimum": "Per operation minimum",
|
||||
"kycOperationMaximum": "Per operation maximum",
|
||||
@@ -289,5 +293,95 @@
|
||||
"type": "int"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"dTitle": "Payout methods",
|
||||
"dAdd": "Add payout method",
|
||||
"dChoose": "Payout destination",
|
||||
"dNew": "Use a new destination",
|
||||
"dSave": "Save payout method",
|
||||
"dContinue": "Continue",
|
||||
"dSaveFuture": "Save for future payouts",
|
||||
"dSaveHelp": "Continue will also save this destination.",
|
||||
"dNickname": "Name for this method (optional)",
|
||||
"dSaved": "Payout method saved.",
|
||||
"dSaveFailed": "Couldn’t save these details. Your input is still here.",
|
||||
"dRetrySave": "Retry saving",
|
||||
"dWithoutSave": "Continue without saving",
|
||||
"dUncertain": "We couldn’t confirm saving. This method may already be saved.",
|
||||
"dCheckSave": "Check save status",
|
||||
"dDuplicate": "This destination is already saved. Use the existing method.",
|
||||
"dUseExisting": "Use existing method",
|
||||
"dCrypto": "Crypto address",
|
||||
"dCard": "Bank card",
|
||||
"dBank": "Russian bank account",
|
||||
"dType": "Destination type",
|
||||
"dSearch": "Search saved methods",
|
||||
"dEmpty": "No saved methods in this category.",
|
||||
"dNoMatches": "No matching methods.",
|
||||
"dEligible": "Available",
|
||||
"dTemporary": "Temporarily unavailable for this payout.",
|
||||
"dAction": "Action required",
|
||||
"dUnsupported": "This method isn’t supported for this payout.",
|
||||
"dUnavailable": "Couldn’t load methods. Try again.",
|
||||
"dNoCapabilities": "No destination types are currently available.",
|
||||
"dDemo": "Demo destinations — saving lasts until reload. No real payout or card collection is connected.",
|
||||
"dAsset": "Receiving asset",
|
||||
"dNetwork": "Network",
|
||||
"dAddress": "Wallet address",
|
||||
"dMemo": "Memo / destination tag",
|
||||
"dNoMemo": "No memo / tag",
|
||||
"dCryptoHelp": "Use the network supported by your receiving wallet. A valid address format does not guarantee delivery.",
|
||||
"dHolder": "Account holder",
|
||||
"dFirst": "First name",
|
||||
"dLast": "Last name",
|
||||
"dPatronymic": "Patronymic (optional)",
|
||||
"dBankDetails": "Bank details",
|
||||
"dBankSearch": "Bank name or BIK",
|
||||
"dAccount": "20-digit account number",
|
||||
"dCorrespondent": "Correspondent account",
|
||||
"dChangeBank": "Change bank",
|
||||
"dBankUnknown": "Bank not found. Check the name or BIK.",
|
||||
"dBankFailure": "Bank directory is unavailable. Your input is preserved.",
|
||||
"dBankChanged": "Bank details changed. Review them and add a replacement destination.",
|
||||
"dPaste": "Paste bank details",
|
||||
"dPasteHelp": "Paste labelled bank details. Review recognized values before applying them.",
|
||||
"dPasteReview": "Review recognized details",
|
||||
"dPasteApply": "Use these details",
|
||||
"dPasteConflict": "Conflicting values were found. Correct the affected fields in the form.",
|
||||
"dInvalid": "Check the entered details and correct the highlighted field.",
|
||||
"dCardDemo": "Choose a simulated secure card capture. Do not enter a real card number.",
|
||||
"dCardReady": "Demo card •••• 4242",
|
||||
"dCardRecover": "Demo card requiring renewed authorization",
|
||||
"dCardExpired": "This card has expired. Add a replacement card.",
|
||||
"dAuthorization": "Authorization needs updating. Follow the service-supported recovery or add a replacement.",
|
||||
"dRemoved": "This method was removed. Your draft is preserved. Choose a destination to continue.",
|
||||
"dConflict": "This method changed in another session. Refresh and review the latest version.",
|
||||
"dRename": "Rename",
|
||||
"dRemove": "Remove",
|
||||
"dReplace": "Add replacement",
|
||||
"dRemoveTitle": "Remove payout method?",
|
||||
"dRemoveHelp": "Removed methods cannot be used for new payouts. Submitted payouts and required financial records are retained.",
|
||||
"dDetails": "Destination details",
|
||||
"dReload": "Refresh methods",
|
||||
"dSelect": "Select destination",
|
||||
"dQuoteChanged": "Payout terms changed. Your draft is preserved. Select a destination and review a new quote.",
|
||||
"dOwn": "Use a wallet, card, or account that belongs to you.",
|
||||
"dSavedIneligible": "Saved. This method is unavailable for the current payout.",
|
||||
"dSaveFailedLabel": "Saving failed",
|
||||
"dNoEligible": "No methods are available for this payout. You can add a destination or refresh.",
|
||||
"dDemoTerms": "Demo receiving amounts use a fixed 1:1 ratio. No real payout is made.",
|
||||
"dTiming": "Expected processing time: {seconds} seconds",
|
||||
"@dTiming": {
|
||||
"placeholders": {
|
||||
"seconds": {
|
||||
"type": "int"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dBik": "BIK",
|
||||
"dBankMismatch": "Pasted bank details differ from the selected bank. Check the details before continuing.",
|
||||
"dManagementUnavailable": "Saving payout methods isn’t available yet. You can still use your configured payout destination.",
|
||||
"dUpdateAuthorization": "Update authorization",
|
||||
"dAuthorizationUpdated": "Authorization updated.",
|
||||
"dReplacementRequired": "Couldn’t confirm this is the same card. Add a replacement destination."
|
||||
}
|
||||
@@ -63,6 +63,7 @@
|
||||
"verificationRequest": "Отправить новое письмо",
|
||||
"verificationRetry": "Повторить подтверждение",
|
||||
"verificationBack": "Вернуться ко входу",
|
||||
"verificationContinue": "Перейти ко входу",
|
||||
"verificationHint": "Нет письма? Проверьте папку «Спам» или запросите новое ниже.",
|
||||
"verificationDemoLink": "Перейти к подтверждению",
|
||||
"verificationStep": "ПОДТВЕРДИТЕ ПОЧТУ",
|
||||
@@ -270,8 +271,11 @@
|
||||
"kycBirth": "Дата рождения",
|
||||
"kycBirthHelp": "ГГГГ-ММ-ДД, например 1990-04-23",
|
||||
"kycCountry": "Страна проживания",
|
||||
"kycCountryHelp": "Код страны из двух букв, например PL или DE",
|
||||
"kycProfileRequired": "Укажите полное имя, корректную дату рождения и код страны из двух букв.",
|
||||
"kycCountrySelect": "Выберите страну",
|
||||
"kycCountrySearch": "Поиск страны",
|
||||
"kycCountryEmpty": "Страны не найдены. Попробуйте другое название или код страны.",
|
||||
"kycCountryClearSearch": "Очистить поиск",
|
||||
"kycProfileRequired": "Укажите полное имя, корректную дату рождения и выберите страну проживания.",
|
||||
"kycContinue": "Перейти в личный кабинет",
|
||||
"kycOperationMinimum": "Минимум на операцию",
|
||||
"kycOperationMaximum": "Максимум на операцию",
|
||||
@@ -289,5 +293,95 @@
|
||||
"type": "int"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"dTitle": "Способы вывода",
|
||||
"dAdd": "Добавить способ вывода",
|
||||
"dChoose": "Реквизиты для вывода",
|
||||
"dNew": "Использовать новые реквизиты",
|
||||
"dSave": "Сохранить способ вывода",
|
||||
"dContinue": "Продолжить",
|
||||
"dSaveFuture": "Сохранить для будущих выводов",
|
||||
"dSaveHelp": "При продолжении реквизиты также будут сохранены.",
|
||||
"dNickname": "Название способа вывода (необязательно)",
|
||||
"dSaved": "Способ вывода сохранён.",
|
||||
"dSaveFailed": "Не удалось сохранить реквизиты. Введённые данные остались в форме.",
|
||||
"dRetrySave": "Повторить сохранение",
|
||||
"dWithoutSave": "Продолжить без сохранения",
|
||||
"dUncertain": "Не удалось подтвердить сохранение. Возможно, способ уже сохранён.",
|
||||
"dCheckSave": "Проверить статус сохранения",
|
||||
"dDuplicate": "Эти реквизиты уже сохранены. Используйте существующий способ.",
|
||||
"dUseExisting": "Использовать существующий способ",
|
||||
"dCrypto": "Криптоадрес",
|
||||
"dCard": "Банковская карта",
|
||||
"dBank": "Российский банковский счёт",
|
||||
"dType": "Тип реквизитов",
|
||||
"dSearch": "Поиск сохранённых способов",
|
||||
"dEmpty": "В этой категории нет сохранённых способов.",
|
||||
"dNoMatches": "Подходящие способы не найдены.",
|
||||
"dEligible": "Доступно",
|
||||
"dTemporary": "Временно недоступно для этого вывода.",
|
||||
"dAction": "Требуется действие",
|
||||
"dUnsupported": "Этот способ не поддерживается для данного вывода.",
|
||||
"dUnavailable": "Не удалось загрузить способы. Повторите попытку.",
|
||||
"dNoCapabilities": "Сейчас нет доступных типов реквизитов.",
|
||||
"dDemo": "Демонстрационные реквизиты — сохранение действует до перезагрузки. Реальный вывод и ввод карт не подключены.",
|
||||
"dAsset": "Получаемый актив",
|
||||
"dNetwork": "Сеть",
|
||||
"dAddress": "Адрес кошелька",
|
||||
"dMemo": "Memo / тег назначения",
|
||||
"dNoMemo": "Без memo / тега",
|
||||
"dCryptoHelp": "Выберите сеть, поддерживаемую кошельком получателя. Верный формат адреса не гарантирует зачисление.",
|
||||
"dHolder": "Владелец счёта",
|
||||
"dFirst": "Имя",
|
||||
"dLast": "Фамилия",
|
||||
"dPatronymic": "Отчество (необязательно)",
|
||||
"dBankDetails": "Банковские реквизиты",
|
||||
"dBankSearch": "Название банка или БИК",
|
||||
"dAccount": "20-значный номер счёта",
|
||||
"dCorrespondent": "Корреспондентский счёт",
|
||||
"dChangeBank": "Изменить банк",
|
||||
"dBankUnknown": "Банк не найден. Проверьте название или БИК.",
|
||||
"dBankFailure": "Справочник банков недоступен. Введённые данные сохранены.",
|
||||
"dBankChanged": "Банковские реквизиты изменились. Проверьте их и добавьте новые реквизиты.",
|
||||
"dPaste": "Вставить банковские реквизиты",
|
||||
"dPasteHelp": "Вставьте реквизиты с названиями полей. Проверьте распознанные значения перед применением.",
|
||||
"dPasteReview": "Проверить распознанные реквизиты",
|
||||
"dPasteApply": "Использовать эти реквизиты",
|
||||
"dPasteConflict": "Найдены противоречивые значения. Исправьте соответствующие поля в форме.",
|
||||
"dInvalid": "Проверьте введённые реквизиты и исправьте выделенное поле.",
|
||||
"dCardDemo": "Выберите демонстрационный результат безопасного ввода карты. Не вводите настоящий номер карты.",
|
||||
"dCardReady": "Демо-карта •••• 4242",
|
||||
"dCardRecover": "Демо-карта с истёкшей авторизацией",
|
||||
"dCardExpired": "Срок действия карты истёк. Добавьте новую карту.",
|
||||
"dAuthorization": "Необходимо обновить авторизацию. Используйте доступное восстановление или добавьте новые реквизиты.",
|
||||
"dRemoved": "Этот способ удалён. Черновик сохранён. Выберите реквизиты для продолжения.",
|
||||
"dConflict": "Этот способ изменён в другой сессии. Обновите и проверьте актуальную версию.",
|
||||
"dRename": "Переименовать",
|
||||
"dRemove": "Удалить",
|
||||
"dReplace": "Добавить новые реквизиты",
|
||||
"dRemoveTitle": "Удалить способ вывода?",
|
||||
"dRemoveHelp": "Удалённые способы недоступны для новых выводов. Отправленные заявки и обязательные финансовые записи сохраняются.",
|
||||
"dDetails": "Реквизиты",
|
||||
"dReload": "Обновить способы",
|
||||
"dSelect": "Выбрать реквизиты",
|
||||
"dQuoteChanged": "Условия вывода изменились. Черновик сохранён. Выберите реквизиты и проверьте новую котировку.",
|
||||
"dOwn": "Используйте принадлежащий вам кошелёк, карту или счёт.",
|
||||
"dSavedIneligible": "Сохранено. Этот способ недоступен для текущего вывода.",
|
||||
"dSaveFailedLabel": "Ошибка сохранения",
|
||||
"dNoEligible": "Для этого вывода нет доступных способов. Добавьте реквизиты или обновите список.",
|
||||
"dDemoTerms": "Демонстрационные суммы зачисления рассчитаны по фиксированному курсу 1:1. Реальный вывод не выполняется.",
|
||||
"dTiming": "Ожидаемое время обработки: {seconds} сек.",
|
||||
"@dTiming": {
|
||||
"placeholders": {
|
||||
"seconds": {
|
||||
"type": "int"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dBik": "БИК",
|
||||
"dBankMismatch": "Вставленные реквизиты отличаются от выбранного банка. Проверьте их перед продолжением.",
|
||||
"dManagementUnavailable": "Сохранение способов вывода пока недоступно. Вы можете использовать ранее настроенные реквизиты для вывода.",
|
||||
"dUpdateAuthorization": "Обновить авторизацию",
|
||||
"dAuthorizationUpdated": "Авторизация обновлена.",
|
||||
"dReplacementRequired": "Не удалось подтвердить, что это та же карта. Добавьте новые реквизиты."
|
||||
}
|
||||
@@ -1,5 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:flutter_web_plugins/url_strategy.dart';
|
||||
|
||||
import 'package:country_picker/country_picker.dart';
|
||||
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:sxchnge_analytics/sxchnge_analytics.dart';
|
||||
@@ -18,6 +22,7 @@ import 'routing/router.dart';
|
||||
import 'generated/i18n/app_localizations.dart';
|
||||
|
||||
Future<void> main() async {
|
||||
usePathUrlStrategy();
|
||||
final binding = WidgetsFlutterBinding.ensureInitialized();
|
||||
final locale = await LocaleProvider.load(binding.platformDispatcher.locales);
|
||||
const apiUrl = String.fromEnvironment('SXCHNGE_API_URL');
|
||||
@@ -37,6 +42,7 @@ class SxchngeApp extends StatefulWidget {
|
||||
this.identityService,
|
||||
this.limitsService,
|
||||
this.walletService,
|
||||
this.destinationService,
|
||||
this.twoFactorService,
|
||||
this.photoService = const FilePhotoService(),
|
||||
this.loginService = const DummyLoginService(),
|
||||
@@ -49,6 +55,7 @@ class SxchngeApp extends StatefulWidget {
|
||||
final IdentityService? identityService;
|
||||
final LimitsService? limitsService;
|
||||
final WalletService? walletService;
|
||||
final DestinationService? destinationService;
|
||||
final TwoFactorService? twoFactorService;
|
||||
final PhotoService photoService;
|
||||
final LoginService loginService;
|
||||
@@ -89,10 +96,17 @@ class _SxchngeAppState extends State<SxchngeApp> {
|
||||
initialLocale: _locale.locale.languageCode,
|
||||
factors: _authFactors,
|
||||
));
|
||||
late final _destinationService =
|
||||
widget.destinationService ??
|
||||
(_walletService.isSimulated && _walletService is DummyWalletService
|
||||
? _walletService.destinations
|
||||
: const UnavailableDestinationService());
|
||||
late final _destinations = DestinationsProvider(_destinationService);
|
||||
late final _wallet = WalletProvider(
|
||||
_walletService,
|
||||
_analytics,
|
||||
factors: _factors,
|
||||
destinations: _destinationService,
|
||||
);
|
||||
late final _limits =
|
||||
widget.limitsService ??
|
||||
@@ -131,6 +145,7 @@ class _SxchngeAppState extends State<SxchngeApp> {
|
||||
if (customer != _walletCustomer) {
|
||||
_walletCustomer = customer;
|
||||
_wallet.reset();
|
||||
_destinations.reset();
|
||||
}
|
||||
final path = _router.routeInformationProvider.value.uri.path;
|
||||
if (path == '/' && _previousPath != '/' && _previousPath != '/two-factor') {
|
||||
@@ -145,6 +160,7 @@ class _SxchngeAppState extends State<SxchngeApp> {
|
||||
_router.dispose();
|
||||
_journeys.dispose();
|
||||
_wallet.dispose();
|
||||
_destinations.dispose();
|
||||
if (_walletService is BackendWalletService) {
|
||||
_walletService.close();
|
||||
}
|
||||
@@ -161,6 +177,7 @@ class _SxchngeAppState extends State<SxchngeApp> {
|
||||
Widget build(BuildContext context) => MultiProvider(
|
||||
providers: [
|
||||
ChangeNotifierProvider.value(value: _wallet),
|
||||
ChangeNotifierProvider.value(value: _destinations),
|
||||
ChangeNotifierProvider.value(value: _security),
|
||||
Provider<TwoFactorService>.value(value: _factors),
|
||||
Provider<JourneyRecorder>.value(value: _journeys),
|
||||
@@ -180,7 +197,10 @@ class _SxchngeAppState extends State<SxchngeApp> {
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: SxchngeTheme.light(),
|
||||
locale: locale.locale,
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
localizationsDelegates: const [
|
||||
...AppLocalizations.localizationsDelegates,
|
||||
CountryLocalizations.delegate,
|
||||
],
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
routerConfig: _router,
|
||||
),
|
||||
|
||||
@@ -7,6 +7,7 @@ import 'package:go_router/go_router.dart';
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import '../auth/page.dart';
|
||||
import '../destinations/list.dart';
|
||||
import '../kyc/page.dart';
|
||||
import '../security/challenge.dart';
|
||||
import '../verification/page.dart';
|
||||
@@ -82,6 +83,12 @@ GoRouter createAppRouter({bool Function()? authenticated}) {
|
||||
GoRoute(
|
||||
path: '/settings',
|
||||
builder: (context, state) => const SettingsPage(),
|
||||
routes: [
|
||||
GoRoute(
|
||||
path: 'payout-methods',
|
||||
builder: (context, state) => const DestinationsPage(),
|
||||
),
|
||||
],
|
||||
),
|
||||
GoRoute(
|
||||
path: '/top-up',
|
||||
@@ -128,7 +135,9 @@ GoRouter createAppRouter({bool Function()? authenticated}) {
|
||||
GoRoute(
|
||||
path: '/',
|
||||
name: AppRoutes.login,
|
||||
builder: (context, state) => const AuthPage(),
|
||||
builder: (context, state) => AuthPage(
|
||||
email: state.extra is String ? state.extra as String : null,
|
||||
),
|
||||
),
|
||||
GoRoute(
|
||||
path: '/verification-sent',
|
||||
|
||||
@@ -318,15 +318,21 @@ class _VerificationPageState extends State<VerificationPage> {
|
||||
if (verified) ...[
|
||||
const SizedBox(height: 16),
|
||||
FilledButton(
|
||||
onPressed: () => context.go('/accounts'),
|
||||
child: Text(l.wEnter),
|
||||
key: const ValueKey('verification-continue'),
|
||||
onPressed: () => context.goNamed(
|
||||
AppRoutes.login,
|
||||
extra: state.result?.verifiedEmail,
|
||||
),
|
||||
child: Text(l.verificationContinue),
|
||||
),
|
||||
],
|
||||
if (!verified) ...[
|
||||
const SizedBox(height: 16),
|
||||
TextButton(
|
||||
onPressed: () => context.goNamed(AppRoutes.login),
|
||||
child: Text(l.verificationBack),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 16),
|
||||
TextButton(
|
||||
onPressed: () => context.goNamed(AppRoutes.login),
|
||||
child: Text(l.verificationBack),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@@ -48,6 +48,7 @@ String fundsText(
|
||||
_ => l.wFailedOutgoing,
|
||||
};
|
||||
String walletError(AppLocalizations l, WalletError e) => switch (e) {
|
||||
WalletError.destinationChanged => l.dQuoteChanged,
|
||||
WalletError.invalidAmount => l.wInvalidAmount,
|
||||
WalletError.insufficientFunds => l.wInsufficient,
|
||||
WalletError.limitExceeded => l.wLimitError,
|
||||
|
||||
@@ -106,6 +106,15 @@ class SettingsPage extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Card(
|
||||
child: ListTile(
|
||||
leading: const Icon(Icons.account_balance_outlined),
|
||||
title: Text(l.dTitle),
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
onTap: () => context.push('/settings/payout-methods'),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
const SecuritySettings(),
|
||||
const SizedBox(height: 20),
|
||||
TextButton(
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import 'dart:math';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:intl/intl.dart';
|
||||
@@ -6,6 +8,8 @@ import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import '../destinations/details.dart';
|
||||
|
||||
import 'copy.dart';
|
||||
|
||||
import '../generated/i18n/app_localizations.dart';
|
||||
@@ -49,13 +53,23 @@ class TransferSummary extends StatelessWidget {
|
||||
q.request.kind == TransferKind.payout
|
||||
? l.wRecipientGets
|
||||
: l.wCredit,
|
||||
money(context, b, q.credit),
|
||||
q.payoutTerms == null
|
||||
? money(context, b, q.credit)
|
||||
: '${NumberFormat.decimalPatternDigits(locale: Localizations.localeOf(context).toLanguageTag(), decimalDigits: q.payoutTerms!.precision).format(q.payoutTerms!.amount / pow(10, q.payoutTerms!.precision))} ${q.payoutTerms!.assetLabel}',
|
||||
large: true,
|
||||
),
|
||||
if (q.payoutTerms != null) ...[
|
||||
const SizedBox(height: 12),
|
||||
Text(l.dTiming(q.payoutTerms!.expectedSeconds)),
|
||||
if (p.service.isSimulated) Text(l.dDemoTerms),
|
||||
],
|
||||
if (q.request.kind == TransferKind.payout) ...[
|
||||
const Divider(height: 32),
|
||||
Text(l.wRecipient),
|
||||
SelectableText(q.request.recipient),
|
||||
if (q.payoutSnapshot != null)
|
||||
DestinationDetailsView(details: q.payoutSnapshot!)
|
||||
else
|
||||
SelectableText(q.request.recipient),
|
||||
],
|
||||
],
|
||||
),
|
||||
|
||||
@@ -11,6 +11,7 @@ import 'package:sxchnge_auth/sxchnge_auth.dart';
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import '../security/challenge.dart';
|
||||
import '../destinations/list.dart';
|
||||
|
||||
import 'copy.dart';
|
||||
import 'summary.dart';
|
||||
@@ -32,7 +33,7 @@ class TransferPageState extends State<TransferPage> {
|
||||
source: widget.source,
|
||||
);
|
||||
final _amount = TextEditingController();
|
||||
final _recipient = TextEditingController();
|
||||
|
||||
final _focus = FocusNode();
|
||||
final _content = GlobalKey();
|
||||
Timer? _timer;
|
||||
@@ -41,7 +42,13 @@ class TransferPageState extends State<TransferPage> {
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) _provider.addListener(_changed);
|
||||
if (mounted) {
|
||||
_provider.addListener(_changed);
|
||||
final destinations = context.read<DestinationsProvider>();
|
||||
if (destinations.capabilities == null && !destinations.loading) {
|
||||
unawaited(destinations.refresh());
|
||||
}
|
||||
}
|
||||
});
|
||||
_timer = Timer.periodic(const Duration(seconds: 1), (_) {
|
||||
if (mounted && _provider.quote != null) setState(() {});
|
||||
@@ -118,7 +125,7 @@ class TransferPageState extends State<TransferPage> {
|
||||
_provider.removeListener(_changed);
|
||||
_provider.dispose();
|
||||
_amount.dispose();
|
||||
_recipient.dispose();
|
||||
|
||||
_focus.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
@@ -134,14 +141,16 @@ class TransferPageState extends State<TransferPage> {
|
||||
final accounts = wallet.data?.accounts ?? [];
|
||||
final source = wallet.account(p.source);
|
||||
final live = !wallet.service.isSimulated;
|
||||
final destinations = context.watch<DestinationsProvider>();
|
||||
final legacyPayout =
|
||||
live &&
|
||||
!(destinations.capabilities?.types.isNotEmpty ?? false) &&
|
||||
destinations.methods.isEmpty;
|
||||
final expiresIn =
|
||||
p.quote?.expiresAt.difference(DateTime.now()).inSeconds ?? 0;
|
||||
final unavailableMethod =
|
||||
live &&
|
||||
((widget.kind == TransferKind.payout &&
|
||||
(source?.payoutMethod.isEmpty ?? true)) ||
|
||||
(widget.kind == TransferKind.topUp &&
|
||||
!(source?.canFund ?? false)));
|
||||
((widget.kind == TransferKind.topUp && !(source?.canFund ?? false)));
|
||||
return SingleChildScrollView(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Center(
|
||||
@@ -235,7 +244,11 @@ class TransferPageState extends State<TransferPage> {
|
||||
FilledButton(
|
||||
key: const ValueKey('transfer-confirm'),
|
||||
onPressed: p.busy ? null : _confirm,
|
||||
child: Text(l.wConfirm),
|
||||
child: Text(
|
||||
widget.kind == TransferKind.payout
|
||||
? '${l.wPayout} ${money(context, source!, p.quote!.debit)}'
|
||||
: l.wConfirm,
|
||||
),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: p.busy ? null : p.edit,
|
||||
@@ -316,23 +329,66 @@ class TransferPageState extends State<TransferPage> {
|
||||
),
|
||||
if (widget.kind == TransferKind.payout) ...[
|
||||
const SizedBox(height: 20),
|
||||
if (live && source?.payoutMethod.isNotEmpty == true)
|
||||
InputDecorator(
|
||||
decoration: InputDecoration(
|
||||
labelText: l.wRecipient,
|
||||
if (legacyPayout) ...[
|
||||
if (source?.payoutMethod.isNotEmpty == true)
|
||||
OutlinedButton.icon(
|
||||
key: const ValueKey(
|
||||
'choose-configured-destination',
|
||||
),
|
||||
icon: const Icon(
|
||||
Icons.account_balance_outlined,
|
||||
),
|
||||
label: Text(source!.payoutLabel),
|
||||
onPressed: p.busy
|
||||
? null
|
||||
: () => p.change(
|
||||
recipient: source.payoutMethod,
|
||||
payoutLabel: source.payoutLabel,
|
||||
),
|
||||
),
|
||||
child: Text(source!.payoutLabel),
|
||||
),
|
||||
if (!live)
|
||||
TextField(
|
||||
key: const ValueKey('transfer-recipient'),
|
||||
controller: _recipient,
|
||||
enabled: !p.busy,
|
||||
decoration: InputDecoration(
|
||||
labelText: l.wRecipient,
|
||||
hintText: l.wRecipientHint,
|
||||
if (source?.payoutMethod.isEmpty ?? true)
|
||||
Text(l.wNoPayoutMethod),
|
||||
] else
|
||||
OutlinedButton.icon(
|
||||
key: const ValueKey(
|
||||
'choose-payout-destination',
|
||||
),
|
||||
onChanged: (v) => p.change(recipient: v),
|
||||
icon: const Icon(
|
||||
Icons.account_balance_wallet_outlined,
|
||||
),
|
||||
label: Text(
|
||||
p.payoutDestination == null
|
||||
? l.dSelect
|
||||
: p.payoutLabel,
|
||||
),
|
||||
onPressed: p.busy
|
||||
? null
|
||||
: () async {
|
||||
final selected =
|
||||
await Navigator.push<
|
||||
DestinationInput
|
||||
>(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (_) =>
|
||||
DestinationsPage(
|
||||
payoutContext:
|
||||
PayoutContext(
|
||||
p.source,
|
||||
amount: source
|
||||
?.parse(
|
||||
p.amount,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
if (!context.mounted ||
|
||||
selected == null) {
|
||||
return;
|
||||
}
|
||||
await p.selectPayout(selected);
|
||||
},
|
||||
),
|
||||
],
|
||||
if (unavailableMethod) ...[
|
||||
@@ -346,7 +402,13 @@ class TransferPageState extends State<TransferPage> {
|
||||
const SizedBox(height: 28),
|
||||
FilledButton(
|
||||
key: const ValueKey('transfer-review'),
|
||||
onPressed: p.busy || unavailableMethod
|
||||
onPressed:
|
||||
p.busy ||
|
||||
unavailableMethod ||
|
||||
(widget.kind == TransferKind.payout &&
|
||||
(legacyPayout
|
||||
? p.recipient.isEmpty
|
||||
: p.payoutDestination == null))
|
||||
? null
|
||||
: p.review,
|
||||
child: Text(l.wReview),
|
||||
|
||||
@@ -49,6 +49,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.19.1"
|
||||
country_picker:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: country_picker
|
||||
sha256: "8ef721183bd7e0a6017c413693cdc68051daceef5790f5420c3b4378b5c69115"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.28"
|
||||
cross_file:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -185,7 +193,7 @@ packages:
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_web_plugins:
|
||||
dependency: transitive
|
||||
dependency: "direct main"
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
@@ -525,6 +533,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.4.0"
|
||||
universal_io:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: universal_io
|
||||
sha256: f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.3.1"
|
||||
vector_math:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
||||
@@ -14,6 +14,8 @@ dependencies:
|
||||
path: ../packages/sxchnge_analytics
|
||||
flutter:
|
||||
sdk: flutter
|
||||
flutter_web_plugins:
|
||||
sdk: flutter
|
||||
sxchnge_auth:
|
||||
path: ../packages/sxchnge_auth
|
||||
sxchnge_theme:
|
||||
@@ -25,6 +27,7 @@ dependencies:
|
||||
shared_preferences: ^2.5.3
|
||||
cupertino_icons: ^1.0.8
|
||||
go_router: ^18.0.1
|
||||
country_picker: ^2.0.28
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
|
||||
@@ -92,6 +92,14 @@ void main() {
|
||||
findsOneWidget,
|
||||
);
|
||||
expect(find.byKey(const ValueKey('verification-sent')), findsNothing);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
tester
|
||||
.widget<TextFormField>(find.byKey(const ValueKey('email')))
|
||||
@@ -153,6 +161,14 @@ void main() {
|
||||
'/verification-sent',
|
||||
);
|
||||
expect(backend.sends, 1);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
find.textContaining('a verification email is on its way'),
|
||||
findsOneWidget,
|
||||
@@ -198,6 +214,14 @@ void main() {
|
||||
find.text('Сервис недоступен. Попробуйте ещё раз.'),
|
||||
findsOneWidget,
|
||||
);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.tap(button);
|
||||
await tester.pump();
|
||||
expect(service.calls, hasLength(2));
|
||||
@@ -207,6 +231,12 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.byKey(const ValueKey('preview-result')), findsOneWidget);
|
||||
expect(find.byKey(const ValueKey('auth-error')), findsNothing);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
);
|
||||
expect(tester.takeException(), isNull);
|
||||
},
|
||||
);
|
||||
@@ -237,6 +267,14 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.byKey(const ValueKey('confirmation')), findsOneWidget);
|
||||
expect(find.byKey(const ValueKey('preview-result')), findsNothing);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
}
|
||||
@@ -55,6 +55,12 @@ void main() {
|
||||
await submit(tester);
|
||||
expect(find.text('Enter your email address.'), findsOneWidget);
|
||||
expect(find.text('Enter your password.'), findsOneWidget);
|
||||
expect(
|
||||
tester.testTextInput.log.where(
|
||||
(call) => call.method == 'TextInput.finishAutofillContext',
|
||||
),
|
||||
isEmpty,
|
||||
);
|
||||
await tester.enterText(
|
||||
find.byKey(const ValueKey('email')),
|
||||
'test@example.com',
|
||||
@@ -79,6 +85,12 @@ void main() {
|
||||
await tester.testTextInput.receiveAction(TextInputAction.done);
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.byKey(const ValueKey('preview-result')), findsOneWidget);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
);
|
||||
expect(tester.takeException(), isNull);
|
||||
},
|
||||
);
|
||||
@@ -104,12 +116,26 @@ void main() {
|
||||
);
|
||||
await submit(tester);
|
||||
expect(find.text('Passwords do not match.'), findsOneWidget);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.enterText(
|
||||
find.byKey(const ValueKey('confirmation')),
|
||||
'example-password',
|
||||
);
|
||||
await submit(tester);
|
||||
expect(find.byKey(const ValueKey('verification-sent')), findsOneWidget);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
);
|
||||
await tester.ensureVisible(
|
||||
find.byKey(const ValueKey('demo-confirmation')),
|
||||
);
|
||||
@@ -119,8 +145,8 @@ void main() {
|
||||
find.byKey(const ValueKey('verification-verified')),
|
||||
findsOneWidget,
|
||||
);
|
||||
await tester.ensureVisible(find.text('Back to login'));
|
||||
await tester.tap(find.text('Back to login'));
|
||||
await tester.ensureVisible(find.text('Continue to login'));
|
||||
await tester.tap(find.text('Continue to login'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.byKey(const ValueKey('confirmation')), findsNothing);
|
||||
expect(find.text('example-password'), findsNothing);
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import 'package:sxchnge_app/main.dart';
|
||||
import 'package:sxchnge_app/providers/locale.dart';
|
||||
|
||||
Finder field(String key) => find.byKey(ValueKey(key));
|
||||
|
||||
EditableTextState editor(WidgetTester tester, String key) =>
|
||||
tester.state<EditableTextState>(
|
||||
find.descendant(of: field(key), matching: find.byType(EditableText)),
|
||||
);
|
||||
|
||||
void main() {
|
||||
for (final language in ['en', 'ru']) {
|
||||
testWidgets(
|
||||
'platform autofill fills the signup credential group ($language)',
|
||||
(tester) async {
|
||||
tester.view.physicalSize = const Size(1440, 1200);
|
||||
tester.view.devicePixelRatio = 1;
|
||||
addTearDown(tester.view.resetPhysicalSize);
|
||||
addTearDown(tester.view.resetDevicePixelRatio);
|
||||
await tester.pumpWidget(
|
||||
SxchngeApp(
|
||||
localeProvider: LocaleProvider(initialLocale: Locale(language)),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
await tester.tap(
|
||||
find.text(language == 'ru' ? 'Регистрация' : 'Sign up'),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
await tester.showKeyboard(field('email'));
|
||||
|
||||
final configuration = tester.testTextInput.setClientArgs!;
|
||||
expect(
|
||||
configuration['inputType']['name'],
|
||||
'TextInputType.emailAddress',
|
||||
);
|
||||
final fields = (configuration['fields'] as List).cast<Map>();
|
||||
expect(fields, hasLength(4));
|
||||
expect(
|
||||
fields.map((field) => field['autofill']['hints'].first),
|
||||
containsAll(['name', 'username', 'newPassword', 'newPassword']),
|
||||
);
|
||||
|
||||
const values = {
|
||||
'name': 'Alex Example',
|
||||
'email': 'alex@example.com',
|
||||
'password': 'generated-example-password',
|
||||
'confirmation': 'generated-example-password',
|
||||
};
|
||||
await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
|
||||
SystemChannels.textInput.name,
|
||||
SystemChannels.textInput.codec.encodeMethodCall(
|
||||
MethodCall('TextInputClient.updateEditingStateWithTag', [
|
||||
0,
|
||||
{
|
||||
for (final entry in values.entries)
|
||||
editor(tester, entry.key).autofillId: TextEditingValue(
|
||||
text: entry.value,
|
||||
).toJSON(),
|
||||
},
|
||||
]),
|
||||
),
|
||||
(_) {},
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
for (final entry in values.entries) {
|
||||
expect(
|
||||
editor(tester, entry.key).currentTextEditingValue.text,
|
||||
entry.value,
|
||||
);
|
||||
}
|
||||
|
||||
// A visibility change must retain both the supplied value and its role.
|
||||
await tester.tap(
|
||||
find.byTooltip(
|
||||
language == 'ru' ? 'Показать пароль' : 'Show password',
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
expect(editor(tester, 'password').widget.obscureText, isFalse);
|
||||
expect(editor(tester, 'password').widget.autofillHints, [
|
||||
'newPassword',
|
||||
]);
|
||||
expect(
|
||||
editor(tester, 'password').currentTextEditingValue.text,
|
||||
values['password'],
|
||||
);
|
||||
|
||||
await tester.tap(find.text(language == 'ru' ? 'Войти' : 'Log in'));
|
||||
await tester.pumpAndSettle();
|
||||
await tester.showKeyboard(field('email'));
|
||||
final loginFields =
|
||||
(tester.testTextInput.setClientArgs!['fields'] as List).cast<Map>();
|
||||
expect(loginFields, hasLength(2));
|
||||
expect(loginFields.map((field) => field['autofill']['hints'].first), [
|
||||
'username',
|
||||
'password',
|
||||
]);
|
||||
expect(
|
||||
editor(tester, 'password').currentTextEditingValue.text,
|
||||
isEmpty,
|
||||
);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: false),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
testWidgets('leaving an unfinished auth form cancels saving', (tester) async {
|
||||
await tester.pumpWidget(const SxchngeApp());
|
||||
await tester.pumpAndSettle();
|
||||
await tester.enterText(field('email'), 'alex@example.com');
|
||||
await tester.enterText(field('password'), 'unfinished-password');
|
||||
tester.testTextInput.log.clear();
|
||||
await tester.pumpWidget(const SizedBox.shrink());
|
||||
await tester.pumpAndSettle();
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: false),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
tester.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,176 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
import 'package:country_picker/country_picker.dart';
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import 'package:sxchnge_theme/sxchnge_theme.dart';
|
||||
|
||||
import 'package:sxchnge_app/kyc/country.dart';
|
||||
|
||||
import 'package:sxchnge_app/generated/i18n/app_localizations.dart';
|
||||
|
||||
void main() {
|
||||
final search = find.byKey(const ValueKey('country-search'));
|
||||
final button = find.byType(OutlinedButton);
|
||||
|
||||
Future<void> mount(
|
||||
WidgetTester tester,
|
||||
ValueNotifier<String> value, {
|
||||
Locale locale = const Locale('en'),
|
||||
bool enabled = true,
|
||||
}) async {
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
theme: SxchngeTheme.light(),
|
||||
locale: locale,
|
||||
localizationsDelegates: const [
|
||||
...AppLocalizations.localizationsDelegates,
|
||||
CountryLocalizations.delegate,
|
||||
],
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
home: Scaffold(
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: ValueListenableBuilder<String>(
|
||||
valueListenable: value,
|
||||
builder: (_, code, _) => CountryField(
|
||||
value: code,
|
||||
enabled: enabled,
|
||||
onChanged: (code) => value.value = code,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
}
|
||||
|
||||
Future<void> open(WidgetTester tester) async {
|
||||
await tester.tap(button);
|
||||
await tester.pumpAndSettle();
|
||||
}
|
||||
|
||||
testWidgets(
|
||||
'name search stores code, reselection and cancel preserve value',
|
||||
(tester) async {
|
||||
final value = ValueNotifier('');
|
||||
addTearDown(value.dispose);
|
||||
await mount(tester, value);
|
||||
expect(find.text('Select a country'), findsOneWidget);
|
||||
await open(tester);
|
||||
await tester.enterText(search, 'polAND');
|
||||
await tester.pumpAndSettle();
|
||||
await tester.tap(find.text('Poland'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(value.value, 'PL');
|
||||
expect(find.text('Poland'), findsOneWidget);
|
||||
expect(find.text('0/2'), findsNothing);
|
||||
|
||||
await open(tester);
|
||||
await tester.enterText(search, ' de ');
|
||||
await tester.pumpAndSettle();
|
||||
await tester.tap(find.text('Germany'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(value.value, 'DE');
|
||||
expect(find.text('Germany'), findsOneWidget);
|
||||
|
||||
await open(tester);
|
||||
await tester.enterText(search, 'poland');
|
||||
await tester.pumpAndSettle();
|
||||
await tester.tap(find.byType(BackButton));
|
||||
await tester.pumpAndSettle();
|
||||
expect(value.value, 'DE');
|
||||
expect(find.text('Germany'), findsOneWidget);
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets('no-results state recovers through clear and Escape cancels', (
|
||||
tester,
|
||||
) async {
|
||||
final value = ValueNotifier('PL');
|
||||
addTearDown(value.dispose);
|
||||
await mount(tester, value);
|
||||
await open(tester);
|
||||
await tester.enterText(search, 'no-such-country');
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.textContaining('No countries found'), findsOneWidget);
|
||||
expect(find.byType(ListTile), findsNothing);
|
||||
expect(value.value, 'PL');
|
||||
await tester.tap(find.byTooltip('Clear search'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.textContaining('No countries found'), findsNothing);
|
||||
expect(find.byType(ListTile), findsWidgets);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.escape);
|
||||
await tester.pumpAndSettle();
|
||||
expect(search, findsNothing);
|
||||
expect(value.value, 'PL');
|
||||
});
|
||||
|
||||
testWidgets('saved code follows locale and Russian names are searchable', (
|
||||
tester,
|
||||
) async {
|
||||
final value = ValueNotifier('PL');
|
||||
addTearDown(value.dispose);
|
||||
await mount(tester, value);
|
||||
expect(find.text('Poland'), findsOneWidget);
|
||||
await mount(tester, value, locale: const Locale('ru'));
|
||||
expect(find.text('Польша'), findsOneWidget);
|
||||
expect(value.value, 'PL');
|
||||
await open(tester);
|
||||
await tester.enterText(search, 'Германия');
|
||||
await tester.pumpAndSettle();
|
||||
await tester.tap(find.byType(ListTile));
|
||||
await tester.pumpAndSettle();
|
||||
expect(value.value, 'DE');
|
||||
expect(find.text('Германия'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('busy field cannot open or change selection', (tester) async {
|
||||
final value = ValueNotifier('PL');
|
||||
addTearDown(value.dispose);
|
||||
await mount(tester, value, enabled: false);
|
||||
expect(tester.widget<OutlinedButton>(button).onPressed, isNull);
|
||||
await tester.tap(button);
|
||||
await tester.pumpAndSettle();
|
||||
expect(search, findsNothing);
|
||||
expect(value.value, 'PL');
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'keyboard and labeled touch targets work at 320px with large text',
|
||||
(tester) async {
|
||||
tester.view.physicalSize = const Size(320, 900);
|
||||
tester.view.devicePixelRatio = 1;
|
||||
tester.platformDispatcher.textScaleFactorTestValue = 1.6;
|
||||
addTearDown(tester.view.resetPhysicalSize);
|
||||
addTearDown(tester.view.resetDevicePixelRatio);
|
||||
addTearDown(tester.platformDispatcher.clearTextScaleFactorTestValue);
|
||||
final semantics = tester.ensureSemantics();
|
||||
final value = ValueNotifier('GS');
|
||||
addTearDown(value.dispose);
|
||||
await mount(tester, value);
|
||||
expect(tester, meetsGuideline(labeledTapTargetGuideline));
|
||||
expect(tester, meetsGuideline(androidTapTargetGuideline));
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.tab);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.enter);
|
||||
await tester.pumpAndSettle();
|
||||
expect(search, findsOneWidget);
|
||||
await tester.enterText(search, 'GS');
|
||||
await tester.pumpAndSettle();
|
||||
expect(tester.widget<ListTile>(find.byType(ListTile)).selected, isTrue);
|
||||
expect(tester, meetsGuideline(labeledTapTargetGuideline));
|
||||
expect(tester, meetsGuideline(androidTapTargetGuideline));
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.tab);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.tab);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.enter);
|
||||
await tester.pumpAndSettle();
|
||||
expect(search, findsNothing);
|
||||
expect(value.value, 'GS');
|
||||
expect(tester.takeException(), isNull);
|
||||
semantics.dispose();
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
const testDestination = CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
);
|
||||
Future<void> seedDestination(DummyDestinationService service) async {
|
||||
await service.create(
|
||||
testDestination,
|
||||
'Test wallet',
|
||||
'test-destination-creation',
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> selectPayout(WidgetTester t) async {
|
||||
final button = find.byKey(const ValueKey('choose-payout-destination'));
|
||||
await t.ensureVisible(button);
|
||||
await t.tap(button);
|
||||
await t.pumpAndSettle();
|
||||
final row = find.text('Test wallet');
|
||||
await t.ensureVisible(row);
|
||||
await t.tap(row);
|
||||
await t.pumpAndSettle();
|
||||
}
|
||||
@@ -0,0 +1,245 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import 'package:sxchnge_analytics/sxchnge_analytics.dart';
|
||||
|
||||
import 'package:sxchnge_kyc/sxchnge_kyc.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import 'package:sxchnge_app/main.dart';
|
||||
import 'package:sxchnge_app/providers/locale.dart';
|
||||
|
||||
import 'destination_helpers.dart';
|
||||
|
||||
Future<void> click(WidgetTester t, Finder finder) async {
|
||||
await t.ensureVisible(finder);
|
||||
await t.pumpAndSettle();
|
||||
await t.tap(finder);
|
||||
await t.pumpAndSettle();
|
||||
}
|
||||
|
||||
Future<DummyWalletService> open(
|
||||
WidgetTester t, {
|
||||
String path = '/settings/payout-methods',
|
||||
String locale = 'en',
|
||||
DummyDestinationService? destinations,
|
||||
DummyAnalyticsService? analytics,
|
||||
}) async {
|
||||
t.platformDispatcher.defaultRouteNameTestValue = path;
|
||||
addTearDown(t.platformDispatcher.clearDefaultRouteNameTestValue);
|
||||
final wallet = DummyWalletService(
|
||||
DummyIdentityService(delay: Duration.zero),
|
||||
delay: Duration.zero,
|
||||
destinations: destinations,
|
||||
initialLocale: locale,
|
||||
settlement: Duration.zero,
|
||||
);
|
||||
await t.pumpWidget(
|
||||
SxchngeApp(
|
||||
walletService: wallet,
|
||||
analyticsService: analytics,
|
||||
localeProvider: LocaleProvider(initialLocale: Locale(locale)),
|
||||
),
|
||||
);
|
||||
await t.pumpAndSettle();
|
||||
addTearDown(() => t.pumpWidget(const SizedBox.shrink()));
|
||||
return wallet;
|
||||
}
|
||||
|
||||
Future<void> cryptoForm(WidgetTester t, {bool payout = false}) async {
|
||||
await click(
|
||||
t,
|
||||
find.text(payout ? 'Use a new destination' : 'Add payout method').first,
|
||||
);
|
||||
await click(t, find.byType(DropdownButtonFormField<DestinationType>));
|
||||
await click(t, find.text('Crypto address').last);
|
||||
await click(t, find.byKey(const ValueKey('asset-null')));
|
||||
await click(t, find.text('ETH').last);
|
||||
await click(t, find.byType(DropdownButtonFormField<String>).last);
|
||||
await click(t, find.text('Ethereum').last);
|
||||
await t.enterText(
|
||||
find.byKey(const ValueKey('destination-address')),
|
||||
testDestination.address,
|
||||
);
|
||||
await t.pump();
|
||||
}
|
||||
|
||||
void main() {
|
||||
testWidgets('Settings saves without nickname and exposes renamed method', (
|
||||
t,
|
||||
) async {
|
||||
final wallet = await open(t);
|
||||
await cryptoForm(t);
|
||||
expect(find.text('Save for future payouts'), findsNothing);
|
||||
await click(t, find.byKey(const ValueKey('destination-continue')));
|
||||
expect((await wallet.destinations.list()).length, 1);
|
||||
expect(find.textContaining('ETH · Ethereum'), findsOneWidget);
|
||||
await click(t, find.textContaining('ETH · Ethereum'));
|
||||
await t.enterText(
|
||||
find.byKey(const ValueKey('destination-nickname')),
|
||||
'My own wallet',
|
||||
);
|
||||
await click(t, find.text('Rename'));
|
||||
expect((await wallet.destinations.list()).single.nickname, 'My own wallet');
|
||||
await click(t, find.text('Remove'));
|
||||
expect(find.textContaining('Submitted payouts'), findsOneWidget);
|
||||
await click(t, find.widgetWithText(FilledButton, 'Remove'));
|
||||
expect(await wallet.destinations.list(), isEmpty);
|
||||
expect(t.takeException(), isNull);
|
||||
});
|
||||
testWidgets('new one-time payout keeps saving unchecked and never persists', (
|
||||
t,
|
||||
) async {
|
||||
final wallet = await open(t, path: '/payout');
|
||||
await t.enterText(find.byKey(const ValueKey('transfer-amount')), '5');
|
||||
await click(t, find.byKey(const ValueKey('choose-payout-destination')));
|
||||
await cryptoForm(t, payout: true);
|
||||
expect(
|
||||
t.widget<CheckboxListTile>(find.byType(CheckboxListTile)).value,
|
||||
isFalse,
|
||||
);
|
||||
expect(find.byKey(const ValueKey('destination-nickname')), findsNothing);
|
||||
await click(t, find.byKey(const ValueKey('destination-continue')));
|
||||
await click(t, find.byKey(const ValueKey('transfer-review')));
|
||||
expect(find.textContaining(testDestination.address), findsOneWidget);
|
||||
await click(t, find.byKey(const ValueKey('transfer-confirm')));
|
||||
expect(find.byKey(const ValueKey('operation-completed')), findsOneWidget);
|
||||
expect(await wallet.destinations.list(), isEmpty);
|
||||
});
|
||||
testWidgets(
|
||||
'optional saving failure permits explicit one-time continuation',
|
||||
(t) async {
|
||||
final service = DummyDestinationService();
|
||||
final wallet = await open(t, path: '/payout', destinations: service);
|
||||
await t.enterText(find.byKey(const ValueKey('transfer-amount')), '5');
|
||||
await click(t, find.byKey(const ValueKey('choose-payout-destination')));
|
||||
await cryptoForm(t, payout: true);
|
||||
await click(t, find.text('Save for future payouts'));
|
||||
service.nextSaveError = DestinationIssue.conflict;
|
||||
await click(t, find.byKey(const ValueKey('destination-continue')));
|
||||
expect(find.textContaining('Couldn’t save'), findsOneWidget);
|
||||
await click(t, find.text('Continue without saving'));
|
||||
await click(t, find.byKey(const ValueKey('transfer-review')));
|
||||
await click(t, find.byKey(const ValueKey('transfer-confirm')));
|
||||
expect(find.byKey(const ValueKey('operation-completed')), findsOneWidget);
|
||||
expect(await wallet.destinations.list(), isEmpty);
|
||||
},
|
||||
);
|
||||
testWidgets(
|
||||
'saved destination is never selected automatically and removal preserves amount',
|
||||
(t) async {
|
||||
final service = DummyDestinationService();
|
||||
await seedDestination(service);
|
||||
final wallet = await open(t, path: '/payout', destinations: service);
|
||||
await t.enterText(find.byKey(const ValueKey('transfer-amount')), '5');
|
||||
expect(
|
||||
t
|
||||
.widget<FilledButton>(find.byKey(const ValueKey('transfer-review')))
|
||||
.onPressed,
|
||||
isNull,
|
||||
);
|
||||
await selectPayout(t);
|
||||
await click(t, find.byKey(const ValueKey('transfer-review')));
|
||||
final d = (await service.list()).single;
|
||||
await service.remove(d.id, d.metadataRevision, d.executionRevision);
|
||||
await click(t, find.byKey(const ValueKey('transfer-confirm')));
|
||||
expect(find.textContaining('Payout terms changed'), findsOneWidget);
|
||||
expect(find.text('5'), findsOneWidget);
|
||||
expect((await t.runAsync(wallet.fetch))!.operations, isEmpty);
|
||||
},
|
||||
);
|
||||
for (final locale in ['en', 'ru']) {
|
||||
testWidgets('all method forms fit $locale at 320px with large text', (
|
||||
t,
|
||||
) async {
|
||||
t.view.physicalSize = const Size(320, 1100);
|
||||
t.view.devicePixelRatio = 1;
|
||||
t.platformDispatcher.textScaleFactorTestValue = 1.6;
|
||||
addTearDown(t.view.resetPhysicalSize);
|
||||
addTearDown(t.view.resetDevicePixelRatio);
|
||||
addTearDown(t.platformDispatcher.clearTextScaleFactorTestValue);
|
||||
await open(t, locale: locale);
|
||||
await click(
|
||||
t,
|
||||
find
|
||||
.text(
|
||||
locale == 'en' ? 'Add payout method' : 'Добавить способ вывода',
|
||||
)
|
||||
.first,
|
||||
);
|
||||
for (final name
|
||||
in locale == 'en'
|
||||
? ['Crypto address', 'Bank card', 'Russian bank account']
|
||||
: [
|
||||
'Криптоадрес',
|
||||
'Банковская карта',
|
||||
'Российский банковский счёт',
|
||||
]) {
|
||||
await click(t, find.byType(DropdownButtonFormField<DestinationType>));
|
||||
await click(t, find.text(name).last);
|
||||
expect(t.takeException(), isNull);
|
||||
}
|
||||
});
|
||||
}
|
||||
testWidgets('semantic save outcomes contain no destination fields', (
|
||||
t,
|
||||
) async {
|
||||
final analytics = DummyAnalyticsService();
|
||||
await open(t, analytics: analytics);
|
||||
await cryptoForm(t);
|
||||
await click(t, find.byKey(const ValueKey('destination-continue')));
|
||||
await t.pumpAndSettle();
|
||||
final events = analytics.events
|
||||
.where((e) => e.kind == JourneyKind.destination)
|
||||
.toList();
|
||||
expect(
|
||||
events.any(
|
||||
(e) =>
|
||||
e.step == JourneyStep.destinationSave &&
|
||||
e.signal == JourneySignal.simulated,
|
||||
),
|
||||
isTrue,
|
||||
);
|
||||
expect(
|
||||
events.map((e) => e.properties.toString()).join(),
|
||||
isNot(contains(testDestination.address)),
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets(
|
||||
'binding recovery uses secure capture and preserves the saved card',
|
||||
(t) async {
|
||||
final service = DummyDestinationService();
|
||||
final created = await service.create(
|
||||
const CardDestination(
|
||||
capture: 'demo-card-recover',
|
||||
brand: '',
|
||||
last4: '',
|
||||
expiryMonth: 0,
|
||||
expiryYear: 0,
|
||||
),
|
||||
'Own card',
|
||||
'creation-key-000001',
|
||||
);
|
||||
await open(t, destinations: service);
|
||||
await click(t, find.text('Own card'));
|
||||
await click(t, find.text('Update authorization'));
|
||||
expect(find.byKey(const ValueKey('destination-nickname')), findsNothing);
|
||||
await click(t, find.text('Demo card •••• 4242'));
|
||||
await click(t, find.byKey(const ValueKey('destination-continue')));
|
||||
final saved = await service.get(created.destinationId);
|
||||
expect(saved.executionRevision, 2);
|
||||
expect(saved.nickname, 'Own card');
|
||||
expect((await service.list()).length, 1);
|
||||
expect(
|
||||
(await service.assess(
|
||||
saved.input,
|
||||
const PayoutContext('eur'),
|
||||
)).eligible,
|
||||
isTrue,
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import 'package:sxchnge_analytics/sxchnge_analytics.dart';
|
||||
|
||||
import 'package:sxchnge_kyc/sxchnge_kyc.dart';
|
||||
|
||||
import 'package:sxchnge_app/kyc/country.dart';
|
||||
import 'package:sxchnge_app/main.dart';
|
||||
import 'package:sxchnge_app/providers/locale.dart';
|
||||
|
||||
@@ -69,7 +70,20 @@ void main() {
|
||||
await tap(t, find.byKey(const ValueKey('kyc-start')));
|
||||
await t.enterText(find.byKey(const ValueKey('kyc-name')), 'Example Person');
|
||||
await t.enterText(find.byKey(const ValueKey('kyc-birth')), '1990-04-23');
|
||||
await t.enterText(find.byKey(const ValueKey('kyc-country')), 'PL');
|
||||
await tap(
|
||||
t,
|
||||
find.descendant(
|
||||
of: find.byKey(const ValueKey('kyc-country')),
|
||||
matching: find.byType(OutlinedButton),
|
||||
),
|
||||
);
|
||||
await t.enterText(find.byKey(const ValueKey('country-search')), 'PL');
|
||||
await t.pumpAndSettle();
|
||||
await tap(t, find.byType(ListTile));
|
||||
expect(
|
||||
t.widget<CountryField>(find.byKey(const ValueKey('kyc-country'))).value,
|
||||
'PL',
|
||||
);
|
||||
await t.pumpAndSettle();
|
||||
await tap(t, find.byKey(const ValueKey('pick-passport')));
|
||||
await tap(t, find.byKey(const ValueKey('kyc-next')));
|
||||
|
||||
@@ -76,6 +76,14 @@ void main() {
|
||||
await t.ensureVisible(review);
|
||||
if (hasMethod) {
|
||||
expect(find.text(destinationLabel), findsOneWidget);
|
||||
final choose = find.byKey(
|
||||
const ValueKey('choose-configured-destination'),
|
||||
);
|
||||
expect(t.widget<FilledButton>(review).onPressed, isNull);
|
||||
await t.ensureVisible(choose);
|
||||
await t.tap(choose);
|
||||
await t.pumpAndSettle();
|
||||
await t.ensureVisible(review);
|
||||
await t.tap(review);
|
||||
await t.pumpAndSettle();
|
||||
expect(wallet.received, 'method-ref');
|
||||
|
||||
@@ -42,6 +42,67 @@ Future<GoRouter> openRoute(
|
||||
}
|
||||
|
||||
void main() {
|
||||
for (final language in ['en', 'ru']) {
|
||||
testWidgets(
|
||||
'verified link keeps success visible and prefills login ($language)',
|
||||
(tester) async {
|
||||
tester.platformDispatcher.defaultRouteNameTestValue =
|
||||
'/verify-email?token=demo-valid';
|
||||
addTearDown(tester.platformDispatcher.clearDefaultRouteNameTestValue);
|
||||
await tester.pumpWidget(
|
||||
SxchngeApp(
|
||||
localeProvider: LocaleProvider(initialLocale: Locale(language)),
|
||||
verificationService: const DummyVerificationService(
|
||||
delay: Duration.zero,
|
||||
verifiedEmail: 'private-alias@example.com',
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
expect(
|
||||
find.byKey(const ValueKey('verification-verified')),
|
||||
findsOneWidget,
|
||||
);
|
||||
expect(find.byKey(const ValueKey('email')), findsNothing);
|
||||
final router = GoRouter.of(
|
||||
tester.element(find.byType(VerificationPage)),
|
||||
);
|
||||
expect(router.routeInformationProvider.value.uri.path, '/verify-email');
|
||||
await tester.ensureVisible(
|
||||
find.byKey(const ValueKey('verification-continue')),
|
||||
);
|
||||
await tester.tap(find.byKey(const ValueKey('verification-continue')));
|
||||
await tester.pumpAndSettle();
|
||||
final email = tester.widget<TextFormField>(
|
||||
find.byKey(const ValueKey('email')),
|
||||
);
|
||||
expect(email.controller!.text, 'private-alias@example.com');
|
||||
final password = tester.state<EditableTextState>(
|
||||
find.descendant(
|
||||
of: find.byKey(const ValueKey('password')),
|
||||
matching: find.byType(EditableText),
|
||||
),
|
||||
);
|
||||
expect(password.currentTextEditingValue.text, isEmpty);
|
||||
expect(password.widget.focusNode.hasFocus, isTrue);
|
||||
expect(router.routeInformationProvider.value.uri.toString(), '/');
|
||||
final restored = router.routeInformationParser.restoreRouteInformation(
|
||||
router.routerDelegate.currentConfiguration,
|
||||
)!;
|
||||
expect(
|
||||
restored.state.toString(),
|
||||
isNot(contains('private-alias@example.com')),
|
||||
);
|
||||
expect(restored.state.toString(), isNot(contains('demo-valid')));
|
||||
await tester.enterText(
|
||||
find.byKey(const ValueKey('email')),
|
||||
'changed@example.com',
|
||||
);
|
||||
expect(email.controller!.text, 'changed@example.com');
|
||||
expect(find.byKey(const ValueKey('confirmation')), findsNothing);
|
||||
},
|
||||
);
|
||||
}
|
||||
testWidgets('unknown deep link redirects to canonical login URL', (
|
||||
tester,
|
||||
) async {
|
||||
|
||||
@@ -6,9 +6,15 @@ import 'package:sxchnge_analytics/sxchnge_analytics.dart';
|
||||
|
||||
import 'package:sxchnge_auth/sxchnge_auth.dart';
|
||||
|
||||
import 'package:sxchnge_kyc/sxchnge_kyc.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import 'package:sxchnge_app/main.dart';
|
||||
import 'package:sxchnge_app/providers/locale.dart';
|
||||
|
||||
import 'destination_helpers.dart';
|
||||
|
||||
Future<void> tapFactor(WidgetTester t, String key) async {
|
||||
final finder = find.byKey(ValueKey(key));
|
||||
await t.ensureVisible(finder);
|
||||
@@ -31,8 +37,16 @@ Future<DummyTwoFactorService> openFactor(
|
||||
delay: Duration.zero,
|
||||
method: method,
|
||||
);
|
||||
final wallet = DummyWalletService(
|
||||
DummyIdentityService(delay: Duration.zero),
|
||||
factors: service,
|
||||
initialLocale: locale,
|
||||
delay: Duration.zero,
|
||||
);
|
||||
await seedDestination(wallet.destinations);
|
||||
await t.pumpWidget(
|
||||
SxchngeApp(
|
||||
walletService: wallet,
|
||||
twoFactorService: service,
|
||||
analyticsService: analytics,
|
||||
localeProvider: LocaleProvider(initialLocale: Locale(locale)),
|
||||
@@ -134,13 +148,38 @@ void main() {
|
||||
await signIn(t);
|
||||
expect(find.byKey(const ValueKey('two-factor-code')), findsOneWidget);
|
||||
expect(find.byKey(const ValueKey('preview-result')), findsNothing);
|
||||
expect(
|
||||
t.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
analytics.events.where((e) => e.kind == JourneyKind.login && e.terminal),
|
||||
isEmpty,
|
||||
);
|
||||
await t.enterText(find.byKey(const ValueKey('two-factor-code')), '000000');
|
||||
await tapFactor(t, 'two-factor-confirm');
|
||||
expect(find.byKey(const ValueKey('two-factor-error')), findsOneWidget);
|
||||
expect(
|
||||
t.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
await t.enterText(find.byKey(const ValueKey('two-factor-code')), '123456');
|
||||
await tapFactor(t, 'two-factor-confirm');
|
||||
expect(find.byKey(const ValueKey('account-eur')), findsOneWidget);
|
||||
expect(
|
||||
t.testTextInput.log,
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
);
|
||||
final login = analytics.events
|
||||
.where((e) => e.kind == JourneyKind.login)
|
||||
.toList();
|
||||
@@ -158,6 +197,20 @@ void main() {
|
||||
await signIn(t);
|
||||
await tapFactor(t, 'two-factor-cancel');
|
||||
expect(find.byKey(const ValueKey('email')), findsOneWidget);
|
||||
expect(
|
||||
t.testTextInput.log,
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: false),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
t.testTextInput.log,
|
||||
isNot(
|
||||
contains(
|
||||
isMethodCall('TextInput.finishAutofillContext', arguments: true),
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(find.byKey(const ValueKey('preview-result')), findsNothing);
|
||||
expect(
|
||||
t
|
||||
@@ -174,10 +227,7 @@ void main() {
|
||||
await openFactor(t, path: '/$kind', enabled: true);
|
||||
await t.enterText(find.byKey(const ValueKey('transfer-amount')), '10');
|
||||
if (kind == 'payout') {
|
||||
await t.enterText(
|
||||
find.byKey(const ValueKey('transfer-recipient')),
|
||||
'Sample recipient',
|
||||
);
|
||||
await selectPayout(t);
|
||||
}
|
||||
await tapFactor(t, 'transfer-review');
|
||||
await tapFactor(t, 'transfer-confirm');
|
||||
|
||||
@@ -11,6 +11,8 @@ import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
import 'package:sxchnge_app/main.dart';
|
||||
import 'package:sxchnge_app/providers/locale.dart';
|
||||
|
||||
import 'destination_helpers.dart';
|
||||
|
||||
Future<void> tap(WidgetTester t, Finder f) async {
|
||||
await t.ensureVisible(f);
|
||||
await t.tap(f);
|
||||
@@ -32,6 +34,7 @@ Future<DummyWalletService> open(
|
||||
settlement: settlement,
|
||||
initialLocale: locale,
|
||||
);
|
||||
await seedDestination(service.destinations);
|
||||
await t.pumpWidget(
|
||||
SxchngeApp(
|
||||
identityService: identity,
|
||||
@@ -78,10 +81,7 @@ void main() {
|
||||
expect(find.byKey(const ValueKey('operation-completed')), findsOneWidget);
|
||||
await tap(t, find.text('Pay out').last);
|
||||
await t.enterText(find.byKey(const ValueKey('transfer-amount')), '5');
|
||||
await t.enterText(
|
||||
find.byKey(const ValueKey('transfer-recipient')),
|
||||
'Sample recipient',
|
||||
);
|
||||
await selectPayout(t);
|
||||
await tap(t, find.byKey(const ValueKey('transfer-review')));
|
||||
expect(find.text('Recipient receives'), findsOneWidget);
|
||||
await tap(t, find.byKey(const ValueKey('transfer-confirm')));
|
||||
@@ -101,10 +101,7 @@ void main() {
|
||||
);
|
||||
s.failNextOperation = true;
|
||||
await t.enterText(find.byKey(const ValueKey('transfer-amount')), '10');
|
||||
await t.enterText(
|
||||
find.byKey(const ValueKey('transfer-recipient')),
|
||||
'Sample recipient',
|
||||
);
|
||||
await selectPayout(t);
|
||||
await tap(t, find.byKey(const ValueKey('transfer-review')));
|
||||
await tap(t, find.byKey(const ValueKey('transfer-confirm')));
|
||||
// Settlement is service-owned; refresh after the simulated processing period.
|
||||
|
||||
@@ -11,8 +11,11 @@ enum JourneyKind {
|
||||
exchange,
|
||||
payout,
|
||||
security,
|
||||
destination,
|
||||
}
|
||||
|
||||
enum DestinationResolution { created, duplicate }
|
||||
|
||||
enum JourneyStep {
|
||||
login,
|
||||
signup,
|
||||
@@ -23,6 +26,10 @@ enum JourneyStep {
|
||||
kycSelfie,
|
||||
kycSubmission,
|
||||
kycStatus,
|
||||
destinationDraft,
|
||||
destinationSave,
|
||||
destinationReconciliation,
|
||||
destinationBinding,
|
||||
transferDraft,
|
||||
transferQuote,
|
||||
transferSubmission,
|
||||
@@ -78,6 +85,7 @@ class AnalyticsEvent {
|
||||
required this.sequence,
|
||||
required this.elapsedMs,
|
||||
this.step,
|
||||
this.resolution,
|
||||
this.operation,
|
||||
this.failure,
|
||||
this.exit,
|
||||
@@ -90,6 +98,7 @@ class AnalyticsEvent {
|
||||
final JourneyKind kind;
|
||||
final JourneySignal signal;
|
||||
final JourneyStep? step;
|
||||
final DestinationResolution? resolution;
|
||||
final JourneyFailure? failure;
|
||||
final JourneyExit? exit;
|
||||
final int sequence;
|
||||
@@ -105,6 +114,7 @@ class AnalyticsEvent {
|
||||
JourneyKind.exchange => 'exchange',
|
||||
JourneyKind.payout => 'payout',
|
||||
JourneyKind.security => 'security',
|
||||
JourneyKind.destination => 'destination',
|
||||
_ => 'auth',
|
||||
};
|
||||
var stage = step == null ? 'journey' : _snake(step!.name);
|
||||
@@ -123,6 +133,7 @@ class AnalyticsEvent {
|
||||
'terminal': terminal,
|
||||
'simulated': simulated,
|
||||
if (step != null) 'step': _snake(step!.name),
|
||||
if (resolution != null) 'destination_resolution': resolution!.name,
|
||||
if (operation != null) 'operation': operation!,
|
||||
if (failure != null) 'failure': _snake(failure!.name),
|
||||
if (exit != null) 'exit': _snake(exit!.name),
|
||||
@@ -210,6 +221,7 @@ class JourneyRecorder {
|
||||
JourneyFailure? failure,
|
||||
bool terminal = false,
|
||||
bool cancelled = false,
|
||||
DestinationResolution? resolution,
|
||||
}) {
|
||||
final journey = operation._journey;
|
||||
if (_disposed || operation._finished || journey.closed) return;
|
||||
@@ -227,6 +239,7 @@ class JourneyRecorder {
|
||||
? JourneySignal.simulated
|
||||
: JourneySignal.succeeded,
|
||||
operation: operation,
|
||||
resolution: resolution,
|
||||
failure: failure,
|
||||
terminal: complete,
|
||||
simulated: simulated || (complete && journey.simulated),
|
||||
@@ -258,6 +271,7 @@ class JourneyRecorder {
|
||||
_Journey journey,
|
||||
JourneySignal signal, {
|
||||
JourneyOperation? operation,
|
||||
DestinationResolution? resolution,
|
||||
JourneyFailure? failure,
|
||||
JourneyExit? exit,
|
||||
bool terminal = false,
|
||||
@@ -271,6 +285,7 @@ class JourneyRecorder {
|
||||
sequence: ++journey.sequence,
|
||||
elapsedMs: journey.time.elapsedMilliseconds,
|
||||
step: operation?.step,
|
||||
resolution: resolution,
|
||||
operation: operation?.number,
|
||||
failure: failure,
|
||||
exit: exit,
|
||||
|
||||
@@ -6,6 +6,8 @@ class BackendDTO {
|
||||
(jsonDecode(body) as Map<String, dynamic>)['data'] as Map<String, dynamic>,
|
||||
);
|
||||
final Map<String, dynamic> data;
|
||||
bool get verified => data['verified'] == true;
|
||||
String? get email => data['email'] as String?;
|
||||
String get error => data['error'] as String? ?? 'unavailable';
|
||||
String get userId =>
|
||||
data['userId'] as String? ??
|
||||
|
||||
@@ -6,6 +6,7 @@ class AuthDTO {
|
||||
}
|
||||
|
||||
class VerificationDTO {
|
||||
const VerificationDTO({required this.simulated});
|
||||
const VerificationDTO({required this.simulated, this.email});
|
||||
final bool simulated;
|
||||
final String? email;
|
||||
}
|
||||
@@ -5,6 +5,13 @@ import '../models/two_factor.dart';
|
||||
import '../models/verification.dart';
|
||||
|
||||
abstract final class BackendMapper {
|
||||
static VerificationResult activation(BackendDTO dto) {
|
||||
if (!dto.verified) {
|
||||
throw const VerificationException(VerificationError.internal);
|
||||
}
|
||||
return VerificationResult(isSimulated: false, verifiedEmail: dto.email);
|
||||
}
|
||||
|
||||
static AuthResult signup(BackendDTO dto) {
|
||||
if (dto.userId.isEmpty) throw const FormatException('Missing user');
|
||||
return AuthResult(userId: dto.userId, isSimulated: false);
|
||||
|
||||
@@ -9,5 +9,5 @@ abstract final class AuthMapper {
|
||||
|
||||
abstract final class VerificationMapper {
|
||||
static VerificationResult fromDTO(VerificationDTO dto) =>
|
||||
VerificationResult(isSimulated: dto.simulated);
|
||||
VerificationResult(isSimulated: dto.simulated, verifiedEmail: dto.email);
|
||||
}
|
||||
@@ -17,15 +17,22 @@ class VerificationException implements Exception {
|
||||
}
|
||||
|
||||
class VerificationResult {
|
||||
const VerificationResult({required this.isSimulated});
|
||||
const VerificationResult({required this.isSimulated, this.verifiedEmail});
|
||||
final bool isSimulated;
|
||||
final String? verifiedEmail;
|
||||
}
|
||||
|
||||
class VerificationState {
|
||||
const VerificationState(this.status, {this.isSimulated = false, this.error});
|
||||
const VerificationState(
|
||||
this.status, {
|
||||
this.isSimulated = false,
|
||||
this.error,
|
||||
this.result,
|
||||
});
|
||||
final VerificationStatus status;
|
||||
final VerificationError? error;
|
||||
final bool isSimulated;
|
||||
final VerificationResult? result;
|
||||
bool get isLoading =>
|
||||
status == VerificationStatus.sending ||
|
||||
status == VerificationStatus.checking;
|
||||
|
||||
@@ -35,7 +35,11 @@ class VerificationProvider extends ChangeNotifier {
|
||||
try {
|
||||
final result = await operation();
|
||||
if (_disposed || generation != _generation) return;
|
||||
_state = VerificationState(success, isSimulated: result.isSimulated);
|
||||
_state = VerificationState(
|
||||
success,
|
||||
isSimulated: result.isSimulated,
|
||||
result: success == VerificationStatus.verified ? result : null,
|
||||
);
|
||||
} catch (error) {
|
||||
if (_disposed || generation != _generation) return;
|
||||
final code = error is VerificationException
|
||||
|
||||
@@ -172,8 +172,10 @@ class BackendAuthServices
|
||||
|
||||
@override
|
||||
Future<VerificationResult> confirm({required String token}) async {
|
||||
await _post('verification/confirm', {'token': token}, verification: true);
|
||||
return VerificationMapper.fromDTO(const VerificationDTO(simulated: false));
|
||||
final dto = await _post('verification/confirm', {
|
||||
'token': token,
|
||||
}, verification: true);
|
||||
return BackendMapper.activation(dto);
|
||||
}
|
||||
|
||||
@override
|
||||
|
||||
@@ -19,11 +19,13 @@ class DummyVerificationService implements VerificationService, SimulationInfo {
|
||||
const DummyVerificationService({
|
||||
this.delay = const Duration(milliseconds: 600),
|
||||
this.sendFailure,
|
||||
this.verifiedEmail = 'alex@example.com',
|
||||
});
|
||||
@override
|
||||
bool get isSimulated => true;
|
||||
final Duration delay;
|
||||
final VerificationError? sendFailure;
|
||||
final String verifiedEmail;
|
||||
|
||||
@override
|
||||
Future<VerificationResult> send({
|
||||
@@ -41,7 +43,7 @@ class DummyVerificationService implements VerificationService, SimulationInfo {
|
||||
switch (token) {
|
||||
case 'demo-valid':
|
||||
return VerificationMapper.fromDTO(
|
||||
const VerificationDTO(simulated: true),
|
||||
VerificationDTO(simulated: true, email: verifiedEmail),
|
||||
);
|
||||
case 'demo-expired':
|
||||
throw const VerificationException(VerificationError.expired);
|
||||
|
||||
@@ -10,6 +10,48 @@ import 'package:sxchnge_auth/sxchnge_auth.dart';
|
||||
void main() {
|
||||
http.Response response(Map<String, Object?> data, [int status = 202]) =>
|
||||
http.Response(jsonEncode({'data': data}), status);
|
||||
test(
|
||||
'activation maps only a confirmed response to the verified email',
|
||||
() async {
|
||||
var confirmed = true;
|
||||
final service = BackendAuthServices(
|
||||
baseUri: Uri.parse('https://api.example/api/v1'),
|
||||
clientId: 'web',
|
||||
client: MockClient((request) async {
|
||||
expect(request.url.path, '/api/v1/accounts/verification/confirm');
|
||||
expect(jsonDecode(request.body), {'token': 'opaque-link'});
|
||||
return response({
|
||||
'verified': confirmed,
|
||||
'email': 'alias@example.com',
|
||||
});
|
||||
}),
|
||||
);
|
||||
addTearDown(service.close);
|
||||
final accepted = await service.confirm(token: 'opaque-link');
|
||||
expect(accepted.verifiedEmail, 'alias@example.com');
|
||||
expect(accepted.isSimulated, isFalse);
|
||||
confirmed = false;
|
||||
await expectLater(
|
||||
service.confirm(token: 'opaque-link'),
|
||||
throwsA(isA<VerificationException>()),
|
||||
);
|
||||
},
|
||||
);
|
||||
test(
|
||||
'activation remains compatible with a verified response without email',
|
||||
() async {
|
||||
final service = BackendAuthServices(
|
||||
baseUri: Uri.parse('https://api.example/api/v1'),
|
||||
clientId: 'web',
|
||||
client: MockClient((_) async => response({'verified': true})),
|
||||
);
|
||||
addTearDown(service.close);
|
||||
expect(
|
||||
(await service.confirm(token: 'opaque-link')).verifiedEmail,
|
||||
isNull,
|
||||
);
|
||||
},
|
||||
);
|
||||
test(
|
||||
'signup distinguishes support recovery and keeps the retry key',
|
||||
() async {
|
||||
|
||||
@@ -42,6 +42,12 @@ void main() {
|
||||
addTearDown(provider.dispose);
|
||||
await provider.confirm(scenario.key);
|
||||
expect(provider.state.status, scenario.value);
|
||||
expect(
|
||||
provider.state.result?.verifiedEmail,
|
||||
scenario.value == VerificationStatus.verified
|
||||
? 'alex@example.com'
|
||||
: null,
|
||||
);
|
||||
expect(
|
||||
provider.state.isSimulated,
|
||||
scenario.value == VerificationStatus.verified,
|
||||
@@ -75,7 +81,23 @@ void main() {
|
||||
service.pending.complete(const VerificationResult(isSimulated: true));
|
||||
await operation;
|
||||
expect(provider.state.status, VerificationStatus.idle);
|
||||
expect(provider.state.result, isNull);
|
||||
});
|
||||
test(
|
||||
'a later failed confirmation clears the previous verified identity',
|
||||
() async {
|
||||
final provider = VerificationProvider(
|
||||
const DummyVerificationService(delay: Duration.zero),
|
||||
);
|
||||
addTearDown(provider.dispose);
|
||||
await provider.confirm('demo-valid');
|
||||
expect(provider.state.result?.verifiedEmail, 'alex@example.com');
|
||||
final operation = provider.confirm('bad');
|
||||
expect(provider.state.result, isNull);
|
||||
await operation;
|
||||
expect(provider.state.result, isNull);
|
||||
},
|
||||
);
|
||||
test('dispose discards late exception', () async {
|
||||
final service = PendingService();
|
||||
final provider = VerificationProvider(service);
|
||||
|
||||
@@ -47,3 +47,17 @@ once on success/failure. Closing the app while pending does not count as draft
|
||||
abandonment. No amounts, account IDs or recipient data enter events. All demo
|
||||
signals are simulated. Cross-session outcomes require backend event delivery;
|
||||
client-only analytics are not production accounting or conversion evidence.
|
||||
|
||||
## Saved destinations — #54
|
||||
|
||||
The injectable `DestinationService` adds canonical crypto, secure-card capture and
|
||||
Russian bank models, saved/one-time input, independent metadata/execution revisions,
|
||||
stable created/duplicate outcomes, contextual eligibility and management providers.
|
||||
`DummyDestinationService` is customer-scoped and process-local. It has isolated
|
||||
fixtures for directory/capture/recovery states, not live banking or card collection.
|
||||
The demo wallet binds immutable destination snapshots to quotes and rechecks at its
|
||||
synchronous acceptance boundary. Production must enforce those checks atomically
|
||||
in the backend. Live mode currently advertises no new destination capabilities and
|
||||
preserves explicit selection of the already provisioned wallet method. It never
|
||||
uses a demo store. See [the UX/service contract](../../../docs/ux/payout-destinations.md)
|
||||
for integration, security, retention, localization and acceptance requirements.
|
||||
@@ -0,0 +1,49 @@
|
||||
/// Local, explicit-label paste parsing. Raw pasted text is never retained.
|
||||
class BankPaste {
|
||||
BankPaste._(this.values, this.conflicts);
|
||||
final Map<String, String> values;
|
||||
final Set<String> conflicts;
|
||||
static BankPaste parse(String text) {
|
||||
final values = <String, String>{};
|
||||
final conflicts = <String>{};
|
||||
const labels = {
|
||||
'бик': 'bik',
|
||||
'bik': 'bik',
|
||||
'счет': 'account',
|
||||
'счёт': 'account',
|
||||
'номер счета': 'account',
|
||||
'номер счёта': 'account',
|
||||
'account': 'account',
|
||||
'account number': 'account',
|
||||
'имя': 'firstName',
|
||||
'first name': 'firstName',
|
||||
'фамилия': 'lastName',
|
||||
'last name': 'lastName',
|
||||
'отчество': 'patronymic',
|
||||
'patronymic': 'patronymic',
|
||||
'получатель': 'holder',
|
||||
'фио': 'holder',
|
||||
'account holder': 'holder',
|
||||
'банк': 'bank',
|
||||
'bank': 'bank',
|
||||
'корреспондентский счет': 'correspondent',
|
||||
'корреспондентский счёт': 'correspondent',
|
||||
'correspondent account': 'correspondent',
|
||||
};
|
||||
for (final line in text.split(RegExp(r'[\r\n]+'))) {
|
||||
final match = RegExp(r'^\s*([^:=]+)\s*[:=]\s*(.+?)\s*$').firstMatch(line);
|
||||
if (match == null) continue;
|
||||
final key = labels[match[1]!.trim().toLowerCase()];
|
||||
if (key == null) continue;
|
||||
var value = match[2]!.trim();
|
||||
if (['bik', 'account', 'correspondent'].contains(key))
|
||||
value = value.replaceAll(RegExp(r'\s'), '');
|
||||
if (values.containsKey(key) && values[key] != value) conflicts.add(key);
|
||||
values[key] = value;
|
||||
}
|
||||
for (final key in conflicts) {
|
||||
values.remove(key);
|
||||
}
|
||||
return BankPaste._(Map.unmodifiable(values), Set.unmodifiable(conflicts));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,614 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'key.dart';
|
||||
import 'models.dart';
|
||||
import 'service.dart';
|
||||
import 'transport.dart';
|
||||
|
||||
/// Shared only by injected demo sessions. Never production persistence.
|
||||
class DestinationMemory {
|
||||
final records = <String, Map<String, SavedDestination>>{};
|
||||
final attempts = <String, Map<String, (String, CreationResult)>>{};
|
||||
final audit = <DestinationAudit>[];
|
||||
final recoveries = <String, Map<String, (String, String)>>{};
|
||||
final fingerprints = <String, Map<String, String?>>{};
|
||||
}
|
||||
|
||||
/// Service-authoritative simulation. No raw card capture and no live rails.
|
||||
class DummyDestinationService implements DestinationService {
|
||||
DummyDestinationService({
|
||||
this.customer = 'demo-customer',
|
||||
DestinationMemory? memory,
|
||||
DateTime Function()? now,
|
||||
}) : memory = memory ?? DestinationMemory(),
|
||||
now = now ?? DateTime.now;
|
||||
final String customer;
|
||||
final DestinationMemory memory;
|
||||
final DateTime Function() now;
|
||||
final availability = <String, PayoutEligibility>{};
|
||||
int requirementsRevision = 1;
|
||||
bool loseNextSaveResponse = false;
|
||||
bool reusableCards = true, cardRecovery = true;
|
||||
DestinationIssue? nextSaveError;
|
||||
bool directoryUnavailable = false;
|
||||
List<Bank> directory = [
|
||||
const Bank(
|
||||
bik: '044525225',
|
||||
name: 'Demo Bank',
|
||||
city: 'Moscow',
|
||||
correspondent: '30101810400000000225',
|
||||
revision: 'demo-1',
|
||||
),
|
||||
];
|
||||
static const assets = [
|
||||
CryptoAsset('demo:ethereum:native', 'ETH', 'eip155:1', 'Ethereum'),
|
||||
CryptoAsset(
|
||||
'demo:ethereum:usdc',
|
||||
'USDC · Ethereum · demo token A',
|
||||
'eip155:1',
|
||||
'Ethereum',
|
||||
),
|
||||
CryptoAsset(
|
||||
'demo:ethereum:usdc-alt',
|
||||
'USDC · Ethereum · demo token B',
|
||||
'eip155:1',
|
||||
'Ethereum',
|
||||
),
|
||||
CryptoAsset('demo:polygon:usdc', 'USDC · Polygon', 'eip155:137', 'Polygon'),
|
||||
CryptoAsset(
|
||||
'demo:xrp:native',
|
||||
'XRP',
|
||||
'xrpl:mainnet',
|
||||
'XRP Ledger',
|
||||
memoRequired: true,
|
||||
memoSupported: true,
|
||||
),
|
||||
];
|
||||
Map<String, SavedDestination> get _records =>
|
||||
memory.records.putIfAbsent(customer, () => {});
|
||||
Map<String, (String, CreationResult)> get _attempts =>
|
||||
memory.attempts.putIfAbsent(customer, () => {});
|
||||
@override
|
||||
bool get isSimulated => true;
|
||||
@override
|
||||
Future<DestinationCapabilities> capabilities() async =>
|
||||
DestinationCapabilities(
|
||||
types: DestinationType.values,
|
||||
assets: assets,
|
||||
reusableCards: true,
|
||||
cardRecovery: true,
|
||||
simulated: true,
|
||||
);
|
||||
@override
|
||||
Future<List<SavedDestination>> list() async =>
|
||||
_records.values.where((d) => !d.removed).toList();
|
||||
SavedDestination _get(String id) {
|
||||
final d = _records[id];
|
||||
if (d == null) throw const DestinationException(DestinationIssue.removed);
|
||||
return d;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<SavedDestination> get(String id) async => _get(id);
|
||||
void _audit(String reference, String action, String outcome) => memory.audit
|
||||
.add(DestinationAudit(customer, reference, action, outcome, now()));
|
||||
DestinationDetails _validate(DestinationDetails details) {
|
||||
switch (details) {
|
||||
case CryptoDestination d:
|
||||
final asset = assets
|
||||
.where((a) => a.id == d.assetId && a.networkId == d.networkId)
|
||||
.firstOrNull;
|
||||
if (asset == null)
|
||||
throw const DestinationException(
|
||||
DestinationIssue.invalid,
|
||||
field: 'asset',
|
||||
);
|
||||
final address = d.address.trim();
|
||||
final valid = asset.networkId.startsWith('eip155:')
|
||||
? RegExp(r'^0x[0-9a-fA-F]{40}$').hasMatch(address)
|
||||
: RegExp(r'^r[1-9A-HJ-NP-Za-km-z]{24,34}$').hasMatch(address);
|
||||
if (!valid)
|
||||
throw const DestinationException(
|
||||
DestinationIssue.invalid,
|
||||
field: 'address',
|
||||
);
|
||||
if (asset.memoRequired && !RegExp(r'^\d{1,10}$').hasMatch(d.memo))
|
||||
throw const DestinationException(
|
||||
DestinationIssue.invalid,
|
||||
field: 'memo',
|
||||
);
|
||||
if (!asset.memoSupported && d.memo.isNotEmpty)
|
||||
throw const DestinationException(
|
||||
DestinationIssue.invalid,
|
||||
field: 'memo',
|
||||
);
|
||||
return CryptoDestination(
|
||||
assetId: asset.id,
|
||||
networkId: asset.networkId,
|
||||
address: address,
|
||||
memo: d.memo,
|
||||
assetLabel: asset.label,
|
||||
networkLabel: asset.networkLabel,
|
||||
);
|
||||
case RussianBankDestination d:
|
||||
final account = d.account.replaceAll(RegExp(r'\s'), '');
|
||||
if (d.firstName.trim().isEmpty || d.lastName.trim().isEmpty)
|
||||
throw const DestinationException(
|
||||
DestinationIssue.invalid,
|
||||
field: 'holder',
|
||||
);
|
||||
if (!RegExp(r'^\d{9}$').hasMatch(d.bank.bik) ||
|
||||
!validBankAccount(account, d.bank.bik))
|
||||
throw const DestinationException(
|
||||
DestinationIssue.invalid,
|
||||
field: 'account',
|
||||
);
|
||||
if (directoryUnavailable)
|
||||
throw const DestinationException(
|
||||
DestinationIssue.unavailable,
|
||||
field: 'bank',
|
||||
);
|
||||
final bank = directory.where((b) => b.bik == d.bank.bik).firstOrNull;
|
||||
if (bank == null)
|
||||
throw const DestinationException(
|
||||
DestinationIssue.invalid,
|
||||
field: 'bank',
|
||||
);
|
||||
if (bank.correspondent != d.bank.correspondent)
|
||||
throw const DestinationException(
|
||||
DestinationIssue.bankChanged,
|
||||
field: 'bank',
|
||||
);
|
||||
// Directory display values are authoritative; identity is never guessed.
|
||||
return RussianBankDestination(
|
||||
firstName: d.firstName.trim(),
|
||||
lastName: d.lastName.trim(),
|
||||
patronymic: d.patronymic.trim(),
|
||||
bank: bank,
|
||||
account: account,
|
||||
);
|
||||
case CardDestination d:
|
||||
if (![
|
||||
'demo-card-ready',
|
||||
'demo-card-recover',
|
||||
'demo-card-unknown',
|
||||
].contains(d.capture))
|
||||
throw const DestinationException(
|
||||
DestinationIssue.invalid,
|
||||
field: 'card',
|
||||
);
|
||||
// These are secure-collection fixtures, not user-entered card metadata.
|
||||
return CardDestination(
|
||||
capture: d.capture,
|
||||
brand: 'Demo card',
|
||||
last4: d.capture == 'demo-card-unknown' ? '0027' : '4242',
|
||||
expiryMonth: 12,
|
||||
expiryYear: now().year + 2,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Future<DestinationValidation> validate(DestinationDetails details) async =>
|
||||
DestinationValidation(DestinationMapper.clone(_validate(details)));
|
||||
|
||||
String? _identity(DestinationDetails details) => switch (details) {
|
||||
CryptoDestination d => jsonEncode([
|
||||
d.type.name,
|
||||
d.assetId,
|
||||
d.networkId,
|
||||
d.networkId.startsWith('eip155:') ? d.address.toLowerCase() : d.address,
|
||||
d.memo,
|
||||
]),
|
||||
RussianBankDestination d => jsonEncode([
|
||||
d.type.name,
|
||||
d.bank.bik,
|
||||
d.account,
|
||||
d.firstName,
|
||||
d.lastName,
|
||||
d.patronymic,
|
||||
]),
|
||||
CardDestination d =>
|
||||
d.capture.isEmpty
|
||||
? (memory.fingerprints[customer] ?? <String, String?>{})[d.identity]
|
||||
: d.capture == 'demo-card-unknown'
|
||||
? null
|
||||
: 'demo-card-fingerprint:4242',
|
||||
};
|
||||
DestinationDetails _resolve(DestinationInput input) {
|
||||
if (input is OneTimeDestination) return _validate(input.details);
|
||||
final ref = input as SavedReference;
|
||||
final d = _get(ref.id);
|
||||
if (d.removed) throw const DestinationException(DestinationIssue.removed);
|
||||
if (d.executionRevision != ref.executionRevision)
|
||||
throw const DestinationException(DestinationIssue.conflict);
|
||||
return d.details;
|
||||
}
|
||||
|
||||
PayoutEligibility _assess(DestinationInput input, PayoutContext context) {
|
||||
final d = _resolve(input);
|
||||
if (input is SavedReference) {
|
||||
final saved = _get(input.id);
|
||||
if (saved.ownership.actionRequired)
|
||||
return const PayoutEligibility(
|
||||
EligibilityState.requiresAction,
|
||||
reason: DestinationIssue.authorization,
|
||||
);
|
||||
final override = availability[input.id];
|
||||
if (override != null) return override;
|
||||
if (d is CardDestination) {
|
||||
if (d.expiryYear < now().year ||
|
||||
d.expiryYear == now().year && d.expiryMonth < now().month)
|
||||
return const PayoutEligibility(
|
||||
EligibilityState.requiresAction,
|
||||
reason: DestinationIssue.expired,
|
||||
);
|
||||
final ready = saved.bindings.any(
|
||||
(b) =>
|
||||
b.reusable &&
|
||||
b.state == BindingState.ready &&
|
||||
(b.expiresAt == null || now().isBefore(b.expiresAt!)),
|
||||
);
|
||||
if (!ready) {
|
||||
final recoverable =
|
||||
cardRecovery && saved.bindings.any((b) => b.recoverable);
|
||||
final temporary = saved.bindings.any(
|
||||
(b) => b.state == BindingState.unavailable,
|
||||
);
|
||||
return PayoutEligibility(
|
||||
recoverable
|
||||
? EligibilityState.requiresAction
|
||||
: temporary
|
||||
? EligibilityState.temporarilyUnavailable
|
||||
: EligibilityState.unsupported,
|
||||
reason: recoverable
|
||||
? DestinationIssue.authorization
|
||||
: temporary
|
||||
? DestinationIssue.unavailable
|
||||
: DestinationIssue.unsupported,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (context.source.isNotEmpty &&
|
||||
!['eur', 'usd', 'gbp'].contains(context.source))
|
||||
return const PayoutEligibility(
|
||||
EligibilityState.unsupported,
|
||||
reason: DestinationIssue.unsupported,
|
||||
);
|
||||
if (d is RussianBankDestination) {
|
||||
if (directoryUnavailable)
|
||||
return const PayoutEligibility(
|
||||
EligibilityState.temporarilyUnavailable,
|
||||
reason: DestinationIssue.unavailable,
|
||||
);
|
||||
final current = directory.where((b) => b.bik == d.bank.bik).firstOrNull;
|
||||
if (current == null || !current.supported)
|
||||
return const PayoutEligibility(
|
||||
EligibilityState.unsupported,
|
||||
reason: DestinationIssue.unsupported,
|
||||
);
|
||||
if (current.correspondent != d.bank.correspondent)
|
||||
return const PayoutEligibility(
|
||||
EligibilityState.requiresAction,
|
||||
reason: DestinationIssue.bankChanged,
|
||||
);
|
||||
}
|
||||
if (d is CardDestination && d.capture == 'demo-card-recover')
|
||||
return const PayoutEligibility(
|
||||
EligibilityState.requiresAction,
|
||||
reason: DestinationIssue.authorization,
|
||||
);
|
||||
return PayoutEligibility(
|
||||
EligibilityState.eligible,
|
||||
canSave: d is! CardDestination || reusableCards || cardRecovery,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<PayoutEligibility> assess(
|
||||
DestinationInput input,
|
||||
PayoutContext context,
|
||||
) async => _assess(input, context);
|
||||
|
||||
@override
|
||||
Future<CreationResult> create(
|
||||
DestinationDetails details,
|
||||
String nickname,
|
||||
String idempotencyKey, {
|
||||
String? replaces,
|
||||
}) async {
|
||||
if (idempotencyKey.length < 16 || nickname.length > 80)
|
||||
throw const DestinationException(DestinationIssue.invalid);
|
||||
final payload = jsonEncode([
|
||||
DestinationMapper.details(details).value,
|
||||
nickname,
|
||||
replaces,
|
||||
]);
|
||||
final previous = _attempts[idempotencyKey];
|
||||
if (previous != null) {
|
||||
if (previous.$1 != payload)
|
||||
throw const DestinationException(DestinationIssue.conflict);
|
||||
return previous.$2;
|
||||
}
|
||||
final error = nextSaveError;
|
||||
nextSaveError = null;
|
||||
if (error != null) {
|
||||
_audit(idempotencyKey, 'create', 'failed');
|
||||
throw DestinationException(error);
|
||||
}
|
||||
if (replaces != null && _get(replaces).removed)
|
||||
throw const DestinationException(DestinationIssue.removed);
|
||||
final normalized = _validate(details);
|
||||
if (normalized is CardDestination && !reusableCards && !cardRecovery)
|
||||
throw const DestinationException(DestinationIssue.unsupported);
|
||||
final identity = _identity(normalized);
|
||||
final existing = identity == null
|
||||
? null
|
||||
: _records.values
|
||||
.where((r) => !r.removed && _identity(r.details) == identity)
|
||||
.firstOrNull;
|
||||
final result = CreationResult(
|
||||
existing == null ? SaveOutcome.created : SaveOutcome.duplicate,
|
||||
existing?.id ?? destinationKey(),
|
||||
);
|
||||
// Synchronous mutation is the demo's linearization boundary; no await gap.
|
||||
if (existing == null) {
|
||||
_records[result.destinationId] = SavedDestination(
|
||||
id: result.destinationId,
|
||||
details: normalized is CardDestination
|
||||
? CardDestination(
|
||||
identity: result.destinationId,
|
||||
brand: normalized.brand,
|
||||
last4: normalized.last4,
|
||||
expiryMonth: normalized.expiryMonth,
|
||||
expiryYear: normalized.expiryYear,
|
||||
)
|
||||
: DestinationMapper.clone(normalized),
|
||||
nickname: nickname.trim(),
|
||||
bindings: normalized is CardDestination
|
||||
? [
|
||||
ProviderBinding(
|
||||
reference: destinationKey(),
|
||||
state:
|
||||
!reusableCards ||
|
||||
normalized.capture == 'demo-card-recover'
|
||||
? BindingState.expired
|
||||
: BindingState.ready,
|
||||
reusable: reusableCards,
|
||||
recoverable: cardRecovery,
|
||||
),
|
||||
]
|
||||
: [],
|
||||
);
|
||||
}
|
||||
if (existing == null && normalized is CardDestination)
|
||||
memory.fingerprints.putIfAbsent(
|
||||
customer,
|
||||
() => {},
|
||||
)[result.destinationId] = identity;
|
||||
_attempts[idempotencyKey] = (payload, result);
|
||||
_audit(
|
||||
result.destinationId,
|
||||
replaces == null ? 'create' : 'replacement',
|
||||
result.outcome.name,
|
||||
);
|
||||
if (loseNextSaveResponse) {
|
||||
loseNextSaveResponse = false;
|
||||
throw const DestinationException(DestinationIssue.uncertain);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<CreationResult?> creation(String idempotencyKey) async =>
|
||||
_attempts[idempotencyKey]?.$2;
|
||||
@override
|
||||
Future<SavedDestination> rename(
|
||||
String id,
|
||||
String nickname,
|
||||
int metadataRevision,
|
||||
) async {
|
||||
final d = _get(id);
|
||||
if (d.removed) throw const DestinationException(DestinationIssue.removed);
|
||||
if (d.metadataRevision != metadataRevision) {
|
||||
_audit(id, 'rename', 'conflict');
|
||||
throw const DestinationException(DestinationIssue.conflict);
|
||||
}
|
||||
if (nickname.length > 80)
|
||||
throw const DestinationException(
|
||||
DestinationIssue.invalid,
|
||||
field: 'nickname',
|
||||
);
|
||||
final updated = SavedDestination(
|
||||
id: d.id,
|
||||
details: d.details,
|
||||
nickname: nickname.trim(),
|
||||
metadataRevision: d.metadataRevision + 1,
|
||||
executionRevision: d.executionRevision,
|
||||
bindings: d.bindings,
|
||||
lastUsed: d.lastUsed,
|
||||
ownership: d.ownership,
|
||||
);
|
||||
_records[id] = updated;
|
||||
_audit(id, 'rename', 'succeeded');
|
||||
return updated;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> remove(
|
||||
String id,
|
||||
int metadataRevision,
|
||||
int executionRevision,
|
||||
) async {
|
||||
final d = _get(id);
|
||||
if (d.removed) return;
|
||||
if (d.metadataRevision != metadataRevision ||
|
||||
d.executionRevision != executionRevision) {
|
||||
_audit(id, 'remove', 'conflict');
|
||||
throw const DestinationException(DestinationIssue.conflict);
|
||||
}
|
||||
_records[id] = SavedDestination(
|
||||
id: d.id,
|
||||
details: d.details,
|
||||
nickname: d.nickname,
|
||||
metadataRevision: d.metadataRevision + 1,
|
||||
executionRevision: d.executionRevision + 1,
|
||||
removed: true,
|
||||
bindings: d.bindings,
|
||||
lastUsed: d.lastUsed,
|
||||
ownership: d.ownership,
|
||||
);
|
||||
_audit(id, 'remove', 'succeeded');
|
||||
}
|
||||
|
||||
@override
|
||||
Future<List<Bank>> banks(String query, {Future<void>? abortTrigger}) async {
|
||||
if (directoryUnavailable)
|
||||
throw const DestinationException(DestinationIssue.unavailable);
|
||||
final value = query.trim().toLowerCase();
|
||||
if (RegExp(r'^\d+$').hasMatch(value) && value.length > 9)
|
||||
throw const DestinationException(DestinationIssue.invalid, field: 'bik');
|
||||
if (value.length < 2) return [];
|
||||
return directory
|
||||
.where(
|
||||
(b) => value.length == 9 && RegExp(r'^\d+$').hasMatch(value)
|
||||
? b.bik == value
|
||||
: b.name.toLowerCase().contains(value) || b.bik.contains(value),
|
||||
)
|
||||
.toList();
|
||||
}
|
||||
|
||||
DestinationDetails _snapshot(DestinationDetails details) =>
|
||||
details is CardDestination
|
||||
? CardDestination(
|
||||
identity: details.identity,
|
||||
brand: details.brand,
|
||||
last4: details.last4,
|
||||
expiryMonth: details.expiryMonth,
|
||||
expiryYear: details.expiryYear,
|
||||
)
|
||||
: DestinationMapper.clone(details);
|
||||
|
||||
@override
|
||||
Future<DestinationLease> prepare(
|
||||
DestinationInput input,
|
||||
PayoutContext context,
|
||||
) async {
|
||||
final eligibility = _assess(input, context);
|
||||
if (!eligibility.eligible)
|
||||
throw DestinationException(
|
||||
eligibility.reason ?? DestinationIssue.unsupported,
|
||||
);
|
||||
return DestinationLease(
|
||||
input: input,
|
||||
snapshot: _snapshot(_resolve(input)),
|
||||
context: context,
|
||||
requirementsRevision: requirementsRevision,
|
||||
expiresAt: now().add(const Duration(seconds: 60)),
|
||||
);
|
||||
}
|
||||
|
||||
/// Synchronous demo acceptance boundary; production enforcement belongs in BFF.
|
||||
void accept(DestinationLease lease) {
|
||||
if (!now().isBefore(lease.expiresAt))
|
||||
throw const DestinationException(DestinationIssue.expired);
|
||||
if (requirementsRevision != lease.requirementsRevision)
|
||||
throw const DestinationException(DestinationIssue.conflict);
|
||||
final result = _assess(lease.input, lease.context);
|
||||
if (!result.eligible)
|
||||
throw DestinationException(result.reason ?? DestinationIssue.unsupported);
|
||||
if (lease.input case SavedReference ref) {
|
||||
final d = _get(ref.id);
|
||||
_records[d.id] = SavedDestination(
|
||||
id: d.id,
|
||||
details: d.details,
|
||||
nickname: d.nickname,
|
||||
metadataRevision: d.metadataRevision,
|
||||
executionRevision: d.executionRevision,
|
||||
bindings: d.bindings,
|
||||
lastUsed: now(),
|
||||
ownership: d.ownership,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Future<SavedDestination> restoreCard(
|
||||
String id,
|
||||
int executionRevision,
|
||||
CardDestination capture,
|
||||
String idempotencyKey,
|
||||
) async {
|
||||
if (idempotencyKey.length < 16)
|
||||
throw const DestinationException(DestinationIssue.invalid);
|
||||
final payload = jsonEncode([
|
||||
id,
|
||||
executionRevision,
|
||||
DestinationMapper.details(capture).value,
|
||||
]);
|
||||
final attempts = memory.recoveries.putIfAbsent(customer, () => {});
|
||||
final previous = attempts[idempotencyKey];
|
||||
if (previous != null) {
|
||||
if (previous.$1 != payload)
|
||||
throw const DestinationException(DestinationIssue.conflict);
|
||||
return _get(previous.$2);
|
||||
}
|
||||
final d = _get(id);
|
||||
if (d.removed) throw const DestinationException(DestinationIssue.removed);
|
||||
if (d.executionRevision != executionRevision)
|
||||
throw const DestinationException(DestinationIssue.conflict);
|
||||
if (!cardRecovery || d.details is! CardDestination)
|
||||
throw const DestinationException(DestinationIssue.unsupported);
|
||||
final normalized = _validate(capture) as CardDestination;
|
||||
final fingerprint = _identity(normalized);
|
||||
if (fingerprint == null || fingerprint != _identity(d.details))
|
||||
throw const DestinationException(DestinationIssue.replacementRequired);
|
||||
if (capture.capture != 'demo-card-ready')
|
||||
throw const DestinationException(DestinationIssue.authorization);
|
||||
final updated = SavedDestination(
|
||||
id: d.id,
|
||||
details: CardDestination(
|
||||
identity: (d.details as CardDestination).identity,
|
||||
brand: normalized.brand,
|
||||
last4: normalized.last4,
|
||||
expiryMonth: normalized.expiryMonth,
|
||||
expiryYear: normalized.expiryYear,
|
||||
),
|
||||
nickname: d.nickname,
|
||||
metadataRevision: d.metadataRevision,
|
||||
executionRevision: d.executionRevision + 1,
|
||||
lastUsed: d.lastUsed,
|
||||
ownership: d.ownership,
|
||||
bindings: [
|
||||
ProviderBinding(
|
||||
reference: destinationKey(),
|
||||
state: BindingState.ready,
|
||||
reusable: true,
|
||||
recoverable: true,
|
||||
),
|
||||
],
|
||||
);
|
||||
_records[id] = updated;
|
||||
attempts[idempotencyKey] = (payload, id);
|
||||
_audit(id, 'bindingRestored', 'succeeded');
|
||||
return updated;
|
||||
}
|
||||
|
||||
@override
|
||||
void clearTransient() {
|
||||
/* No transient server records survive method calls. */
|
||||
}
|
||||
}
|
||||
|
||||
bool validBankAccount(String account, String bik) {
|
||||
if (!RegExp(r'^\d{20}$').hasMatch(account) ||
|
||||
!RegExp(r'^\d{9}$').hasMatch(bik))
|
||||
return false;
|
||||
final digits = bik.substring(6) + account;
|
||||
var sum = 0;
|
||||
for (var i = 0; i < digits.length; i++) {
|
||||
sum += int.parse(digits[i]) * [7, 1, 3][i % 3];
|
||||
}
|
||||
return sum % 10 == 0;
|
||||
}
|
||||
@@ -0,0 +1,276 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
import 'package:sxchnge_analytics/sxchnge_analytics.dart';
|
||||
|
||||
import 'key.dart';
|
||||
import 'models.dart';
|
||||
import 'service.dart';
|
||||
|
||||
class DestinationFormProvider extends ChangeNotifier {
|
||||
DestinationFormProvider(
|
||||
this.service,
|
||||
this.analytics, {
|
||||
this.context,
|
||||
this.initial,
|
||||
this.replacing,
|
||||
this.restoring,
|
||||
}) : recorder = JourneyRecorder(analytics),
|
||||
details = initial {
|
||||
if (context == null) _startJourney();
|
||||
}
|
||||
final DestinationService service;
|
||||
final AnalyticsService analytics;
|
||||
final JourneyRecorder recorder;
|
||||
final PayoutContext? context;
|
||||
final DestinationDetails? initial;
|
||||
final String? replacing;
|
||||
final SavedReference? restoring;
|
||||
DestinationDetails? details;
|
||||
String nickname = '';
|
||||
bool save = false, busy = false, _disposed = false, uncertain = false;
|
||||
DestinationIssue? error;
|
||||
String? errorField;
|
||||
CreationResult? saved;
|
||||
PayoutEligibility? eligibility;
|
||||
DestinationInput? result;
|
||||
String? _key;
|
||||
bool _creationStarted = false;
|
||||
bool _journeyStarted = false;
|
||||
void _startJourney() {
|
||||
if (_journeyStarted) return;
|
||||
_journeyStarted = true;
|
||||
final op = recorder.begin(
|
||||
JourneyKind.destination,
|
||||
JourneyStep.destinationDraft,
|
||||
simulated: service.isSimulated,
|
||||
);
|
||||
recorder.finish(op, simulated: service.isSimulated);
|
||||
}
|
||||
|
||||
bool savingFailed = false;
|
||||
bool get hasDraft => details != null || nickname.isNotEmpty;
|
||||
void change(DestinationDetails? value) {
|
||||
if (busy || uncertain) return;
|
||||
details = value;
|
||||
error = null;
|
||||
errorField = null;
|
||||
eligibility = null;
|
||||
result = null;
|
||||
saved = null;
|
||||
_key = null;
|
||||
_creationStarted = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void preferences({bool? save, String? nickname}) {
|
||||
if (busy || uncertain) return;
|
||||
if (save == true) _startJourney();
|
||||
if (save == false && this.save) {
|
||||
recorder.abandon(JourneyExit.modeChange);
|
||||
_journeyStarted = false;
|
||||
}
|
||||
this.save = save ?? this.save;
|
||||
this.nickname = nickname ?? this.nickname;
|
||||
_key = null;
|
||||
saved = null;
|
||||
error = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> proceed({bool withoutSaving = false}) async {
|
||||
if (busy || details == null) return;
|
||||
if (withoutSaving && !uncertain) recorder.abandon(JourneyExit.modeChange);
|
||||
if (uncertain && !withoutSaving) {
|
||||
await reconcile();
|
||||
return;
|
||||
}
|
||||
busy = true;
|
||||
error = null;
|
||||
errorField = null;
|
||||
savingFailed = false;
|
||||
if (!uncertain) _creationStarted = false;
|
||||
notifyListeners();
|
||||
try {
|
||||
// Validation precedes both persistence and payout assessment.
|
||||
final normalized = (await service.validate(details!)).details;
|
||||
if (_disposed) return;
|
||||
if (restoring != null) {
|
||||
_key ??= destinationKey();
|
||||
final bindingOperation = recorder.begin(
|
||||
JourneyKind.destination,
|
||||
JourneyStep.destinationBinding,
|
||||
simulated: service.isSimulated,
|
||||
);
|
||||
final restored = await service.restoreCard(
|
||||
restoring!.id,
|
||||
restoring!.executionRevision,
|
||||
normalized as CardDestination,
|
||||
_key!,
|
||||
);
|
||||
recorder.finish(
|
||||
bindingOperation,
|
||||
terminal: true,
|
||||
simulated: service.isSimulated,
|
||||
);
|
||||
if (!_disposed) result = restored.input;
|
||||
} else if (context != null) {
|
||||
eligibility = await service.assess(
|
||||
OneTimeDestination(normalized),
|
||||
context!,
|
||||
);
|
||||
if (_disposed) return;
|
||||
}
|
||||
if (restoring == null &&
|
||||
(context == null || save) &&
|
||||
!withoutSaving &&
|
||||
saved == null) {
|
||||
if (eligibility?.canSave == false)
|
||||
throw const DestinationException(DestinationIssue.unsupported);
|
||||
_key ??= destinationKey();
|
||||
final op = recorder.begin(
|
||||
JourneyKind.destination,
|
||||
JourneyStep.destinationSave,
|
||||
simulated: service.isSimulated,
|
||||
);
|
||||
_creationStarted = true;
|
||||
try {
|
||||
saved = await service.create(
|
||||
normalized,
|
||||
nickname,
|
||||
_key!,
|
||||
replaces: replacing,
|
||||
);
|
||||
_creationStarted = false;
|
||||
if (_disposed) return;
|
||||
recorder.finish(
|
||||
op,
|
||||
simulated: service.isSimulated,
|
||||
terminal: true,
|
||||
resolution: DestinationResolution.values.byName(
|
||||
saved!.outcome.name,
|
||||
),
|
||||
);
|
||||
} catch (e) {
|
||||
savingFailed = true;
|
||||
recorder.finish(
|
||||
op,
|
||||
failure: JourneyFailure.unavailable,
|
||||
simulated: service.isSimulated,
|
||||
);
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
if (restoring != null) {
|
||||
// Restored bindings never create or rename a saved destination.
|
||||
} else if (context == null) {
|
||||
if (saved?.outcome == SaveOutcome.created)
|
||||
result = SavedReference(
|
||||
saved!.destinationId,
|
||||
(await service.get(saved!.destinationId)).executionRevision,
|
||||
);
|
||||
} else if (eligibility!.eligible) {
|
||||
if (withoutSaving || saved == null) {
|
||||
result = OneTimeDestination(normalized);
|
||||
} else if (saved!.outcome == SaveOutcome.created) {
|
||||
final d = await service.get(saved!.destinationId);
|
||||
result = d.input;
|
||||
}
|
||||
// Duplicates need explicit Use existing method, never another create.
|
||||
}
|
||||
} on DestinationException catch (e) {
|
||||
error = e.issue;
|
||||
errorField = e.field;
|
||||
uncertain =
|
||||
_creationStarted &&
|
||||
[
|
||||
DestinationIssue.uncertain,
|
||||
DestinationIssue.unavailable,
|
||||
].contains(e.issue);
|
||||
} catch (_) {
|
||||
error = DestinationIssue.unavailable;
|
||||
uncertain = _creationStarted;
|
||||
}
|
||||
if (_disposed) return;
|
||||
busy = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> useExisting() async {
|
||||
if (busy || saved == null) return;
|
||||
error = null;
|
||||
busy = true;
|
||||
notifyListeners();
|
||||
try {
|
||||
final d = await service.get(saved!.destinationId);
|
||||
if (d.removed) throw const DestinationException(DestinationIssue.removed);
|
||||
if (context != null)
|
||||
eligibility = await service.assess(d.input, context!);
|
||||
if (context == null || eligibility!.eligible) result = d.input;
|
||||
} on DestinationException catch (e) {
|
||||
error = e.issue;
|
||||
} catch (_) {
|
||||
error = DestinationIssue.unavailable;
|
||||
}
|
||||
if (_disposed) return;
|
||||
busy = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> reconcile() async {
|
||||
if (busy || _key == null) return;
|
||||
busy = true;
|
||||
notifyListeners();
|
||||
final op = recorder.begin(
|
||||
JourneyKind.destination,
|
||||
JourneyStep.destinationReconciliation,
|
||||
simulated: service.isSimulated,
|
||||
);
|
||||
try {
|
||||
final outcome = await service.creation(_key!);
|
||||
if (_disposed) return;
|
||||
saved = outcome;
|
||||
recorder.finish(
|
||||
op,
|
||||
simulated: service.isSimulated,
|
||||
terminal: outcome != null,
|
||||
resolution: outcome == null
|
||||
? null
|
||||
: DestinationResolution.values.byName(outcome.outcome.name),
|
||||
);
|
||||
uncertain = false;
|
||||
_creationStarted = false;
|
||||
error = null;
|
||||
// Absence is an authoritative lookup result, not a timeout inference.
|
||||
if (outcome?.outcome == SaveOutcome.created && context == null) {
|
||||
final d = await service.get(outcome!.destinationId);
|
||||
if (d.removed)
|
||||
throw const DestinationException(DestinationIssue.removed);
|
||||
result = d.input;
|
||||
}
|
||||
} on DestinationException catch (e) {
|
||||
recorder.finish(
|
||||
op,
|
||||
simulated: service.isSimulated,
|
||||
failure: JourneyFailure.unavailable,
|
||||
);
|
||||
error = e.issue;
|
||||
} catch (_) {
|
||||
recorder.finish(
|
||||
op,
|
||||
simulated: service.isSimulated,
|
||||
failure: JourneyFailure.unavailable,
|
||||
);
|
||||
error = DestinationIssue.unavailable;
|
||||
}
|
||||
if (_disposed) return;
|
||||
busy = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_disposed = true;
|
||||
recorder.dispose(abandonActive: !uncertain);
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
import 'dart:math';
|
||||
|
||||
/// An opaque attempt/record reference, never derived from destination details.
|
||||
String destinationKey() => List.generate(
|
||||
16,
|
||||
(_) => Random.secure().nextInt(256).toRadixString(16).padLeft(2, '0'),
|
||||
).join();
|
||||
@@ -0,0 +1,53 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
import 'models.dart';
|
||||
import 'service.dart';
|
||||
|
||||
class DestinationManagementProvider extends ChangeNotifier {
|
||||
DestinationManagementProvider(this.service, this.destination);
|
||||
final DestinationService service;
|
||||
SavedDestination destination;
|
||||
DestinationIssue? error;
|
||||
bool busy = false, removed = false, _disposed = false;
|
||||
Future<void> rename(String nickname) => _run(() async {
|
||||
destination = await service.rename(
|
||||
destination.id,
|
||||
nickname,
|
||||
destination.metadataRevision,
|
||||
);
|
||||
});
|
||||
Future<void> remove() => _run(() async {
|
||||
await service.remove(
|
||||
destination.id,
|
||||
destination.metadataRevision,
|
||||
destination.executionRevision,
|
||||
);
|
||||
removed = true;
|
||||
});
|
||||
Future<void> refresh() => _run(() async {
|
||||
destination = await service.get(destination.id);
|
||||
removed = destination.removed;
|
||||
});
|
||||
Future<void> _run(Future<void> Function() action) async {
|
||||
if (busy) return;
|
||||
busy = true;
|
||||
error = null;
|
||||
notifyListeners();
|
||||
try {
|
||||
await action();
|
||||
} on DestinationException catch (e) {
|
||||
error = e.issue;
|
||||
} catch (_) {
|
||||
error = DestinationIssue.unavailable;
|
||||
}
|
||||
if (_disposed) return;
|
||||
busy = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_disposed = true;
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,255 @@
|
||||
enum DestinationType { crypto, card, russianBank }
|
||||
|
||||
enum EligibilityState {
|
||||
eligible,
|
||||
temporarilyUnavailable,
|
||||
requiresAction,
|
||||
unsupported,
|
||||
}
|
||||
|
||||
enum DestinationIssue {
|
||||
invalid,
|
||||
unavailable,
|
||||
uncertain,
|
||||
conflict,
|
||||
removed,
|
||||
expired,
|
||||
bankChanged,
|
||||
authorization,
|
||||
unsupported,
|
||||
duplicate,
|
||||
replacementRequired,
|
||||
}
|
||||
|
||||
enum SaveOutcome { created, duplicate }
|
||||
|
||||
enum BindingState { ready, expired, revoked, unavailable }
|
||||
|
||||
class DestinationException implements Exception {
|
||||
const DestinationException(this.issue, {this.field});
|
||||
final DestinationIssue issue;
|
||||
final String? field;
|
||||
}
|
||||
|
||||
sealed class DestinationDetails {
|
||||
const DestinationDetails();
|
||||
DestinationType get type;
|
||||
String get display;
|
||||
String get review;
|
||||
}
|
||||
|
||||
class CryptoDestination extends DestinationDetails {
|
||||
const CryptoDestination({
|
||||
required this.assetId,
|
||||
required this.networkId,
|
||||
required this.address,
|
||||
this.memo = '',
|
||||
required this.assetLabel,
|
||||
required this.networkLabel,
|
||||
});
|
||||
final String assetId, networkId, address, memo, assetLabel, networkLabel;
|
||||
@override
|
||||
DestinationType get type => DestinationType.crypto;
|
||||
@override
|
||||
String get display =>
|
||||
'$assetLabel · $networkLabel · ${address.length > 14 ? '${address.substring(0, 6)}…${address.substring(address.length - 6)}' : address}';
|
||||
@override
|
||||
String get review =>
|
||||
'$assetLabel · $networkLabel\n$address${memo.isEmpty ? '' : '\n$memo'}';
|
||||
}
|
||||
|
||||
/// Secure capture references are short lived, not PAN/CVV or destination IDs.
|
||||
class CardDestination extends DestinationDetails {
|
||||
const CardDestination({
|
||||
this.capture = '',
|
||||
this.identity = '',
|
||||
required this.brand,
|
||||
required this.last4,
|
||||
required this.expiryMonth,
|
||||
required this.expiryYear,
|
||||
});
|
||||
final String capture, identity, brand, last4;
|
||||
final int expiryMonth, expiryYear;
|
||||
@override
|
||||
DestinationType get type => DestinationType.card;
|
||||
@override
|
||||
String get display => '$brand · •••• $last4';
|
||||
@override
|
||||
String get review => display;
|
||||
}
|
||||
|
||||
class RussianBankDestination extends DestinationDetails {
|
||||
const RussianBankDestination({
|
||||
required this.firstName,
|
||||
required this.lastName,
|
||||
this.patronymic = '',
|
||||
required this.bank,
|
||||
required this.account,
|
||||
});
|
||||
final String firstName, lastName, patronymic, account;
|
||||
final Bank bank;
|
||||
String get holder =>
|
||||
[firstName, lastName, patronymic].where((s) => s.isNotEmpty).join(' ');
|
||||
@override
|
||||
DestinationType get type => DestinationType.russianBank;
|
||||
@override
|
||||
String get display =>
|
||||
'${bank.name} · •••• ${account.length < 4 ? account : account.substring(account.length - 4)}';
|
||||
@override
|
||||
String get review =>
|
||||
'$holder\n${bank.name}\n${bank.bik}\n$account\n${bank.correspondent}';
|
||||
}
|
||||
|
||||
class Bank {
|
||||
const Bank({
|
||||
required this.bik,
|
||||
required this.name,
|
||||
required this.city,
|
||||
required this.correspondent,
|
||||
required this.revision,
|
||||
this.supported = true,
|
||||
});
|
||||
final String bik, name, city, correspondent, revision;
|
||||
final bool supported;
|
||||
}
|
||||
|
||||
class CryptoAsset {
|
||||
const CryptoAsset(
|
||||
this.id,
|
||||
this.label,
|
||||
this.networkId,
|
||||
this.networkLabel, {
|
||||
this.memoRequired = false,
|
||||
this.memoSupported = false,
|
||||
});
|
||||
final String id, label, networkId, networkLabel;
|
||||
final bool memoRequired, memoSupported;
|
||||
}
|
||||
|
||||
class ProviderBinding {
|
||||
const ProviderBinding({
|
||||
required this.reference,
|
||||
required this.state,
|
||||
required this.reusable,
|
||||
this.recoverable = false,
|
||||
this.expiresAt,
|
||||
});
|
||||
final String reference;
|
||||
final BindingState state;
|
||||
final bool reusable, recoverable;
|
||||
final DateTime? expiresAt;
|
||||
}
|
||||
|
||||
class OwnershipAssessment {
|
||||
const OwnershipAssessment({
|
||||
this.declaredOwn = true,
|
||||
this.verified = false,
|
||||
this.actionRequired = false,
|
||||
});
|
||||
final bool declaredOwn, verified, actionRequired;
|
||||
}
|
||||
|
||||
class SavedDestination {
|
||||
SavedDestination({
|
||||
required this.id,
|
||||
required this.details,
|
||||
this.nickname = '',
|
||||
this.metadataRevision = 1,
|
||||
this.executionRevision = 1,
|
||||
this.removed = false,
|
||||
this.lastUsed,
|
||||
this.ownership = const OwnershipAssessment(),
|
||||
List<ProviderBinding> bindings = const [],
|
||||
}) : bindings = List.unmodifiable(bindings);
|
||||
final String id, nickname;
|
||||
final DestinationDetails details;
|
||||
final int metadataRevision, executionRevision;
|
||||
final bool removed;
|
||||
final DateTime? lastUsed;
|
||||
final OwnershipAssessment ownership;
|
||||
final List<ProviderBinding> bindings;
|
||||
String get label => nickname.isEmpty ? details.display : nickname;
|
||||
SavedReference get input => SavedReference(id, executionRevision);
|
||||
}
|
||||
|
||||
sealed class DestinationInput {
|
||||
const DestinationInput();
|
||||
}
|
||||
|
||||
class SavedReference extends DestinationInput {
|
||||
const SavedReference(this.id, this.executionRevision);
|
||||
final String id;
|
||||
final int executionRevision;
|
||||
}
|
||||
|
||||
class OneTimeDestination extends DestinationInput {
|
||||
const OneTimeDestination(this.details);
|
||||
final DestinationDetails details;
|
||||
}
|
||||
|
||||
class PayoutContext {
|
||||
const PayoutContext(this.source, {this.amount});
|
||||
final String source;
|
||||
final int? amount;
|
||||
}
|
||||
|
||||
class PayoutEligibility {
|
||||
const PayoutEligibility(this.state, {this.reason, this.canSave = true});
|
||||
final EligibilityState state;
|
||||
final DestinationIssue? reason;
|
||||
final bool canSave;
|
||||
bool get eligible => state == EligibilityState.eligible;
|
||||
}
|
||||
|
||||
class DestinationValidation {
|
||||
const DestinationValidation(this.details);
|
||||
final DestinationDetails details;
|
||||
}
|
||||
|
||||
class DestinationCapabilities {
|
||||
DestinationCapabilities({
|
||||
List<DestinationType> types = const [],
|
||||
List<CryptoAsset> assets = const [],
|
||||
this.reusableCards = false,
|
||||
this.cardRecovery = false,
|
||||
this.simulated = false,
|
||||
}) : types = List.unmodifiable(types),
|
||||
assets = List.unmodifiable(assets);
|
||||
final List<DestinationType> types;
|
||||
final List<CryptoAsset> assets;
|
||||
final bool reusableCards, cardRecovery, simulated;
|
||||
}
|
||||
|
||||
/// Outcome identity never changes when a record is later renamed or removed.
|
||||
class CreationResult {
|
||||
const CreationResult(this.outcome, this.destinationId);
|
||||
final SaveOutcome outcome;
|
||||
final String destinationId;
|
||||
}
|
||||
|
||||
class DestinationLease {
|
||||
const DestinationLease({
|
||||
required this.input,
|
||||
required this.snapshot,
|
||||
required this.context,
|
||||
required this.requirementsRevision,
|
||||
required this.expiresAt,
|
||||
});
|
||||
final DestinationInput input;
|
||||
final DestinationDetails snapshot;
|
||||
final PayoutContext context;
|
||||
final int requirementsRevision;
|
||||
final DateTime expiresAt;
|
||||
}
|
||||
|
||||
class DestinationAudit {
|
||||
const DestinationAudit(
|
||||
this.actor,
|
||||
this.reference,
|
||||
this.action,
|
||||
this.outcome,
|
||||
this.at,
|
||||
);
|
||||
final String actor, reference, action, outcome;
|
||||
final DateTime at;
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
import 'models.dart';
|
||||
import 'service.dart';
|
||||
|
||||
class DestinationsProvider extends ChangeNotifier {
|
||||
DestinationsProvider(this.service);
|
||||
final DestinationService service;
|
||||
DestinationCapabilities? capabilities;
|
||||
List<SavedDestination> methods = [];
|
||||
bool loading = false, failed = false, _disposed = false;
|
||||
int _revision = 0;
|
||||
Future<void> refresh() async {
|
||||
final revision = ++_revision;
|
||||
loading = true;
|
||||
failed = false;
|
||||
notifyListeners();
|
||||
try {
|
||||
final caps = await service.capabilities();
|
||||
final rows = await service.list();
|
||||
if (_disposed || revision != _revision) return;
|
||||
capabilities = caps;
|
||||
methods = rows;
|
||||
} catch (_) {
|
||||
if (_disposed || revision != _revision) return;
|
||||
failed = true;
|
||||
}
|
||||
if (_disposed) return;
|
||||
loading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
List<SavedDestination> search(String query, DestinationType type) {
|
||||
final q = query.trim().toLowerCase();
|
||||
final rows = methods
|
||||
.where(
|
||||
(d) =>
|
||||
d.details.type == type &&
|
||||
'${d.label} ${d.details.display}'.toLowerCase().contains(q),
|
||||
)
|
||||
.toList();
|
||||
rows.sort(
|
||||
(a, b) => (b.lastUsed ?? DateTime(1970)).compareTo(
|
||||
a.lastUsed ?? DateTime(1970),
|
||||
),
|
||||
);
|
||||
return rows;
|
||||
}
|
||||
|
||||
void reset() {
|
||||
_revision++;
|
||||
methods = [];
|
||||
capabilities = null;
|
||||
loading = failed = false;
|
||||
service.clearTransient();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_disposed = true;
|
||||
_revision++;
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
import 'models.dart';
|
||||
import 'service.dart';
|
||||
|
||||
class BankSearchProvider extends ChangeNotifier {
|
||||
BankSearchProvider(this.service);
|
||||
final DestinationService service;
|
||||
Timer? _timer;
|
||||
Completer<void>? _abort;
|
||||
int _generation = 0;
|
||||
bool _disposed = false, loading = false;
|
||||
String query = '';
|
||||
List<Bank> results = [];
|
||||
DestinationIssue? error;
|
||||
void search(String value) {
|
||||
_timer?.cancel();
|
||||
if (_abort != null && !_abort!.isCompleted) _abort!.complete();
|
||||
_abort = null;
|
||||
final generation = ++_generation;
|
||||
query = value;
|
||||
results = [];
|
||||
error = null;
|
||||
loading = false;
|
||||
if (value.trim().length >= 2) {
|
||||
_timer = Timer(
|
||||
const Duration(milliseconds: 350),
|
||||
() => _lookup(value, generation),
|
||||
);
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> _lookup(String value, int generation) async {
|
||||
loading = true;
|
||||
notifyListeners();
|
||||
try {
|
||||
final abort = Completer<void>();
|
||||
_abort = abort;
|
||||
final rows = await service.banks(value, abortTrigger: abort.future);
|
||||
if (_disposed || generation != _generation) return;
|
||||
results = rows;
|
||||
if (rows.isEmpty) error = DestinationIssue.invalid;
|
||||
} on DestinationException catch (e) {
|
||||
if (!_disposed && generation == _generation) error = e.issue;
|
||||
} catch (_) {
|
||||
if (!_disposed && generation == _generation)
|
||||
error = DestinationIssue.unavailable;
|
||||
}
|
||||
if (_disposed || generation != _generation) return;
|
||||
loading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_disposed = true;
|
||||
_generation++;
|
||||
_timer?.cancel();
|
||||
if (_abort != null && !_abort!.isCompleted) _abort!.complete();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
import 'models.dart';
|
||||
import 'service.dart';
|
||||
|
||||
class DestinationSelectionProvider extends ChangeNotifier {
|
||||
DestinationSelectionProvider(this.service, this.context);
|
||||
final DestinationService service;
|
||||
final PayoutContext context;
|
||||
final assessments = <String, PayoutEligibility>{};
|
||||
bool busy = false, _disposed = false;
|
||||
DestinationIssue? error;
|
||||
Future<void> assess(List<SavedDestination> methods) async {
|
||||
for (final d in methods) {
|
||||
try {
|
||||
final assessment = await service.assess(d.input, context);
|
||||
if (_disposed) return;
|
||||
assessments[d.id] = assessment;
|
||||
} on DestinationException catch (e) {
|
||||
if (_disposed) return;
|
||||
assessments[d.id] = PayoutEligibility(
|
||||
EligibilityState.requiresAction,
|
||||
reason: e.issue,
|
||||
);
|
||||
} catch (_) {
|
||||
if (_disposed) return;
|
||||
assessments[d.id] = const PayoutEligibility(
|
||||
EligibilityState.temporarilyUnavailable,
|
||||
reason: DestinationIssue.unavailable,
|
||||
);
|
||||
}
|
||||
}
|
||||
if (!_disposed) notifyListeners();
|
||||
}
|
||||
|
||||
Future<SavedReference?> select(SavedDestination d) async {
|
||||
if (busy) return null;
|
||||
busy = true;
|
||||
error = null;
|
||||
notifyListeners();
|
||||
SavedReference? result;
|
||||
try {
|
||||
final current = await service.get(d.id);
|
||||
final a = await service.assess(current.input, context);
|
||||
if (_disposed) return null;
|
||||
assessments[d.id] = a;
|
||||
if (a.eligible) result = current.input;
|
||||
} on DestinationException catch (e) {
|
||||
error = e.issue;
|
||||
} catch (_) {
|
||||
error = DestinationIssue.unavailable;
|
||||
}
|
||||
if (_disposed) return null;
|
||||
busy = false;
|
||||
notifyListeners();
|
||||
return result;
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_disposed = true;
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
import 'models.dart';
|
||||
|
||||
abstract interface class DestinationService {
|
||||
bool get isSimulated;
|
||||
Future<DestinationCapabilities> capabilities();
|
||||
Future<List<SavedDestination>> list();
|
||||
Future<SavedDestination> get(String id);
|
||||
Future<DestinationValidation> validate(DestinationDetails details);
|
||||
Future<PayoutEligibility> assess(
|
||||
DestinationInput input,
|
||||
PayoutContext context,
|
||||
);
|
||||
Future<CreationResult> create(
|
||||
DestinationDetails details,
|
||||
String nickname,
|
||||
String idempotencyKey, {
|
||||
String? replaces,
|
||||
});
|
||||
Future<CreationResult?> creation(String idempotencyKey);
|
||||
Future<SavedDestination> rename(
|
||||
String id,
|
||||
String nickname,
|
||||
int metadataRevision,
|
||||
);
|
||||
Future<void> remove(String id, int metadataRevision, int executionRevision);
|
||||
Future<List<Bank>> banks(String query, {Future<void>? abortTrigger});
|
||||
Future<DestinationLease> prepare(
|
||||
DestinationInput input,
|
||||
PayoutContext context,
|
||||
);
|
||||
|
||||
Future<SavedDestination> restoreCard(
|
||||
String id,
|
||||
int executionRevision,
|
||||
CardDestination capture,
|
||||
String idempotencyKey,
|
||||
);
|
||||
void clearTransient();
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
import 'models.dart';
|
||||
|
||||
/// Local DTO boundary: transport fields never escape services into providers/UI.
|
||||
class DestinationDTO {
|
||||
const DestinationDTO(this.value);
|
||||
final Map<String, Object?> value;
|
||||
}
|
||||
|
||||
abstract final class DestinationMapper {
|
||||
static DestinationDTO details(DestinationDetails value) =>
|
||||
DestinationDTO(switch (value) {
|
||||
CryptoDestination d => {
|
||||
'type': 'crypto',
|
||||
'assetId': d.assetId,
|
||||
'networkId': d.networkId,
|
||||
'address': d.address,
|
||||
'memo': d.memo,
|
||||
'assetLabel': d.assetLabel,
|
||||
'networkLabel': d.networkLabel,
|
||||
},
|
||||
CardDestination d => {
|
||||
'type': 'card',
|
||||
'capture': d.capture,
|
||||
'identity': d.identity,
|
||||
'brand': d.brand,
|
||||
'last4': d.last4,
|
||||
'expiryMonth': d.expiryMonth,
|
||||
'expiryYear': d.expiryYear,
|
||||
},
|
||||
RussianBankDestination d => {
|
||||
'type': 'russianBank',
|
||||
'firstName': d.firstName,
|
||||
'lastName': d.lastName,
|
||||
'patronymic': d.patronymic,
|
||||
'account': d.account,
|
||||
'bank': bank(d.bank),
|
||||
},
|
||||
});
|
||||
static Map<String, Object?> bank(Bank b) => {
|
||||
'bik': b.bik,
|
||||
'name': b.name,
|
||||
'city': b.city,
|
||||
'correspondent': b.correspondent,
|
||||
'revision': b.revision,
|
||||
'supported': b.supported,
|
||||
};
|
||||
static Bank fromBank(Map<String, dynamic> v) => Bank(
|
||||
bik: v['bik'] as String,
|
||||
name: v['name'] as String,
|
||||
city: v['city'] as String,
|
||||
correspondent: v['correspondent'] as String,
|
||||
revision: v['revision'] as String,
|
||||
supported: v['supported'] as bool,
|
||||
);
|
||||
static DestinationDetails fromDTO(DestinationDTO dto) {
|
||||
final d = dto.value;
|
||||
return switch (d['type']) {
|
||||
'crypto' => CryptoDestination(
|
||||
assetId: d['assetId'] as String,
|
||||
networkId: d['networkId'] as String,
|
||||
address: d['address'] as String,
|
||||
memo: d['memo'] as String,
|
||||
assetLabel: d['assetLabel'] as String,
|
||||
networkLabel: d['networkLabel'] as String,
|
||||
),
|
||||
'card' => CardDestination(
|
||||
capture: d['capture'] as String,
|
||||
identity: d['identity'] as String,
|
||||
brand: d['brand'] as String,
|
||||
last4: d['last4'] as String,
|
||||
expiryMonth: d['expiryMonth'] as int,
|
||||
expiryYear: d['expiryYear'] as int,
|
||||
),
|
||||
'russianBank' => RussianBankDestination(
|
||||
firstName: d['firstName'] as String,
|
||||
lastName: d['lastName'] as String,
|
||||
patronymic: d['patronymic'] as String,
|
||||
account: d['account'] as String,
|
||||
bank: fromBank(Map<String, dynamic>.from(d['bank'] as Map)),
|
||||
),
|
||||
_ => throw const DestinationException(DestinationIssue.unsupported),
|
||||
};
|
||||
}
|
||||
|
||||
static DestinationDetails clone(DestinationDetails d) => fromDTO(details(d));
|
||||
}
|
||||
|
||||
sealed class DestinationInputDTO {
|
||||
const DestinationInputDTO();
|
||||
}
|
||||
|
||||
class SavedInputDTO extends DestinationInputDTO {
|
||||
const SavedInputDTO(this.id, this.executionRevision);
|
||||
final String id;
|
||||
final int executionRevision;
|
||||
}
|
||||
|
||||
class OneTimeInputDTO extends DestinationInputDTO {
|
||||
const OneTimeInputDTO(this.details);
|
||||
final DestinationDTO details;
|
||||
}
|
||||
|
||||
abstract final class DestinationInputMapper {
|
||||
static DestinationInputDTO toDTO(DestinationInput input) => switch (input) {
|
||||
SavedReference r => SavedInputDTO(r.id, r.executionRevision),
|
||||
OneTimeDestination d => OneTimeInputDTO(
|
||||
DestinationMapper.details(d.details),
|
||||
),
|
||||
};
|
||||
static DestinationInput fromDTO(DestinationInputDTO dto) => switch (dto) {
|
||||
SavedInputDTO d => SavedReference(d.id, d.executionRevision),
|
||||
OneTimeInputDTO d => OneTimeDestination(
|
||||
DestinationMapper.fromDTO(d.details),
|
||||
),
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
import 'models.dart';
|
||||
import 'service.dart';
|
||||
|
||||
/// Fail closed when the live backend has not supplied the destination contract.
|
||||
/// Never substitutes a demo store for an authenticated live wallet.
|
||||
class UnavailableDestinationService implements DestinationService {
|
||||
const UnavailableDestinationService();
|
||||
@override
|
||||
bool get isSimulated => false;
|
||||
@override
|
||||
Future<DestinationCapabilities> capabilities() async =>
|
||||
DestinationCapabilities();
|
||||
@override
|
||||
Future<List<SavedDestination>> list() async => [];
|
||||
Never _unsupported() =>
|
||||
throw const DestinationException(DestinationIssue.unsupported);
|
||||
@override
|
||||
Future<SavedDestination> get(String id) async => _unsupported();
|
||||
@override
|
||||
Future<DestinationValidation> validate(DestinationDetails details) async =>
|
||||
_unsupported();
|
||||
@override
|
||||
Future<PayoutEligibility> assess(
|
||||
DestinationInput input,
|
||||
PayoutContext context,
|
||||
) async => const PayoutEligibility(
|
||||
EligibilityState.unsupported,
|
||||
reason: DestinationIssue.unsupported,
|
||||
canSave: false,
|
||||
);
|
||||
@override
|
||||
Future<CreationResult> create(
|
||||
DestinationDetails details,
|
||||
String nickname,
|
||||
String idempotencyKey, {
|
||||
String? replaces,
|
||||
}) async => _unsupported();
|
||||
@override
|
||||
Future<CreationResult?> creation(String idempotencyKey) async =>
|
||||
_unsupported();
|
||||
@override
|
||||
Future<SavedDestination> rename(
|
||||
String id,
|
||||
String nickname,
|
||||
int metadataRevision,
|
||||
) async => _unsupported();
|
||||
@override
|
||||
Future<void> remove(
|
||||
String id,
|
||||
int metadataRevision,
|
||||
int executionRevision,
|
||||
) async => _unsupported();
|
||||
@override
|
||||
Future<List<Bank>> banks(String query, {Future<void>? abortTrigger}) async =>
|
||||
_unsupported();
|
||||
@override
|
||||
Future<DestinationLease> prepare(
|
||||
DestinationInput input,
|
||||
PayoutContext context,
|
||||
) async => _unsupported();
|
||||
@override
|
||||
Future<SavedDestination> restoreCard(
|
||||
String id,
|
||||
int executionRevision,
|
||||
CardDestination capture,
|
||||
String idempotencyKey,
|
||||
) async => _unsupported();
|
||||
@override
|
||||
void clearTransient() {}
|
||||
}
|
||||
@@ -1,3 +1,5 @@
|
||||
import '../destinations/models.dart';
|
||||
|
||||
enum TransferKind { topUp, exchange, payout }
|
||||
|
||||
enum OperationStatus { pending, completed, failed }
|
||||
@@ -12,6 +14,7 @@ enum WalletError {
|
||||
unsupported,
|
||||
notFound,
|
||||
uncertain,
|
||||
destinationChanged,
|
||||
}
|
||||
|
||||
class WalletException implements Exception {
|
||||
@@ -64,12 +67,14 @@ class TransferRequest {
|
||||
required this.amount,
|
||||
this.destination,
|
||||
this.recipient = '',
|
||||
this.payoutDestination,
|
||||
});
|
||||
final TransferKind kind;
|
||||
final String source;
|
||||
final int amount;
|
||||
final String? destination;
|
||||
final String recipient;
|
||||
final DestinationInput? payoutDestination;
|
||||
}
|
||||
|
||||
class Quote {
|
||||
@@ -82,11 +87,15 @@ class Quote {
|
||||
required this.expiresAt,
|
||||
required this.rateNumerator,
|
||||
required this.rateDenominator,
|
||||
this.payoutSnapshot,
|
||||
this.payoutTerms,
|
||||
});
|
||||
final String id;
|
||||
final TransferRequest request;
|
||||
final int fee, debit, credit, rateNumerator, rateDenominator;
|
||||
final DateTime expiresAt;
|
||||
final DestinationDetails? payoutSnapshot;
|
||||
final PayoutTerms? payoutTerms;
|
||||
}
|
||||
|
||||
class WalletOperation {
|
||||
@@ -116,3 +125,14 @@ class AccountProfile {
|
||||
const AccountProfile(this.locale);
|
||||
final String locale;
|
||||
}
|
||||
|
||||
class PayoutTerms {
|
||||
const PayoutTerms(
|
||||
this.amount,
|
||||
this.precision,
|
||||
this.assetLabel,
|
||||
this.expectedSeconds,
|
||||
);
|
||||
final int amount, precision, expectedSeconds;
|
||||
final String assetLabel;
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import 'package:sxchnge_analytics/sxchnge_analytics.dart';
|
||||
|
||||
import 'package:sxchnge_auth/sxchnge_auth.dart';
|
||||
|
||||
import '../destinations/models.dart';
|
||||
import '../models/wallet.dart';
|
||||
import 'wallet.dart';
|
||||
|
||||
@@ -40,16 +41,18 @@ class TransferProvider extends ChangeNotifier {
|
||||
if (!accounts.any((a) => a.id == destination) || destination == source) {
|
||||
destination = accounts.where((a) => a.id != source).firstOrNull?.id;
|
||||
}
|
||||
if (!wallet.service.isSimulated && kind == TransferKind.payout) {
|
||||
recipient = wallet.account(source)?.payoutMethod ?? '';
|
||||
}
|
||||
}
|
||||
|
||||
void _walletChanged() {
|
||||
if (_disposed) return;
|
||||
final previous = source;
|
||||
_syncAccounts();
|
||||
if (source != previous) notifyListeners();
|
||||
if (source != previous) {
|
||||
payoutDestination = null;
|
||||
payoutLabel = '';
|
||||
recipient = '';
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
final WalletProvider wallet;
|
||||
@@ -58,6 +61,8 @@ class TransferProvider extends ChangeNotifier {
|
||||
String source;
|
||||
String? destination;
|
||||
String amount = '', recipient = '';
|
||||
DestinationInput? payoutDestination;
|
||||
String payoutLabel = '';
|
||||
Quote? quote;
|
||||
WalletOperation? result;
|
||||
WalletError? error;
|
||||
@@ -72,7 +77,7 @@ class TransferProvider extends ChangeNotifier {
|
||||
TransferKind.payout => JourneyKind.payout,
|
||||
};
|
||||
bool get hasDraft =>
|
||||
amount.isNotEmpty || (wallet.service.isSimulated && recipient.isNotEmpty);
|
||||
amount.isNotEmpty || payoutDestination != null || recipient.isNotEmpty;
|
||||
bool get expired =>
|
||||
quote != null && !DateTime.now().isBefore(quote!.expiresAt);
|
||||
void change({
|
||||
@@ -80,8 +85,17 @@ class TransferProvider extends ChangeNotifier {
|
||||
String? destination,
|
||||
String? amount,
|
||||
String? recipient,
|
||||
DestinationInput? payoutDestination,
|
||||
String? payoutLabel,
|
||||
}) {
|
||||
if (busy || uncertain) return;
|
||||
if (source != null && source != this.source) {
|
||||
this.payoutDestination = null;
|
||||
this.payoutLabel = '';
|
||||
recipient = '';
|
||||
}
|
||||
this.payoutDestination = payoutDestination ?? this.payoutDestination;
|
||||
this.payoutLabel = payoutLabel ?? this.payoutLabel;
|
||||
this.source = source ?? this.source;
|
||||
this.destination = destination ?? this.destination;
|
||||
this.amount = amount ?? this.amount;
|
||||
@@ -96,6 +110,36 @@ class TransferProvider extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> selectPayout(DestinationInput input) async {
|
||||
if (busy || uncertain || wallet.destinations == null) return;
|
||||
busy = true;
|
||||
error = null;
|
||||
notifyListeners();
|
||||
try {
|
||||
final service = wallet.destinations!;
|
||||
final assessment = await service.assess(
|
||||
input,
|
||||
PayoutContext(source, amount: wallet.account(source)?.parse(amount)),
|
||||
);
|
||||
if (!assessment.eligible)
|
||||
throw const DestinationException(DestinationIssue.unsupported);
|
||||
final details = input is OneTimeDestination
|
||||
? input.details
|
||||
: (await service.get((input as SavedReference).id)).details;
|
||||
if (_disposed) return;
|
||||
busy = false;
|
||||
change(payoutDestination: input, payoutLabel: details.display);
|
||||
} catch (_) {
|
||||
if (_disposed) return;
|
||||
payoutDestination = null;
|
||||
payoutLabel = '';
|
||||
error = WalletError.destinationChanged;
|
||||
}
|
||||
if (_disposed) return;
|
||||
busy = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void edit() {
|
||||
if (!busy && !uncertain) {
|
||||
quote = null;
|
||||
@@ -133,6 +177,7 @@ class TransferProvider extends ChangeNotifier {
|
||||
amount: money,
|
||||
destination: kind == TransferKind.exchange ? destination : null,
|
||||
recipient: recipient.trim(),
|
||||
payoutDestination: payoutDestination,
|
||||
),
|
||||
);
|
||||
if (_disposed || revision != _revision) return;
|
||||
@@ -142,6 +187,10 @@ class TransferProvider extends ChangeNotifier {
|
||||
} catch (e) {
|
||||
if (_disposed) return;
|
||||
error = _code(e);
|
||||
if (error == WalletError.destinationChanged) {
|
||||
payoutDestination = null;
|
||||
payoutLabel = '';
|
||||
}
|
||||
recorder.finish(op, failure: _failure(error!));
|
||||
}
|
||||
if (_disposed) return;
|
||||
@@ -225,6 +274,11 @@ class TransferProvider extends ChangeNotifier {
|
||||
uncertain = false;
|
||||
} else {
|
||||
error = _code(e);
|
||||
if (error == WalletError.destinationChanged) {
|
||||
quote = null;
|
||||
payoutDestination = null;
|
||||
payoutLabel = '';
|
||||
}
|
||||
}
|
||||
// All transport/unexpected failures are ambiguous after execution started.
|
||||
uncertain = [
|
||||
@@ -247,6 +301,7 @@ class TransferProvider extends ChangeNotifier {
|
||||
error = null;
|
||||
factorError = null;
|
||||
recipient = '';
|
||||
payoutDestination = null;
|
||||
recorder.finish(op, simulated: wallet.service.isSimulated);
|
||||
wallet.track(value, recorder, journey);
|
||||
_handedOff = true;
|
||||
|
||||
@@ -6,12 +6,19 @@ import 'package:sxchnge_analytics/sxchnge_analytics.dart';
|
||||
|
||||
import 'package:sxchnge_auth/sxchnge_auth.dart';
|
||||
|
||||
import '../destinations/service.dart';
|
||||
import '../models/wallet.dart';
|
||||
import '../services/contracts.dart';
|
||||
|
||||
class WalletProvider extends ChangeNotifier {
|
||||
WalletProvider(this.service, this.analytics, {this.factors});
|
||||
WalletProvider(
|
||||
this.service,
|
||||
this.analytics, {
|
||||
this.factors,
|
||||
this.destinations,
|
||||
});
|
||||
final WalletService service;
|
||||
final DestinationService? destinations;
|
||||
final TwoFactorService? factors;
|
||||
final AnalyticsService analytics;
|
||||
WalletSnapshot? data;
|
||||
|
||||
@@ -94,10 +94,15 @@ class BackendWalletService implements WalletService {
|
||||
@override
|
||||
Future<WalletSnapshot> fetch() => _mapped(send(''), BackendMapper.snapshot);
|
||||
@override
|
||||
Future<Quote> quote(TransferRequest request) => _mapped(
|
||||
send('/quote', body: BackendMapper.request(request)),
|
||||
BackendMapper.quote,
|
||||
);
|
||||
Future<Quote> quote(TransferRequest request) async {
|
||||
if (request.payoutDestination != null)
|
||||
throw const WalletException(WalletError.unsupported);
|
||||
return _mapped(
|
||||
send('/quote', body: BackendMapper.request(request)),
|
||||
BackendMapper.quote,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<WalletOperation> submit(
|
||||
String quoteId,
|
||||
|
||||
@@ -5,6 +5,9 @@ import 'package:sxchnge_auth/sxchnge_auth.dart';
|
||||
import 'package:sxchnge_kyc/limits_transport.dart';
|
||||
import 'package:sxchnge_kyc/sxchnge_kyc.dart';
|
||||
|
||||
import '../destinations/dummy.dart';
|
||||
import '../destinations/models.dart';
|
||||
import '../destinations/transport.dart';
|
||||
import '../models/wallet.dart';
|
||||
import '../transport/wallet.dart';
|
||||
import 'contracts.dart';
|
||||
@@ -14,13 +17,17 @@ class DummyWalletService implements WalletService {
|
||||
DummyWalletService(
|
||||
this.identity, {
|
||||
this.factors,
|
||||
DummyDestinationService? destinations,
|
||||
this.delay = const Duration(milliseconds: 350),
|
||||
this.settlement = const Duration(seconds: 2),
|
||||
DateTime Function()? now,
|
||||
String initialLocale = 'en',
|
||||
}) : now = now ?? DateTime.now,
|
||||
}) : destinations = destinations ?? DummyDestinationService(now: now),
|
||||
now = now ?? DateTime.now,
|
||||
_locale = initialLocale;
|
||||
final IdentityService identity;
|
||||
final DummyDestinationService destinations;
|
||||
final _destinationLeases = <String, DestinationLease>{};
|
||||
final TwoFactorService? factors;
|
||||
final Duration delay, settlement;
|
||||
final DateTime Function() now;
|
||||
@@ -59,6 +66,10 @@ class DummyWalletService implements WalletService {
|
||||
};
|
||||
int _eur(int minor, String id) => (minor * _weight(id) + 1099) ~/ 1100;
|
||||
void _settle() {
|
||||
_quotes.removeWhere((_, quote) => !now().isBefore(quote.expires));
|
||||
_destinationLeases.removeWhere(
|
||||
(_, lease) => !now().isBefore(lease.expiresAt),
|
||||
);
|
||||
for (final o in _submissions.values) {
|
||||
if (o.status != 'pending' || now().isBefore(o.ready)) continue;
|
||||
o.status = o.fail ? 'failed' : 'completed';
|
||||
@@ -133,9 +144,19 @@ class DummyWalletService implements WalletService {
|
||||
if (r.kind == TransferKind.exchange &&
|
||||
(r.source == r.destination || r.destination == null))
|
||||
throw const WalletException(WalletError.unsupported);
|
||||
if (r.kind == TransferKind.payout &&
|
||||
(r.recipient.trim().length < 6 || r.recipient.length > 140))
|
||||
throw const WalletException(WalletError.invalidRecipient);
|
||||
DestinationLease? lease;
|
||||
if (r.kind == TransferKind.payout) {
|
||||
if (r.payoutDestination == null)
|
||||
throw const WalletException(WalletError.invalidRecipient);
|
||||
try {
|
||||
lease = await destinations.prepare(
|
||||
r.payoutDestination!,
|
||||
PayoutContext(r.source, amount: r.amount),
|
||||
);
|
||||
} on DestinationException {
|
||||
throw const WalletException(WalletError.destinationChanged);
|
||||
}
|
||||
}
|
||||
if (r.kind == TransferKind.exchange) _account(r.destination!);
|
||||
final fee = switch (r.kind) {
|
||||
TransferKind.topUp => 0,
|
||||
@@ -146,19 +167,30 @@ class DummyWalletService implements WalletService {
|
||||
final d = r.kind == TransferKind.exchange ? _weight(r.destination!) : 1;
|
||||
final q = QuoteDTO(
|
||||
'quote-${++_serial}',
|
||||
WalletMapper.request(r),
|
||||
WalletMapper.request(r, includePayoutInput: false),
|
||||
fee,
|
||||
r.kind == TransferKind.topUp ? r.amount : r.amount + fee,
|
||||
r.amount * n ~/ d,
|
||||
now().add(const Duration(seconds: 60)),
|
||||
n,
|
||||
d,
|
||||
payoutTerms: lease == null
|
||||
? null
|
||||
: PayoutTermsDTO(r.amount, 2, switch (lease.snapshot) {
|
||||
CryptoDestination d => d.assetLabel,
|
||||
RussianBankDestination() => 'RUB',
|
||||
CardDestination() => _account(r.source).currency,
|
||||
}, settlement.inSeconds),
|
||||
payoutSnapshot: lease == null
|
||||
? null
|
||||
: DestinationMapper.details(lease.snapshot),
|
||||
);
|
||||
if (q.credit <= 0) throw const WalletException(WalletError.invalidAmount);
|
||||
final verified = await _verified();
|
||||
_settle();
|
||||
_check(q, verified);
|
||||
_quotes[q.id] = q;
|
||||
if (lease != null) _destinationLeases[q.id] = lease;
|
||||
return WalletMapper.quote(q);
|
||||
}
|
||||
|
||||
@@ -193,6 +225,17 @@ class DummyWalletService implements WalletService {
|
||||
if (_usedQuotes.contains(q.id))
|
||||
throw const WalletException(WalletError.expiredQuote);
|
||||
_check(q, verified);
|
||||
final lease = _destinationLeases[q.id];
|
||||
if (q.request.kind == 'payout' && lease == null)
|
||||
throw const WalletException(WalletError.expiredQuote);
|
||||
if (lease != null) {
|
||||
try {
|
||||
destinations.accept(lease);
|
||||
} on DestinationException {
|
||||
throw const WalletException(WalletError.destinationChanged);
|
||||
}
|
||||
}
|
||||
// No asynchronous gap between destination acceptance and financial mutation.
|
||||
_usedQuotes.add(q.id);
|
||||
if (q.request.kind != 'topUp')
|
||||
_account(q.request.source).available -= q.debit;
|
||||
@@ -205,6 +248,7 @@ class DummyWalletService implements WalletService {
|
||||
);
|
||||
failNextOperation = false;
|
||||
_submissions[idempotencyKey] = o;
|
||||
_destinationLeases.remove(q.id);
|
||||
if (loseNextResponse) {
|
||||
loseNextResponse = false;
|
||||
throw const WalletException(WalletError.uncertain);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import '../destinations/transport.dart';
|
||||
import '../models/wallet.dart';
|
||||
|
||||
class AccountDTO {
|
||||
@@ -23,11 +24,13 @@ class RequestDTO {
|
||||
this.source,
|
||||
this.destination,
|
||||
this.amount,
|
||||
this.recipient,
|
||||
);
|
||||
this.recipient, {
|
||||
this.payoutInput,
|
||||
});
|
||||
final String kind, source, recipient;
|
||||
final String? destination;
|
||||
final int amount;
|
||||
final DestinationInputDTO? payoutInput;
|
||||
}
|
||||
|
||||
class QuoteDTO {
|
||||
@@ -39,12 +42,16 @@ class QuoteDTO {
|
||||
this.credit,
|
||||
this.expires,
|
||||
this.numerator,
|
||||
this.denominator,
|
||||
);
|
||||
this.denominator, {
|
||||
this.payoutSnapshot,
|
||||
this.payoutTerms,
|
||||
});
|
||||
final String id;
|
||||
final RequestDTO request;
|
||||
final int fee, debit, credit, numerator, denominator;
|
||||
final DateTime expires;
|
||||
final DestinationDTO? payoutSnapshot;
|
||||
final PayoutTermsDTO? payoutTerms;
|
||||
}
|
||||
|
||||
class OperationDTO {
|
||||
@@ -78,14 +85,28 @@ abstract final class WalletMapper {
|
||||
payoutLabel: d.payoutLabel,
|
||||
canFund: d.canFund,
|
||||
);
|
||||
static RequestDTO request(TransferRequest r) =>
|
||||
RequestDTO(r.kind.name, r.source, r.destination, r.amount, r.recipient);
|
||||
static RequestDTO request(
|
||||
TransferRequest r, {
|
||||
bool includePayoutInput = true,
|
||||
}) => RequestDTO(
|
||||
r.kind.name,
|
||||
r.source,
|
||||
r.destination,
|
||||
r.amount,
|
||||
r.recipient,
|
||||
payoutInput: !includePayoutInput || r.payoutDestination == null
|
||||
? null
|
||||
: DestinationInputMapper.toDTO(r.payoutDestination!),
|
||||
);
|
||||
static TransferRequest fromRequest(RequestDTO d) => TransferRequest(
|
||||
kind: TransferKind.values.byName(d.kind),
|
||||
source: d.source,
|
||||
destination: d.destination,
|
||||
amount: d.amount,
|
||||
recipient: d.recipient,
|
||||
payoutDestination: d.payoutInput == null
|
||||
? null
|
||||
: DestinationInputMapper.fromDTO(d.payoutInput!),
|
||||
);
|
||||
static Quote quote(QuoteDTO d) => Quote(
|
||||
id: d.id,
|
||||
@@ -96,6 +117,17 @@ abstract final class WalletMapper {
|
||||
expiresAt: d.expires,
|
||||
rateNumerator: d.numerator,
|
||||
rateDenominator: d.denominator,
|
||||
payoutTerms: d.payoutTerms == null
|
||||
? null
|
||||
: PayoutTerms(
|
||||
d.payoutTerms!.amount,
|
||||
d.payoutTerms!.precision,
|
||||
d.payoutTerms!.assetLabel,
|
||||
d.payoutTerms!.expectedSeconds,
|
||||
),
|
||||
payoutSnapshot: d.payoutSnapshot == null
|
||||
? null
|
||||
: DestinationMapper.fromDTO(d.payoutSnapshot!),
|
||||
);
|
||||
static WalletOperation operation(OperationDTO d) => WalletOperation(
|
||||
id: d.id,
|
||||
@@ -105,3 +137,14 @@ abstract final class WalletMapper {
|
||||
);
|
||||
static AccountProfile profile(ProfileDTO dto) => AccountProfile(dto.locale);
|
||||
}
|
||||
|
||||
class PayoutTermsDTO {
|
||||
const PayoutTermsDTO(
|
||||
this.amount,
|
||||
this.precision,
|
||||
this.assetLabel,
|
||||
this.expectedSeconds,
|
||||
);
|
||||
final int amount, precision, expectedSeconds;
|
||||
final String assetLabel;
|
||||
}
|
||||
@@ -6,3 +6,15 @@ export 'src/services/dummy.dart';
|
||||
export 'src/providers/limits.dart';
|
||||
export 'src/services/backend.dart';
|
||||
export 'src/services/factors.dart';
|
||||
|
||||
export 'src/destinations/models.dart';
|
||||
export 'src/destinations/service.dart';
|
||||
export 'src/destinations/dummy.dart';
|
||||
export 'src/destinations/provider.dart';
|
||||
export 'src/destinations/bank_paste.dart';
|
||||
export 'src/destinations/unavailable.dart';
|
||||
export 'src/destinations/form.dart';
|
||||
export 'src/destinations/search.dart';
|
||||
export 'src/destinations/selection.dart';
|
||||
export 'src/destinations/management.dart';
|
||||
export 'src/destinations/key.dart';
|
||||
@@ -235,11 +235,52 @@ void main() {
|
||||
addTearDown(draft.dispose);
|
||||
await wallet.refresh();
|
||||
expect(draft.source, 'ledger');
|
||||
expect(draft.recipient, 'method');
|
||||
expect(draft.recipient, isEmpty);
|
||||
expect(draft.hasDraft, false);
|
||||
draft.change(recipient: 'method');
|
||||
expect(draft.hasDraft, true);
|
||||
draft.change(amount: '20.01');
|
||||
await draft.review();
|
||||
await draft.submit(approval: const FactorGrant('approved-intent-key'));
|
||||
expect(draft.result, isNotNull);
|
||||
});
|
||||
|
||||
test('new typed destinations cannot be silently dropped into the legacy live API', () async {
|
||||
var calls = 0;
|
||||
final service = BackendWalletService(
|
||||
baseUri: Uri.parse('https://example.test'),
|
||||
accessToken: () => 'test-token',
|
||||
client: MockClient((request) async {
|
||||
calls++;
|
||||
return http.Response('{}', 500);
|
||||
}),
|
||||
);
|
||||
addTearDown(service.close);
|
||||
await expectLater(
|
||||
service.quote(
|
||||
const TransferRequest(
|
||||
kind: TransferKind.payout,
|
||||
source: 'ledger',
|
||||
amount: 100,
|
||||
payoutDestination: OneTimeDestination(
|
||||
CryptoDestination(
|
||||
assetId: 'asset',
|
||||
networkId: 'network',
|
||||
address: 'address',
|
||||
assetLabel: 'Asset',
|
||||
networkLabel: 'Network',
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
throwsA(
|
||||
isA<WalletException>().having(
|
||||
(e) => e.code,
|
||||
'code',
|
||||
WalletError.unsupported,
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(calls, 0);
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,617 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import 'package:sxchnge_analytics/sxchnge_analytics.dart';
|
||||
|
||||
import 'package:sxchnge_kyc/sxchnge_kyc.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/sxchnge_wallet.dart';
|
||||
|
||||
import 'package:sxchnge_wallet/src/destinations/transport.dart';
|
||||
|
||||
const crypto = CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'Untrusted label',
|
||||
networkLabel: 'Untrusted network',
|
||||
);
|
||||
const input = OneTimeDestination(crypto);
|
||||
const card = CardDestination(
|
||||
capture: 'demo-card-ready',
|
||||
brand: 'Untrusted brand',
|
||||
last4: '9999',
|
||||
expiryMonth: 1,
|
||||
expiryYear: 1900,
|
||||
);
|
||||
const bank = Bank(
|
||||
bik: '044525225',
|
||||
name: 'Demo Bank',
|
||||
city: 'Moscow',
|
||||
correspondent: '30101810400000000225',
|
||||
revision: 'demo-1',
|
||||
);
|
||||
const russian = RussianBankDestination(
|
||||
firstName: 'Anna Maria',
|
||||
lastName: 'de la Cruz',
|
||||
bank: bank,
|
||||
account: '40817810899910004312',
|
||||
);
|
||||
Matcher issue(DestinationIssue value) =>
|
||||
throwsA(isA<DestinationException>().having((e) => e.issue, 'issue', value));
|
||||
void main() {
|
||||
late DummyDestinationService service;
|
||||
setUp(() {
|
||||
service = DummyDestinationService();
|
||||
});
|
||||
test('one-time validation, quotation and acceptance never save', () async {
|
||||
final lease = await service.prepare(
|
||||
input,
|
||||
const PayoutContext('eur', amount: 100),
|
||||
);
|
||||
expect(lease.snapshot.display, contains('ETH'));
|
||||
service.accept(lease);
|
||||
expect(await service.list(), isEmpty);
|
||||
});
|
||||
test('idempotency replays creation and rejects changed payload', () async {
|
||||
final first = await service.create(
|
||||
crypto,
|
||||
'Private name',
|
||||
'creation-key-000001',
|
||||
);
|
||||
expect(first.outcome, SaveOutcome.created);
|
||||
expect(
|
||||
(await service.create(
|
||||
crypto,
|
||||
'Private name',
|
||||
'creation-key-000001',
|
||||
)).destinationId,
|
||||
first.destinationId,
|
||||
);
|
||||
await expectLater(
|
||||
service.create(crypto, 'Changed', 'creation-key-000001'),
|
||||
issue(DestinationIssue.conflict),
|
||||
);
|
||||
expect((await service.list()).length, 1);
|
||||
});
|
||||
test(
|
||||
'duplicate outcome is stable after rename, removal and concurrent create',
|
||||
() async {
|
||||
final results = await Future.wait(
|
||||
List.generate(
|
||||
8,
|
||||
(i) => service.create(crypto, 'Name $i', 'creation-key-00000$i'),
|
||||
),
|
||||
);
|
||||
expect(results.where((r) => r.outcome == SaveOutcome.created).length, 1);
|
||||
expect(results.map((r) => r.destinationId).toSet().length, 1);
|
||||
final d = await service.get(results.first.destinationId);
|
||||
final renamed = await service.rename(
|
||||
d.id,
|
||||
'Original stays',
|
||||
d.metadataRevision,
|
||||
);
|
||||
await service.remove(
|
||||
d.id,
|
||||
renamed.metadataRevision,
|
||||
renamed.executionRevision,
|
||||
);
|
||||
final replay = await service.create(
|
||||
crypto,
|
||||
'Name 1',
|
||||
'creation-key-000001',
|
||||
);
|
||||
expect(replay.outcome, SaveOutcome.duplicate);
|
||||
expect(replay.destinationId, d.id);
|
||||
expect(
|
||||
(await service.creation('creation-key-000001'))!.outcome,
|
||||
SaveOutcome.duplicate,
|
||||
);
|
||||
},
|
||||
);
|
||||
test(
|
||||
'save timeout reconciles a created record separately from duplicate',
|
||||
() async {
|
||||
service.loseNextSaveResponse = true;
|
||||
await expectLater(
|
||||
service.create(crypto, '', 'creation-key-000001'),
|
||||
issue(DestinationIssue.uncertain),
|
||||
);
|
||||
expect(
|
||||
(await service.creation('creation-key-000001'))!.outcome,
|
||||
SaveOutcome.created,
|
||||
);
|
||||
service.loseNextSaveResponse = true;
|
||||
await expectLater(
|
||||
service.create(crypto, '', 'creation-key-000002'),
|
||||
issue(DestinationIssue.uncertain),
|
||||
);
|
||||
expect(
|
||||
(await service.creation('creation-key-000002'))!.outcome,
|
||||
SaveOutcome.duplicate,
|
||||
);
|
||||
},
|
||||
);
|
||||
test('customer isolation includes duplicates, attempt lookup, reads and mutations', () async {
|
||||
final memory = DestinationMemory();
|
||||
final a = DummyDestinationService(customer: 'a', memory: memory);
|
||||
final b = DummyDestinationService(customer: 'b', memory: memory);
|
||||
final saved = await a.create(crypto, 'A', 'creation-key-000001');
|
||||
expect(await b.creation('creation-key-000001'), isNull);
|
||||
await expectLater(
|
||||
b.get(saved.destinationId),
|
||||
issue(DestinationIssue.removed),
|
||||
);
|
||||
await expectLater(
|
||||
b.rename(saved.destinationId, 'B', 1),
|
||||
issue(DestinationIssue.removed),
|
||||
);
|
||||
await expectLater(
|
||||
b.remove(saved.destinationId, 1, 1),
|
||||
issue(DestinationIssue.removed),
|
||||
);
|
||||
expect(
|
||||
(await b.create(crypto, 'B', 'creation-key-000001')).outcome,
|
||||
SaveOutcome.created,
|
||||
);
|
||||
});
|
||||
test('metadata concurrency never changes execution revision or invalidates lease', () async {
|
||||
final result = await service.create(crypto, '', 'creation-key-000001');
|
||||
final d = await service.get(result.destinationId);
|
||||
final lease = await service.prepare(d.input, const PayoutContext('eur'));
|
||||
final changed = await service.rename(d.id, 'New label', d.metadataRevision);
|
||||
expect(changed.executionRevision, d.executionRevision);
|
||||
expect(changed.metadataRevision, d.metadataRevision + 1);
|
||||
service.accept(lease);
|
||||
await expectLater(
|
||||
service.rename(d.id, 'Stale', d.metadataRevision),
|
||||
issue(DestinationIssue.conflict),
|
||||
);
|
||||
});
|
||||
test(
|
||||
'removal invalidates draft lease and never mutates previous snapshots',
|
||||
() async {
|
||||
final result = await service.create(crypto, '', 'creation-key-000001');
|
||||
final d = await service.get(result.destinationId);
|
||||
final lease = await service.prepare(d.input, const PayoutContext('eur'));
|
||||
await service.remove(d.id, d.metadataRevision, d.executionRevision);
|
||||
expect(() => service.accept(lease), issue(DestinationIssue.removed));
|
||||
expect(lease.snapshot.review, contains(crypto.address));
|
||||
expect(await service.list(), isEmpty);
|
||||
expect(service.memory.audit.map((a) => a.action), contains('remove'));
|
||||
},
|
||||
);
|
||||
test(
|
||||
'requirements and contextual availability are rechecked at acceptance',
|
||||
() async {
|
||||
final result = await service.create(crypto, '', 'creation-key-000001');
|
||||
final d = await service.get(result.destinationId);
|
||||
final lease = await service.prepare(d.input, const PayoutContext('eur'));
|
||||
service.availability[d.id] = const PayoutEligibility(
|
||||
EligibilityState.temporarilyUnavailable,
|
||||
reason: DestinationIssue.unavailable,
|
||||
);
|
||||
expect(() => service.accept(lease), issue(DestinationIssue.unavailable));
|
||||
service.availability.clear();
|
||||
service.requirementsRevision++;
|
||||
expect(() => service.accept(lease), issue(DestinationIssue.conflict));
|
||||
},
|
||||
);
|
||||
test(
|
||||
'network and canonical token identity distinguish duplicate addresses',
|
||||
() async {
|
||||
final ids = <String>{};
|
||||
for (final a in DummyDestinationService.assets.where(
|
||||
(a) => a.networkId.startsWith('eip155:'),
|
||||
)) {
|
||||
final result = await service.create(
|
||||
CryptoDestination(
|
||||
assetId: a.id,
|
||||
networkId: a.networkId,
|
||||
address: crypto.address,
|
||||
memo: '',
|
||||
assetLabel: a.label,
|
||||
networkLabel: a.networkLabel,
|
||||
),
|
||||
'',
|
||||
destinationKey(),
|
||||
);
|
||||
ids.add(result.destinationId);
|
||||
}
|
||||
expect(ids.length, 4);
|
||||
},
|
||||
);
|
||||
test(
|
||||
'address presentation preserves case; normalization is service-owned',
|
||||
() async {
|
||||
const upper = CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0xABCDEFabcdefABCDEFabcdefABCDEFabcdefABCD',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
);
|
||||
final first = await service.create(upper, '', 'creation-key-000001');
|
||||
final lower = CryptoDestination(
|
||||
assetId: upper.assetId,
|
||||
networkId: upper.networkId,
|
||||
address: upper.address.toLowerCase(),
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
);
|
||||
expect(
|
||||
(await service.create(lower, '', 'creation-key-000002')).destinationId,
|
||||
first.destinationId,
|
||||
);
|
||||
expect(
|
||||
(await service.get(first.destinationId)).details.review,
|
||||
contains(upper.address),
|
||||
);
|
||||
},
|
||||
);
|
||||
test('memo requirements are validated before saving', () async {
|
||||
const d = CryptoDestination(
|
||||
assetId: 'demo:xrp:native',
|
||||
networkId: 'xrpl:mainnet',
|
||||
address: 'r123456789ABCDEFGHJKLMNPQRSTU',
|
||||
assetLabel: 'XRP',
|
||||
networkLabel: 'XRP Ledger',
|
||||
);
|
||||
await expectLater(
|
||||
service.create(d, '', 'creation-key-000001'),
|
||||
issue(DestinationIssue.invalid),
|
||||
);
|
||||
expect(await service.list(), isEmpty);
|
||||
});
|
||||
test('card captures never trust user display metadata; recovery preserves record', () async {
|
||||
final r = await service.create(card, '', 'creation-key-000001');
|
||||
final saved = await service.get(r.destinationId);
|
||||
expect(saved.details.display, contains('4242'));
|
||||
expect(saved.details.display, isNot(contains('9999')));
|
||||
const recovery = CardDestination(
|
||||
capture: 'demo-card-recover',
|
||||
brand: '',
|
||||
last4: '',
|
||||
expiryMonth: 0,
|
||||
expiryYear: 0,
|
||||
);
|
||||
final other = DummyDestinationService();
|
||||
final pending = await other.create(recovery, '', 'creation-key-000001');
|
||||
final d = await other.get(pending.destinationId);
|
||||
expect(
|
||||
(await other.assess(d.input, const PayoutContext('eur'))).state,
|
||||
EligibilityState.requiresAction,
|
||||
);
|
||||
expect((await other.list()).length, 1);
|
||||
});
|
||||
test('unreliable card fingerprint does not merge by last four', () async {
|
||||
const d = CardDestination(
|
||||
capture: 'demo-card-unknown',
|
||||
brand: '',
|
||||
last4: '',
|
||||
expiryMonth: 0,
|
||||
expiryYear: 0,
|
||||
);
|
||||
final a = await service.create(d, '', 'creation-key-000001');
|
||||
final b = await service.create(d, '', 'creation-key-000002');
|
||||
expect(a.destinationId, isNot(b.destinationId));
|
||||
expect(b.outcome, SaveOutcome.created);
|
||||
});
|
||||
test(
|
||||
'bank control key and directory changes are separate from ownership',
|
||||
() async {
|
||||
expect(validBankAccount('40817810899910004312', bank.bik), isTrue);
|
||||
final r = await service.create(russian, '', 'creation-key-000001');
|
||||
final saved = await service.get(r.destinationId);
|
||||
expect(saved.ownership.verified, isFalse);
|
||||
service.directory = [
|
||||
const Bank(
|
||||
bik: '044525225',
|
||||
name: 'New cosmetic name',
|
||||
city: 'Moscow',
|
||||
correspondent: '30101810400000000225',
|
||||
revision: 'demo-2',
|
||||
),
|
||||
];
|
||||
expect(
|
||||
(await service.assess(
|
||||
saved.input,
|
||||
const PayoutContext('eur'),
|
||||
)).eligible,
|
||||
isTrue,
|
||||
);
|
||||
service.directory = [
|
||||
const Bank(
|
||||
bik: '044525225',
|
||||
name: 'New bank',
|
||||
city: 'Moscow',
|
||||
correspondent: 'changed',
|
||||
revision: 'demo-3',
|
||||
),
|
||||
];
|
||||
expect(
|
||||
(await service.assess(saved.input, const PayoutContext('eur'))).reason,
|
||||
DestinationIssue.bankChanged,
|
||||
);
|
||||
expect(
|
||||
(await service.get(saved.id)).details.review,
|
||||
contains(bank.correspondent),
|
||||
);
|
||||
},
|
||||
);
|
||||
test(
|
||||
'paste conflicts are never guessed and full holder names remain unsplit',
|
||||
() {
|
||||
final parsed = BankPaste.parse(
|
||||
'БИК: 044525225\nБИК: 044525999\nНомер счета: 0000 1234\nФИО: Anna Maria de la Cruz',
|
||||
);
|
||||
expect(parsed.conflicts, contains('bik'));
|
||||
expect(parsed.values, isNot(contains('bik')));
|
||||
expect(parsed.values['account'], '00001234');
|
||||
expect(parsed.values['holder'], 'Anna Maria de la Cruz');
|
||||
expect(parsed.values, isNot(contains('firstName')));
|
||||
},
|
||||
);
|
||||
test('all details round trip through DTO mapper', () {
|
||||
for (final d in <DestinationDetails>[crypto, card, russian]) {
|
||||
expect(DestinationMapper.clone(d).review, d.review);
|
||||
}
|
||||
});
|
||||
test(
|
||||
'optional save failure can continue one-time without claiming saved',
|
||||
() async {
|
||||
final p = DestinationFormProvider(
|
||||
service,
|
||||
DummyAnalyticsService(),
|
||||
context: const PayoutContext('eur'),
|
||||
);
|
||||
addTearDown(p.dispose);
|
||||
p.change(crypto);
|
||||
p.preferences(save: true);
|
||||
service.nextSaveError = DestinationIssue.conflict;
|
||||
await p.proceed();
|
||||
expect(p.savingFailed, isTrue);
|
||||
expect(p.saved, isNull);
|
||||
await p.proceed(withoutSaving: true);
|
||||
expect(p.result, isA<OneTimeDestination>());
|
||||
expect(await service.list(), isEmpty);
|
||||
},
|
||||
);
|
||||
test('saving and contextual eligibility have independent outcomes', () async {
|
||||
final p = DestinationFormProvider(
|
||||
service,
|
||||
DummyAnalyticsService(),
|
||||
context: const PayoutContext('unsupported'),
|
||||
);
|
||||
addTearDown(p.dispose);
|
||||
p.change(crypto);
|
||||
p.preferences(save: true);
|
||||
await p.proceed();
|
||||
expect(p.saved!.outcome, SaveOutcome.created);
|
||||
expect(p.eligibility!.state, EligibilityState.unsupported);
|
||||
expect(p.result, isNull);
|
||||
expect(p.error, isNull);
|
||||
});
|
||||
test('explicit duplicate reuse preserves existing nickname', () async {
|
||||
final first = await service.create(
|
||||
crypto,
|
||||
'Original',
|
||||
'creation-key-000001',
|
||||
);
|
||||
final p = DestinationFormProvider(
|
||||
service,
|
||||
DummyAnalyticsService(),
|
||||
context: const PayoutContext('eur'),
|
||||
);
|
||||
addTearDown(p.dispose);
|
||||
p.change(crypto);
|
||||
p.preferences(save: true, nickname: 'New');
|
||||
await p.proceed();
|
||||
expect(p.saved!.outcome, SaveOutcome.duplicate);
|
||||
expect(p.result, isNull);
|
||||
await p.useExisting();
|
||||
expect((p.result as SavedReference).id, first.destinationId);
|
||||
expect((await service.get(first.destinationId)).nickname, 'Original');
|
||||
});
|
||||
test(
|
||||
'wallet acceptance rejects removed destination without debiting',
|
||||
() async {
|
||||
final wallet = DummyWalletService(
|
||||
DummyIdentityService(delay: Duration.zero),
|
||||
delay: Duration.zero,
|
||||
destinations: service,
|
||||
);
|
||||
final created = await service.create(crypto, '', 'creation-key-000001');
|
||||
final d = await service.get(created.destinationId);
|
||||
final q = await wallet.quote(
|
||||
TransferRequest(
|
||||
kind: TransferKind.payout,
|
||||
source: 'eur',
|
||||
amount: 1000,
|
||||
payoutDestination: d.input,
|
||||
),
|
||||
);
|
||||
await service.remove(d.id, d.metadataRevision, d.executionRevision);
|
||||
await expectLater(
|
||||
wallet.submit(q.id, 'request'),
|
||||
throwsA(
|
||||
isA<WalletException>().having(
|
||||
(e) => e.code,
|
||||
'code',
|
||||
WalletError.destinationChanged,
|
||||
),
|
||||
),
|
||||
);
|
||||
expect((await wallet.fetch()).accounts.first.available, 7500);
|
||||
expect((await wallet.fetch()).operations, isEmpty);
|
||||
},
|
||||
);
|
||||
|
||||
test('large collections search safe metadata and sort recent use without choosing', () async {
|
||||
for (var i = 0; i < 240; i++) {
|
||||
await service.create(
|
||||
CryptoDestination(
|
||||
assetId: crypto.assetId,
|
||||
networkId: crypto.networkId,
|
||||
address: '0x' + i.toRadixString(16).padLeft(40, '0'),
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
),
|
||||
'Wallet ' + i.toString(),
|
||||
destinationKey(),
|
||||
);
|
||||
}
|
||||
final rows = await service.list();
|
||||
service.accept(
|
||||
await service.prepare(rows.last.input, const PayoutContext('eur')),
|
||||
);
|
||||
final p = DestinationsProvider(service);
|
||||
addTearDown(p.dispose);
|
||||
await p.refresh();
|
||||
expect(p.search('', DestinationType.crypto).first.id, rows.last.id);
|
||||
expect(
|
||||
p.search('Wallet 239', DestinationType.crypto).single.id,
|
||||
rows.last.id,
|
||||
);
|
||||
expect(p.search('not found', DestinationType.crypto), isEmpty);
|
||||
});
|
||||
test('cards without supported reuse or recovery cannot be saved', () async {
|
||||
service.reusableCards = false;
|
||||
service.cardRecovery = false;
|
||||
expect(
|
||||
(await service.assess(
|
||||
const OneTimeDestination(card),
|
||||
const PayoutContext('eur'),
|
||||
)).canSave,
|
||||
isFalse,
|
||||
);
|
||||
await expectLater(
|
||||
service.create(card, '', 'creation-key-000001'),
|
||||
issue(DestinationIssue.unsupported),
|
||||
);
|
||||
expect(await service.list(), isEmpty);
|
||||
});
|
||||
test('existing card survives loss of its only reusable binding', () async {
|
||||
final result = await service.create(card, '', 'creation-key-000001');
|
||||
final d = await service.get(result.destinationId);
|
||||
expect((d.details as CardDestination).capture, isEmpty);
|
||||
final old = await service.prepare(d.input, const PayoutContext('eur'));
|
||||
service.memory.records[service.customer]![d.id] = SavedDestination(
|
||||
id: d.id,
|
||||
details: d.details,
|
||||
metadataRevision: d.metadataRevision,
|
||||
executionRevision: d.executionRevision + 1,
|
||||
bindings: [
|
||||
const ProviderBinding(
|
||||
reference: 'binding',
|
||||
state: BindingState.revoked,
|
||||
reusable: true,
|
||||
recoverable: true,
|
||||
),
|
||||
],
|
||||
);
|
||||
final changed = await service.get(d.id);
|
||||
expect(
|
||||
(await service.assess(changed.input, const PayoutContext('eur'))).state,
|
||||
EligibilityState.requiresAction,
|
||||
);
|
||||
expect(() => service.accept(old), issue(DestinationIssue.conflict));
|
||||
expect((await service.list()).length, 1);
|
||||
service.cardRecovery = false;
|
||||
expect(
|
||||
(await service.assess(changed.input, const PayoutContext('eur'))).state,
|
||||
EligibilityState.unsupported,
|
||||
);
|
||||
});
|
||||
test(
|
||||
'accepted payout snapshot survives nickname changes and removal',
|
||||
() async {
|
||||
final wallet = DummyWalletService(
|
||||
DummyIdentityService(delay: Duration.zero),
|
||||
delay: Duration.zero,
|
||||
destinations: service,
|
||||
);
|
||||
final result = await service.create(crypto, '', 'creation-key-000001');
|
||||
final d = await service.get(result.destinationId);
|
||||
final q = await wallet.quote(
|
||||
TransferRequest(
|
||||
kind: TransferKind.payout,
|
||||
source: 'eur',
|
||||
amount: 1000,
|
||||
payoutDestination: d.input,
|
||||
),
|
||||
);
|
||||
final renamed = await service.rename(
|
||||
d.id,
|
||||
'After quote',
|
||||
d.metadataRevision,
|
||||
);
|
||||
final accepted = await wallet.submit(q.id, 'payout-key');
|
||||
await service.remove(
|
||||
d.id,
|
||||
renamed.metadataRevision,
|
||||
renamed.executionRevision,
|
||||
);
|
||||
expect((await wallet.fetch()).operations.single.id, accepted.id);
|
||||
expect(accepted.quote.payoutSnapshot!.review, contains(crypto.address));
|
||||
},
|
||||
);
|
||||
|
||||
test('card recovery preserves identity, invalidates execution and replays idempotently', () async {
|
||||
const capture = CardDestination(
|
||||
capture: 'demo-card-recover',
|
||||
brand: '',
|
||||
last4: '',
|
||||
expiryMonth: 0,
|
||||
expiryYear: 0,
|
||||
);
|
||||
final created = await service.create(
|
||||
capture,
|
||||
'Keep label',
|
||||
'creation-key-000001',
|
||||
);
|
||||
final d = await service.get(created.destinationId);
|
||||
final restored = await service.restoreCard(
|
||||
d.id,
|
||||
d.executionRevision,
|
||||
card,
|
||||
'card-recovery-key-0001',
|
||||
);
|
||||
expect(restored.id, d.id);
|
||||
expect(restored.nickname, d.nickname);
|
||||
expect(restored.metadataRevision, d.metadataRevision);
|
||||
expect(restored.executionRevision, d.executionRevision + 1);
|
||||
expect(
|
||||
(await service.assess(
|
||||
restored.input,
|
||||
const PayoutContext('eur'),
|
||||
)).eligible,
|
||||
isTrue,
|
||||
);
|
||||
expect(
|
||||
(await service.restoreCard(
|
||||
d.id,
|
||||
d.executionRevision,
|
||||
card,
|
||||
'card-recovery-key-0001',
|
||||
)).executionRevision,
|
||||
restored.executionRevision,
|
||||
);
|
||||
expect((await service.list()).length, 1);
|
||||
const unidentified = CardDestination(
|
||||
capture: 'demo-card-unknown',
|
||||
brand: '',
|
||||
last4: '',
|
||||
expiryMonth: 0,
|
||||
expiryYear: 0,
|
||||
);
|
||||
await expectLater(
|
||||
service.restoreCard(
|
||||
d.id,
|
||||
restored.executionRevision,
|
||||
unidentified,
|
||||
'card-recovery-key-0002',
|
||||
),
|
||||
issue(DestinationIssue.replacementRequired),
|
||||
);
|
||||
});
|
||||
}
|
||||
@@ -27,6 +27,15 @@ void main() {
|
||||
amount: 1000,
|
||||
destination: kind == TransferKind.exchange ? 'usd' : null,
|
||||
recipient: 'Sample recipient',
|
||||
payoutDestination: OneTimeDestination(
|
||||
CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
await expectLater(
|
||||
@@ -59,6 +68,15 @@ void main() {
|
||||
source: 'eur',
|
||||
amount: 1000,
|
||||
recipient: 'Sample recipient',
|
||||
payoutDestination: OneTimeDestination(
|
||||
CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
final c = (await factor.begin(FactorPurpose.payout, q.id))!;
|
||||
@@ -85,6 +103,15 @@ void main() {
|
||||
source: 'eur',
|
||||
amount: 1000,
|
||||
recipient: 'Sample recipient',
|
||||
payoutDestination: OneTimeDestination(
|
||||
CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
final c = (await factor.begin(FactorPurpose.payout, 'different-quote'))!;
|
||||
|
||||
@@ -39,6 +39,15 @@ void main() {
|
||||
destination: to,
|
||||
amount: amount,
|
||||
recipient: recipient,
|
||||
payoutDestination: OneTimeDestination(
|
||||
CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
return s.submit(q.id, key);
|
||||
@@ -107,6 +116,15 @@ void main() {
|
||||
source: 'eur',
|
||||
amount: 7000,
|
||||
recipient: 'Sample recipient',
|
||||
payoutDestination: OneTimeDestination(
|
||||
CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
now = now.add(const Duration(seconds: 61));
|
||||
@@ -127,6 +145,15 @@ void main() {
|
||||
source: 'eur',
|
||||
amount: 6000,
|
||||
recipient: 'Sample recipient',
|
||||
payoutDestination: OneTimeDestination(
|
||||
CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
final b = await s.quote(
|
||||
@@ -135,6 +162,15 @@ void main() {
|
||||
source: 'eur',
|
||||
amount: 6000,
|
||||
recipient: 'Sample recipient',
|
||||
payoutDestination: OneTimeDestination(
|
||||
CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
await s.submit(a.id, 'first');
|
||||
@@ -160,6 +196,15 @@ void main() {
|
||||
source: 'eur',
|
||||
amount: 11000,
|
||||
recipient: 'Sample recipient',
|
||||
payoutDestination: OneTimeDestination(
|
||||
CryptoDestination(
|
||||
assetId: 'demo:ethereum:native',
|
||||
networkId: 'eip155:1',
|
||||
address: '0x1234567890123456789012345678901234567890',
|
||||
assetLabel: 'ETH',
|
||||
networkLabel: 'Ethereum',
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
throwsA(
|
||||
|
||||
@@ -5,7 +5,7 @@ RUN apk add --no-cache protobuf protobuf-dev make
|
||||
WORKDIR /src
|
||||
COPY Makefile ./
|
||||
COPY backend ./backend
|
||||
RUN make generate-notifications
|
||||
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg/mod make generate-notifications
|
||||
ARG MODULE
|
||||
WORKDIR /src/backend/${MODULE}
|
||||
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg/mod CGO_ENABLED=0 go build -trimpath -o /out/service .
|
||||
|
||||
@@ -119,6 +119,8 @@ services:
|
||||
|
||||
frontend:
|
||||
image: sxchnge-local/frontend:dev
|
||||
# Reap orphaned ssl_client children from BusyBox wget HTTPS health probes.
|
||||
init: true
|
||||
build:
|
||||
context: .
|
||||
dockerfile: infra/images/frontend.Dockerfile
|
||||
|
||||
@@ -5,6 +5,21 @@
|
||||
|
||||
https://localhost:8443 {
|
||||
tls internal
|
||||
# Record signup status/timing even when the API rejects a request before
|
||||
# account creation. Drop the entire request and response headers so URLs,
|
||||
# cookies, addresses and browser-provided values cannot enter access logs.
|
||||
log signup {
|
||||
format filter {
|
||||
wrap json
|
||||
fields {
|
||||
request delete
|
||||
resp_headers delete
|
||||
user_id delete
|
||||
}
|
||||
}
|
||||
}
|
||||
@otherRequests not path /api/v1/accounts/signup
|
||||
log_skip @otherRequests
|
||||
root * /srv
|
||||
handle /api/* {
|
||||
reverse_proxy bff:8082
|
||||
|
||||
Loaded 100 of 110 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user