ACME证书增加ZeroSSL支持

internal/rpc/services/service_acme_provider.go

@@ -0,0 +1,62 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package services
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/acme"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+// ACMEProviderService ACME服务商
+type ACMEProviderService struct {
+	BaseService
+}
+
+// FindAllACMEProviders 查找所有的服务商
+func (this *ACMEProviderService) FindAllACMEProviders(ctx context.Context, req *pb.FindAllACMEProvidersRequest) (*pb.FindAllACMEProvidersResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var pbProviders = []*pb.ACMEProvider{}
+	for _, provider := range acme.FindAllProviders() {
+		pbProviders = append(pbProviders, &pb.ACMEProvider{
+			Name:           provider.Name,
+			Code:           provider.Code,
+			Description:    provider.Description,
+			ApiURL:         provider.APIURL,
+			RequireEAB:     provider.RequireEAB,
+			EabDescription: provider.EABDescription,
+		})
+	}
+
+	return &pb.FindAllACMEProvidersResponse{AcmeProviders: pbProviders}, nil
+}
+
+// FindACMEProviderWithCode 根据代号查找服务商
+func (this *ACMEProviderService) FindACMEProviderWithCode(ctx context.Context, req *pb.FindACMEProviderWithCodeRequest) (*pb.FindACMEProviderWithCodeResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var provider = acme.FindProviderWithCode(req.AcmeProviderCode)
+	if provider == nil {
+		return &pb.FindACMEProviderWithCodeResponse{
+			AcmeProvider: nil,
+		}, nil
+	}
+
+	return &pb.FindACMEProviderWithCodeResponse{
+		AcmeProvider: &pb.ACMEProvider{
+			Name:           provider.Name,
+			Code:           provider.Code,
+			Description:    provider.Description,
+			ApiURL:         provider.APIURL,
+			RequireEAB:     provider.RequireEAB,
+			EabDescription: provider.EABDescription,
+		},
+	}, nil
+}

internal/rpc/services/service_acme_provider_account.go

