feat: update gitea vendor

package/gitea/source/tests/integration/api_oauth2_apps_test.go

@@ -8,13 +8,16 @@ import (
 	"net/http"
 	"testing"
 
-	auth_model "code.gitea.io/gitea/models/auth"
-	"code.gitea.io/gitea/models/unittest"
-	user_model "code.gitea.io/gitea/models/user"
-	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/tests"
+	auth_model "gitea.dev/models/auth"
+	"gitea.dev/models/unittest"
+	user_model "gitea.dev/models/user"
+	"gitea.dev/modules/setting"
+	api "gitea.dev/modules/structs"
+	"gitea.dev/modules/test"
+	"gitea.dev/tests"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestOAuth2Application(t *testing.T) {
@@ -28,27 +31,25 @@ func TestOAuth2Application(t *testing.T) {
 
 func testAPICreateOAuth2Application(t *testing.T) {
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	appBody := api.CreateOAuth2ApplicationOptions{
-		Name: "test-app-1",
-		RedirectURIs: []string{
-			"http://www.google.com",
-		},
-		ConfidentialClient: true,
-	}
+	redirectURIs := []string{"http://www.google.com", "my-app:foo"}
+	appBody := api.CreateOAuth2ApplicationOptions{Name: "test-app-1", RedirectURIs: redirectURIs, ConfidentialClient: true}
 
-	req := NewRequestWithJSON(t, "POST", "/api/v1/user/applications/oauth2", &appBody).
-		AddBasicAuth(user.Name)
+	// no custom scheme
+	req := NewRequestWithJSON(t, "POST", "/api/v1/user/applications/oauth2", &appBody).AddBasicAuth(user.Name)
+	MakeRequest(t, req, http.StatusBadRequest)
+
+	// with custom scheme
+	defer test.MockVariableValue(&setting.OAuth2.CustomSchemes, []string{"my-app"})()
+	req = NewRequestWithJSON(t, "POST", "/api/v1/user/applications/oauth2", &appBody).AddBasicAuth(user.Name)
 	resp := MakeRequest(t, req, http.StatusCreated)
-
-	var createdApp *api.OAuth2Application
-	DecodeJSON(t, resp, &createdApp)
+	createdApp := DecodeJSON(t, resp, &api.OAuth2Application{})
 
 	assert.Equal(t, appBody.Name, createdApp.Name)
 	assert.Len(t, createdApp.ClientSecret, 56)
 	assert.Len(t, createdApp.ClientID, 36)
 	assert.True(t, createdApp.ConfidentialClient)
 	assert.NotEmpty(t, createdApp.Created)
-	assert.Equal(t, appBody.RedirectURIs[0], createdApp.RedirectURIs[0])
+	assert.Equal(t, redirectURIs, createdApp.RedirectURIs)
 	unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{UID: user.ID, Name: createdApp.Name})
 }
 
@@ -57,21 +58,13 @@ func testAPIListOAuth2Applications(t *testing.T) {
 	session := loginUser(t, user.Name)
 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser)
 
-	existApp := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{
-		UID:  user.ID,
-		Name: "test-app-1",
-		RedirectURIs: []string{
-			"http://www.google.com",
-		},
-		ConfidentialClient: true,
-	})
+	existApp := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{UID: user.ID, Name: "test-app-1", ConfidentialClient: true})
+	require.NotEmpty(t, existApp.RedirectURIs)
 
-	req := NewRequest(t, "GET", "/api/v1/user/applications/oauth2").
-		AddTokenAuth(token)
+	req := NewRequest(t, "GET", "/api/v1/user/applications/oauth2").AddTokenAuth(token)
 	resp := MakeRequest(t, req, http.StatusOK)
 
-	var appList api.OAuth2ApplicationList
-	DecodeJSON(t, resp, &appList)
+	appList := DecodeJSON(t, resp, api.OAuth2ApplicationList{})
 	expectedApp := appList[0]
 
 	assert.Equal(t, expectedApp.Name, existApp.Name)
@@ -79,7 +72,7 @@ func testAPIListOAuth2Applications(t *testing.T) {
 	assert.Equal(t, expectedApp.ConfidentialClient, existApp.ConfidentialClient)
 	assert.Len(t, expectedApp.ClientID, 36)
 	assert.Empty(t, expectedApp.ClientSecret)
-	assert.Equal(t, existApp.RedirectURIs[0], expectedApp.RedirectURIs[0])
+	assert.Equal(t, expectedApp.RedirectURIs, existApp.RedirectURIs)
 	unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})
 }
 
@@ -88,21 +81,16 @@ func testAPIDeleteOAuth2Application(t *testing.T) {
 	session := loginUser(t, user.Name)
 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser)
 
