From b8e028b80dbc43f66991451655f5b1ffb7de22b1 Mon Sep 17 00:00:00 2001
From: ACoolName <acoolname@acooldomain.co>
Date: Wed, 9 Apr 2025 03:28:14 +0300
Subject: [PATCH] fixed invite bug

---
 config.yaml                                 |  2 --
 dbhandler/mongo/user_pass_authentication.go | 11 +++--------
 mail/mail.go                                | 12 ++++++------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/config.yaml b/config.yaml
index 0b78758..d188a16 100644
--- a/config.yaml
+++ b/config.yaml
@@ -19,8 +19,6 @@ authentication:
   user_pass:
     type: "mongo"
     initial_user:
-      username: ""
-      password: ""
       email: ""
     mongo:
       url: "mongodb://mongo:27107"
diff --git a/dbhandler/mongo/user_pass_authentication.go b/dbhandler/mongo/user_pass_authentication.go
index 43753c0..304c082 100644
--- a/dbhandler/mongo/user_pass_authentication.go
+++ b/dbhandler/mongo/user_pass_authentication.go
@@ -27,7 +27,6 @@ type UserPassAuthenticationDbHandler struct {
 
 func (self *UserPassAuthenticationDbHandler) ListUsers(ctx context.Context) ([]models.User, error) {
 	cursor, err := self.collection.Find(ctx, bson.M{})
-
 	if err != nil {
 		return nil, err
 	}
@@ -53,13 +52,11 @@ func (self *UserPassAuthenticationDbHandler) ListUsers(ctx context.Context) ([]m
 func (self *UserPassAuthenticationDbHandler) AuthenticateUser(ctx context.Context, username string, password string) (*models.User, error) {
 	var user AuthUser
 	err := self.collection.FindOne(ctx, bson.M{"username": username}).Decode(&user)
-
 	if err != nil {
 		return nil, err
 	}
 
 	err = bcrypt.CompareHashAndPassword([]byte(user.HashedPassword), []byte(password))
-
 	if err != nil {
 		return nil, err
 	}
@@ -82,7 +79,6 @@ func (self *UserPassAuthenticationDbHandler) CreateUser(
 	maxOwnedServers uint,
 ) error {
 	hashedPassword, err := dbhandler.HashPassword(password)
-
 	if err != nil {
 		return err
 	}
@@ -149,9 +145,9 @@ func NewUserPassAuthHandler(config models.MongoDBConfig) (*UserPassAuthenticatio
 }
 
 type InviteToken struct {
-	Email       string            `json:"email"`
-	Token       string            `json:"token"`
-	Permissions models.Permission `json:"permissions"`
+	Email       string            `bson:"email"`
+	Token       string            `bson:"token"`
+	Permissions models.Permission `bson:"permissions"`
 }
 
 type InviteTokenDbHandler struct {
@@ -167,7 +163,6 @@ func (self *ServersDbHandler) SaveInviteToken(ctx context.Context, email string,
 		Email:       email,
 		Token:       token,
 	})
-
 	if err != nil {
 		return "", err
 	}
diff --git a/mail/mail.go b/mail/mail.go
index cfec187..1a957c5 100644
--- a/mail/mail.go
+++ b/mail/mail.go
@@ -22,12 +22,12 @@ func NewMailClient(config models.EmailConfig) *MailClient {
 	}
 }
 
-func (self *MailClient) SendMail(
+func (mc *MailClient) SendMail(
 	recipient string,
 	subject string,
 	content string,
 ) error {
-	from := mail.Address{Name: "", Address: self.mailConfig.FromEmail}
+	from := mail.Address{Name: "", Address: mc.mailConfig.FromEmail}
 	to := mail.Address{Name: "", Address: recipient}
 
 	headers := make(map[string]string)
@@ -41,21 +41,21 @@ func (self *MailClient) SendMail(
 	}
 	message += "\r\n" + content
 
-	conn, err := tls.Dial("tcp", self.mailConfig.Server+":465", &tls.Config{ServerName: self.mailConfig.Server})
+	conn, err := tls.Dial("tcp", mc.mailConfig.Server+":465", &tls.Config{ServerName: mc.mailConfig.Server})
 	if err != nil {
 		return err
 	}
 
-	client, err := smtp.NewClient(conn, self.mailConfig.Server)
+	client, err := smtp.NewClient(conn, mc.mailConfig.Server)
 	if err != nil {
 		return err
 	}
 
-	if err = client.Auth(*self.auth); err != nil {
+	if err = client.Auth(*mc.auth); err != nil {
 		return err
 	}
 
-	if err = client.Mail(self.mailConfig.FromEmail); err != nil {
+	if err = client.Mail(mc.mailConfig.FromEmail); err != nil {
 		return err
 	}