From 99af6ce45f8eca0062524878b65eaa651df2db50 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 11 Sep 2024 09:57:31 +0200 Subject: [PATCH] feat(spot): added tenant select for public key check in ee version --- backend/pkg/spot/service/public_key.go | 3 +-- backend/pkg/spot/service/user.go | 3 +++ ee/backend/pkg/spot/service/user.go | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 backend/pkg/spot/service/user.go create mode 100644 ee/backend/pkg/spot/service/user.go diff --git a/backend/pkg/spot/service/public_key.go b/backend/pkg/spot/service/public_key.go index 96ff78c0f..28eab5aee 100644 --- a/backend/pkg/spot/service/public_key.go +++ b/backend/pkg/spot/service/public_key.go @@ -135,8 +135,7 @@ func (k *keysImpl) IsValid(key string) (*auth.User, error) { // Get user info by userID user := &auth.User{ID: userID, AuthMethod: "public-key"} // We don't need tenantID here - sql = `SELECT 1, name, email FROM public.users WHERE user_id = $1 AND deleted_at IS NULL LIMIT 1` - if err := k.conn.QueryRow(sql, userID).Scan(&user.TenantID, &user.Name, &user.Email); err != nil { + if err := k.conn.QueryRow(getUserSQL, userID).Scan(&user.TenantID, &user.Name, &user.Email); err != nil { k.log.Error(context.Background(), "failed to get user: %v", err) return nil, fmt.Errorf("user not found") } diff --git a/backend/pkg/spot/service/user.go b/backend/pkg/spot/service/user.go new file mode 100644 index 000000000..1f2b16c33 --- /dev/null +++ b/backend/pkg/spot/service/user.go @@ -0,0 +1,3 @@ +package service + +var getUserSQL = `SELECT 1, name, email FROM public.users WHERE user_id = $1 AND deleted_at IS NULL LIMIT 1` diff --git a/ee/backend/pkg/spot/service/user.go b/ee/backend/pkg/spot/service/user.go new file mode 100644 index 000000000..ec9e2bb69 --- /dev/null +++ b/ee/backend/pkg/spot/service/user.go @@ -0,0 +1,3 @@ +package service + +var getUserSQL = `SELECT tenant_id, name, email FROM public.users WHERE user_id = $1 AND deleted_at IS NULL LIMIT 1`