email queue processing

application.yaml

@@ -85,6 +85,8 @@ kyc/quiz:
 auth/email-link:
   extraLoadBalancersCount: 2
   wintr/connectors/storage/v2: *db
+  wintr/connectors/storage/v3:
+    url: redis://default:@localhost:6379/
   fromEmailAddress: [email protected]
   fromEmailName: ice
   emailValidation:

auth/email_link/.testdata/docker-compose.yaml

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: ice License 1.0
+
+version: '3.7'
+services:
+  eskimo-dfly:
+    container_name: eskimo-dfly
+    image: 'docker.dragonflydb.io/dragonflydb/dragonfly'
+    ulimits:
+      memlock: -1
+    ports:
+      - 6379:6379
+    command: "dragonfly --dbnum=1"

auth/email_link/DDL.sql

@@ -9,6 +9,7 @@ CREATE TABLE IF NOT EXISTS email_link_sign_ins (
            previously_issued_token_seq            BIGINT DEFAULT 0 NOT NULL,
            confirmation_code_wrong_attempts_count BIGINT DEFAULT 0 NOT NULL,
            email                                  TEXT NOT NULL,
+           language                               TEXT NOT NULL,
            confirmation_code                      TEXT,
            user_id                                TEXT,
            phone_number_to_email_migration_user_id TEXT,
@@ -33,4 +34,7 @@ CREATE TABLE IF NOT EXISTS sign_ins_per_ip (
        login_attempts        BIGINT DEFAULT 0 NOT NULL CONSTRAINT sign_ins_per_ip_login_attempts_count CHECK (login_attempts <= 10),
        ip                    TEXT NOT NULL,
        PRIMARY KEY (login_session_number, ip)
-);
+);
+
+ALTER TABLE email_link_sign_ins
+    ADD COLUMN IF NOT EXISTS language TEXT NOT NULL DEFAULT 'en';

auth/email_link/contract.go

@@ -16,6 +16,7 @@ import (
 	"github.com/ice-blockchain/eskimo/users"
 	"github.com/ice-blockchain/wintr/auth"
 	"github.com/ice-blockchain/wintr/connectors/storage/v2"
+	storagev3 "github.com/ice-blockchain/wintr/connectors/storage/v3"
 	"github.com/ice-blockchain/wintr/email"
 	"github.com/ice-blockchain/wintr/time"
 )