@@ -0,0 +1,203 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package services
+
+import (
+	"context"
+	acmeutils "github.com/TeaOSLab/EdgeAPI/internal/acme"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/acme"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+// ACMEProviderAccountService ACME服务商账号服务
+type ACMEProviderAccountService struct {
+	BaseService
+}
+
+// CreateACMEProviderAccount 创建服务商账号
+func (this *ACMEProviderAccountService) CreateACMEProviderAccount(ctx context.Context, req *pb.CreateACMEProviderAccountRequest) (*pb.CreateACMEProviderAccountResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	accountId, err := acme.SharedACMEProviderAccountDAO.CreateAccount(tx, req.Name, req.ProviderCode, req.EabKid, req.EabKey)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.CreateACMEProviderAccountResponse{
+		AcmeProviderAccountId: accountId,
+	}, nil
+}
+
+// FindAllACMEProviderAccountsWithProviderCode 使用代号查找服务商账号
+func (this *ACMEProviderAccountService) FindAllACMEProviderAccountsWithProviderCode(ctx context.Context, req *pb.FindAllACMEProviderAccountsWithProviderCodeRequest) (*pb.FindAllACMEProviderAccountsWithProviderCodeResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	accounts, err := acme.SharedACMEProviderAccountDAO.FindAllEnabledAccountsWithProviderCode(tx, req.AcmeProviderCode)
+	if err != nil {
+		return nil, err
+	}
+	var pbAccounts = []*pb.ACMEProviderAccount{}
+	for _, account := range accounts {
+		var pbProvider *pb.ACMEProvider
+		provider := acmeutils.FindProviderWithCode(account.ProviderCode)
+		if provider != nil {
+			pbProvider = &pb.ACMEProvider{
+				Name:        provider.Name,
+				Code:        provider.Code,
+				Description: provider.Description,
+				ApiURL:      provider.APIURL,
+				RequireEAB:  provider.RequireEAB,
+			}
+		}
+
+		pbAccounts = append(pbAccounts, &pb.ACMEProviderAccount{
+			Id:           int64(account.Id),
+			Name:         account.Name,
+			ProviderCode: account.ProviderCode,
+			IsOn:         account.IsOn == 1,
+			EabKid:       account.EabKid,
+			EabKey:       account.EabKey,
+			Error:        account.Error,
+			AcmeProvider: pbProvider,
+		})
+	}
+
+	return &pb.FindAllACMEProviderAccountsWithProviderCodeResponse{
+		AcmeProviderAccounts: pbAccounts,
+	}, nil
+}
+
+// UpdateACMEProviderAccount 修改服务商账号
+func (this *ACMEProviderAccountService) UpdateACMEProviderAccount(ctx context.Context, req *pb.UpdateACMEProviderAccountRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = acme.SharedACMEProviderAccountDAO.UpdateAccount(tx, req.AcmeProviderAccountId, req.Name, req.EabKid, req.EabKey)
+	if err != nil {
+		return nil, err
+	}
+	return this.Success()
+}
+
+// DeleteACMEProviderAccount 删除服务商账号
+func (this *ACMEProviderAccountService) DeleteACMEProviderAccount(ctx context.Context, req *pb.DeleteACMEProviderAccountRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = acme.SharedACMEProviderAccountDAO.DisableACMEProviderAccount(tx, req.AcmeProviderAccountId)
+	if err != nil {
+		return nil, err
+	}
+	return this.Success()
+}
+
+// FindEnabledACMEProviderAccount 查找单个服务商账号
+func (this *ACMEProviderAccountService) FindEnabledACMEProviderAccount(ctx context.Context, req *pb.FindEnabledACMEProviderAccountRequest) (*pb.FindEnabledACMEProviderAccountResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	account, err := acme.SharedACMEProviderAccountDAO.FindEnabledACMEProviderAccount(tx, req.AcmeProviderAccountId)
+	if err != nil {
+		return nil, err
+	}
+	if account == nil {
+		return &pb.FindEnabledACMEProviderAccountResponse{AcmeProviderAccount: nil}, nil
+	}
+
+	var pbProvider *pb.ACMEProvider
+	provider := acmeutils.FindProviderWithCode(account.ProviderCode)
+	if provider != nil {
+		pbProvider = &pb.ACMEProvider{
+			Name:           provider.Name,
+			Code:           provider.Code,
+			Description:    provider.Description,
+			ApiURL:         provider.APIURL,
+			RequireEAB:     provider.RequireEAB,
+			EabDescription: provider.EABDescription,
+		}
+	}
+
+	return &pb.FindEnabledACMEProviderAccountResponse{AcmeProviderAccount: &pb.ACMEProviderAccount{
+		Id:           int64(account.Id),
+		Name:         account.Name,
+		ProviderCode: account.ProviderCode,
+		IsOn:         account.IsOn == 1,
+		EabKid:       account.EabKid,
+		EabKey:       account.EabKey,
+		Error:        account.Error,
+		AcmeProvider: pbProvider,
+	}}, nil
+}
+
+// CountAllEnabledACMEProviderAccounts 计算所有服务商账号数量
+func (this *ACMEProviderAccountService) CountAllEnabledACMEProviderAccounts(ctx context.Context, req *pb.CountAllEnabledACMEProviderAccountsRequest) (*pb.RPCCountResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	count, err := acme.SharedACMEProviderAccountDAO.CountAllEnabledAccounts(tx)
+	if err != nil {
+		return nil, err
+	}
+	return this.SuccessCount(count)
+}
+
+// ListEnabledACMEProviderAccounts 列出单页服务商账号
+func (this *ACMEProviderAccountService) ListEnabledACMEProviderAccounts(ctx context.Context, req *pb.ListEnabledACMEProviderAccountsRequest) (*pb.ListEnabledACMEProviderAccountsResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	accounts, err := acme.SharedACMEProviderAccountDAO.ListEnabledAccounts(tx, req.Offset, req.Size)
+	if err != nil {
+		return nil, err
+	}
+	var pbAccounts = []*pb.ACMEProviderAccount{}
+	for _, account := range accounts {
+		var pbProvider *pb.ACMEProvider
+		provider := acmeutils.FindProviderWithCode(account.ProviderCode)
+		if provider != nil {
+			pbProvider = &pb.ACMEProvider{
+				Name:           provider.Name,
+				Code:           provider.Code,
+				Description:    provider.Description,
+				ApiURL:         provider.APIURL,
+				RequireEAB:     provider.RequireEAB,
+				EabDescription: provider.EABDescription,
+			}
+		}
+
+		pbAccounts = append(pbAccounts, &pb.ACMEProviderAccount{
+			Id:           int64(account.Id),
+			Name:         account.Name,
+			ProviderCode: account.ProviderCode,
+			IsOn:         account.IsOn == 1,
+			EabKid:       account.EabKid,
+			EabKey:       account.EabKey,
+			Error:        account.Error,
+			AcmeProvider: pbProvider,
+		})
+	}
+
+	return &pb.ListEnabledACMEProviderAccountsResponse{AcmeProviderAccounts: pbAccounts}, nil
+}

internal/rpc/services/service_acme_task.go

@@ -98,7 +98,50 @@ func (this *ACMETaskService) ListEnabledACMETasks(ctx context.Context, req *pb.L
 			CreatedAt:   int64(acmeUser.CreatedAt),
 		}
 
-		var pbProvider *pb.DNSProvider
+		// 服务商
+		if len(acmeUser.ProviderCode) == 0 {
+			acmeUser.ProviderCode = acme.DefaultProviderCode
+		}
+		var provider = acme.FindProviderWithCode(acmeUser.ProviderCode)
+		if provider != nil {
+			pbACMEUser.AcmeProvider = &pb.ACMEProvider{
+				Name:           provider.Name,
+				Code:           provider.Code,
+				Description:    provider.Description,
+				RequireEAB:     provider.RequireEAB,
+				EabDescription: provider.EABDescription,
+			}
+		}
+
+		// 账号
+		if acmeUser.AccountId > 0 {
+			account, err := acmemodels.SharedACMEProviderAccountDAO.FindEnabledACMEProviderAccount(tx, int64(acmeUser.AccountId))
+			if err != nil {
+				return nil, err
+			}
+			if account != nil {
+				pbACMEUser.AcmeProviderAccount = &pb.ACMEProviderAccount{
+					Id:           int64(account.Id),
+					Name:         account.Name,
+					IsOn:         account.IsOn == 1,
+					ProviderCode: account.ProviderCode,
+					AcmeProvider: nil,
+				}
+
+				var provider = acme.FindProviderWithCode(account.ProviderCode)
+				if provider != nil {
+					pbACMEUser.AcmeProviderAccount.AcmeProvider = &pb.ACMEProvider{
+						Name:           provider.Name,
+						Code:           provider.Code,
+						Description:    provider.Description,
+						RequireEAB:     provider.RequireEAB,
+						EabDescription: provider.EABDescription,
+					}
+				}
+			}
+		}
+
+		var pbDNSProvider *pb.DNSProvider
 		if task.AuthType == acme.AuthTypeDNS {
 			// DNS
 			provider, err := dns.SharedDNSProviderDAO.FindEnabledDNSProvider(tx, int64(task.DnsProviderId))
@@ -108,7 +151,7 @@ func (this *ACMETaskService) ListEnabledACMETasks(ctx context.Context, req *pb.L
 			if provider == nil {
 				continue
 			}
-			pbProvider = &pb.DNSProvider{
+			pbDNSProvider = &pb.DNSProvider{
 				Id:       int64(provider.Id),
 				Name:     provider.Name,
 				Type:     provider.Type,
@@ -158,7 +201,7 @@ func (this *ACMETaskService) ListEnabledACMETasks(ctx context.Context, req *pb.L
 			CreatedAt:         int64(task.CreatedAt),
 			AutoRenew:         task.AutoRenew == 1,
 			AcmeUser:          pbACMEUser,
-			DnsProvider:       pbProvider,
+			DnsProvider:       pbDNSProvider,
 			SslCert:           pbCert,
 			LatestACMETaskLog: pbTaskLog,
 			AuthType:          task.AuthType,
@@ -301,6 +344,49 @@ func (this *ACMETaskService) FindEnabledACMETask(ctx context.Context, req *pb.Fi
 				Description: acmeUser.Description,
 				CreatedAt:   int64(acmeUser.CreatedAt),
 			}
+
+			// 服务商
+			if len(acmeUser.ProviderCode) == 0 {
+				acmeUser.ProviderCode = acme.DefaultProviderCode
+			}
+			var provider = acme.FindProviderWithCode(acmeUser.ProviderCode)
+			if provider != nil {
+				pbACMEUser.AcmeProvider = &pb.ACMEProvider{
+					Name:           provider.Name,
+					Code:           provider.Code,
+					Description:    provider.Description,
+					RequireEAB:     provider.RequireEAB,
+					EabDescription: provider.EABDescription,
+				}
+			}
+
+			// 账号
+			if acmeUser.AccountId > 0 {
+				account, err := acmemodels.SharedACMEProviderAccountDAO.FindEnabledACMEProviderAccount(tx, int64(acmeUser.AccountId))
+				if err != nil {
+					return nil, err
+				}
+				if account != nil {
+					pbACMEUser.AcmeProviderAccount = &pb.ACMEProviderAccount{
+						Id:           int64(account.Id),
+						Name:         account.Name,
+						IsOn:         account.IsOn == 1,
+						ProviderCode: account.ProviderCode,
+						AcmeProvider: nil,
+					}
+
+					var provider = acme.FindProviderWithCode(account.ProviderCode)
+					if provider != nil {
+						pbACMEUser.AcmeProviderAccount.AcmeProvider = &pb.ACMEProvider{
+							Name:           provider.Name,
+							Code:           provider.Code,
+							Description:    provider.Description,
+							RequireEAB:     provider.RequireEAB,
+							EabDescription: provider.EABDescription,
+						}
+					}
+				}
+			}
 		}
 	}
 

internal/rpc/services/service_acme_user.go

@@ -2,16 +2,17 @@ package services
 
 import (
 	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/acme"
 	acmemodels "github.com/TeaOSLab/EdgeAPI/internal/db/models/acme"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
-// 用户服务
+// ACMEUserService 用户服务
 type ACMEUserService struct {
 	BaseService
 }
 
-// 创建用户
+// CreateACMEUser 创建用户
 func (this *ACMEUserService) CreateACMEUser(ctx context.Context, req *pb.CreateACMEUserRequest) (*pb.CreateACMEUserResponse, error) {
 	// 校验请求
 	adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
@@ -21,14 +22,14 @@ func (this *ACMEUserService) CreateACMEUser(ctx context.Context, req *pb.CreateA
 
 	tx := this.NullTx()
 
-	acmeUserId, err := acmemodels.SharedACMEUserDAO.CreateACMEUser(tx, adminId, userId, req.Email, req.Description)
+	acmeUserId, err := acmemodels.SharedACMEUserDAO.CreateACMEUser(tx, adminId, userId, req.AcmeProviderCode, req.AcmeProviderAccountId, req.Email, req.Description)
 	if err != nil {
 		return nil, err
 	}
 	return &pb.CreateACMEUserResponse{AcmeUserId: acmeUserId}, nil
 }
 
-// 修改用户
+// UpdateACMEUser 修改用户
 func (this *ACMEUserService) UpdateACMEUser(ctx context.Context, req *pb.UpdateACMEUserRequest) (*pb.RPCSuccess, error) {
 	// 校验请求
 	adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
@@ -54,7 +55,7 @@ func (this *ACMEUserService) UpdateACMEUser(ctx context.Context, req *pb.UpdateA
 	return this.Success()
 }
 
-// 删除用户
+// DeleteACMEUser 删除用户
 func (this *ACMEUserService) DeleteACMEUser(ctx context.Context, req *pb.DeleteACMEUserRequest) (*pb.RPCSuccess, error) {
 	// 校验请求
 	adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
@@ -80,7 +81,7 @@ func (this *ACMEUserService) DeleteACMEUser(ctx context.Context, req *pb.DeleteA
 	return this.Success()
 }
 
-// 计算用户数量
+// CountACMEUsers 计算用户数量
 func (this *ACMEUserService) CountACMEUsers(ctx context.Context, req *pb.CountAcmeUsersRequest) (*pb.RPCCountResponse, error) {
 	// 校验请求
 	adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId)
@@ -97,7 +98,7 @@ func (this *ACMEUserService) CountACMEUsers(ctx context.Context, req *pb.CountAc
 	return this.SuccessCount(count)
 }
 
-// 列出单页用户
+// ListACMEUsers 列出单页用户
 func (this *ACMEUserService) ListACMEUsers(ctx context.Context, req *pb.ListACMEUsersRequest) (*pb.ListACMEUsersResponse, error) {
 	// 校验请求
 	adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId)
@@ -113,17 +114,63 @@ func (this *ACMEUserService) ListACMEUsers(ctx context.Context, req *pb.ListACME
 	}
 	result := []*pb.ACMEUser{}
 	for _, user := range acmeUsers {
-		result = append(result, &pb.ACMEUser{
-			Id:          int64(user.Id),
-			Email:       user.Email,
-			Description: user.Description,
-			CreatedAt:   int64(user.CreatedAt),
-		})
+		var pbUser = &pb.ACMEUser{
+			Id:               int64(user.Id),
+			Email:            user.Email,
+			Description:      user.Description,
+			CreatedAt:        int64(user.CreatedAt),
+			AcmeProviderCode: user.ProviderCode,
+		}
+
+		// 服务商
+		if len(user.ProviderCode) == 0 {
+			user.ProviderCode = acme.DefaultProviderCode
+		}
+		var provider = acme.FindProviderWithCode(user.ProviderCode)
+		if provider != nil {
+			pbUser.AcmeProvider = &pb.ACMEProvider{
+				Name:           provider.Name,
+				Code:           provider.Code,
+				Description:    provider.Description,
+				RequireEAB:     provider.RequireEAB,
+				EabDescription: provider.EABDescription,
+			}
+		}
+
+		// 账号
+		if user.AccountId > 0 {
+			account, err := acmemodels.SharedACMEProviderAccountDAO.FindEnabledACMEProviderAccount(tx, int64(user.AccountId))
+			if err != nil {
+				return nil, err
+			}
+			if account != nil {
+				pbUser.AcmeProviderAccount = &pb.ACMEProviderAccount{
+					Id:           int64(account.Id),
+					Name:         account.Name,
+					IsOn:         account.IsOn == 1,
+					ProviderCode: account.ProviderCode,
+					AcmeProvider: nil,
+				}
+
+				var provider = acme.FindProviderWithCode(account.ProviderCode)
+				if provider != nil {
+					pbUser.AcmeProviderAccount.AcmeProvider = &pb.ACMEProvider{
+						Name:           provider.Name,
+						Code:           provider.Code,
+						Description:    provider.Description,
+						RequireEAB:     provider.RequireEAB,
+						EabDescription: provider.EABDescription,
+					}
+				}
+			}
+		}
+
+		result = append(result, pbUser)
 	}
 	return &pb.ListACMEUsersResponse{AcmeUsers: result}, nil
 }
 
-// 查找单个用户
+// FindEnabledACMEUser 查找单个用户
 func (this *ACMEUserService) FindEnabledACMEUser(ctx context.Context, req *pb.FindEnabledACMEUserRequest) (*pb.FindEnabledACMEUserResponse, error) {
 	// 校验请求
 	adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
@@ -149,15 +196,61 @@ func (this *ACMEUserService) FindEnabledACMEUser(ctx context.Context, req *pb.Fi
 	if acmeUser == nil {
 		return &pb.FindEnabledACMEUserResponse{AcmeUser: nil}, nil
 	}
-	return &pb.FindEnabledACMEUserResponse{AcmeUser: &pb.ACMEUser{
-		Id:          int64(acmeUser.Id),
-		Email:       acmeUser.Email,
-		Description: acmeUser.Description,
-		CreatedAt:   int64(acmeUser.CreatedAt),
-	}}, nil
+
+	// 服务商
+	var pbACMEUser = &pb.ACMEUser{
+		Id:               int64(acmeUser.Id),
+		Email:            acmeUser.Email,
+		Description:      acmeUser.Description,
+		CreatedAt:        int64(acmeUser.CreatedAt),
+		AcmeProviderCode: acmeUser.ProviderCode,
+	}
+	if len(acmeUser.ProviderCode) == 0 {
+		acmeUser.ProviderCode = acme.DefaultProviderCode
+	}
+	var provider = acme.FindProviderWithCode(acmeUser.ProviderCode)
+	if provider != nil {
+		pbACMEUser.AcmeProvider = &pb.ACMEProvider{
+			Name:           provider.Name,
+			Code:           provider.Code,
+			Description:    provider.Description,
+			RequireEAB:     provider.RequireEAB,
+			EabDescription: provider.EABDescription,
+		}
+	}
+
+	// 账号
+	if acmeUser.AccountId > 0 {
+		account, err := acmemodels.SharedACMEProviderAccountDAO.FindEnabledACMEProviderAccount(tx, int64(acmeUser.AccountId))
+		if err != nil {
+			return nil, err
+		}
+		if account != nil {
+			pbACMEUser.AcmeProviderAccount = &pb.ACMEProviderAccount{
+				Id:           int64(account.Id),
+				Name:         account.Name,
+				IsOn:         account.IsOn == 1,
+				ProviderCode: account.ProviderCode,
+				AcmeProvider: nil,
+			}
+
+			var provider = acme.FindProviderWithCode(account.ProviderCode)
+			if provider != nil {
+				pbACMEUser.AcmeProviderAccount.AcmeProvider = &pb.ACMEProvider{
+					Name:           provider.Name,
+					Code:           provider.Code,
+					Description:    provider.Description,
+					RequireEAB:     provider.RequireEAB,
+					EabDescription: provider.EABDescription,
+				}
+			}
+		}
+	}
+
+	return &pb.FindEnabledACMEUserResponse{AcmeUser: pbACMEUser}, nil
 }
 
-// 查找所有用户
+// FindAllACMEUsers 查找所有用户
 func (this *ACMEUserService) FindAllACMEUsers(ctx context.Context, req *pb.FindAllACMEUsersRequest) (*pb.FindAllACMEUsersResponse, error) {
 	// 校验请求
 	adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, req.UserId)
@@ -167,17 +260,18 @@ func (this *ACMEUserService) FindAllACMEUsers(ctx context.Context, req *pb.FindA
 
 	tx := this.NullTx()
 
-	acmeUsers, err := acmemodels.SharedACMEUserDAO.FindAllACMEUsers(tx, adminId, userId)
+	acmeUsers, err := acmemodels.SharedACMEUserDAO.FindAllACMEUsers(tx, adminId, userId, req.AcmeProviderCode)
 	if err != nil {
 		return nil, err
 	}
 	result := []*pb.ACMEUser{}
 	for _, user := range acmeUsers {
 		result = append(result, &pb.ACMEUser{
-			Id:          int64(user.Id),
-			Email:       user.Email,
-			Description: user.Description,
-			CreatedAt:   int64(user.CreatedAt),
+			Id:               int64(user.Id),
+			Email:            user.Email,
+			Description:      user.Description,
+			CreatedAt:        int64(user.CreatedAt),
+			AcmeProviderCode: user.ProviderCode,
 		})
 	}
 	return &pb.FindAllACMEUsersResponse{AcmeUsers: result}, nil