Auth: Separate anonymous settings to its own struct (#97791)

separate anonymous settings to its own struct
This commit is contained in:
Jo
2024-12-13 10:46:27 +01:00
committed by GitHub
parent fc7805957e
commit 40d3b02648
18 changed files with 75 additions and 53 deletions
+18 -8
View File
@@ -30,16 +30,20 @@ func TestAnonymous_Authenticate(t *testing.T) {
desc: "should success with valid org configured",
org: &org.Org{ID: 1, Name: "some org"},
cfg: &setting.Cfg{
AnonymousOrgName: "some org",
AnonymousOrgRole: "Viewer",
Anonymous: setting.AnonymousSettings{
OrgRole: "Viewer",
OrgName: "some org",
},
},
},
{
desc: "should return error if any error occurs during org lookup",
err: fmt.Errorf("some error"),
cfg: &setting.Cfg{
AnonymousOrgName: "some org",
AnonymousOrgRole: "Viewer",
Anonymous: setting.AnonymousSettings{
OrgRole: "Viewer",
OrgName: "some org",
},
},
},
}
@@ -63,7 +67,7 @@ func TestAnonymous_Authenticate(t *testing.T) {
assert.Equal(t, "anonymous:0", user.GetID())
assert.Equal(t, tt.org.ID, user.OrgID)
assert.Equal(t, tt.org.Name, user.OrgName)
assert.Equal(t, tt.cfg.AnonymousOrgRole, string(user.GetOrgRole()))
assert.Equal(t, tt.cfg.Anonymous.OrgRole, string(user.GetOrgRole()))
}
})
}
@@ -86,7 +90,9 @@ func TestAnonymous_ResolveIdentity(t *testing.T) {
desc: "should return error when org id is not the configured one",
org: &org.Org{ID: 2, Name: "some org"},
cfg: &setting.Cfg{
AnonymousOrgName: "some org",
Anonymous: setting.AnonymousSettings{
OrgName: "some org",
},
},
orgID: 1,
typ: claims.TypeAnonymous,
@@ -97,7 +103,9 @@ func TestAnonymous_ResolveIdentity(t *testing.T) {
desc: "should return error when namespace id does not match anonymous namespace id",
org: &org.Org{ID: 1, Name: "some org"},
cfg: &setting.Cfg{
AnonymousOrgName: "some org",
Anonymous: setting.AnonymousSettings{
OrgName: "some org",
},
},
orgID: 1,
typ: claims.TypeAnonymous,
@@ -108,7 +116,9 @@ func TestAnonymous_ResolveIdentity(t *testing.T) {
desc: "should resolve identity",
org: &org.Org{ID: 1, Name: "some org"},
cfg: &setting.Cfg{
AnonymousOrgName: "some org",
Anonymous: setting.AnonymousSettings{
OrgName: "some org",
},
},
orgID: 1,
typ: claims.TypeAnonymous,