@@ -28,10 +29,11 @@ type (
 	}
 	Client interface {
 		IceUserIDClient
-		SendSignInLinkToEmail(ctx context.Context, emailValue, deviceUniqueID, language, clientIP string) (loginSession string, err error)
+		SendSignInLinkToEmail(ctx context.Context, emailValue, deviceUniqueID, language, clientIP string) (queuePos int64, rateLimit, loginSession string, err error)
 		SignIn(ctx context.Context, loginFlowToken, confirmationCode string) (tokens *Tokens, emailConfirmed bool, err error)
 		RegenerateTokens(ctx context.Context, prevToken string) (tokens *Tokens, err error)
 		UpdateMetadata(ctx context.Context, userID string, metadata *users.JSON) (*users.JSON, error)
+		CheckHealth(ctx context.Context) error
 	}
 	IceUserIDClient interface {
 		io.Closer
@@ -86,14 +88,19 @@ const (
 	sameIPCheckRate = 24 * stdlibtime.Hour
 
 	duplicatedSignInRequestsInLessThan = 2 * stdlibtime.Second
+	loginQueueKey                      = "login_queue"
+	loginRateLimitKey                  = "login_rate_limit"
+	initEmailRateLimit                 = "1000:1m"
 )
 
 type (
 	languageCode = string
 	client       struct {
 		db                 *storage.DB
+		queueDB            storagev3.DB
 		cfg                *config
 		shutdown           func() error
+		cancel             context.CancelFunc
 		authClient         auth.Client
 		userModifier       UserModifier
 		emailClients       []email.Client
@@ -180,4 +187,5 @@ var (
 		modifyEmailType,
 		notifyEmailChangedType,
 	}
+	errAlreadyEnqueued = errors.New("already enqueued")
 )

auth/email_link/email_modify.go

@@ -44,7 +44,7 @@ func (c *client) handleEmailModification(ctx context.Context, els *emailLinkSign
 	if notifyEmail != "" {
 		now := time.Now()
 		resetConfirmationCode := generateConfirmationCode()
-		uErr := c.upsertEmailLinkSignIn(ctx, oldEmail, els.DeviceUniqueID, resetConfirmationCode, now)
+		uErr := c.upsertEmailLinkSignIn(ctx, oldEmail, els.DeviceUniqueID, resetConfirmationCode, els.Language, now)
 		if uErr != nil {
 			return multierror.Append( //nolint:wrapcheck // .
 				errors.Wrapf(c.resetEmailModification(ctx, usr.ID, oldEmail), "[reset] resetEmailModification failed for email:%v", oldEmail),

auth/email_link/emaillink.go

@@ -19,6 +19,7 @@ import (
 	"github.com/ice-blockchain/wintr/auth"
 	appcfg "github.com/ice-blockchain/wintr/config"
 	"github.com/ice-blockchain/wintr/connectors/storage/v2"
+	storagev3 "github.com/ice-blockchain/wintr/connectors/storage/v3"
 	"github.com/ice-blockchain/wintr/email"
 	"github.com/ice-blockchain/wintr/log"
 	"github.com/ice-blockchain/wintr/time"
@@ -29,15 +30,20 @@ func init() {
 	loadEmailMagicLinkTranslationTemplates()
 }
 
-func NewClient(ctx context.Context, userModifier UserModifier, authClient auth.Client) Client {
+//nolint:funlen // .
+func NewClient(ctx context.Context, cancel context.CancelFunc, userModifier UserModifier, authClient auth.Client) Client {
 	cfg := loadConfiguration()
 	cfg.validate()
 	db := storage.MustConnect(ctx, ddl, applicationYamlKey)
-
+	//nolint:contextcheck // Used in queue processing.
+	queueDB := storagev3.MustConnect(context.Background(), applicationYamlKey)
+	log.Panic(errors.Wrapf(queueDB.SetNX(ctx, loginRateLimitKey, initEmailRateLimit, 0).Err(), "failed to init email sending rate limit")) //nolint:revive // .
 	cl := &client{
 		cfg:            cfg,
 		shutdown:       db.Close,
 		db:             db,
+		cancel:         cancel,
+		queueDB:        queueDB,
 		authClient:     authClient,
 		userModifier:   userModifier,
 		emailClients:   make([]email.Client, 0, cfg.ExtraLoadBalancersCount+1),
@@ -52,6 +58,7 @@ func NewClient(ctx context.Context, userModifier UserModifier, authClient auth.C
 			cl.emailClients = append(cl.emailClients, email.New(fmt.Sprintf("%v/%v", applicationYamlKey, i+1)))
 			cl.fromRecipients = append(cl.fromRecipients, fromRecipient{nestedCfg.FromEmailName, nestedCfg.FromEmailAddress})
 		}
+		go cl.processEmailQueue(ctx)
 	}
 	go cl.startOldLoginAttemptsCleaner(ctx)
 
@@ -68,7 +75,31 @@ func NewROClient(ctx context.Context) IceUserIDClient {
 }
 
 func (c *client) Close() error {
-	return errors.Wrap(c.shutdown(), "closing auth/emaillink repository failed")
+	retErr := errors.Wrap(c.shutdown(), "closing auth/emaillink repository failed")
+	if c.cancel != nil {
+		c.cancel()
+	}
+
+	return retErr
+}
+
+func (c *client) CheckHealth(ctx context.Context) error {
+	return errors.Wrapf(c.checkQueueDBHealth(ctx), "[health-check] failed to ping queueDB/dfly for email client")
+}
+
+func (c *client) checkQueueDBHealth(ctx context.Context) error {
+	if resp := c.queueDB.Ping(ctx); resp.Err() != nil || resp.Val() != "PONG" {
+		if resp.Err() == nil {
+			resp.SetErr(errors.Errorf("response `%v` is not `PONG`", resp.Val()))
+		}
+
+		return errors.Wrap(resp.Err(), "[health-check] failed to ping DB")
+	}
+	if !c.queueDB.IsRW(ctx) {
+		return errors.New("db is not writeable")
+	}
+
+	return nil
 }
 
 func loadConfiguration() *config {