mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Support uploading file to empty repo by API (#24357)
The uploading API already works (the only nit is the the IsEmpty flag is out-of-sync, this PR also fixes it) Close #14633
This commit is contained in:
		| @@ -458,6 +458,11 @@ func CreateOrUpdateRepoFile(ctx context.Context, repo *repo_model.Repository, do | |||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return nil, err | 		return nil, err | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	if repo.IsEmpty { | ||||||
|  | 		_ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: repo.ID, IsEmpty: false}, "is_empty") | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	return file, nil | 	return file, nil | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,17 +5,21 @@ package integration | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"bytes" | 	"bytes" | ||||||
|  | 	"encoding/base64" | ||||||
|  | 	"fmt" | ||||||
| 	"io" | 	"io" | ||||||
| 	"mime/multipart" | 	"mime/multipart" | ||||||
| 	"net/http" | 	"net/http" | ||||||
| 	"testing" | 	"testing" | ||||||
|  |  | ||||||
|  | 	auth_model "code.gitea.io/gitea/models/auth" | ||||||
| 	"code.gitea.io/gitea/models/db" | 	"code.gitea.io/gitea/models/db" | ||||||
| 	repo_model "code.gitea.io/gitea/models/repo" | 	repo_model "code.gitea.io/gitea/models/repo" | ||||||
| 	"code.gitea.io/gitea/models/unittest" | 	"code.gitea.io/gitea/models/unittest" | ||||||
| 	user_model "code.gitea.io/gitea/models/user" | 	user_model "code.gitea.io/gitea/models/user" | ||||||
| 	"code.gitea.io/gitea/modules/json" | 	"code.gitea.io/gitea/modules/json" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
|  | 	api "code.gitea.io/gitea/modules/structs" | ||||||
| 	"code.gitea.io/gitea/modules/test" | 	"code.gitea.io/gitea/modules/test" | ||||||
| 	"code.gitea.io/gitea/tests" | 	"code.gitea.io/gitea/tests" | ||||||
|  |  | ||||||
| @@ -105,3 +109,32 @@ func TestEmptyRepoUploadFile(t *testing.T) { | |||||||
| 	resp = session.MakeRequest(t, req, http.StatusOK) | 	resp = session.MakeRequest(t, req, http.StatusOK) | ||||||
| 	assert.Contains(t, resp.Body.String(), "uploaded-file.txt") | 	assert.Contains(t, resp.Body.String(), "uploaded-file.txt") | ||||||
| } | } | ||||||
|  |  | ||||||
|  | func TestEmptyRepoAddFileByAPI(t *testing.T) { | ||||||
|  | 	defer tests.PrepareTestEnv(t)() | ||||||
|  |  | ||||||
|  | 	err := user_model.UpdateUserCols(db.DefaultContext, &user_model.User{ID: 30, ProhibitLogin: false}, "prohibit_login") | ||||||
|  | 	assert.NoError(t, err) | ||||||
|  |  | ||||||
|  | 	session := loginUser(t, "user30") | ||||||
|  | 	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo) | ||||||
|  |  | ||||||
|  | 	url := fmt.Sprintf("/api/v1/repos/user30/empty/contents/new-file.txt?token=%s", token) | ||||||
|  | 	req := NewRequestWithJSON(t, "POST", url, &api.CreateFileOptions{ | ||||||
|  | 		FileOptions: api.FileOptions{ | ||||||
|  | 			NewBranchName: "new_branch", | ||||||
|  | 			Message:       "init", | ||||||
|  | 		}, | ||||||
|  | 		Content: base64.StdEncoding.EncodeToString([]byte("newly-added-api-file")), | ||||||
|  | 	}) | ||||||
|  |  | ||||||
|  | 	resp := MakeRequest(t, req, http.StatusCreated) | ||||||
|  | 	var fileResponse api.FileResponse | ||||||
|  | 	DecodeJSON(t, resp, &fileResponse) | ||||||
|  | 	expectedHTMLURL := setting.AppURL + "user30/empty/src/branch/new_branch/new-file.txt" | ||||||
|  | 	assert.EqualValues(t, expectedHTMLURL, *fileResponse.Content.HTMLURL) | ||||||
|  |  | ||||||
|  | 	req = NewRequest(t, "GET", "/user30/empty/src/branch/new_branch/new-file.txt") | ||||||
|  | 	resp = session.MakeRequest(t, req, http.StatusOK) | ||||||
|  | 	assert.Contains(t, resp.Body.String(), "newly-added-api-file") | ||||||
|  | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user