feat: support e-mail in get user

goto · Jan 18, 2024 · 83094a9 · 83094a9
1 parent 0b9608a
commit 83094a9
Show file tree

Hide file tree

Showing 21 changed files with 368 additions and 51 deletions.
diff --git a/core/user/service.go b/core/user/service.go
@@ -3,6 +3,8 @@ package user
 import (
 	"context"
 	"strings"
+
+	"github.com/goto/shield/pkg/uuid"
 )
 
 type Service struct {
@@ -15,6 +17,13 @@ func NewService(repository Repository) *Service {
 	}
 }
 
+func (s Service) Get(ctx context.Context, idOrEmail string) (User, error) {
+	if uuid.IsValid(idOrEmail) {
+		return s.repository.GetByID(ctx, idOrEmail)
+	}
+	return s.repository.GetByEmail(ctx, idOrEmail)
+}
+
 func (s Service) GetByID(ctx context.Context, id string) (User, error) {
 	return s.repository.GetByID(ctx, id)
 }

diff --git a/go.mod b/go.mod
@@ -145,6 +145,7 @@ require (
 	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/vektra/mockery v1.1.2 // indirect
 	github.com/yuin/goldmark v1.5.3 // indirect
 	github.com/yuin/goldmark-emoji v1.0.1 // indirect
 	go.uber.org/atomic v1.10.0 // indirect

diff --git a/go.sum b/go.sum
@@ -2058,6 +2058,8 @@ github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4=
+github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
@@ -2714,6 +2716,7 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=

diff --git a/internal/api/v1beta1/mocks/action_service.go b/internal/api/v1beta1/mocks/action_service.go
diff --git a/internal/api/v1beta1/mocks/group_service.go b/internal/api/v1beta1/mocks/group_service.go
diff --git a/internal/api/v1beta1/mocks/namespace_service.go b/internal/api/v1beta1/mocks/namespace_service.go
diff --git a/internal/api/v1beta1/mocks/organization_service.go b/internal/api/v1beta1/mocks/organization_service.go
diff --git a/internal/api/v1beta1/mocks/policy_service.go b/internal/api/v1beta1/mocks/policy_service.go
diff --git a/internal/api/v1beta1/mocks/project_service.go b/internal/api/v1beta1/mocks/project_service.go