Sync master with main (#3)

Author: alexk307

backend/memory/backend.go

@@ -3,14 +3,15 @@ package memory
 
 import (
 	"errors"
-	"time"
-
+	"fmt"
 	"github.com/emersion/go-imap"
 	"github.com/emersion/go-imap/backend"
+	"sync"
 )
 
 type Backend struct {
-	users map[string]*User
+	users    map[string]*User
+	userLock sync.Mutex
 }
 
 func (be *Backend) Login(_ *imap.ConnInfo, username, password string) (backend.User, error) {
@@ -22,35 +23,36 @@ func (be *Backend) Login(_ *imap.ConnInfo, username, password string) (backend.U
 	return nil, errors.New("Bad username or password")
 }
 
-func New() *Backend {
-	user := &User{username: "username", password: "password"}
-
-	body := "From: contact@example.org\r\n" +
-		"To: contact@example.org\r\n" +
-		"Subject: A little message, just for you\r\n" +
-		"Date: Wed, 11 May 2016 14:31:59 +0000\r\n" +
-		"Message-ID: <0000000@localhost/>\r\n" +
-		"Content-Type: text/plain\r\n" +
-		"\r\n" +
-		"Hi there :)"
-
-	user.mailboxes = map[string]*Mailbox{
-		"INBOX": {
-			name: "INBOX",
-			user: user,
-			Messages: []*Message{
-				{
-					Uid:   6,
-					Date:  time.Now(),
-					Flags: []string{"\\Seen"},
-					Size:  uint32(len(body)),
-					Body:  []byte(body),
-				},
-			},
-		},
+func (be *Backend) AddUser(username, password string) (*User, error) {
+	if _, ok := be.users[username]; ok {
+		return nil, fmt.Errorf("user %s already exists", username)
+	}
+
+	user := &User{
+		username: username,
+		password: password,
 	}
 
+	be.userLock.Lock()
+	defer be.userLock.Unlock()
+	be.users[username] = user
+	return user, nil
+}
+
+func (u *User) SetMailboxes(mailboxes map[string]*Mailbox) {
+	u.mailboxes = mailboxes
+}
+
+func (be *Backend) GetUser(username string) (*User, error) {
+	if user, ok := be.users[username]; ok {
+		return user, nil
+	}
+	return nil, fmt.Errorf("no user exists with username %s", username)
+}
+
+func New() *Backend {
 	return &Backend{
-		users: map[string]*User{user.username: user},
+		users:    map[string]*User{},
+		userLock: sync.Mutex{},
 	}
 }

go.mod

@@ -3,6 +3,7 @@ module github.com/emersion/go-imap
 go 1.13
 
 require (
+	github.com/emersion/go-imap v1.2.1
 	github.com/emersion/go-message v0.15.0
 	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
 	golang.org/x/text v0.3.7

go.sum

@@ -1,3 +1,5 @@
+github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA=
+github.com/emersion/go-imap v1.2.1/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY=
 github.com/emersion/go-message v0.15.0 h1:urgKGqt2JAc9NFJcgncQcohHdiYb803YTH9OQwHBHIY=
 github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
 github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1XQp98QTaHernxMYzRaOasRir9hUlFQ=