mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
711d688294
# Which Problems Are Solved When resolving the organization for a self-registration, the resource owner was determined only from an explicitly requested org, falling back to the default org. The login policy applied to the same request, however, is resolved from the requested org, the user org, and only then the default org. As a result the two could diverge — e.g. after the login context had already resolved a user's organization — and a user could be registered in a different organization than the one whose settings were evaluated for the request. # How the Problems Are Solved `determineResourceOwner` now uses the same resolution order as the policy lookup (requested org, then user org, then default org), so the organization a user is registered in matches the one the request was evaluated against. # Additional Changes Added a unit test covering the resolution order. # Additional Context Aligns login v1 registration org resolution with the behavior in login v2. Co-authored-by: Claude Opus 4.8 <[email protected]>
53 lines
1.7 KiB
Go
53 lines
1.7 KiB
Go
package login
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
)
|
|
|
|
func Test_determineResourceOwner(t *testing.T) {
|
|
// Note: the nil-authRequest and "both empty" cases fall back to
|
|
// authz.GetInstance(ctx).DefaultOrganisationID() and are covered by the
|
|
// integration/handler tests where an instance is present in the context.
|
|
// Here we lock the resolution order for the cases that do not touch the
|
|
// instance: RequestedOrgID takes precedence over UserOrgID, and UserOrgID
|
|
// is used as the fallback before the default org.
|
|
tests := []struct {
|
|
name string
|
|
authRequest *domain.AuthRequest
|
|
want string
|
|
}{
|
|
{
|
|
name: "requested org wins over user org",
|
|
authRequest: &domain.AuthRequest{RequestedOrgID: "requested", UserOrgID: "user"},
|
|
want: "requested",
|
|
},
|
|
{
|
|
name: "requested org only",
|
|
authRequest: &domain.AuthRequest{RequestedOrgID: "requested"},
|
|
want: "requested",
|
|
},
|
|
{
|
|
name: "user org used when no requested org (matches fillPolicies resolution)",
|
|
authRequest: &domain.AuthRequest{UserOrgID: "user"},
|
|
want: "user",
|
|
},
|
|
{
|
|
// domain discovery sets BOTH RequestedOrgID and UserOrgID to the
|
|
// discovered org, so it still resolves to the discovered org.
|
|
name: "domain discovery result",
|
|
authRequest: &domain.AuthRequest{RequestedOrgID: "discovered", UserOrgID: "discovered"},
|
|
want: "discovered",
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := determineResourceOwner(context.Background(), tt.authRequest); got != tt.want {
|
|
t.Errorf("determineResourceOwner() = %q, want %q", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|