Fix rebasing issues

- Due to new architectural changes in gitea some files had to be relocated.
- Some modules got renamed, use the new names.

PS: this was painful we should sync with upstream more often.

Author: AbdulrhmnGhanem

routers/api/v1/repo/migrate.go

@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/convert"
-	auth "code.gitea.io/gitea/modules/forms"
 	"code.gitea.io/gitea/modules/lfs"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/migrations"
@@ -68,7 +67,7 @@ func Migrate(ctx *context.APIContext) {
 			ctx.Error(http.StatusInternalServerError, "", ctx.Tr("repo.migrate.invalid_lfs_endpoint"))
 			return
 		}
-		err = migrations.IsMigrateURLAllowed(ep.String(), ctx.User)
+		err := migrations.IsMigrateURLAllowed(ep.String(), ctx.User)
 		if err != nil {
 			handleRemoteAddrError(ctx, err)
 			return
@@ -198,7 +197,7 @@ func handleMigrateError(ctx *context.APIContext, repoOwner *models.User, migrati
 	case base.IsErrNotSupported(err):
 		ctx.Error(http.StatusUnprocessableEntity, "", err)
 	default:
-		remoteAddr, _ := auth.ParseRemoteAddr(migrationOpts.CloneAddr, migrationOpts.AuthUsername, migrationOpts.AuthPassword)
+		remoteAddr, _ := forms.ParseRemoteAddr(migrationOpts.CloneAddr, migrationOpts.AuthUsername, migrationOpts.AuthPassword)
 		err = util.NewStringURLSanitizedError(err, remoteAddr, true)
 		if strings.Contains(err.Error(), "Authentication failed") ||
 			strings.Contains(err.Error(), "Bad credentials") ||
@@ -253,7 +252,7 @@ func GetMigratingTask(ctx *context.APIContext) {
 	//     "$ref": "#/responses/"
 	//   "404":
 	//	   "$ref": "#/response/"
-	t, err := models.GetMigratingTask(ctx.QueryInt64("repo_id"))
+	t, err := models.GetMigratingTask(ctx.FormInt64("repo_id"))
 
 	if err != nil {
 		ctx.JSON(http.StatusNotFound, err)
@@ -262,7 +261,7 @@ func GetMigratingTask(ctx *context.APIContext) {
 
 	ctx.JSON(200, map[string]interface{}{
 		"status":  t.Status,
-		"err":     t.Errors,
+		"err":     t.Message,
 		"repo-id": t.RepoID,
 		"start":   t.StartTime,
 		"end":     t.EndTime,

routers/kitspace.go renamed to routers/web/kitspace.go

@@ -1,4 +1,4 @@
-package routers
+package web
 
 import (
 	"bytes"
@@ -31,7 +31,7 @@ func Kitspace(ctx *context.Context) {
 	)
 	var user *structs.User
 	if ctx.User != nil && ctx.IsSigned {
-		user = convert.ToUser(ctx.User, true, true)
+		user = convert.ToUser(ctx.User, ctx.User)
 	}
 
 	m := KitspaceSession{
@@ -44,7 +44,7 @@ func Kitspace(ctx *context.Context) {
 		panic(err)
 	}
 
-	req, err := http.NewRequest("GET", url.String(), bytes.NewBuffer(b))
+	req, _ := http.NewRequest("GET", url.String(), bytes.NewBuffer(b))
 	req.Header.Add("Content-Type", "application/json")
 
 	resp, err := http.DefaultClient.Do(req)

routers/web/repo/editor.go

@@ -733,7 +733,7 @@ func UploadFilePost(ctx *context.Context) {
 func UploadFilePostJson(ctx *context.Context) {
 	// `renderCommitRights` is a poorly named; it's not responsible directly for rendering anything,
 	// it returns a boolean
-	form := web.GetForm(ctx).(*auth.UploadRepoFileForm)
+	form := web.GetForm(ctx).(*forms.UploadRepoFileForm)
 	canCommit := renderCommitRights(ctx)
 	oldBranchName := ctx.Repo.BranchName
 	branchName := oldBranchName

routers/user/kitspace_auth.go renamed to routers/web/user/kitspace_auth.go

@@ -5,12 +5,13 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
-	auth "code.gitea.io/gitea/modules/forms"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/password"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/web"
+	"code.gitea.io/gitea/services/auth"
+	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/mailer"
 )
 
@@ -38,7 +39,7 @@ func KitspaceSignUp(ctx *context.Context) {
 	//   "422":
 	//     "$ref": "#/responses/validationError"
 	response := make(map[string]string)
-	form := web.GetForm(ctx).(*auth.RegisterForm)
+	form := web.GetForm(ctx).(*forms.RegisterForm)
 
 	if len(form.Password) < setting.MinPasswordLength {
 		response["error"] = "UnprocessableEntity"
@@ -111,7 +112,6 @@ func KitspaceSignUp(ctx *context.Context) {
 	)
 
 	ctx.JSON(http.StatusCreated, response)
-	return
 }
 
 // KitspaceSignIn custom sign-in compatible with Kitspace architecture
@@ -140,8 +140,8 @@ func KitspaceSignIn(ctx *context.Context) {
 	//   "422":
 	//     "$ref": "#/responses/validationError"
 
-	form := web.GetForm(ctx).(*auth.SignInForm)
-	u, err := models.UserSignIn(form.UserName, form.Password)
+	form := web.GetForm(ctx).(*forms.SignInForm)
+	u, err := auth.UserSignIn(form.UserName, form.Password)
 
 	response := make(map[string]string)
 	if err != nil {

routers/web/web.go

@@ -263,8 +263,8 @@ func RegisterRoutes(m *web.Route) {
 	// ***** START: User *****
 	m.Group("/user", func() {
 		m.Group("/kitspace", func() {
-			m.Post("/sign_up", bindIgnErr(auth.RegisterForm{}), user.KitspaceSignUp)
-			m.Post("/sign_in", bindIgnErr(auth.SignInForm{}), user.KitspaceSignIn)
+			m.Post("/sign_up", bindIgnErr(forms.RegisterForm{}), user.KitspaceSignUp)
+			m.Post("/sign_in", bindIgnErr(forms.SignInForm{}), user.KitspaceSignIn)
 		})
 
 		m.Get("/login", user.SignIn)