Skip to content

Commit fa3895c

Browse files
zeripath6543lunnytechknowlogick
authored
Move modules/forms to services/forms (#15305)
Forms are dependent on models and therefore should be in services. This PR also removes the old auth. aliasing Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: 6543 <[email protected]> Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: techknowlogick <[email protected]>
1 parent 8be2cc4 commit fa3895c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+335
-335
lines changed

‎integrations/api_helper_for_declarative_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"time"
1515

1616
"code.gitea.io/gitea/models"
17-
auth "code.gitea.io/gitea/modules/forms"
1817
"code.gitea.io/gitea/modules/queue"
1918
api "code.gitea.io/gitea/modules/structs"
19+
"code.gitea.io/gitea/services/forms"
2020

2121
jsoniter "github.com/json-iterator/go"
2222
"github.com/stretchr/testify/assert"
@@ -243,7 +243,7 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64)
243243
return func(t *testing.T) {
244244
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
245245
owner, repo, index, ctx.Token)
246-
req := NewRequestWithJSON(t, http.MethodPost, urlStr, &auth.MergePullRequestForm{
246+
req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
247247
MergeMessageField: "doAPIMergePullRequest Merge",
248248
Do: string(models.MergeStyleMerge),
249249
})
@@ -255,7 +255,7 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64)
255255
DecodeJSON(t, resp, &err)
256256
assert.EqualValues(t, "Please try again later", err.Message)
257257
queue.GetManager().FlushAll(context.Background(), 5*time.Second)
258-
req = NewRequestWithJSON(t, http.MethodPost, urlStr, &auth.MergePullRequestForm{
258+
req = NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
259259
MergeMessageField: "doAPIMergePullRequest Merge",
260260
Do: string(models.MergeStyleMerge),
261261
})
@@ -278,7 +278,7 @@ func doAPIManuallyMergePullRequest(ctx APITestContext, owner, repo, commitID str
278278
return func(t *testing.T) {
279279
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
280280
owner, repo, index, ctx.Token)
281-
req := NewRequestWithJSON(t, http.MethodPost, urlStr, &auth.MergePullRequestForm{
281+
req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
282282
Do: string(models.MergeStyleManuallyMerged),
283283
MergeCommitID: commitID,
284284
})

‎integrations/api_pull_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
auth "code.gitea.io/gitea/modules/forms"
1413
"code.gitea.io/gitea/modules/setting"
1514
api "code.gitea.io/gitea/modules/structs"
15+
"code.gitea.io/gitea/services/forms"
1616
issue_service "code.gitea.io/gitea/services/issue"
1717

1818
"github.com/stretchr/testify/assert"
@@ -50,7 +50,7 @@ func TestAPIMergePullWIP(t *testing.T) {
5050

5151
session := loginUser(t, owner.Name)
5252
token := getTokenForLoggedInUser(t, session)
53-
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", owner.Name, repo.Name, pr.Index, token), &auth.MergePullRequestForm{
53+
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", owner.Name, repo.Name, pr.Index, token), &forms.MergePullRequestForm{
5454
MergeMessageField: pr.Issue.Title,
5555
Do: string(models.MergeStyleMerge),
5656
})

