From e568c5b9c88efa22d5f01d34d640a12d25c174d6 Mon Sep 17 00:00:00 2001 From: Aravinth Manivannan Date: Mon, 25 Mar 2024 18:37:55 +0530 Subject: [PATCH] feat: test webfinger with webfinger datatypes --- tests/integration/webfinger_test.go | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/tests/integration/webfinger_test.go b/tests/integration/webfinger_test.go index 7e6d46063..c225d954e 100644 --- a/tests/integration/webfinger_test.go +++ b/tests/integration/webfinger_test.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/services/forgefed" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -29,27 +30,12 @@ func TestWebfinger(t *testing.T) { appURL, _ := url.Parse(setting.AppURL) - type webfingerLink struct { - Rel string `json:"rel,omitempty"` - Type string `json:"type,omitempty"` - Href string `json:"href,omitempty"` - Titles map[string]string `json:"titles,omitempty"` - Properties map[string]any `json:"properties,omitempty"` - } - - type webfingerJRD struct { - Subject string `json:"subject,omitempty"` - Aliases []string `json:"aliases,omitempty"` - Properties map[string]any `json:"properties,omitempty"` - Links []*webfingerLink `json:"links,omitempty"` - } - session := loginUser(t, "user1") req := NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=acct:%s@%s", user.LowerName, appURL.Host)) resp := MakeRequest(t, req, http.StatusOK) - var jrd webfingerJRD + var jrd forgefed.WebfingerJRD DecodeJSON(t, resp, &jrd) assert.Equal(t, "acct:user2@"+appURL.Host, jrd.Subject) assert.ElementsMatch(t, []string{user.HTMLURL(), appURL.String() + "api/v1/activitypub/user-id/" + fmt.Sprint(user.ID)}, jrd.Aliases)