-	oldApp := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{
-		UID:  user.ID,
-		Name: "test-app-1",
-	})
+	oldApp := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{UID: user.ID, Name: "test-app-1"})
 
 	urlStr := fmt.Sprintf("/api/v1/user/applications/oauth2/%d", oldApp.ID)
-	req := NewRequest(t, "DELETE", urlStr).
-		AddTokenAuth(token)
+	req := NewRequest(t, "DELETE", urlStr).AddTokenAuth(token)
 	MakeRequest(t, req, http.StatusNoContent)
 
 	unittest.AssertNotExistsBean(t, &auth_model.OAuth2Application{UID: oldApp.UID, Name: oldApp.Name})
 
 	// Delete again will return not found
-	req = NewRequest(t, "DELETE", urlStr).
-		AddTokenAuth(token)
+	req = NewRequest(t, "DELETE", urlStr).AddTokenAuth(token)
 	MakeRequest(t, req, http.StatusNotFound)
 }
 
@@ -111,65 +99,41 @@ func testAPIGetOAuth2Application(t *testing.T) {
 	session := loginUser(t, user.Name)
 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser)
 
-	existApp := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{
-		UID:  user.ID,
-		Name: "test-app-1",
-		RedirectURIs: []string{
-			"http://www.google.com",
-		},
-		ConfidentialClient: true,
-	})
+	existApp := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{UID: user.ID, Name: "test-app-1", ConfidentialClient: true})
+	require.NotEmpty(t, existApp.RedirectURIs)
 
-	req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/applications/oauth2/%d", existApp.ID)).
-		AddTokenAuth(token)
+	req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/applications/oauth2/%d", existApp.ID)).AddTokenAuth(token)
 	resp := MakeRequest(t, req, http.StatusOK)
-
-	var app api.OAuth2Application
-	DecodeJSON(t, resp, &app)
-	expectedApp := app
+	expectedApp := DecodeJSON(t, resp, &api.OAuth2Application{})
 
 	assert.Equal(t, expectedApp.Name, existApp.Name)
 	assert.Equal(t, expectedApp.ClientID, existApp.ClientID)
 	assert.Equal(t, expectedApp.ConfidentialClient, existApp.ConfidentialClient)
 	assert.Len(t, expectedApp.ClientID, 36)
 	assert.Empty(t, expectedApp.ClientSecret)
-	assert.Len(t, expectedApp.RedirectURIs, 1)
-	assert.Equal(t, expectedApp.RedirectURIs[0], existApp.RedirectURIs[0])
+	assert.Equal(t, expectedApp.RedirectURIs, existApp.RedirectURIs)
 	unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})
 }
 
 func testAPIUpdateOAuth2Application(t *testing.T) {
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 
-	existApp := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{
-		UID:  user.ID,
-		Name: "test-app-1",
-		RedirectURIs: []string{
-			"http://www.google.com",
-		},
-	})
-
-	appBody := api.CreateOAuth2ApplicationOptions{
-		Name: "test-app-1",
-		RedirectURIs: []string{
-			"http://www.google.com/",
-			"http://www.github.com/",
-		},
-		ConfidentialClient: true,
-	}
-
+	existApp := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{UID: user.ID, Name: "test-app-1"})
+	redirectURIs := []string{"https://www.google.com", "my-app:foo"}
+	appBody := api.CreateOAuth2ApplicationOptions{Name: "test-app-1", RedirectURIs: redirectURIs, ConfidentialClient: true}
 	urlStr := fmt.Sprintf("/api/v1/user/applications/oauth2/%d", existApp.ID)
-	req := NewRequestWithJSON(t, "PATCH", urlStr, &appBody).
-		AddBasicAuth(user.Name)
+
+	// no custom scheme
+	req := NewRequestWithJSON(t, "PATCH", urlStr, &appBody).AddBasicAuth(user.Name)
+	MakeRequest(t, req, http.StatusBadRequest)
+
+	// with custom scheme
+	defer test.MockVariableValue(&setting.OAuth2.CustomSchemes, []string{"my-app"})()
+	req = NewRequestWithJSON(t, "PATCH", urlStr, &appBody).AddBasicAuth(user.Name)
 	resp := MakeRequest(t, req, http.StatusOK)
 
-	var app api.OAuth2Application
-	DecodeJSON(t, resp, &app)
-	expectedApp := app
-
-	assert.Len(t, expectedApp.RedirectURIs, 2)
-	assert.Equal(t, expectedApp.RedirectURIs[0], appBody.RedirectURIs[0])
-	assert.Equal(t, expectedApp.RedirectURIs[1], appBody.RedirectURIs[1])
+	expectedApp := DecodeJSON(t, resp, &api.OAuth2Application{})
+	assert.Equal(t, expectedApp.RedirectURIs, appBody.RedirectURIs)
 	assert.Equal(t, expectedApp.ConfidentialClient, appBody.ConfidentialClient)
 	unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})
 }