‎routers/admin/admin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ import (
1919
"code.gitea.io/gitea/modules/base"
2020
"code.gitea.io/gitea/modules/context"
2121
"code.gitea.io/gitea/modules/cron"
22-
auth "code.gitea.io/gitea/modules/forms"
2322
"code.gitea.io/gitea/modules/git"
2423
"code.gitea.io/gitea/modules/log"
2524
"code.gitea.io/gitea/modules/process"
2625
"code.gitea.io/gitea/modules/queue"
2726
"code.gitea.io/gitea/modules/setting"
2827
"code.gitea.io/gitea/modules/timeutil"
2928
"code.gitea.io/gitea/modules/web"
29+
"code.gitea.io/gitea/services/forms"
3030
"code.gitea.io/gitea/services/mailer"
3131
jsoniter "github.com/json-iterator/go"
3232

@@ -134,7 +134,7 @@ func Dashboard(ctx *context.Context) {
134134

135135
// DashboardPost run an admin operation
136136
func DashboardPost(ctx *context.Context) {
137-
form := web.GetForm(ctx).(*auth.AdminDashboardForm)
137+
form := web.GetForm(ctx).(*forms.AdminDashboardForm)
138138
ctx.Data["Title"] = ctx.Tr("admin.dashboard")
139139
ctx.Data["PageIsAdmin"] = true
140140
ctx.Data["PageIsAdminDashboard"] = true

‎routers/admin/auths.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
"code.gitea.io/gitea/modules/auth/pam"
1717
"code.gitea.io/gitea/modules/base"
1818
"code.gitea.io/gitea/modules/context"
19-
auth "code.gitea.io/gitea/modules/forms"
2019
"code.gitea.io/gitea/modules/log"
2120
"code.gitea.io/gitea/modules/setting"
2221
"code.gitea.io/gitea/modules/util"
2322
"code.gitea.io/gitea/modules/web"
23+
"code.gitea.io/gitea/services/forms"
2424

2525
"xorm.io/xorm/convert"
2626
)
@@ -113,7 +113,7 @@ func NewAuthSource(ctx *context.Context) {
113113
ctx.HTML(http.StatusOK, tplAuthNew)
114114
}
115115

116-
func parseLDAPConfig(form auth.AuthenticationForm) *models.LDAPConfig {
116+
func parseLDAPConfig(form forms.AuthenticationForm) *models.LDAPConfig {
117117
var pageSize uint32
118118
if form.UsePagedSearch {
119119
pageSize = uint32(form.SearchPageSize)
@@ -150,7 +150,7 @@ func parseLDAPConfig(form auth.AuthenticationForm) *models.LDAPConfig {
150150
}
151151
}
152152

153-
func parseSMTPConfig(form auth.AuthenticationForm) *models.SMTPConfig {
153+
func parseSMTPConfig(form forms.AuthenticationForm) *models.SMTPConfig {
154154
return &models.SMTPConfig{
155155
Auth: form.SMTPAuth,
156156
Host: form.SMTPHost,
@@ -161,7 +161,7 @@ func parseSMTPConfig(form auth.AuthenticationForm) *models.SMTPConfig {
161161
}
162162
}
163163

164-
func parseOAuth2Config(form auth.AuthenticationForm) *models.OAuth2Config {
164+
func parseOAuth2Config(form forms.AuthenticationForm) *models.OAuth2Config {
165165
var customURLMapping *oauth2.CustomURLMapping
166166
if form.Oauth2UseCustomURL {
167167
customURLMapping = &oauth2.CustomURLMapping{
@@ -183,7 +183,7 @@ func parseOAuth2Config(form auth.AuthenticationForm) *models.OAuth2Config {
183183
}
184184
}
185185

186-
func parseSSPIConfig(ctx *context.Context, form auth.AuthenticationForm) (*models.SSPIConfig, error) {
186+
func parseSSPIConfig(ctx *context.Context, form forms.AuthenticationForm) (*models.SSPIConfig, error) {
187187
if util.IsEmptyString(form.SSPISeparatorReplacement) {
188188
ctx.Data["Err_SSPISeparatorReplacement"] = true
189189
return nil, errors.New(ctx.Tr("form.SSPISeparatorReplacement") + ctx.Tr("form.require_error"))
@@ -209,7 +209,7 @@ func parseSSPIConfig(ctx *context.Context, form auth.AuthenticationForm) (*model
209209

210210
// NewAuthSourcePost response for adding an auth source
211211
func NewAuthSourcePost(ctx *context.Context) {
212-
form := *web.GetForm(ctx).(*auth.AuthenticationForm)
212+
form := *web.GetForm(ctx).(*forms.AuthenticationForm)
213213
ctx.Data["Title"] = ctx.Tr("admin.auths.new")
214214
ctx.Data["PageIsAdmin"] = true
215215
ctx.Data["PageIsAdminAuthentications"] = true
@@ -316,7 +316,7 @@ func EditAuthSource(ctx *context.Context) {
316316

317317
// EditAuthSourcePost response for editing auth source
318318
func EditAuthSourcePost(ctx *context.Context) {
319-
form := *web.GetForm(ctx).(*auth.AuthenticationForm)
319+
form := *web.GetForm(ctx).(*forms.AuthenticationForm)
320320
ctx.Data["Title"] = ctx.Tr("admin.auths.edit")
321321
ctx.Data["PageIsAdmin"] = true
322322
ctx.Data["PageIsAdminAuthentications"] = true

‎routers/admin/users.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
"code.gitea.io/gitea/models"
1515
"code.gitea.io/gitea/modules/base"
1616
"code.gitea.io/gitea/modules/context"
17-
auth "code.gitea.io/gitea/modules/forms"
1817
"code.gitea.io/gitea/modules/log"
1918
"code.gitea.io/gitea/modules/password"
2019
"code.gitea.io/gitea/modules/setting"
2120
"code.gitea.io/gitea/modules/web"
2221
"code.gitea.io/gitea/routers"
2322
router_user_setting "code.gitea.io/gitea/routers/user/setting"
23+
"code.gitea.io/gitea/services/forms"
2424
"code.gitea.io/gitea/services/mailer"
2525
)
2626

@@ -66,7 +66,7 @@ func NewUser(ctx *context.Context) {
6666

6767
// NewUserPost response for adding a new user
6868
func NewUserPost(ctx *context.Context) {
69-
form := web.GetForm(ctx).(*auth.AdminCreateUserForm)
69+
form := web.GetForm(ctx).(*forms.AdminCreateUserForm)
7070
ctx.Data["Title"] = ctx.Tr("admin.users.new_account")
7171
ctx.Data["PageIsAdmin"] = true
7272
ctx.Data["PageIsAdminUsers"] = true
@@ -218,7 +218,7 @@ func EditUser(ctx *context.Context) {
218218

219219
// EditUserPost response for editting user
220220
func EditUserPost(ctx *context.Context) {
221-
form := web.GetForm(ctx).(*auth.AdminEditUserForm)
221+
form := web.GetForm(ctx).(*forms.AdminEditUserForm)
222222
ctx.Data["Title"] = ctx.Tr("admin.users.edit_account")
223223
ctx.Data["PageIsAdmin"] = true
224224
ctx.Data["PageIsAdminUsers"] = true

‎routers/admin/users_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models"
11-
auth "code.gitea.io/gitea/modules/forms"
1211
"code.gitea.io/gitea/modules/test"
1312
"code.gitea.io/gitea/modules/web"
13+
"code.gitea.io/gitea/services/forms"
1414

1515
"github.com/stretchr/testify/assert"
1616
)
@@ -30,7 +30,7 @@ func TestNewUserPost_MustChangePassword(t *testing.T) {
3030
username := "gitea"
3131
email := "[email protected]"
3232

33-
form := auth.AdminCreateUserForm{
33+
form := forms.AdminCreateUserForm{
3434
LoginType: "local",
3535
LoginName: "local",
3636
UserName: username,
@@ -68,7 +68,7 @@ func TestNewUserPost_MustChangePasswordFalse(t *testing.T) {
6868
username := "gitea"
6969
email := "[email protected]"
7070

71-
form := auth.AdminCreateUserForm{
71+
form := forms.AdminCreateUserForm{
7272
LoginType: "local",
7373
LoginName: "local",
7474
UserName: username,
@@ -106,7 +106,7 @@ func TestNewUserPost_InvalidEmail(t *testing.T) {
106106
username := "gitea"
107107
email := "[email protected]\r\n"
108108

109-
form := auth.AdminCreateUserForm{
109+
form := forms.AdminCreateUserForm{
110110
LoginType: "local",
111111
LoginName: "local",
112112
UserName: username,

‎routers/api/v1/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ import (
7171

7272
"code.gitea.io/gitea/models"
7373
"code.gitea.io/gitea/modules/context"
74-
auth "code.gitea.io/gitea/modules/forms"
7574
"code.gitea.io/gitea/modules/log"
7675
"code.gitea.io/gitea/modules/setting"
7776
api "code.gitea.io/gitea/modules/structs"
@@ -84,6 +83,7 @@ import (
8483
"code.gitea.io/gitea/routers/api/v1/settings"
8584
_ "code.gitea.io/gitea/routers/api/v1/swagger" // for swagger generation
8685
"code.gitea.io/gitea/routers/api/v1/user"
86+
"code.gitea.io/gitea/services/forms"
8787

8888
"gitea.com/go-chi/binding"
8989
"gitea.com/go-chi/session"
@@ -897,7 +897,7 @@ func Routes() *web.Route {
897897
m.Get(".patch", repo.DownloadPullPatch)
898898
m.Post("/update", reqToken(), repo.UpdatePullRequest)
899899
m.Combo("/merge").Get(repo.IsPullRequestMerged).
900-
Post(reqToken(), mustNotBeArchived, bind(auth.MergePullRequestForm{}), repo.MergePullRequest)
900+
Post(reqToken(), mustNotBeArchived, bind(forms.MergePullRequestForm{}), repo.MergePullRequest)
901901
m.Group("/reviews", func() {
902902
m.Combo("").
903903
Get(repo.ListPullReviews).

‎routers/api/v1/repo/migrate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"code.gitea.io/gitea/models"
1515
"code.gitea.io/gitea/modules/context"
1616
"code.gitea.io/gitea/modules/convert"
17-
auth "code.gitea.io/gitea/modules/forms"
1817
"code.gitea.io/gitea/modules/graceful"
1918
"code.gitea.io/gitea/modules/log"
2019
"code.gitea.io/gitea/modules/migrations"
@@ -25,6 +24,7 @@ import (
2524
api "code.gitea.io/gitea/modules/structs"
2625
"code.gitea.io/gitea/modules/util"
2726
"code.gitea.io/gitea/modules/web"
27+
"code.gitea.io/gitea/services/forms"
2828
)
2929

3030
// Migrate migrate remote git repository to gitea
@@ -96,7 +96,7 @@ func Migrate(ctx *context.APIContext) {
9696
}
9797
}
9898

99-
remoteAddr, err := auth.ParseRemoteAddr(form.CloneAddr, form.AuthUsername, form.AuthPassword)
99+
remoteAddr, err := forms.ParseRemoteAddr(form.CloneAddr, form.AuthUsername, form.AuthPassword)
100100
if err == nil {
101101
err = migrations.IsMigrateURLAllowed(remoteAddr, ctx.User)
102102
}

‎routers/api/v1/repo/pull.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import (
1313
"code.gitea.io/gitea/models"
1414
"code.gitea.io/gitea/modules/context"
1515
"code.gitea.io/gitea/modules/convert"
16-
auth "code.gitea.io/gitea/modules/forms"
1716
"code.gitea.io/gitea/modules/git"
1817
"code.gitea.io/gitea/modules/log"
1918
"code.gitea.io/gitea/modules/notification"
2019
api "code.gitea.io/gitea/modules/structs"
2120
"code.gitea.io/gitea/modules/timeutil"
2221
"code.gitea.io/gitea/modules/web"
2322
"code.gitea.io/gitea/routers/api/v1/utils"
23+
"code.gitea.io/gitea/services/forms"
2424
issue_service "code.gitea.io/gitea/services/issue"
2525
pull_service "code.gitea.io/gitea/services/pull"
2626
)
@@ -721,7 +721,7 @@ func MergePullRequest(ctx *context.APIContext) {
721721
// "409":
722722
// "$ref": "#/responses/error"
723723

724-
form := web.GetForm(ctx).(*auth.MergePullRequestForm)
724+
form := web.GetForm(ctx).(*forms.MergePullRequestForm)
725725
pr, err := models.GetPullRequestByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
726726
if err != nil {
727727
if models.IsErrPullRequestNotExist(err) {

‎routers/api/v1/swagger/options.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
package swagger
66

77
import (
8-
auth "code.gitea.io/gitea/modules/forms"
98
api "code.gitea.io/gitea/modules/structs"
9+
"code.gitea.io/gitea/services/forms"
1010
)
1111

1212
// not actually a response, just a hack to get go-swagger to include definitions
@@ -72,7 +72,7 @@ type swaggerParameterBodies struct {
7272
// in:body
7373
EditPullRequestOption api.EditPullRequestOption
7474
// in:body
75-
MergePullRequestOption auth.MergePullRequestForm
75+
MergePullRequestOption forms.MergePullRequestForm
7676

7777
// in:body
7878
CreateReleaseOption api.CreateReleaseOption
@@ -106,7 +106,7 @@ type swaggerParameterBodies struct {
106106
EditUserOption api.EditUserOption
107107

108108
// in:body
109-
MigrateRepoForm auth.MigrateRepoForm
109+
MigrateRepoForm forms.MigrateRepoForm
110110

111111
// in:body
112112
EditAttachmentOptions api.EditAttachmentOptions

‎routers/install.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"code.gitea.io/gitea/models"
1717
"code.gitea.io/gitea/modules/base"
1818
"code.gitea.io/gitea/modules/context"
19-
auth "code.gitea.io/gitea/modules/forms"
2019
"code.gitea.io/gitea/modules/generate"
2120
"code.gitea.io/gitea/modules/graceful"
2221
"code.gitea.io/gitea/modules/log"
@@ -26,6 +25,7 @@ import (
2625
"code.gitea.io/gitea/modules/util"
2726
"code.gitea.io/gitea/modules/web"
2827
"code.gitea.io/gitea/modules/web/middleware"
28+
"code.gitea.io/gitea/services/forms"
2929

3030
"gitea.com/go-chi/session"
3131
"gopkg.in/ini.v1"
@@ -76,7 +76,7 @@ func InstallInit(next http.Handler) http.Handler {
7676

7777
// Install render installation page
7878
func Install(ctx *context.Context) {
79-
form := auth.InstallForm{}
79+
form := forms.InstallForm{}
8080

8181
// Database settings
8282
form.DbHost = setting.Database.Host
@@ -151,7 +151,7 @@ func Install(ctx *context.Context) {
151151

152152
// InstallPost response for submit install items
153153
func InstallPost(ctx *context.Context) {
154-
form := *web.GetForm(ctx).(*auth.InstallForm)
154+
form := *web.GetForm(ctx).(*forms.InstallForm)
155155
var err error
156156
ctx.Data["CurDbOption"] = form.DbType
157157

‎routers/org/org.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/modules/base"
1414
"code.gitea.io/gitea/modules/context"
15-
auth "code.gitea.io/gitea/modules/forms"
1615
"code.gitea.io/gitea/modules/log"
1716
"code.gitea.io/gitea/modules/setting"
1817
"code.gitea.io/gitea/modules/web"
18+
"code.gitea.io/gitea/services/forms"
1919
)
2020

2121
const (
@@ -36,7 +36,7 @@ func Create(ctx *context.Context) {
3636

3737
// CreatePost response for create organization
3838
func CreatePost(ctx *context.Context) {
39-
form := *web.GetForm(ctx).(*auth.CreateOrgForm)
39+
form := *web.GetForm(ctx).(*forms.CreateOrgForm)
4040
ctx.Data["Title"] = ctx.Tr("new_org")
4141

4242
if !ctx.User.CanCreateOrganization() {

0 commit comments

Comments
 (0)