plz

auth/auth.go

@@ -84,13 +84,13 @@ func (con *AuthApi) LoggedIn(ctx *gin.Context) {
 }
 
 type SignUpRequest struct {
-	Token    string
-	Username string
-	Password string
+	Username string `json:"username"`
+	Password string `json:"password"`
 }
 
 func (con AuthApi) signUp(ctx *gin.Context) {
 	var request SignUpRequest
+	rawToken := ctx.Query("token")
 
 	err := json.NewDecoder(ctx.Request.Body).Decode(&request)
 	if err != nil {
@@ -98,7 +98,7 @@ func (con AuthApi) signUp(ctx *gin.Context) {
 		return
 	}
 
-	token, err := con.tokenHandler.GetInviteToken(ctx, request.Token)
+	token, err := con.tokenHandler.GetInviteToken(ctx, rawToken)
 	if err != nil {
 		ctx.AbortWithError(500, err)
 		return

config.yaml

@@ -19,8 +19,6 @@ authentication:
   user_pass:
     type: "mongo"
     initial_user:
-      username: ""
-      password: ""
       email: ""
     mongo:
       url: "mongodb://mongo:27107"

dbhandler/mongo/user_pass_authentication.go

@@ -25,9 +25,8 @@ type UserPassAuthenticationDbHandler struct {
 	collection *mongo.Collection
 }
 
-func (self *UserPassAuthenticationDbHandler) ListUsers(ctx context.Context) ([]models.User, error) {
-	cursor, err := self.collection.Find(ctx, bson.M{})
-
+func (i *UserPassAuthenticationDbHandler) ListUsers(ctx context.Context) ([]models.User, error) {
+	cursor, err := i.collection.Find(ctx, bson.M{})
 	if err != nil {
 		return nil, err
 	}
@@ -50,16 +49,14 @@ func (self *UserPassAuthenticationDbHandler) ListUsers(ctx context.Context) ([]m
 	return modelUsers, nil
 }
 
-func (self *UserPassAuthenticationDbHandler) AuthenticateUser(ctx context.Context, username string, password string) (*models.User, error) {
+func (i *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)
-
+	err := i.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
 	}
@@ -73,7 +70,7 @@ func (self *UserPassAuthenticationDbHandler) AuthenticateUser(ctx context.Contex
 	}, nil
 }
 
-func (self *UserPassAuthenticationDbHandler) CreateUser(
+func (i *UserPassAuthenticationDbHandler) CreateUser(
 	ctx context.Context,
 	username string,
 	password string,
@@ -82,12 +79,11 @@ func (self *UserPassAuthenticationDbHandler) CreateUser(
 	maxOwnedServers uint,
 ) error {
 	hashedPassword, err := dbhandler.HashPassword(password)
-
 	if err != nil {
 		return err
 	}
 
-	_, err = self.collection.InsertOne(ctx, &AuthUser{
+	_, err = i.collection.InsertOne(ctx, &AuthUser{
 		Username:       username,
 		HashedPassword: hashedPassword,
 		Permissions:    permissions,
@@ -98,16 +94,16 @@ func (self *UserPassAuthenticationDbHandler) CreateUser(
 	return err
 }
 
-func (self *UserPassAuthenticationDbHandler) CountUsers(ctx context.Context) (uint, error) {
-	count, err := self.collection.CountDocuments(ctx, bson.M{})
+func (i *UserPassAuthenticationDbHandler) CountUsers(ctx context.Context) (uint, error) {
+	count, err := i.collection.CountDocuments(ctx, bson.M{})
 	if err != nil {
 		return 0, err
 	}
 	return uint(count), nil
 }
 
-func (self *UserPassAuthenticationDbHandler) RemoveUser(ctx context.Context, username string) error {
-	_, err := self.collection.DeleteOne(
+func (i *UserPassAuthenticationDbHandler) RemoveUser(ctx context.Context, username string) error {
+	_, err := i.collection.DeleteOne(
 		ctx,
 		bson.M{
 			"username": username,
@@ -117,12 +113,12 @@ func (self *UserPassAuthenticationDbHandler) RemoveUser(ctx context.Context, use
 	return err
 }
 
-func (self *UserPassAuthenticationDbHandler) SetPermissions(
+func (i *UserPassAuthenticationDbHandler) SetPermissions(
 	ctx context.Context,
 	username string,
 	permissions models.Permission,
 ) error {
-	_, err := self.collection.UpdateOne(
+	_, err := i.collection.UpdateOne(
 		ctx,
 		bson.M{
 			"username": username,
@@ -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 {
@@ -159,15 +155,14 @@ type InviteTokenDbHandler struct {
 	collection *mongo.Collection
 }
 
-func (self *ServersDbHandler) SaveInviteToken(ctx context.Context, email string, permissions models.Permission) (string, error) {
+func (i *InviteTokenDbHandler) SaveInviteToken(ctx context.Context, email string, permissions models.Permission) (string, error) {
 	token := uuid.NewString()
 
-	_, err := self.collection.InsertOne(ctx, &InviteToken{
+	_, err := i.collection.InsertOne(ctx, &InviteToken{
 		Permissions: permissions,
 		Email:       email,
 		Token:       token,
 	})
-
 	if err != nil {
 		return "", err
 	}
@@ -175,9 +170,9 @@ func (self *ServersDbHandler) SaveInviteToken(ctx context.Context, email string,
 	return token, nil
 }
 
-func (self *ServersDbHandler) GetInviteToken(ctx context.Context, token string) (*dbhandler.InviteToken, error) {
+func (i *InviteTokenDbHandler) GetInviteToken(ctx context.Context, token string) (*dbhandler.InviteToken, error) {
 	var inviteToken InviteToken
-	err := self.collection.FindOne(ctx, bson.M{"token": token}).Decode(&inviteToken)
+	err := i.collection.FindOne(ctx, bson.M{"token": token}).Decode(&inviteToken)
 	if err != nil {
 		return nil, err
 	}

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
 	}