From 568498475564a7ae882b3929ea88cc16e733f3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Wed, 18 Feb 2026 18:20:45 +0400 Subject: [PATCH] Fix bot review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Émile Ré --- pkg/server/api/connect/v1/resolver.go | 5 +++++ pkg/server/api/connect/v1/v1_resolver.go | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/server/api/connect/v1/resolver.go b/pkg/server/api/connect/v1/resolver.go index 97f3082a8..782347c99 100644 --- a/pkg/server/api/connect/v1/resolver.go +++ b/pkg/server/api/connect/v1/resolver.go @@ -23,6 +23,7 @@ import ( "github.com/go-chi/chi/v5" "go.gearno.de/kit/log" "go.probo.inc/probo/pkg/baseurl" + "go.probo.inc/probo/pkg/gid" "go.probo.inc/probo/pkg/iam" "go.probo.inc/probo/pkg/securecookie" "go.probo.inc/probo/pkg/server/api/authn" @@ -66,3 +67,7 @@ func NewMux(logger *log.Logger, svc *iam.Service, cookieConfig securecookie.Conf func (r *Resolver) Permission(ctx context.Context, obj types.Node, action string) (bool, error) { return r.authorize(ctx, obj.GetID(), action) == nil, nil } + +func (r *Resolver) SSOLoginURL(samlConfigID gid.GID) string { + return r.baseURL.WithPath("/api/connect/v1/saml/2.0/" + samlConfigID.String()).MustString() +} diff --git a/pkg/server/api/connect/v1/v1_resolver.go b/pkg/server/api/connect/v1/v1_resolver.go index 2c9a78baf..71cc26252 100644 --- a/pkg/server/api/connect/v1/v1_resolver.go +++ b/pkg/server/api/connect/v1/v1_resolver.go @@ -194,13 +194,13 @@ func (r *identityResolver) SsoLoginURL(ctx context.Context, obj *types.Identity) return nil, gqlutils.Internal(ctx) } - samlConfig := samlConfigs[0] - if samlConfig == nil { + if len(samlConfigs) == 0 { r.logger.ErrorCtx(ctx, "cannot find SAML config") return nil, gqlutils.NotFoundf(ctx, "cannot find SAML config") } + samlConfig := samlConfigs[0] - loginURL := r.baseURL.WithPath("/api/connect/v1/saml/2.0/" + samlConfig.ID.String()).MustString() + loginURL := r.SSOLoginURL(samlConfig.ID) return &loginURL, nil } @@ -1757,7 +1757,8 @@ func (r *queryResolver) SsoLoginURL(ctx context.Context, email mail.Addr) (*stri } samlConfig := samlConfigs[0] - loginURL := r.baseURL.WithPath("/api/connect/v1/saml/2.0/" + samlConfig.ID.String()).MustString() + loginURL := r.SSOLoginURL(samlConfig.ID) + return &loginURL, nil }