diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2024-06-19 06:32:45 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-19 06:32:45 +0800 |
commit | 43c7a2e7b1c7fb8aa2347d82ad0a6886d6fad9c2 (patch) | |
tree | c98c2e1159ee02eb52282811f28a4c31ad222c67 /routers/api | |
parent | 17baf1af10de025a47ade1f16f1e5c51646d7fcf (diff) | |
download | gitea-43c7a2e7b1c7fb8aa2347d82ad0a6886d6fad9c2.tar.gz gitea-43c7a2e7b1c7fb8aa2347d82ad0a6886d6fad9c2.zip |
Refactor names (#31405)
This PR only does "renaming":
* `Route` should be `Router` (and chi router is also called "router")
* `Params` should be `PathParam` (to distingush it from URL query param, and to match `FormString`)
* Use lower case for private functions to avoid exposing or abusing
Diffstat (limited to 'routers/api')
86 files changed, 415 insertions, 415 deletions
diff --git a/routers/api/actions/actions.go b/routers/api/actions/actions.go index a418b3a1c4..6f03f290ea 100644 --- a/routers/api/actions/actions.go +++ b/routers/api/actions/actions.go @@ -11,8 +11,8 @@ import ( "code.gitea.io/gitea/routers/api/actions/runner" ) -func Routes(prefix string) *web.Route { - m := web.NewRoute() +func Routes(prefix string) *web.Router { + m := web.NewRouter() path, handler := ping.NewPingServiceHandler() m.Post(path+"*", http.StripPrefix(prefix, handler).ServeHTTP) diff --git a/routers/api/actions/artifacts.go b/routers/api/actions/artifacts.go index 72a2a26c47..da5850589f 100644 --- a/routers/api/actions/artifacts.go +++ b/routers/api/actions/artifacts.go @@ -101,8 +101,8 @@ func init() { }) } -func ArtifactsRoutes(prefix string) *web.Route { - m := web.NewRoute() +func ArtifactsRoutes(prefix string) *web.Router { + m := web.NewRouter() m.Use(ArtifactContexter()) r := artifactRoutes{ @@ -457,7 +457,7 @@ func (ar artifactRoutes) downloadArtifact(ctx *ArtifactContext) { return } - artifactID := ctx.ParamsInt64("artifact_id") + artifactID := ctx.PathParamInt64("artifact_id") artifact, exist, err := db.GetByID[actions.ActionArtifact](ctx, artifactID) if err != nil { log.Error("Error getting artifact: %v", err) diff --git a/routers/api/actions/artifacts_utils.go b/routers/api/actions/artifacts_utils.go index 3517d57f78..a4ca5797dc 100644 --- a/routers/api/actions/artifacts_utils.go +++ b/routers/api/actions/artifacts_utils.go @@ -34,7 +34,7 @@ func validateArtifactName(ctx *ArtifactContext, artifactName string) bool { func validateRunID(ctx *ArtifactContext) (*actions.ActionTask, int64, bool) { task := ctx.ActionTask - runID := ctx.ParamsInt64("run_id") + runID := ctx.PathParamInt64("run_id") if task.Job.RunID != runID { log.Error("Error runID not match") ctx.Error(http.StatusBadRequest, "run-id does not match") @@ -55,7 +55,7 @@ func validateRunIDV4(ctx *ArtifactContext, rawRunID string) (*actions.ActionTask } func validateArtifactHash(ctx *ArtifactContext, artifactName string) bool { - paramHash := ctx.Params("artifact_hash") + paramHash := ctx.PathParam("artifact_hash") // use artifact name to create upload url artifactHash := fmt.Sprintf("%x", md5.Sum([]byte(artifactName))) if paramHash == artifactHash { diff --git a/routers/api/actions/artifactsv4.go b/routers/api/actions/artifactsv4.go index 2ace9f915f..e78ed7a0c2 100644 --- a/routers/api/actions/artifactsv4.go +++ b/routers/api/actions/artifactsv4.go @@ -129,8 +129,8 @@ func ArtifactV4Contexter() func(next http.Handler) http.Handler { } } -func ArtifactsV4Routes(prefix string) *web.Route { - m := web.NewRoute() +func ArtifactsV4Routes(prefix string) *web.Router { + m := web.NewRouter() r := artifactV4Routes{ prefix: prefix, diff --git a/routers/api/packages/alpine/alpine.go b/routers/api/packages/alpine/alpine.go index 5127319807..4b652c9ecc 100644 --- a/routers/api/packages/alpine/alpine.go +++ b/routers/api/packages/alpine/alpine.go @@ -73,7 +73,7 @@ func GetRepositoryFile(ctx *context.Context) { pv, &packages_service.PackageFileInfo{ Filename: alpine_service.IndexArchiveFilename, - CompositeKey: fmt.Sprintf("%s|%s|%s", ctx.Params("branch"), ctx.Params("repository"), ctx.Params("architecture")), + CompositeKey: fmt.Sprintf("%s|%s|%s", ctx.PathParam("branch"), ctx.PathParam("repository"), ctx.PathParam("architecture")), }, ) if err != nil { @@ -89,8 +89,8 @@ func GetRepositoryFile(ctx *context.Context) { } func UploadPackageFile(ctx *context.Context) { - branch := strings.TrimSpace(ctx.Params("branch")) - repository := strings.TrimSpace(ctx.Params("repository")) + branch := strings.TrimSpace(ctx.PathParam("branch")) + repository := strings.TrimSpace(ctx.PathParam("repository")) if branch == "" || repository == "" { apiError(ctx, http.StatusBadRequest, "invalid branch or repository") return @@ -182,14 +182,14 @@ func UploadPackageFile(ctx *context.Context) { } func DownloadPackageFile(ctx *context.Context) { - branch := ctx.Params("branch") - repository := ctx.Params("repository") - architecture := ctx.Params("architecture") + branch := ctx.PathParam("branch") + repository := ctx.PathParam("repository") + architecture := ctx.PathParam("architecture") opts := &packages_model.PackageFileSearchOptions{ OwnerID: ctx.Package.Owner.ID, PackageType: packages_model.TypeAlpine, - Query: ctx.Params("filename"), + Query: ctx.PathParam("filename"), CompositeKey: fmt.Sprintf("%s|%s|%s", branch, repository, architecture), } pfs, _, err := packages_model.SearchFiles(ctx, opts) @@ -230,12 +230,12 @@ func DownloadPackageFile(ctx *context.Context) { } func DeletePackageFile(ctx *context.Context) { - branch, repository, architecture := ctx.Params("branch"), ctx.Params("repository"), ctx.Params("architecture") + branch, repository, architecture := ctx.PathParam("branch"), ctx.PathParam("repository"), ctx.PathParam("architecture") pfs, _, err := packages_model.SearchFiles(ctx, &packages_model.PackageFileSearchOptions{ OwnerID: ctx.Package.Owner.ID, PackageType: packages_model.TypeAlpine, - Query: ctx.Params("filename"), + Query: ctx.PathParam("filename"), CompositeKey: fmt.Sprintf("%s|%s|%s", branch, repository, architecture), }) if err != nil { diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index 4122f632ff..0f42e8f59e 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -74,7 +74,7 @@ func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) { } } -func verifyAuth(r *web.Route, authMethods []auth.Method) { +func verifyAuth(r *web.Router, authMethods []auth.Method) { if setting.Service.EnableReverseProxyAuth { authMethods = append(authMethods, &auth.ReverseProxy{}) } @@ -94,8 +94,8 @@ func verifyAuth(r *web.Route, authMethods []auth.Method) { // CommonRoutes provide endpoints for most package managers (except containers - see below) // These are mounted on `/api/packages` (not `/api/v1/packages`) -func CommonRoutes() *web.Route { - r := web.NewRoute() +func CommonRoutes() *web.Router { + r := web.NewRouter() r.Use(context.PackageContexter()) @@ -264,15 +264,15 @@ func CommonRoutes() *web.Route { ) r.Get("/*", func(ctx *context.Context) { - m := downloadPattern.FindStringSubmatch(ctx.Params("*")) + m := downloadPattern.FindStringSubmatch(ctx.PathParam("*")) if len(m) == 0 { ctx.Status(http.StatusNotFound) return } - ctx.SetParams("channel", strings.TrimSuffix(m[1], "/")) - ctx.SetParams("architecture", m[2]) - ctx.SetParams("filename", m[3]) + ctx.SetPathParam("channel", strings.TrimSuffix(m[1], "/")) + ctx.SetPathParam("architecture", m[2]) + ctx.SetPathParam("filename", m[3]) switch m[3] { case "repodata.json", "repodata.json.bz2", "current_repodata.json", "current_repodata.json.bz2": @@ -282,14 +282,14 @@ func CommonRoutes() *web.Route { } }) r.Put("/*", reqPackageAccess(perm.AccessModeWrite), func(ctx *context.Context) { - m := uploadPattern.FindStringSubmatch(ctx.Params("*")) + m := uploadPattern.FindStringSubmatch(ctx.PathParam("*")) if len(m) == 0 { ctx.Status(http.StatusNotFound) return } - ctx.SetParams("channel", strings.TrimSuffix(m[1], "/")) - ctx.SetParams("filename", m[2]) + ctx.SetPathParam("channel", strings.TrimSuffix(m[1], "/")) + ctx.SetPathParam("filename", m[2]) conda.UploadPackageFile(ctx) }) @@ -339,11 +339,11 @@ func CommonRoutes() *web.Route { // Manual mapping of routes because the package name contains slashes which chi does not support // https://go.dev/ref/mod#goproxy-protocol r.Get("/*", func(ctx *context.Context) { - path := ctx.Params("*") + path := ctx.PathParam("*") if strings.HasSuffix(path, "/@latest") { - ctx.SetParams("name", path[:len(path)-len("/@latest")]) - ctx.SetParams("version", "latest") + ctx.SetPathParam("name", path[:len(path)-len("/@latest")]) + ctx.SetPathParam("version", "latest") goproxy.PackageVersionMetadata(ctx) return @@ -355,7 +355,7 @@ func CommonRoutes() *web.Route { return } - ctx.SetParams("name", parts[0]) + ctx.SetPathParam("name", parts[0]) // <package/name>/@v/list if parts[1] == "list" { @@ -365,21 +365,21 @@ func CommonRoutes() *web.Route { // <package/name>/@v/<version>.zip if strings.HasSuffix(parts[1], ".zip") { - ctx.SetParams("version", parts[1][:len(parts[1])-len(".zip")]) + ctx.SetPathParam("version", parts[1][:len(parts[1])-len(".zip")]) goproxy.DownloadPackageFile(ctx) return } // <package/name>/@v/<version>.info if strings.HasSuffix(parts[1], ".info") { - ctx.SetParams("version", parts[1][:len(parts[1])-len(".info")]) + ctx.SetPathParam("version", parts[1][:len(parts[1])-len(".info")]) goproxy.PackageVersionMetadata(ctx) return } // <package/name>/@v/<version>.mod if strings.HasSuffix(parts[1], ".mod") { - ctx.SetParams("version", parts[1][:len(parts[1])-len(".mod")]) + ctx.SetPathParam("version", parts[1][:len(parts[1])-len(".mod")]) goproxy.PackageVersionGoModContent(ctx) return @@ -525,7 +525,7 @@ func CommonRoutes() *web.Route { ) r.Methods("HEAD,GET,PUT,DELETE", "*", func(ctx *context.Context) { - path := ctx.Params("*") + path := ctx.PathParam("*") isHead := ctx.Req.Method == "HEAD" isGetHead := ctx.Req.Method == "HEAD" || ctx.Req.Method == "GET" isPut := ctx.Req.Method == "PUT" @@ -533,15 +533,15 @@ func CommonRoutes() *web.Route { m := repoPattern.FindStringSubmatch(path) if len(m) == 2 && isGetHead { - ctx.SetParams("group", strings.Trim(m[1], "/")) + ctx.SetPathParam("group", strings.Trim(m[1], "/")) rpm.GetRepositoryConfig(ctx) return } m = repoFilePattern.FindStringSubmatch(path) if len(m) == 3 && isGetHead { - ctx.SetParams("group", strings.Trim(m[1], "/")) - ctx.SetParams("filename", m[2]) + ctx.SetPathParam("group", strings.Trim(m[1], "/")) + ctx.SetPathParam("filename", m[2]) if isHead { rpm.CheckRepositoryFileExistence(ctx) } else { @@ -556,17 +556,17 @@ func CommonRoutes() *web.Route { if ctx.Written() { return } - ctx.SetParams("group", strings.Trim(m[1], "/")) + ctx.SetPathParam("group", strings.Trim(m[1], "/")) rpm.UploadPackageFile(ctx) return } m = filePattern.FindStringSubmatch(path) if len(m) == 6 && (isGetHead || isDelete) { - ctx.SetParams("group", strings.Trim(m[1], "/")) - ctx.SetParams("name", m[2]) - ctx.SetParams("version", m[3]) - ctx.SetParams("architecture", m[4]) + ctx.SetPathParam("group", strings.Trim(m[1], "/")) + ctx.SetPathParam("name", m[2]) + ctx.SetPathParam("version", m[3]) + ctx.SetPathParam("architecture", m[4]) if isGetHead { rpm.DownloadPackageFile(ctx) } else { @@ -607,13 +607,13 @@ func CommonRoutes() *web.Route { r.Get("", func(ctx *context.Context) { // Can't use normal routes here: https://github.com/go-chi/chi/issues/781 - version := ctx.Params("version") + version := ctx.PathParam("version") if strings.HasSuffix(version, ".zip") { swift.CheckAcceptMediaType(swift.AcceptZip)(ctx) if ctx.Written() { return } - ctx.SetParams("version", version[:len(version)-4]) + ctx.SetPathParam("version", version[:len(version)-4]) swift.DownloadPackageFile(ctx) } else { swift.CheckAcceptMediaType(swift.AcceptJSON)(ctx) @@ -621,7 +621,7 @@ func CommonRoutes() *web.Route { return } if strings.HasSuffix(version, ".json") { - ctx.SetParams("version", version[:len(version)-5]) + ctx.SetPathParam("version", version[:len(version)-5]) } swift.PackageVersionMetadata(ctx) } @@ -651,8 +651,8 @@ func CommonRoutes() *web.Route { // ContainerRoutes provides endpoints that implement the OCI API to serve containers // These have to be mounted on `/v2/...` to comply with the OCI spec: // https://github.com/opencontainers/distribution-spec/blob/main/spec.md -func ContainerRoutes() *web.Route { - r := web.NewRoute() +func ContainerRoutes() *web.Router { + r := web.NewRouter() r.Use(context.PackageContexter()) @@ -700,7 +700,7 @@ func ContainerRoutes() *web.Route { // Manual mapping of routes because {image} can contain slashes which chi does not support r.Methods("HEAD,GET,POST,PUT,PATCH,DELETE", "/*", func(ctx *context.Context) { - path := ctx.Params("*") + path := ctx.PathParam("*") isHead := ctx.Req.Method == "HEAD" isGet := ctx.Req.Method == "GET" isPost := ctx.Req.Method == "POST" @@ -714,7 +714,7 @@ func ContainerRoutes() *web.Route { return } - ctx.SetParams("image", path[:len(path)-14]) + ctx.SetPathParam("image", path[:len(path)-14]) container.VerifyImageName(ctx) if ctx.Written() { return @@ -724,7 +724,7 @@ func ContainerRoutes() *web.Route { return } if isGet && strings.HasSuffix(path, "/tags/list") { - ctx.SetParams("image", path[:len(path)-10]) + ctx.SetPathParam("image", path[:len(path)-10]) container.VerifyImageName(ctx) if ctx.Written() { return @@ -741,13 +741,13 @@ func ContainerRoutes() *web.Route { return } - ctx.SetParams("image", m[1]) + ctx.SetPathParam("image", m[1]) container.VerifyImageName(ctx) if ctx.Written() { return } - ctx.SetParams("uuid", m[2]) + ctx.SetPathParam("uuid", m[2]) if isGet { container.GetUploadBlob(ctx) @@ -762,13 +762,13 @@ func ContainerRoutes() *web.Route { } m = blobsPattern.FindStringSubmatch(path) if len(m) == 3 && (isHead || isGet || isDelete) { - ctx.SetParams("image", m[1]) + ctx.SetPathParam("image", m[1]) container.VerifyImageName(ctx) if ctx.Written() { return } - ctx.SetParams("digest", m[2]) + ctx.SetPathParam("digest", m[2]) if isHead { container.HeadBlob(ctx) @@ -785,13 +785,13 @@ func ContainerRoutes() *web.Route { } m = manifestsPattern.FindStringSubmatch(path) if len(m) == 3 && (isHead || isGet || isPut || isDelete) { - ctx.SetParams("image", m[1]) + ctx.SetPathParam("image", m[1]) container.VerifyImageName(ctx) if ctx.Written() { return } - ctx.SetParams("reference", m[2]) + ctx.SetPathParam("reference", m[2]) if isHead { container.HeadManifest(ctx) diff --git a/routers/api/packages/cargo/cargo.go b/routers/api/packages/cargo/cargo.go index 140e532efd..3d8407e6b6 100644 --- a/routers/api/packages/cargo/cargo.go +++ b/routers/api/packages/cargo/cargo.go @@ -55,7 +55,7 @@ func RepositoryConfig(ctx *context.Context) { } func EnumeratePackageVersions(ctx *context.Context) { - p, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.TypeCargo, ctx.Params("package")) + p, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.TypeCargo, ctx.PathParam("package")) if err != nil { if errors.Is(err, util.ErrNotExist) { apiError(ctx, http.StatusNotFound, err) @@ -173,11 +173,11 @@ func DownloadPackageFile(ctx *context.Context) { &packages_service.PackageInfo{ Owner: ctx.Package.Owner, PackageType: packages_model.TypeCargo, - Name: ctx.Params("package"), - Version: ctx.Params("version"), + Name: ctx.PathParam("package"), + Version: ctx.PathParam("version"), }, &packages_service.PackageFileInfo{ - Filename: strings.ToLower(fmt.Sprintf("%s-%s.crate", ctx.Params("package"), ctx.Params("version"))), + Filename: strings.ToLower(fmt.Sprintf("%s-%s.crate", ctx.PathParam("package"), ctx.PathParam("version"))), }, ) if err != nil { @@ -274,7 +274,7 @@ func UnyankPackage(ctx *context.Context) { } func yankPackage(ctx *context.Context, yank bool) { - pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeCargo, ctx.Params("package"), ctx.Params("version")) + pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeCargo, ctx.PathParam("package"), ctx.PathParam("version")) if err != nil { if err == packages_model.ErrPackageNotExist { apiError(ctx, http.StatusNotFound, err) diff --git a/routers/api/packages/chef/chef.go b/routers/api/packages/chef/chef.go index b49f4e9d0a..b3cdf12697 100644 --- a/routers/api/packages/chef/chef.go +++ b/routers/api/packages/chef/chef.go @@ -150,7 +150,7 @@ func EnumeratePackages(ctx *context.Context) { // https://github.com/chef/chef/blob/main/knife/lib/chef/knife/supermarket_show.rb func PackageMetadata(ctx *context.Context) { - packageName := ctx.Params("name") + packageName := ctx.PathParam("name") pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeChef, packageName) if err != nil { @@ -211,8 +211,8 @@ func PackageMetadata(ctx *context.Context) { // https://github.com/chef/chef/blob/main/knife/lib/chef/knife/supermarket_show.rb func PackageVersionMetadata(ctx *context.Context) { - packageName := ctx.Params("name") - packageVersion := strings.ReplaceAll(ctx.Params("version"), "_", ".") // Chef calls this endpoint with "_" instead of "."?! + packageName := ctx.PathParam("name") + packageVersion := strings.ReplaceAll(ctx.PathParam("version"), "_", ".") // Chef calls this endpoint with "_" instead of "."?! pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeChef, packageName, packageVersion) if err != nil { @@ -325,7 +325,7 @@ func UploadPackage(ctx *context.Context) { // https://github.com/chef/chef/blob/main/knife/lib/chef/knife/supermarket_download.rb func DownloadPackage(ctx *context.Context) { - pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeChef, ctx.Params("name"), ctx.Params("version")) + pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeChef, ctx.PathParam("name"), ctx.PathParam("version")) if err != nil { if err == packages_model.ErrPackageNotExist { apiError(ctx, http.StatusNotFound, err) @@ -354,8 +354,8 @@ func DownloadPackage(ctx *context.Context) { // https://github.com/chef/chef/blob/main/knife/lib/chef/knife/supermarket_unshare.rb func DeletePackageVersion(ctx *context.Context) { - packageName := ctx.Params("name") - packageVersion := ctx.Params("version") + packageName := ctx.PathParam("name") + packageVersion := ctx.PathParam("version") err := packages_service.RemovePackageVersionByNameAndVersion( ctx, @@ -381,7 +381,7 @@ func DeletePackageVersion(ctx *context.Context) { // https://github.com/chef/chef/blob/main/knife/lib/chef/knife/supermarket_unshare.rb func DeletePackage(ctx *context.Context) { - pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeChef, ctx.Params("name")) + pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeChef, ctx.PathParam("name")) if err != nil { apiError(ctx, http.StatusInternalServerError, err) return diff --git a/routers/api/packages/composer/composer.go b/routers/api/packages/composer/composer.go index a045da40de..40f72f6484 100644 --- a/routers/api/packages/composer/composer.go +++ b/routers/api/packages/composer/composer.go @@ -134,8 +134,8 @@ func EnumeratePackages(ctx *context.Context) { // PackageMetadata returns the metadata for a single package // https://packagist.org/apidoc#get-package-data func PackageMetadata(ctx *context.Context) { - vendorName := ctx.Params("vendorname") - projectName := ctx.Params("projectname") + vendorName := ctx.PathParam("vendorname") + projectName := ctx.PathParam("projectname") pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeComposer, vendorName+"/"+projectName) if err != nil { @@ -168,11 +168,11 @@ func DownloadPackageFile(ctx *context.Context) { &packages_service.PackageInfo{ Owner: ctx.Package.Owner, PackageType: packages_model.TypeComposer, - Name: ctx.Params("package"), - Version: ctx.Params("version"), + Name: ctx.PathParam("package"), + Version: ctx.PathParam("version"), }, &packages_service.PackageFileInfo{ - Filename: ctx.Params("filename"), + Filename: ctx.PathParam("filename"), }, ) if err != nil { diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go index 07ea3eda34..7afca2fab1 100644 --- a/routers/api/packages/conan/conan.go +++ b/routers/api/packages/conan/conan.go @@ -72,11 +72,11 @@ func baseURL(ctx *context.Context) string { // ExtractPathParameters is a middleware to extract common parameters from path func ExtractPathParameters(ctx *context.Context) { rref, err := conan_module.NewRecipeReference( - ctx.Params("name"), - ctx.Params("version"), - ctx.Params("user"), - ctx.Params("channel"), - ctx.Params("recipe_revision"), + ctx.PathParam("name"), + ctx.PathParam("version"), + ctx.PathParam("user"), + ctx.PathParam("channel"), + ctx.PathParam("recipe_revision"), ) if err != nil { apiError(ctx, http.StatusBadRequest, err) @@ -85,14 +85,14 @@ func ExtractPathParameters(ctx *context.Context) { ctx.Data[recipeReferenceKey] = rref - reference := ctx.Params("package_reference") + reference := ctx.PathParam("package_reference") var pref *conan_module.PackageReference if reference != "" { pref, err = conan_module.NewPackageReference( rref, reference, - ctx.Params("package_revision"), + ctx.PathParam("package_revision"), ) if err != nil { apiError(ctx, http.StatusBadRequest, err) @@ -304,7 +304,7 @@ func uploadFile(ctx *context.Context, fileFilter container.Set[string], fileKey rref := ctx.Data[recipeReferenceKey].(*conan_module.RecipeReference) pref := ctx.Data[packageReferenceKey].(*conan_module.PackageReference) - filename := ctx.Params("filename") + filename := ctx.PathParam("filename") if !fileFilter.Contains(filename) { apiError(ctx, http.StatusBadRequest, nil) return @@ -444,7 +444,7 @@ func DownloadPackageFile(ctx *context.Context) { func downloadFile(ctx *context.Context, fileFilter container.Set[string], fileKey string) { rref := ctx.Data[recipeReferenceKey].(*conan_module.RecipeReference) - filename := ctx.Params("filename") + filename := ctx.PathParam("filename") if !fileFilter.Contains(filename) { apiError(ctx, http.StatusBadRequest, nil) return diff --git a/routers/api/packages/conda/conda.go b/routers/api/packages/conda/conda.go index c7e4544d52..7a46681235 100644 --- a/routers/api/packages/conda/conda.go +++ b/routers/api/packages/conda/conda.go @@ -66,7 +66,7 @@ func EnumeratePackages(ctx *context.Context) { repoData := &RepoData{ Info: Info{ - Subdir: ctx.Params("architecture"), + Subdir: ctx.PathParam("architecture"), }, Packages: make(map[string]*PackageInfo), PackagesConda: make(map[string]*PackageInfo), @@ -75,7 +75,7 @@ func EnumeratePackages(ctx *context.Context) { pfs, err := conda_model.SearchFiles(ctx, &conda_model.FileSearchOptions{ OwnerID: ctx.Package.Owner.ID, - Channel: ctx.Params("channel"), + Channel: ctx.PathParam("channel"), Subdir: repoData.Info.Subdir, }) if err != nil { @@ -151,7 +151,7 @@ func EnumeratePackages(ctx *context.Context) { var w io.Writer = resp - if strings.HasSuffix(ctx.Params("filename"), ".json") { + if strings.HasSuffix(ctx.PathParam("filename"), ".json") { resp.Header().Set("Content-Type", "application/json") } else { resp.Header().Set("Content-Type", "application/x-bzip2") @@ -191,7 +191,7 @@ func UploadPackageFile(ctx *context.Context) { defer buf.Close() var pck *conda_module.Package - if strings.HasSuffix(strings.ToLower(ctx.Params("filename")), ".tar.bz2") { + if strings.HasSuffix(strings.ToLower(ctx.PathParam("filename")), ".tar.bz2") { pck, err = conda_module.ParsePackageBZ2(buf) } else { pck, err = conda_module.ParsePackageConda(buf, buf.Size()) @@ -212,7 +212,7 @@ func UploadPackageFile(ctx *context.Context) { fullName := pck.Name - channel := ctx.Params("channel") + channel := ctx.PathParam("channel") if channel != "" { fullName = channel + "/" + pck.Name } @@ -277,9 +277,9 @@ func UploadPackageFile(ctx *context.Context) { func DownloadPackageFile(ctx *context.Context) { pfs, err := conda_model.SearchFiles(ctx, &conda_model.FileSearchOptions{ OwnerID: ctx.Package.Owner.ID, - Channel: ctx.Params("channel"), - Subdir: ctx.Params("architecture"), - Filename: ctx.Params("filename"), + Channel: ctx.PathParam("channel"), + Subdir: ctx.PathParam("architecture"), + Filename: ctx.PathParam("filename"), }) if err != nil { apiError(ctx, http.StatusInternalServerError, err) diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go index 5007037bee..74a3295f09 100644 --- a/routers/api/packages/container/container.go +++ b/routers/api/packages/container/container.go @@ -131,7 +131,7 @@ func ReqContainerAccess(ctx *context.Context) { // VerifyImageName is a middleware which checks if the image name is allowed func VerifyImageName(ctx *context.Context) { - if !imageNamePattern.MatchString(ctx.Params("image")) { + if !imageNamePattern.MatchString(ctx.PathParam("image")) { apiErrorDefined(ctx, errNameInvalid) } } @@ -216,7 +216,7 @@ func GetRepositoryList(ctx *context.Context) { // https://github.com/opencontainers/distribution-spec/blob/main/spec.md#single-post // https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-a-blob-in-chunks func InitiateUploadBlob(ctx *context.Context) { - image := ctx.Params("image") + image := ctx.PathParam("image") mount := ctx.FormTrim("mount") from := ctx.FormTrim("from") @@ -305,7 +305,7 @@ func InitiateUploadBlob(ctx *context.Context) { // https://docs.docker.com/registry/spec/api/#get-blob-upload func GetUploadBlob(ctx *context.Context) { - uuid := ctx.Params("uuid") + uuid := ctx.PathParam("uuid") upload, err := packages_model.GetBlobUploadByID(ctx, uuid) if err != nil { @@ -326,9 +326,9 @@ func GetUploadBlob(ctx *context.Context) { // https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-a-blob-in-chunks func UploadBlob(ctx *context.Context) { - image := ctx.Params("image") + image := ctx.PathParam("image") - uploader, err := container_service.NewBlobUploader(ctx, ctx.Params("uuid")) + uploader, err := container_service.NewBlobUploader(ctx, ctx.PathParam("uuid")) if err != nil { if err == packages_model.ErrPackageBlobUploadNotExist { apiErrorDefined(ctx, errBlobUploadUnknown) @@ -371,7 +371,7 @@ func UploadBlob(ctx *context.Context) { // https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-a-blob-in-chunks func EndUploadBlob(ctx *context.Context) { - image := ctx.Params("image") + image := ctx.PathParam("image") digest := ctx.FormTrim("digest") if digest == "" { @@ -379,7 +379,7 @@ func EndUploadBlob(ctx *context.Context) { return } - uploader, err := container_service.NewBlobUploader(ctx, ctx.Params("uuid")) + uploader, err := container_service.NewBlobUploader(ctx, ctx.PathParam("uuid")) if err != nil { if err == packages_model.ErrPackageBlobUploadNotExist { apiErrorDefined(ctx, errBlobUploadUnknown) @@ -446,7 +446,7 @@ func EndUploadBlob(ctx *context.Context) { // https://docs.docker.com/registry/spec/api/#delete-blob-upload func CancelUploadBlob(ctx *context.Context) { - uuid := ctx.Params("uuid") + uuid := ctx.PathParam("uuid") _, err := packages_model.GetBlobUploadByID(ctx, uuid) if err != nil { @@ -469,7 +469,7 @@ func CancelUploadBlob(ctx *context.Context) { } func getBlobFromContext(ctx *context.Context) (*packages_model.PackageFileDescriptor, error) { - d := ctx.Params("digest") + d := ctx.PathParam("digest") if digest.Digest(d).Validate() != nil { return nil, container_model.ErrContainerBlobNotExist @@ -477,7 +477,7 @@ func getBlobFromContext(ctx *context.Context) (*packages_model.PackageFileDescri return workaroundGetContainerBlob(ctx, &container_model.BlobSearchOptions{ OwnerID: ctx.Package.Owner.ID, - Image: ctx.Params("image"), + Image: ctx.PathParam("image"), Digest: d, }) } @@ -518,14 +518,14 @@ func GetBlob(ctx *context.Context) { // https://github.com/opencontainers/distribution-spec/blob/main/spec.md#deleting-blobs func DeleteBlob(ctx *context.Context) { - d := ctx.Params("digest") + d := ctx.PathParam("digest") if digest.Digest(d).Validate() != nil { apiErrorDefined(ctx, errBlobUnknown) return } - if err := deleteBlob(ctx, ctx.Package.Owner.ID, ctx.Params("image"), d); err != nil { + if err := deleteBlob(ctx, ctx.Package.Owner.ID, ctx.PathParam("image"), d); err != nil { apiError(ctx, http.StatusInternalServerError, err) return } @@ -537,13 +537,13 @@ func DeleteBlob(ctx *context.Context) { // https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-manifests func UploadManifest(ctx *context.Context) { - reference := ctx.Params("reference") + reference := ctx.PathParam("reference") mci := &manifestCreationInfo{ MediaType: ctx.Req.Header.Get("Content-Type"), Owner: ctx.Package.Owner, Creator: ctx.Doer, - Image: ctx.Params("image"), + Image: ctx.PathParam("image"), Reference: reference, IsTagged: digest.Digest(reference).Validate() != nil, } @@ -592,11 +592,11 @@ func UploadManifest(ctx *context.Context) { } func getBlobSearchOptionsFromContext(ctx *context.Context) (*container_model.BlobSearchOptions, error) { - reference := ctx.Params("reference") + reference := ctx.PathParam("reference") opts := &container_model.BlobSearchOptions{ OwnerID: ctx.Package.Owner.ID, - Image: ctx.Params("image"), + Image: ctx.PathParam("image"), IsManifest: true, } @@ -719,7 +719,7 @@ func serveBlob(ctx *context.Context, pfd *packages_model.PackageFileDescriptor) // https://github.com/opencontainers/distribution-spec/blob/main/spec.md#content-discovery func GetTagList(ctx *context.Context) { - image := ctx.Params("image") + image := ctx.PathParam("image") if _, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.TypeContainer, image); err != nil { if err == packages_model.ErrPackageNotExist { diff --git a/routers/api/packages/cran/cran.go b/routers/api/packages/cran/cran.go index f1d616724a..8a20072cb6 100644 --- a/routers/api/packages/cran/cran.go +++ b/routers/api/packages/cran/cran.go @@ -28,18 +28,18 @@ func apiError(ctx *context.Context, status int, obj any) { } func EnumerateSourcePackages(ctx *context.Context) { - enumeratePackages(ctx, ctx.Params("format"), &cran_model.SearchOptions{ + enumeratePackages(ctx, ctx.PathParam("format"), &cran_model.SearchOptions{ OwnerID: ctx.Package.Owner.ID, FileType: cran_module.TypeSource, }) } func EnumerateBinaryPackages(ctx *context.Context) { - enumeratePackages(ctx, ctx.Params("format"), &cran_model.SearchOptions{ + enumeratePackages(ctx, ctx.PathParam("format"), &cran_model.SearchOptions{ OwnerID: ctx.Package.Owner.ID, FileType: cran_module.TypeBinary, - Platform: ctx.Params("platform"), - RVersion: ctx.Params("rversion"), + Platform: ctx.PathParam("platform"), + RVersion: ctx.PathParam("rversion"), }) } @@ -225,7 +225,7 @@ func DownloadSourcePackageFile(ctx *context.Context) { downloadPackageFile(ctx, &cran_model.SearchOptions{ OwnerID: ctx.Package.Owner.ID, FileType: cran_module.TypeSource, - Filename: ctx.Params("filename"), + Filename: ctx.PathParam("filename"), }) } @@ -233,9 +233,9 @@ func DownloadBinaryPackageFile(ctx *context.Context) { downloadPackageFile(ctx, &cran_model.SearchOptions{ OwnerID: ctx.Package.Owner.ID, FileType: cran_module.TypeBinary, - Platform: ctx.Params("platform"), - RVersion: ctx.Params("rversion"), - Filename: ctx.Params("filename"), + Platform: ctx.PathParam("platform"), + RVersion: ctx.PathParam("rversion"), + Filename: ctx.PathParam("filename"), }) } diff --git a/routers/api/packages/debian/debian.go b/routers/api/packages/debian/debian.go index 8c05476cbc..162122ccbd 100644 --- a/routers/api/packages/debian/debian.go +++ b/routers/api/packages/debian/debian.go @@ -51,10 +51,10 @@ func GetRepositoryFile(ctx *context.Context) { return } - key := ctx.Params("distribution") + key := ctx.PathParam("distribution") - component := ctx.Params("component") - architecture := strings.TrimPrefix(ctx.Params("architecture"), "binary-") + component := ctx.PathParam("component") + architecture := strings.TrimPrefix(ctx.PathParam("architecture"), "binary-") if component != "" && architecture != "" { key += "|" + component + "|" + architecture } @@ -63,7 +63,7 @@ func GetRepositoryFile(ctx *context.Context) { ctx, pv, &packages_service.PackageFileInfo{ - Filename: ctx.Params("filename"), + Filename: ctx.PathParam("filename"), CompositeKey: key, }, ) @@ -87,14 +87,14 @@ func GetRepositoryFileByHash(ctx *context.Context) { return } - algorithm := strings.ToLower(ctx.Params("algorithm")) + algorithm := strings.ToLower(ctx.PathParam("algorithm")) if algorithm == "md5sum" { algorithm = "md5" } pfs, _, err := packages_model.SearchFiles(ctx, &packages_model.PackageFileSearchOptions{ VersionID: pv.ID, - Hash: strings.ToLower(ctx.Params("hash")), + Hash: strings.ToLower(ctx.PathParam("hash")), HashAlgorithm: algorithm, }) if err != nil { @@ -120,8 +120,8 @@ func GetRepositoryFileByHash(ctx *context.Context) { } func UploadPackageFile(ctx *context.Context) { - distribution := strings.TrimSpace(ctx.Params("distribution")) - component := strings.TrimSpace(ctx.Params("component")) + distribution := strings.TrimSpace(ctx.PathParam("distribution")) + component := strings.TrimSpace(ctx.PathParam("component")) if distribution == "" || component == "" { apiError(ctx, http.StatusBadRequest, "invalid distribution or component") return @@ -207,8 +207,8 @@ func UploadPackageFile(ctx *context.Context) { } func DownloadPackageFile(ctx *context.Context) { - name := ctx.Params("name") - version := ctx.Params("version") + name := ctx.PathParam("name") + version := ctx.PathParam("version") s, u, pf, err := packages_service.GetFileStreamByPackageNameAndVersion( ctx, @@ -219,8 +219,8 @@ func DownloadPackageFile(ctx *context.Context) { Version: version, }, &packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%s_%s_%s.deb", name, version, ctx.Params("architecture")), - CompositeKey: fmt.Sprintf("%s|%s", ctx.Params("distribution"), ctx.Params("component")), + Filename: fmt.Sprintf("%s_%s_%s.deb", name, version, ctx.PathParam("architecture")), + CompositeKey: fmt.Sprintf("%s|%s", ctx.PathParam("distribution"), ctx.PathParam("component")), }, ) if err != nil { @@ -240,11 +240,11 @@ func DownloadPackageFile(ctx *context.Context) { } func DeletePackageFile(ctx *context.Context) { - distribution := ctx.Params("distribution") - component := ctx.Params("component") - name := ctx.Params("name") - version := ctx.Params("version") - architecture := ctx.Params("architecture") + distribution := ctx.PathParam("distribution") + component := ctx.PathParam("component") + name := ctx.PathParam("name") + version := ctx.PathParam("version") + architecture := ctx.PathParam("architecture") owner := ctx.Package.Owner diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go index e66f3ee676..868caf9cf0 100644 --- a/routers/api/packages/generic/generic.go +++ b/routers/api/packages/generic/generic.go @@ -36,11 +36,11 @@ func DownloadPackageFile(ctx *context.Context) { &packages_service.PackageInfo{ Owner: ctx.Package.Owner, PackageType: packages_model.TypeGeneric, - Name: ctx.Params("packagename"), - Version: ctx.Params("packageversion"), + Name: ctx.PathParam("packagename"), + Version: ctx.PathParam("packageversion"), }, &packages_service.PackageFileInfo{ - Filename: ctx.Params("filename"), + Filename: ctx.PathParam("filename"), }, ) if err != nil { @@ -71,8 +71,8 @@ func isValidFileName(filename string) bool { // UploadPackage uploads the specific generic package. // Duplicated packages get rejected. func UploadPackage(ctx *context.Context) { - packageName := ctx.Params("packagename") - filename := ctx.Params("filename") + packageName := ctx.PathParam("packagename") + filename := ctx.PathParam("filename") if !isValidPackageName(packageName) { apiError(ctx, http.StatusBadRequest, errors.New("invalid package name")) @@ -84,7 +84,7 @@ func UploadPackage(ctx *context.Context) { return } - packageVersion := ctx.Params("packageversion") + packageVersion := ctx.PathParam("packageversion") if packageVersion != strings.TrimSpace(packageVersion) { apiError(ctx, http.StatusBadRequest, errors.New("invalid package version")) return @@ -150,8 +150,8 @@ func DeletePackage(ctx *context.Context) { &packages_service.PackageInfo{ Owner: ctx.Package.Owner, PackageType: packages_model.TypeGeneric, - Name: ctx.Params("packagename"), - Version: ctx.Params("packageversion"), + Name: ctx.PathParam("packagename"), + Version: ctx.PathParam("packageversion"), }, ) if err != nil { @@ -169,12 +169,12 @@ func DeletePackage(ctx *context.Context) { // DeletePackageFile deletes the specific file of a generic package. func DeletePackageFile(ctx *context.Context) { pv, pf, err := func() (*packages_model.PackageVersion, *packages_model.PackageFile, error) { - pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeGeneric, ctx.Params("packagename"), ctx.Params("packageversion")) + pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeGeneric, ctx.PathParam("packagename"), ctx.PathParam("packageversion")) if err != nil { return nil, nil, err } - pf, err := packages_model.GetFileForVersionByName(ctx, pv.ID, ctx.Params("filename"), packages_model.EmptyFileKey) + pf, err := packages_model.GetFileForVersionByName(ctx, pv.ID, ctx.PathParam("filename"), packages_model.EmptyFileKey) if err != nil { return nil, nil, err } diff --git a/routers/api/packages/goproxy/goproxy.go b/routers/api/packages/goproxy/goproxy.go index 56a07dbd43..bde29df739 100644 --- a/routers/api/packages/goproxy/goproxy.go +++ b/routers/api/packages/goproxy/goproxy.go @@ -28,7 +28,7 @@ func apiError(ctx *context.Context, status int, obj any) { } func EnumeratePackageVersions(ctx *context.Context) { - pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeGo, ctx.Params("name")) + pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeGo, ctx.PathParam("name")) if err != nil { apiError(ctx, http.StatusInternalServerError, err) return @@ -50,7 +50,7 @@ func EnumeratePackageVersions(ctx *context.Context) { } func PackageVersionMetadata(ctx *context.Context) { - pv, err := resolvePackage(ctx, ctx.Package.Owner.ID, ctx.Params("name"), ctx.Params("version")) + pv, err := resolvePackage(ctx, ctx.Package.Owner.ID, ctx.PathParam("name"), ctx.PathParam("version")) if err != nil { if errors.Is(err, util.ErrNotExist) { apiError(ctx, http.StatusNotFound, err) @@ -70,7 +70,7 @@ func PackageVersionMetadata(ctx *context.Context) { } func PackageVersionGoModContent(ctx *context.Context) { - pv, err := resolvePackage(ctx, ctx.Package.Owner.ID, ctx.Params("name"), ctx.Params("version")) + pv, err := resolvePackage(ctx, ctx.Package.Owner.ID, ctx.PathParam("name"), ctx.PathParam("version")) if err != nil { if errors.Is(err, util.ErrNotExist) { apiError(ctx, http.StatusNotFound, err) @@ -90,7 +90,7 @@ func PackageVersionGoModContent(ctx *context.Context) { } func DownloadPackageFile(ctx *context.Context) { - pv, err := resolvePackage(ctx, ctx.Package.Owner.ID, ctx.Params("name"), ctx.Params("version")) + pv, err := resolvePackage(ctx, ctx.Package.Owner.ID, ctx.PathParam("name"), ctx.PathParam("version")) if err != nil { if errors.Is(err, util.ErrNotExist) { apiError(ctx, http.StatusNotFound, err) diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go index efdb83ec0e..cb30a20074 100644 --- a/routers/api/packages/helm/helm.go +++ b/routers/api/packages/helm/helm.go @@ -101,14 +101,14 @@ func Index(ctx *context.Context) { // DownloadPackageFile serves the content of a package func DownloadPackageFile(ctx *context.Context) { - filename := ctx.Params("filename") + filename := ctx.PathParam("filename") pvs, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{ OwnerID: ctx.Package.Owner.ID, Type: packages_model.TypeHelm, Name: packages_model.SearchValue{ ExactMatch: true, - Value: ctx.Params("package"), + Value: ctx.PathParam("package"), }, HasFileWithName: filename, IsInternal: optional.Some(false), diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go index cb15eae682..1486e83c57 100644 --- a/routers/api/packages/maven/maven.go +++ b/routers/api/packages/maven/maven.go @@ -385,7 +385,7 @@ type parameters struct { } func extractPathParameters(ctx *context.Context) (parameters, error) { - parts := strings.Split(ctx.Params("*"), "/") + parts := strings.Split(ctx.PathParam("*"), "/") p := parameters{ Filename: parts[len(parts)-1], diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go index 84acfffae2..284723e0d7 100644 --- a/routers/api/packages/npm/npm.go +++ b/routers/api/packages/npm/npm.go @@ -43,8 +43,8 @@ func apiError(ctx *context.Context, status int, obj any) { // packageNameFromParams gets the package name from the url parameters // Variations: /name/, /@scope/name/, /@scope%2Fname/ func packageNameFromParams(ctx *context.Context) string { - scope := ctx.Params("scope") - id := ctx.Params("id") + scope := ctx.PathParam("scope") + id := ctx.PathParam("id") if scope != "" { return fmt.Sprintf("@%s/%s", scope, id) } @@ -82,8 +82,8 @@ func PackageMetadata(ctx *context.Context) { // DownloadPackageFile serves the content of a package func DownloadPackageFile(ctx *context.Context) { packageName := packageNameFromParams(ctx) - packageVersion := ctx.Params("version") - filename := ctx.Params("filename") + packageVersion := ctx.PathParam("version") + filename := ctx.PathParam("filename") s, u, pf, err := packages_service.GetFileStreamByPackageNameAndVersion( ctx, @@ -111,7 +111,7 @@ func DownloadPackageFile(ctx *context.Context) { // DownloadPackageFileByName finds the version and serves the contents of a package func DownloadPackageFileByName(ctx *context.Context) { - filename := ctx.Params("filename") + filename := ctx.PathParam("filename") pvs, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{ OwnerID: ctx.Package.Owner.ID, @@ -254,7 +254,7 @@ func DeletePreview(ctx *context.Context) { // DeletePackageVersion deletes the package version func DeletePackageVersion(ctx *context.Context) { packageName := packageNameFromParams(ctx) - packageVersion := ctx.Params("version") + packageVersion := ctx.PathParam("version") err := packages_service.RemovePackageVersionByNameAndVersion( ctx, @@ -349,7 +349,7 @@ func AddPackageTag(ctx *context.Context) { return } - if err := setPackageTag(ctx, ctx.Params("tag"), pv, false); err != nil { + if err := setPackageTag(ctx, ctx.PathParam("tag"), pv, false); err != nil { if err == errInvalidTagName { apiError(ctx, http.StatusBadRequest, err) return @@ -370,7 +370,7 @@ func DeletePackageTag(ctx *context.Context) { } if len(pvs) != 0 { - if err := setPackageTag(ctx, ctx.Params("tag"), pvs[0], true); err != nil { + if err := setPackageTag(ctx, ctx.PathParam("tag"), pvs[0], true); err != nil { if err == errInvalidTagName { apiError(ctx, http.StatusBadRequest, err) return diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go index 0d7212d7f7..70b95e6a77 100644 --- a/routers/api/packages/nuget/nuget.go +++ b/routers/api/packages/nuget/nuget.go @@ -226,7 +226,7 @@ func SearchServiceV3(ctx *context.Context) { // https://docs.microsoft.com/en-us/nuget/api/registration-base-url-resource#registration-index func RegistrationIndex(ctx *context.Context) { - packageName := ctx.Params("id") + packageName := ctx.PathParam("id") pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeNuGet, packageName) if err != nil { @@ -254,8 +254,8 @@ func RegistrationIndex(ctx *context.Context) { // https://github.com/NuGet/NuGet.Client/blob/dev/src/NuGet.Core/NuGet.Protocol/LegacyFeed/V2FeedQueryBuilder.cs func RegistrationLeafV2(ctx *context.Context) { - packageName := ctx.Params("id") - packageVersion := ctx.Params("version") + packageName := ctx.PathParam("id") + packageVersion := ctx.PathParam("version") pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeNuGet, packageName, packageVersion) if err != nil { @@ -283,8 +283,8 @@ func RegistrationLeafV2(ctx *context.Context) { // https://docs.microsoft.com/en-us/nuget/api/registration-base-url-resource#registration-leaf func RegistrationLeafV3(ctx *context.Context) { - packageName := ctx.Params("id") - packageVersion := strings.TrimSuffix(ctx.Params("version"), ".json") + packageName := ctx.PathParam("id") + packageVersion := strings.TrimSuffix(ctx.PathParam("version"), ".json") pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeNuGet, packageName, packageVersion) if err != nil { @@ -381,7 +381,7 @@ func EnumeratePackageVersionsV2Count(ctx *context.Context) { // https://docs.microsoft.com/en-us/nuget/api/package-base-address-resource#enumerate-package-versions func EnumeratePackageVersionsV3(ctx *context.Context) { - packageName := ctx.Params("id") + packageName := ctx.PathParam("id") pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeNuGet, packageName) if err != nil { @@ -401,9 +401,9 @@ func EnumeratePackageVersionsV3(ctx *context.Context) { // https://learn.microsoft.com/en-us/nuget/api/package-base-address-resource#download-package-manifest-nuspec // https://learn.microsoft.com/en-us/nuget/api/package-base-address-resource#download-package-content-nupkg func DownloadPackageFile(ctx *context.Context) { - packageName := ctx.Params("id") - packageVersion := ctx.Params("version") - filename := ctx.Params("filename") + packageName := ctx.PathParam("id") + packageVersion := ctx.PathParam("version") + filename := ctx.PathParam("filename") s, u, pf, err := packages_service.GetFileStreamByPackageNameAndVersion( ctx, @@ -643,9 +643,9 @@ func processUploadedFile(ctx *context.Context, expectedType nuget_module.Package // https://github.com/dotnet/symstore/blob/main/docs/specs/Simple_Symbol_Query_Protocol.md#request func DownloadSymbolFile(ctx *context.Context) { - filename := ctx.Params("filename") - guid := ctx.Params("guid")[:32] - filename2 := ctx.Params("filename2") + filename := ctx.PathParam("filename") + guid := ctx.PathParam("guid")[:32] + filename2 := ctx.PathParam("filename2") if filename != filename2 { apiError(ctx, http.StatusBadRequest, nil) @@ -685,8 +685,8 @@ func DownloadSymbolFile(ctx *context.Context) { // DeletePackage hard deletes the package // https://docs.microsoft.com/en-us/nuget/api/package-publish-resource#delete-a-package func DeletePackage(ctx *context.Context) { - packageName := ctx.Params("id") - packageVersion := ctx.Params("version") + packageName := ctx.PathParam("id") + packageVersion := ctx.PathParam("version") err := packages_service.RemovePackageVersionByNameAndVersion( ctx, diff --git a/routers/api/packages/pub/pub.go b/routers/api/packages/pub/pub.go index f87df52a29..2be27323fd 100644 --- a/routers/api/packages/pub/pub.go +++ b/routers/api/packages/pub/pub.go @@ -81,7 +81,7 @@ func baseURL(ctx *context.Context) string { // https://github.com/dart-lang/pub/blob/master/doc/repository-spec-v2.md#list-all-versions-of-a-package func EnumeratePackageVersions(ctx *context.Context) { - packageName := ctx.Params("id") + packageName := ctx.PathParam("id") pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypePub, packageName) if err != nil { @@ -119,8 +119,8 @@ func EnumeratePackageVersions(ctx *context.Context) { // https://github.com/dart-lang/pub/blob/master/doc/repository-spec-v2.md#deprecated-inspect-a-specific-version-of-a-package func PackageVersionMetadata(ctx *context.Context) { - packageName := ctx.Params("id") - packageVersion := ctx.Params("version") + packageName := ctx.PathParam("id") + packageVersion := ctx.PathParam("version") pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypePub, packageName, packageVersion) if err != nil { @@ -228,8 +228,8 @@ func UploadPackageFile(ctx *context.Context) { // https://github.com/dart-lang/pub/blob/master/doc/repository-spec-v2.md#publishing-packages func FinalizePackage(ctx *context.Context) { - packageName := ctx.Params("id") - packageVersion := ctx.Params("version") + packageName := ctx.PathParam("id") + packageVersion := ctx.PathParam("version") _, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypePub, packageName, packageVersion) if err != nil { @@ -253,8 +253,8 @@ func FinalizePackage(ctx *context.Context) { // https://github.com/dart-lang/pub/blob/master/doc/repository-spec-v2.md#deprecated-download-a-specific-version-of-a-package func DownloadPackageFile(ctx *context.Context) { - packageName := ctx.Params("id") - packageVersion := strings.TrimSuffix(ctx.Params("version"), ".tar.gz") + packageName := ctx.PathParam("id") + packageVersion := strings.TrimSuffix(ctx.PathParam("version"), ".tar.gz") pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypePub, packageName, packageVersion) if err != nil { diff --git a/routers/api/packages/pypi/pypi.go b/routers/api/packages/pypi/pypi.go index 7824db1823..5ea86071a9 100644 --- a/routers/api/packages/pypi/pypi.go +++ b/routers/api/packages/pypi/pypi.go @@ -45,7 +45,7 @@ func apiError(ctx *context.Context, status int, obj any) { // PackageMetadata returns the metadata for a single package func PackageMetadata(ctx *context.Context) { - packageName := normalizer.Replace(ctx.Params("id")) + packageName := normalizer.Replace(ctx.PathParam("id")) pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypePyPI, packageName) if err != nil { @@ -76,9 +76,9 @@ func PackageMetadata(ctx *context.Context) { // DownloadPackageFile serves the content of a package func DownloadPackageFile(ctx *context.Context) { - packageName := normalizer.Replace(ctx.Params("id")) - packageVersion := ctx.Params("version") - filename := ctx.Params("filename") + packageName := normalizer.Replace(ctx.PathParam("id")) + packageVersion := ctx.PathParam("version") + filename := ctx.PathParam("filename") s, u, pf, err := packages_service.GetFileStreamByPackageNameAndVersion( ctx, diff --git a/routers/api/packages/rpm/rpm.go b/routers/api/packages/rpm/rpm.go index c59366992c..11d7729eec 100644 --- a/routers/api/packages/rpm/rpm.go +++ b/routers/api/packages/rpm/rpm.go @@ -33,7 +33,7 @@ func apiError(ctx *context.Context, status int, obj any) { // https://dnf.readthedocs.io/en/latest/conf_ref.html func GetRepositoryConfig(ctx *context.Context) { - group := ctx.Params("group") + group := ctx.PathParam("group") var groupParts []string if group != "" { @@ -71,7 +71,7 @@ func CheckRepositoryFileExistence(ctx *context.Context) { return } - pf, err := packages_model.GetFileForVersionByName(ctx, pv.ID, ctx.Params("filename"), ctx.Params("group")) + pf, err := packages_model.GetFileForVersionByName(ctx, pv.ID, ctx.PathParam("filename"), ctx.PathParam("group")) if err != nil { if errors.Is(err, util.ErrNotExist) { ctx.Status(http.StatusNotFound) @@ -100,8 +100,8 @@ func GetRepositoryFile(ctx *context.Context) { ctx, pv, &packages_service.PackageFileInfo{ - Filename: ctx.Params("filename"), - CompositeKey: ctx.Params("group"), + Filename: ctx.PathParam("filename"), + CompositeKey: ctx.PathParam("group"), }, ) if err != nil { @@ -153,7 +153,7 @@ func UploadPackageFile(ctx *context.Context) { apiError(ctx, http.StatusInternalServerError, err) return } - group := ctx.Params("group") + group := ctx.PathParam("group") _, _, err = packages_service.CreatePackageOrAddFileToExisting( ctx, &packages_service.PackageCreationInfo{ @@ -202,8 +202,8 @@ func UploadPackageFile(ctx *context.Context) { } func DownloadPackageFile(ctx *context.Context) { - name := ctx.Params("name") - version := ctx.Params("version") + name := ctx.PathParam("name") + version := ctx.PathParam("version") s, u, pf, err := packages_service.GetFileStreamByPackageNameAndVersion( ctx, @@ -214,8 +214,8 @@ func DownloadPackageFile(ctx *context.Context) { Version: version, }, &packages_service.PackageFileInfo{ - Filename: fmt.Sprintf("%s-%s.%s.rpm", name, version, ctx.Params("architecture")), - CompositeKey: ctx.Params("group"), + Filename: fmt.Sprintf("%s-%s.%s.rpm", name, version, ctx.PathParam("architecture")), + CompositeKey: ctx.PathParam("group"), }, ) if err != nil { @@ -231,10 +231,10 @@ func DownloadPackageFile(ctx *context.Context) { } func DeletePackageFile(webctx *context.Context) { - group := webctx.Params("group") - name := webctx.Params("name") - version := webctx.Params("version") - architecture := webctx.Params("architecture") + group := webctx.PathParam("group") + name := webctx.PathParam("name") + version := webctx.PathParam("version") + architecture := webctx.PathParam("architecture") var pd *packages_model.PackageDescriptor diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go index 0a08378b47..958063e70a 100644 --- a/routers/api/packages/rubygems/rubygems.go +++ b/routers/api/packages/rubygems/rubygems.go @@ -95,7 +95,7 @@ func enumeratePackages(ctx *context.Context, filename string, pvs []*packages_mo // ServePackageSpecification serves the compressed Gemspec file of a package func ServePackageSpecification(ctx *context.Context) { - filename := ctx.Params("filename") + filename := ctx.PathParam("filename") if !strings.HasSuffix(filename, ".gemspec.rz") { apiError(ctx, http.StatusNotImplemented, nil) @@ -164,7 +164,7 @@ func ServePackageSpecification(ctx *context.Context) { // DownloadPackageFile serves the content of a package func DownloadPackageFile(ctx *context.Context) { - filename := ctx.Params("filename") + filename := ctx.PathParam("filename") pvs, err := getVersionsByFilename(ctx, filename) if err != nil { @@ -299,7 +299,7 @@ func DeletePackage(ctx *context.Context) { // GetPackageInfo returns a custom text based format for the single rubygem with a line for each version of the rubygem // ref: https://guides.rubygems.org/rubygems-org-compact-index-api/ func GetPackageInfo(ctx *context.Context) { - packageName := ctx.Params("packagename") + packageName := ctx.PathParam("packagename") versions, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeRubyGems, packageName) if err != nil { apiError(ctx, http.StatusInternalServerError, err) diff --git a/routers/api/packages/swift/swift.go b/routers/api/packages/swift/swift.go index a9da3ea9c2..d5d4d4e9d1 100644 --- a/routers/api/packages/swift/swift.go +++ b/routers/api/packages/swift/swift.go @@ -115,8 +115,8 @@ type EnumeratePackageVersionsResponse struct { // https://github.com/apple/swift-package-manager/blob/main/Documentation/Registry.md#41-list-package-releases func EnumeratePackageVersions(ctx *context.Context) { - packageScope := ctx.Params("scope") - packageName := ctx.Params("name") + packageScope := ctx.PathParam("scope") + packageName := ctx.PathParam("name") pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeSwift, buildPackageID(packageScope, packageName)) if err != nil { @@ -172,9 +172,9 @@ type PackageVersionMetadataResponse struct { // https://github.com/apple/swift-package-manager/blob/main/Documentation/Registry.md#endpoint-2 func PackageVersionMetadata(ctx *context.Context) { - id := buildPackageID(ctx.Params("scope"), ctx.Params("name")) + id := buildPackageID(ctx.PathParam("scope"), ctx.PathParam("name")) - pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeSwift, id, ctx.Params("version")) + pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeSwift, id, ctx.PathParam("version")) if err != nil { if errors.Is(err, util.ErrNotExist) { apiError(ctx, http.StatusNotFound, err) @@ -230,9 +230,9 @@ func PackageVersionMetadata(ctx *context.Context) { // https://github.com/apple/swift-package-manager/blob/main/Documentation/Registry.md#43-fetch-manifest-for-a-package-release func DownloadManifest(ctx *context.Context) { - packageScope := ctx.Params("scope") - packageName := ctx.Params("name") - packageVersion := ctx.Params("version") + packageScope := ctx.PathParam("scope") + packageName := ctx.PathParam("name") + packageVersion := ctx.PathParam("version") pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeSwift, buildPackageID(packageScope, packageName), packageVersion) if err != nil { @@ -282,10 +282,10 @@ func DownloadManifest(ctx *context.Context) { // https://github.com/apple/swift-package-manager/blob/main/Documentation/Registry.md#endpoint-6 func UploadPackageFile(ctx *context.Context) { - packageScope := ctx.Params("scope") - packageName := ctx.Params("name") + packageScope := ctx.PathParam("scope") + packageName := ctx.PathParam("name") - v, err := version.NewVersion(ctx.Params("version")) + v, err := version.NewVersion(ctx.PathParam("version")) if !scopePattern.MatchString(packageScope) || !namePattern.MatchString(packageName) || err != nil { apiError(ctx, http.StatusBadRequest, err) @@ -381,7 +381,7 @@ func UploadPackageFile(ctx *context.Context) { // https://github.com/apple/swift-package-manager/blob/main/Documentation/Registry.md#endpoint-4 func DownloadPackageFile(ctx *context.Context) { - pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeSwift, buildPackageID(ctx.Params("scope"), ctx.Params("name")), ctx.Params("version")) + pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeSwift, buildPackageID(ctx.PathParam("scope"), ctx.PathParam("name")), ctx.PathParam("version")) if err != nil { if errors.Is(err, util.ErrNotExist) { apiError(ctx, http.StatusNotFound, err) diff --git a/routers/api/packages/vagrant/vagrant.go b/routers/api/packages/vagrant/vagrant.go index 98a81da368..1daf2a0527 100644 --- a/routers/api/packages/vagrant/vagrant.go +++ b/routers/api/packages/vagrant/vagrant.go @@ -44,7 +44,7 @@ func CheckAuthenticate(ctx *context.Context) { } func CheckBoxAvailable(ctx *context.Context) { - pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeVagrant, ctx.Params("name")) + pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeVagrant, ctx.PathParam("name")) if err != nil { apiError(ctx, http.StatusInternalServerError, err) return @@ -101,7 +101,7 @@ func packageDescriptorToMetadata(baseURL string, pd *packages_model.PackageDescr } func EnumeratePackageVersions(ctx *context.Context) { - pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeVagrant, ctx.Params("name")) + pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeVagrant, ctx.PathParam("name")) if err != nil { apiError(ctx, http.StatusInternalServerError, err) return @@ -136,14 +136,14 @@ func EnumeratePackageVersions(ctx *context.Context) { } func UploadPackageFile(ctx *context.Context) { - boxName := ctx.Params("name") - boxVersion := ctx.Params("version") + boxName := ctx.PathParam("name") + boxVersion := ctx.PathParam("version") _, err := version.NewSemver(boxVersion) if err != nil { apiError(ctx, http.StatusBadRequest, err) return } - boxProvider := ctx.Params("provider") + boxProvider := ctx.PathParam("provider") if !strings.HasSuffix(boxProvider, ".box") { apiError(ctx, http.StatusBadRequest, err) return @@ -222,11 +222,11 @@ func DownloadPackageFile(ctx *context.Context) { &packages_service.PackageInfo{ Owner: ctx.Package.Owner, PackageType: packages_model.TypeVagrant, - Name: ctx.Params("name"), - Version: ctx.Params("version"), + Name: ctx.PathParam("name"), + Version: ctx.PathParam("version"), }, &packages_service.PackageFileInfo{ - Filename: ctx.Params("provider"), + Filename: ctx.PathParam("provider"), }, ) if err != nil { diff --git a/routers/api/v1/admin/adopt.go b/routers/api/v1/admin/adopt.go index a4708fe032..613d123494 100644 --- a/routers/api/v1/admin/adopt.go +++ b/routers/api/v1/admin/adopt.go @@ -80,8 +80,8 @@ func AdoptRepository(ctx *context.APIContext) { // "$ref": "#/responses/notFound" // "403": // "$ref": "#/responses/forbidden" - ownerName := ctx.Params(":username") - repoName := ctx.Params(":reponame") + ownerName := ctx.PathParam(":username") + repoName := ctx.PathParam(":reponame") ctxUser, err := user_model.GetUserByName(ctx, ownerName) if err != nil { @@ -142,8 +142,8 @@ func DeleteUnadoptedRepository(ctx *context.APIContext) { // "$ref": "#/responses/empty" // "403": // "$ref": "#/responses/forbidden" - ownerName := ctx.Params(":username") - repoName := ctx.Params(":reponame") + ownerName := ctx.PathParam(":username") + repoName := ctx.PathParam(":reponame") ctxUser, err := user_model.GetUserByName(ctx, ownerName) if err != nil { diff --git a/routers/api/v1/admin/cron.go b/routers/api/v1/admin/cron.go index e1ca6048c9..fba9d33f25 100644 --- a/routers/api/v1/admin/cron.go +++ b/routers/api/v1/admin/cron.go @@ -74,7 +74,7 @@ func PostCronTask(ctx *context.APIContext) { // "$ref": "#/responses/empty" // "404": // "$ref": "#/responses/notFound" - task := cron.GetTask(ctx.Params(":task")) + task := cron.GetTask(ctx.PathParam(":task")) if task == nil { ctx.NotFound() return diff --git a/routers/api/v1/admin/email.go b/routers/api/v1/admin/email.go index ba963e9f69..6fe418249b 100644 --- a/routers/api/v1/admin/email.go +++ b/routers/api/v1/admin/email.go @@ -38,7 +38,7 @@ func GetAllEmails(ctx *context.APIContext) { listOptions := utils.GetListOptions(ctx) emails, maxResults, err := user_model.SearchEmails(ctx, &user_model.SearchEmailOptions{ - Keyword: ctx.Params(":email"), + Keyword: ctx.PathParam(":email"), ListOptions: listOptions, }) if err != nil { @@ -82,6 +82,6 @@ func SearchEmail(ctx *context.APIContext) { // "403": // "$ref": "#/responses/forbidden" - ctx.SetParams(":email", ctx.FormTrim("q")) + ctx.SetPathParam(":email", ctx.FormTrim("q")) GetAllEmails(ctx) } diff --git a/routers/api/v1/admin/hooks.go b/routers/api/v1/admin/hooks.go index 4c168b55bf..fa60836b7e 100644 --- a/routers/api/v1/admin/hooks.go +++ b/routers/api/v1/admin/hooks.go @@ -73,7 +73,7 @@ func GetHook(ctx *context.APIContext) { // "200": // "$ref": "#/responses/Hook" - hookID := ctx.ParamsInt64(":id") + hookID := ctx.PathParamInt64(":id") hook, err := webhook.GetSystemOrDefaultWebhook(ctx, hookID) if err != nil { if errors.Is(err, util.ErrNotExist) { @@ -142,7 +142,7 @@ func EditHook(ctx *context.APIContext) { form := web.GetForm(ctx).(*api.EditHookOption) // TODO in body params - hookID := ctx.ParamsInt64(":id") + hookID := ctx.PathParamInt64(":id") utils.EditSystemHook(ctx, form, hookID) } @@ -164,7 +164,7 @@ func DeleteHook(ctx *context.APIContext) { // "204": // "$ref": "#/responses/empty" - hookID := ctx.ParamsInt64(":id") + hookID := ctx.PathParamInt64(":id") if err := webhook.DeleteDefaultSystemWebhook(ctx, hookID); err != nil { if errors.Is(err, util.ErrNotExist) { ctx.NotFound() diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index be907805d6..3e2fefc6da 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -373,7 +373,7 @@ func DeleteUserPublicKey(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - if err := asymkey_service.DeletePublicKey(ctx, ctx.ContextUser, ctx.ParamsInt64(":id")); err != nil { + if err := asymkey_service.DeletePublicKey(ctx, ctx.ContextUser, ctx.PathParamInt64(":id")); err != nil { if asymkey_model.IsErrKeyNotExist(err) { ctx.NotFound() } else if asymkey_model.IsErrKeyAccessDenied(err) { diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 5363489939..be67ec1695 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -136,8 +136,8 @@ func sudo() func(ctx *context.APIContext) { func repoAssignment() func(ctx *context.APIContext) { return func(ctx *context.APIContext) { - userName := ctx.Params("username") - repoName := ctx.Params("reponame") + userName := ctx.PathParam("username") + repoName := ctx.PathParam("reponame") var ( owner *user_model.User @@ -555,12 +555,12 @@ func orgAssignment(args ...bool) func(ctx *context.APIContext) { var err error if assignOrg { - ctx.Org.Organization, err = organization.GetOrgByName(ctx, ctx.Params(":org")) + ctx.Org.Organization, err = organization.GetOrgByName(ctx, ctx.PathParam(":org")) if err != nil { if organization.IsErrOrgNotExist(err) { - redirectUserID, err := user_model.LookupUserRedirect(ctx, ctx.Params(":org")) + redirectUserID, err := user_model.LookupUserRedirect(ctx, ctx.PathParam(":org")) if err == nil { - context.RedirectToUser(ctx.Base, ctx.Params(":org"), redirectUserID) + context.RedirectToUser(ctx.Base, ctx.PathParam(":org"), redirectUserID) } else if user_model.IsErrUserRedirectNotExist(err) { ctx.NotFound("GetOrgByName", err) } else { @@ -575,7 +575,7 @@ func orgAssignment(args ...bool) func(ctx *context.APIContext) { } if assignTeam { - ctx.Org.Team, err = organization.GetTeamByID(ctx, ctx.ParamsInt64(":teamid")) + ctx.Org.Team, err = organization.GetTeamByID(ctx, ctx.PathParamInt64(":teamid")) if err != nil { if organization.IsErrTeamNotExist(err) { ctx.NotFound() @@ -812,8 +812,8 @@ func checkDeprecatedAuthMethods(ctx *context.APIContext) { } // Routes registers all v1 APIs routes to web application. -func Routes() *web.Route { - m := web.NewRoute() +func Routes() *web.Router { + m := web.NewRouter() m.Use(securityHeaders()) if setting.CORSConfig.Enabled { @@ -837,7 +837,7 @@ func Routes() *web.Route { })) addActionsRoutes := func( - m *web.Route, + m *web.Router, reqChecker func(ctx *context.APIContext), act actions.API, ) { diff --git a/routers/api/v1/misc/gitignore.go b/routers/api/v1/misc/gitignore.go index dffd771752..b0bf00a921 100644 --- a/routers/api/v1/misc/gitignore.go +++ b/routers/api/v1/misc/gitignore.go @@ -44,7 +44,7 @@ func GetGitignoreTemplateInfo(ctx *context.APIContext) { // "$ref": "#/responses/GitignoreTemplateInfo" // "404": // "$ref": "#/responses/notFound" - name := util.PathJoinRelX(ctx.Params("name")) + name := util.PathJoinRelX(ctx.PathParam("name")) text, err := options.Gitignore(name) if err != nil { diff --git a/routers/api/v1/misc/label_templates.go b/routers/api/v1/misc/label_templates.go index cc11f37626..f105b4c684 100644 --- a/routers/api/v1/misc/label_templates.go +++ b/routers/api/v1/misc/label_templates.go @@ -48,7 +48,7 @@ func GetLabelTemplate(ctx *context.APIContext) { // "$ref": "#/responses/LabelTemplateInfo" // "404": // "$ref": "#/responses/notFound" - name := util.PathJoinRelX(ctx.Params("name")) + name := util.PathJoinRelX(ctx.PathParam("name")) labels, err := repo_module.LoadTemplateLabelsByDisplayName(name) if err != nil { diff --git a/routers/api/v1/misc/licenses.go b/routers/api/v1/misc/licenses.go index 2a980f5084..d99b276232 100644 --- a/routers/api/v1/misc/licenses.go +++ b/routers/api/v1/misc/licenses.go @@ -55,7 +55,7 @@ func GetLicenseTemplateInfo(ctx *context.APIContext) { // "$ref": "#/responses/LicenseTemplateInfo" // "404": // "$ref": "#/responses/notFound" - name := util.PathJoinRelX(ctx.Params("name")) + name := util.PathJoinRelX(ctx.PathParam("name")) text, err := options.License(name) if err != nil { diff --git a/routers/api/v1/notify/threads.go b/routers/api/v1/notify/threads.go index 8e12d359cb..0761e684a3 100644 --- a/routers/api/v1/notify/threads.go +++ b/routers/api/v1/notify/threads.go @@ -101,7 +101,7 @@ func ReadThread(ctx *context.APIContext) { } func getThread(ctx *context.APIContext) *activities_model.Notification { - n, err := activities_model.GetNotificationByID(ctx, ctx.ParamsInt64(":id")) + n, err := activities_model.GetNotificationByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if db.IsErrNotExist(err) { ctx.Error(http.StatusNotFound, "GetNotificationByID", err) diff --git a/routers/api/v1/org/action.go b/routers/api/v1/org/action.go index 03a1fa8ccc..199ee7d777 100644 --- a/routers/api/v1/org/action.go +++ b/routers/api/v1/org/action.go @@ -106,7 +106,7 @@ func (Action) CreateOrUpdateSecret(ctx *context.APIContext) { opt := web.GetForm(ctx).(*api.CreateOrUpdateSecretOption) - _, created, err := secret_service.CreateOrUpdateSecret(ctx, ctx.Org.Organization.ID, 0, ctx.Params("secretname"), opt.Data) + _, created, err := secret_service.CreateOrUpdateSecret(ctx, ctx.Org.Organization.ID, 0, ctx.PathParam("secretname"), opt.Data) if err != nil { if errors.Is(err, util.ErrInvalidArgument) { ctx.Error(http.StatusBadRequest, "CreateOrUpdateSecret", err) @@ -153,7 +153,7 @@ func (Action) DeleteSecret(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - err := secret_service.DeleteSecretByName(ctx, ctx.Org.Organization.ID, 0, ctx.Params("secretname")) + err := secret_service.DeleteSecretByName(ctx, ctx.Org.Organization.ID, 0, ctx.PathParam("secretname")) if err != nil { if errors.Is(err, util.ErrInvalidArgument) { ctx.Error(http.StatusBadRequest, "DeleteSecret", err) @@ -269,7 +269,7 @@ func (Action) GetVariable(ctx *context.APIContext) { v, err := actions_service.GetVariable(ctx, actions_model.FindVariablesOpts{ OwnerID: ctx.Org.Organization.ID, - Name: ctx.Params("variablename"), + Name: ctx.PathParam("variablename"), }) if err != nil { if errors.Is(err, util.ErrNotExist) { @@ -320,7 +320,7 @@ func (Action) DeleteVariable(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - if err := actions_service.DeleteVariableByName(ctx, ctx.Org.Organization.ID, 0, ctx.Params("variablename")); err != nil { + if err := actions_service.DeleteVariableByName(ctx, ctx.Org.Organization.ID, 0, ctx.PathParam("variablename")); err != nil { if errors.Is(err, util.ErrInvalidArgument) { ctx.Error(http.StatusBadRequest, "DeleteVariableByName", err) } else if errors.Is(err, util.ErrNotExist) { @@ -371,7 +371,7 @@ func (Action) CreateVariable(ctx *context.APIContext) { opt := web.GetForm(ctx).(*api.CreateVariableOption) ownerID := ctx.Org.Organization.ID - variableName := ctx.Params("variablename") + variableName := ctx.PathParam("variablename") v, err := actions_service.GetVariable(ctx, actions_model.FindVariablesOpts{ OwnerID: ownerID, @@ -436,7 +436,7 @@ func (Action) UpdateVariable(ctx *context.APIContext) { v, err := actions_service.GetVariable(ctx, actions_model.FindVariablesOpts{ OwnerID: ctx.Org.Organization.ID, - Name: ctx.Params("variablename"), + Name: ctx.PathParam("variablename"), }) if err != nil { if errors.Is(err, util.ErrNotExist) { @@ -448,7 +448,7 @@ func (Action) UpdateVariable(ctx *context.APIContext) { } if opt.Name == "" { - opt.Name = ctx.Params("variablename") + opt.Name = ctx.PathParam("variablename") } if _, err := actions_service.UpdateVariable(ctx, v.ID, opt.Name, opt.Value); err != nil { if errors.Is(err, util.ErrInvalidArgument) { diff --git a/routers/api/v1/org/hook.go b/routers/api/v1/org/hook.go index c1dc0519ea..df82f4e5a2 100644 --- a/routers/api/v1/org/hook.go +++ b/routers/api/v1/org/hook.go @@ -71,7 +71,7 @@ func GetHook(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - hook, err := utils.GetOwnerHook(ctx, ctx.ContextUser.ID, ctx.ParamsInt64("id")) + hook, err := utils.GetOwnerHook(ctx, ctx.ContextUser.ID, ctx.PathParamInt64("id")) if err != nil { return } @@ -152,7 +152,7 @@ func EditHook(ctx *context.APIContext) { ctx, ctx.ContextUser, web.GetForm(ctx).(*api.EditHookOption), - ctx.ParamsInt64("id"), + ctx.PathParamInt64("id"), ) } @@ -184,6 +184,6 @@ func DeleteHook(ctx *context.APIContext) { utils.DeleteOwnerHook( ctx, ctx.ContextUser, - ctx.ParamsInt64("id"), + ctx.PathParamInt64("id"), ) } diff --git a/routers/api/v1/org/label.go b/routers/api/v1/org/label.go index b5ec54ccf4..24ee4ed642 100644 --- a/routers/api/v1/org/label.go +++ b/routers/api/v1/org/label.go @@ -139,7 +139,7 @@ func GetLabel(ctx *context.APIContext) { label *issues_model.Label err error ) - strID := ctx.Params(":id") + strID := ctx.PathParam(":id") if intID, err2 := strconv.ParseInt(strID, 10, 64); err2 != nil { label, err = issues_model.GetLabelInOrgByName(ctx, ctx.Org.Organization.ID, strID) } else { @@ -190,7 +190,7 @@ func EditLabel(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" form := web.GetForm(ctx).(*api.EditLabelOption) - l, err := issues_model.GetLabelInOrgByID(ctx, ctx.Org.Organization.ID, ctx.ParamsInt64(":id")) + l, err := issues_model.GetLabelInOrgByID(ctx, ctx.Org.Organization.ID, ctx.PathParamInt64(":id")) if err != nil { if issues_model.IsErrOrgLabelNotExist(err) { ctx.NotFound() @@ -249,7 +249,7 @@ func DeleteLabel(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - if err := issues_model.DeleteLabel(ctx, ctx.Org.Organization.ID, ctx.ParamsInt64(":id")); err != nil { + if err := issues_model.DeleteLabel(ctx, ctx.Org.Organization.ID, ctx.PathParamInt64(":id")); err != nil { ctx.Error(http.StatusInternalServerError, "DeleteLabel", err) return } diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index 015af774e3..c55837ff44 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -453,7 +453,7 @@ func GetTeamMember(ctx *context.APIContext) { if ctx.Written() { return } - teamID := ctx.ParamsInt64("teamid") + teamID := ctx.PathParamInt64("teamid") isTeamMember, err := organization.IsUserInTeams(ctx, u.ID, []int64{teamID}) if err != nil { ctx.Error(http.StatusInternalServerError, "IsUserInTeams", err) @@ -645,7 +645,7 @@ func GetTeamRepo(ctx *context.APIContext) { // getRepositoryByParams get repository by a team's organization ID and repo name func getRepositoryByParams(ctx *context.APIContext) *repo_model.Repository { - repo, err := repo_model.GetRepositoryByName(ctx, ctx.Org.Team.OrgID, ctx.Params(":reponame")) + repo, err := repo_model.GetRepositoryByName(ctx, ctx.Org.Team.OrgID, ctx.PathParam(":reponame")) if err != nil { if repo_model.IsErrRepoNotExist(err) { ctx.NotFound() diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index f6656d89c6..48ba35ac21 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -122,7 +122,7 @@ func (Action) CreateOrUpdateSecret(ctx *context.APIContext) { opt := web.GetForm(ctx).(*api.CreateOrUpdateSecretOption) - _, created, err := secret_service.CreateOrUpdateSecret(ctx, owner.ID, repo.ID, ctx.Params("secretname"), opt.Data) + _, created, err := secret_service.CreateOrUpdateSecret(ctx, owner.ID, repo.ID, ctx.PathParam("secretname"), opt.Data) if err != nil { if errors.Is(err, util.ErrInvalidArgument) { ctx.Error(http.StatusBadRequest, "CreateOrUpdateSecret", err) @@ -177,7 +177,7 @@ func (Action) DeleteSecret(ctx *context.APIContext) { owner := ctx.Repo.Owner repo := ctx.Repo.Repository - err := secret_service.DeleteSecretByName(ctx, owner.ID, repo.ID, ctx.Params("secretname")) + err := secret_service.DeleteSecretByName(ctx, owner.ID, repo.ID, ctx.PathParam("secretname")) if err != nil { if errors.Is(err, util.ErrInvalidArgument) { ctx.Error(http.StatusBadRequest, "DeleteSecret", err) @@ -224,7 +224,7 @@ func (Action) GetVariable(ctx *context.APIContext) { // "$ref": "#/responses/notFound" v, err := actions_service.GetVariable(ctx, actions_model.FindVariablesOpts{ RepoID: ctx.Repo.Repository.ID, - Name: ctx.Params("variablename"), + Name: ctx.PathParam("variablename"), }) if err != nil { if errors.Is(err, util.ErrNotExist) { @@ -280,7 +280,7 @@ func (Action) DeleteVariable(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - if err := actions_service.DeleteVariableByName(ctx, 0, ctx.Repo.Repository.ID, ctx.Params("variablename")); err != nil { + if err := actions_service.DeleteVariableByName(ctx, 0, ctx.Repo.Repository.ID, ctx.PathParam("variablename")); err != nil { if errors.Is(err, util.ErrInvalidArgument) { ctx.Error(http.StatusBadRequest, "DeleteVariableByName", err) } else if errors.Is(err, util.ErrNotExist) { @@ -334,7 +334,7 @@ func (Action) CreateVariable(ctx *context.APIContext) { opt := web.GetForm(ctx).(*api.CreateVariableOption) repoID := ctx.Repo.Repository.ID - variableName := ctx.Params("variablename") + variableName := ctx.PathParam("variablename") v, err := actions_service.GetVariable(ctx, actions_model.FindVariablesOpts{ RepoID: repoID, @@ -402,7 +402,7 @@ func (Action) UpdateVariable(ctx *context.APIContext) { v, err := actions_service.GetVariable(ctx, actions_model.FindVariablesOpts{ RepoID: ctx.Repo.Repository.ID, - Name: ctx.Params("variablename"), + Name: ctx.PathParam("variablename"), }) if err != nil { if errors.Is(err, util.ErrNotExist) { @@ -414,7 +414,7 @@ func (Action) UpdateVariable(ctx *context.APIContext) { } if opt.Name == "" { - opt.Name = ctx.Params("variablename") + opt.Name = ctx.PathParam("variablename") } if _, err := actions_service.UpdateVariable(ctx, v.ID, opt.Name, opt.Value); err != nil { if errors.Is(err, util.ErrInvalidArgument) { diff --git a/routers/api/v1/repo/blob.go b/routers/api/v1/repo/blob.go index 3b116666ea..f38086954b 100644 --- a/routers/api/v1/repo/blob.go +++ b/routers/api/v1/repo/blob.go @@ -41,7 +41,7 @@ func GetBlob(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - sha := ctx.Params("sha") + sha := ctx.PathParam("sha") if len(sha) == 0 { ctx.Error(http.StatusBadRequest, "", "sha not provided") return diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index baab486e52..652fcd9441 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -56,7 +56,7 @@ func GetBranch(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - branchName := ctx.Params("*") + branchName := ctx.PathParam("*") branch, err := ctx.Repo.GitRepo.GetBranch(branchName) if err != nil { @@ -131,7 +131,7 @@ func DeleteBranch(ctx *context.APIContext) { return } - branchName := ctx.Params("*") + branchName := ctx.PathParam("*") if ctx.Repo.Repository.IsEmpty { ctx.Error(http.StatusForbidden, "", "Git Repository is empty.") @@ -426,7 +426,7 @@ func GetBranchProtection(ctx *context.APIContext) { // "$ref": "#/responses/notFound" repo := ctx.Repo.Repository - bpName := ctx.Params(":name") + bpName := ctx.PathParam(":name") bp, err := git_model.GetProtectedBranchRuleByName(ctx, repo.ID, bpName) if err != nil { ctx.Error(http.StatusInternalServerError, "GetProtectedBranchByID", err) @@ -724,7 +724,7 @@ func EditBranchProtection(ctx *context.APIContext) { // "$ref": "#/responses/repoArchivedError" form := web.GetForm(ctx).(*api.EditBranchProtectionOption) repo := ctx.Repo.Repository - bpName := ctx.Params(":name") + bpName := ctx.PathParam(":name") protectBranch, err := git_model.GetProtectedBranchRuleByName(ctx, repo.ID, bpName) if err != nil { ctx.Error(http.StatusInternalServerError, "GetProtectedBranchByID", err) @@ -992,7 +992,7 @@ func DeleteBranchProtection(ctx *context.APIContext) { // "$ref": "#/responses/notFound" repo := ctx.Repo.Repository - bpName := ctx.Params(":name") + bpName := ctx.PathParam(":name") bp, err := git_model.GetProtectedBranchRuleByName(ctx, repo.ID, bpName) if err != nil { ctx.Error(http.StatusInternalServerError, "GetProtectedBranchByID", err) diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index 4ce14f7d01..39c9ba527d 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -102,7 +102,7 @@ func IsCollaborator(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" - user, err := user_model.GetUserByName(ctx, ctx.Params(":collaborator")) + user, err := user_model.GetUserByName(ctx, ctx.PathParam(":collaborator")) if err != nil { if user_model.IsErrUserNotExist(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) @@ -162,7 +162,7 @@ func AddCollaborator(ctx *context.APIContext) { form := web.GetForm(ctx).(*api.AddCollaboratorOption) - collaborator, err := user_model.GetUserByName(ctx, ctx.Params(":collaborator")) + collaborator, err := user_model.GetUserByName(ctx, ctx.PathParam(":collaborator")) if err != nil { if user_model.IsErrUserNotExist(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) @@ -227,7 +227,7 @@ func DeleteCollaborator(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" - collaborator, err := user_model.GetUserByName(ctx, ctx.Params(":collaborator")) + collaborator, err := user_model.GetUserByName(ctx, ctx.PathParam(":collaborator")) if err != nil { if user_model.IsErrUserNotExist(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) @@ -275,12 +275,12 @@ func GetRepoPermissions(ctx *context.APIContext) { // "403": // "$ref": "#/responses/forbidden" - if !ctx.Doer.IsAdmin && ctx.Doer.LoginName != ctx.Params(":collaborator") && !ctx.IsUserRepoAdmin() { + if !ctx.Doer.IsAdmin && ctx.Doer.LoginName != ctx.PathParam(":collaborator") && !ctx.IsUserRepoAdmin() { ctx.Error(http.StatusForbidden, "User", "Only admins can query all permissions, repo admins can query all repo permissions, collaborators can query only their own") return } - collaborator, err := user_model.GetUserByName(ctx, ctx.Params(":collaborator")) + collaborator, err := user_model.GetUserByName(ctx, ctx.PathParam(":collaborator")) if err != nil { if user_model.IsErrUserNotExist(err) { ctx.Error(http.StatusNotFound, "GetUserByName", err) diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go index d06a3b4e49..d33be9d80a 100644 --- a/routers/api/v1/repo/commits.go +++ b/routers/api/v1/repo/commits.go @@ -63,7 +63,7 @@ func GetSingleCommit(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - sha := ctx.Params(":sha") + sha := ctx.PathParam(":sha") if !git.IsValidRefPattern(sha) { ctx.Error(http.StatusUnprocessableEntity, "no valid ref or sha", fmt.Sprintf("no valid ref or sha: %s", sha)) return @@ -312,8 +312,8 @@ func DownloadCommitDiffOrPatch(ctx *context.APIContext) { // "$ref": "#/responses/string" // "404": // "$ref": "#/responses/notFound" - sha := ctx.Params(":sha") - diffType := git.RawDiffType(ctx.Params(":diffType")) + sha := ctx.PathParam(":sha") + diffType := git.RawDiffType(ctx.PathParam(":diffType")) if err := git.GetRawDiff(ctx.Repo.GitRepo, sha, diffType, ctx.Resp); err != nil { if git.IsErrNotExist(err) { @@ -354,7 +354,7 @@ func GetCommitPullRequest(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - pr, err := issues_model.GetPullRequestByMergedCommit(ctx, ctx.Repo.Repository.ID, ctx.Params(":sha")) + pr, err := issues_model.GetPullRequestByMergedCommit(ctx, ctx.Repo.Repository.ID, ctx.PathParam(":sha")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.Error(http.StatusNotFound, "GetPullRequestByMergedCommit", err) diff --git a/routers/api/v1/repo/compare.go b/routers/api/v1/repo/compare.go index 429145c714..38e5330b3a 100644 --- a/routers/api/v1/repo/compare.go +++ b/routers/api/v1/repo/compare.go @@ -53,7 +53,7 @@ func CompareDiff(ctx *context.APIContext) { defer gitRepo.Close() } - infoPath := ctx.Params("*") + infoPath := ctx.PathParam("*") infos := []string{ctx.Repo.Repository.DefaultBranch, ctx.Repo.Repository.DefaultBranch} if infoPath != "" { infos = strings.SplitN(infoPath, "...", 2) diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 6ecdc1ff67..42483291fc 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -294,7 +294,7 @@ func GetArchive(ctx *context.APIContext) { } func archiveDownload(ctx *context.APIContext) { - uri := ctx.Params("*") + uri := ctx.PathParam("*") aReq, err := archiver_service.NewRequest(ctx.Repo.Repository.ID, ctx.Repo.GitRepo, uri) if err != nil { if errors.Is(err, archiver_service.ErrUnknownArchiveFormat{}) { @@ -393,7 +393,7 @@ func GetEditorconfig(ctx *context.APIContext) { return } - fileName := ctx.Params("filename") + fileName := ctx.PathParam("filename") def, err := ec.GetDefinitionForFilename(fileName) if def == nil { ctx.NotFound(err) @@ -577,7 +577,7 @@ func CreateFile(ctx *context.APIContext) { Files: []*files_service.ChangeRepoFile{ { Operation: "create", - TreePath: ctx.Params("*"), + TreePath: ctx.PathParam("*"), ContentReader: contentReader, }, }, @@ -681,7 +681,7 @@ func UpdateFile(ctx *context.APIContext) { ContentReader: contentReader, SHA: apiOpts.SHA, FromTreePath: apiOpts.FromPath, - TreePath: ctx.Params("*"), + TreePath: ctx.PathParam("*"), }, }, Message: apiOpts.Message, @@ -840,7 +840,7 @@ func DeleteFile(ctx *context.APIContext) { { Operation: "delete", SHA: apiOpts.SHA, - TreePath: ctx.Params("*"), + TreePath: ctx.PathParam("*"), }, }, Message: apiOpts.Message, @@ -935,7 +935,7 @@ func GetContents(ctx *context.APIContext) { return } - treePath := ctx.Params("*") + treePath := ctx.PathParam("*") ref := ctx.FormTrim("ref") if fileList, err := files_service.GetContentsOrList(ctx, ctx.Repo.Repository, treePath, ref); err != nil { diff --git a/routers/api/v1/repo/git_hook.go b/routers/api/v1/repo/git_hook.go index 26ae84d08d..0887a90096 100644 --- a/routers/api/v1/repo/git_hook.go +++ b/routers/api/v1/repo/git_hook.go @@ -79,7 +79,7 @@ func GetGitHook(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - hookID := ctx.Params(":id") + hookID := ctx.PathParam(":id") hook, err := ctx.Repo.GitRepo.GetHook(hookID) if err != nil { if err == git.ErrNotValidHook { @@ -126,7 +126,7 @@ func EditGitHook(ctx *context.APIContext) { // "$ref": "#/responses/notFound" form := web.GetForm(ctx).(*api.EditGitHookOption) - hookID := ctx.Params(":id") + hookID := ctx.PathParam(":id") hook, err := ctx.Repo.GitRepo.GetHook(hookID) if err != nil { if err == git.ErrNotValidHook { @@ -175,7 +175,7 @@ func DeleteGitHook(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - hookID := ctx.Params(":id") + hookID := ctx.PathParam(":id") hook, err := ctx.Repo.GitRepo.GetHook(hookID) if err != nil { if err == git.ErrNotValidHook { diff --git a/routers/api/v1/repo/git_ref.go b/routers/api/v1/repo/git_ref.go index 0fa58425b8..1743c0fc20 100644 --- a/routers/api/v1/repo/git_ref.go +++ b/routers/api/v1/repo/git_ref.go @@ -71,7 +71,7 @@ func GetGitRefs(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - getGitRefsInternal(ctx, ctx.Params("*")) + getGitRefsInternal(ctx, ctx.PathParam("*")) } func getGitRefsInternal(ctx *context.APIContext, filter string) { diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index ffd2313591..9ef57da1b9 100644 --- a/routers/api/v1/repo/hook.go +++ b/routers/api/v1/repo/hook.go @@ -109,7 +109,7 @@ func GetHook(ctx *context.APIContext) { // "$ref": "#/responses/notFound" repo := ctx.Repo - hookID := ctx.ParamsInt64(":id") + hookID := ctx.PathParamInt64(":id") hook, err := utils.GetRepoHook(ctx, repo.Repository.ID, hookID) if err != nil { return @@ -168,7 +168,7 @@ func TestHook(ctx *context.APIContext) { ref = r } - hookID := ctx.ParamsInt64(":id") + hookID := ctx.PathParamInt64(":id") hook, err := utils.GetRepoHook(ctx, ctx.Repo.Repository.ID, hookID) if err != nil { return @@ -263,7 +263,7 @@ func EditHook(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" form := web.GetForm(ctx).(*api.EditHookOption) - hookID := ctx.ParamsInt64(":id") + hookID := ctx.PathParamInt64(":id") utils.EditRepoHook(ctx, form, hookID) } @@ -296,7 +296,7 @@ func DeleteHook(ctx *context.APIContext) { // "$ref": "#/responses/empty" // "404": // "$ref": "#/responses/notFound" - if err := webhook.DeleteWebhookByRepoID(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil { + if err := webhook.DeleteWebhookByRepoID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":id")); err != nil { if webhook.IsErrWebhookNotExist(err) { ctx.NotFound() } else { diff --git a/routers/api/v1/repo/hook_test.go b/routers/api/v1/repo/hook_test.go index 37cf61c1ed..c2f3a972ef 100644 --- a/routers/api/v1/repo/hook_test.go +++ b/routers/api/v1/repo/hook_test.go @@ -18,7 +18,7 @@ func TestTestHook(t *testing.T) { unittest.PrepareTestEnv(t) ctx, _ := contexttest.MockAPIContext(t, "user2/repo1/wiki/_pages") - ctx.SetParams(":id", "1") + ctx.SetPathParam(":id", "1") contexttest.LoadRepo(t, ctx, 1) contexttest.LoadRepoCommit(t, ctx) contexttest.LoadUser(t, ctx, 2) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index ddfc36f17d..108504ebb4 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -599,7 +599,7 @@ func GetIssue(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueWithAttrsByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueWithAttrsByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -779,7 +779,7 @@ func EditIssue(ctx *context.APIContext) { // "$ref": "#/responses/error" form := web.GetForm(ctx).(*api.EditIssueOption) - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -942,7 +942,7 @@ func DeleteIssue(ctx *context.APIContext) { // "$ref": "#/responses/forbidden" // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound(err) @@ -998,7 +998,7 @@ func UpdateIssueDeadline(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" form := web.GetForm(ctx).(*api.EditDeadlineOption) - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() diff --git a/routers/api/v1/repo/issue_attachment.go b/routers/api/v1/repo/issue_attachment.go index ef846a43a3..27c7af2282 100644 --- a/routers/api/v1/repo/issue_attachment.go +++ b/routers/api/v1/repo/issue_attachment.go @@ -320,7 +320,7 @@ func DeleteIssueAttachment(ctx *context.APIContext) { } func getIssueFromContext(ctx *context.APIContext) *issues_model.Issue { - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64("index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index")) if err != nil { ctx.NotFoundOrServerError("GetIssueByIndex", issues_model.IsErrIssueNotExist, err) return nil @@ -345,7 +345,7 @@ func getIssueAttachmentSafeWrite(ctx *context.APIContext) *repo_model.Attachment } func getIssueAttachmentSafeRead(ctx *context.APIContext, issue *issues_model.Issue) *repo_model.Attachment { - attachment, err := repo_model.GetAttachmentByID(ctx, ctx.ParamsInt64("attachment_id")) + attachment, err := repo_model.GetAttachmentByID(ctx, ctx.PathParamInt64("attachment_id")) if err != nil { ctx.NotFoundOrServerError("GetAttachmentByID", repo_model.IsErrAttachmentNotExist, err) return nil diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index 910cc1ce74..f9b5aa816b 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -68,7 +68,7 @@ func ListIssueComments(ctx *context.APIContext) { ctx.Error(http.StatusUnprocessableEntity, "GetQueryBeforeSince", err) return } - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { ctx.Error(http.StatusInternalServerError, "GetRawIssueByIndex", err) return @@ -172,7 +172,7 @@ func ListIssueCommentsAndTimeline(ctx *context.APIContext) { ctx.Error(http.StatusUnprocessableEntity, "GetQueryBeforeSince", err) return } - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { ctx.Error(http.StatusInternalServerError, "GetRawIssueByIndex", err) return @@ -380,7 +380,7 @@ func CreateIssueComment(ctx *context.APIContext) { // "$ref": "#/responses/repoArchivedError" form := web.GetForm(ctx).(*api.CreateIssueCommentOption) - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { ctx.Error(http.StatusInternalServerError, "GetIssueByIndex", err) return @@ -445,7 +445,7 @@ func GetIssueComment(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - comment, err := issues_model.GetCommentByID(ctx, ctx.ParamsInt64(":id")) + comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if issues_model.IsErrCommentNotExist(err) { ctx.NotFound(err) @@ -579,7 +579,7 @@ func EditIssueCommentDeprecated(ctx *context.APIContext) { } func editIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption) { - comment, err := issues_model.GetCommentByID(ctx, ctx.ParamsInt64(":id")) + comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if issues_model.IsErrCommentNotExist(err) { ctx.NotFound(err) @@ -696,7 +696,7 @@ func DeleteIssueCommentDeprecated(ctx *context.APIContext) { } func deleteIssueComment(ctx *context.APIContext) { - comment, err := issues_model.GetCommentByID(ctx, ctx.ParamsInt64(":id")) + comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if issues_model.IsErrCommentNotExist(err) { ctx.NotFound(err) diff --git a/routers/api/v1/repo/issue_comment_attachment.go b/routers/api/v1/repo/issue_comment_attachment.go index 1ec758ec2c..0863ebd182 100644 --- a/routers/api/v1/repo/issue_comment_attachment.go +++ b/routers/api/v1/repo/issue_comment_attachment.go @@ -331,7 +331,7 @@ func DeleteIssueCommentAttachment(ctx *context.APIContext) { } func getIssueCommentSafe(ctx *context.APIContext) *issues_model.Comment { - comment, err := issues_model.GetCommentByID(ctx, ctx.ParamsInt64("id")) + comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64("id")) if err != nil { ctx.NotFoundOrServerError("GetCommentByID", issues_model.IsErrCommentNotExist, err) return nil @@ -376,7 +376,7 @@ func canUserWriteIssueCommentAttachment(ctx *context.APIContext, comment *issues } func getIssueCommentAttachmentSafeRead(ctx *context.APIContext, comment *issues_model.Comment) *repo_model.Attachment { - attachment, err := repo_model.GetAttachmentByID(ctx, ctx.ParamsInt64("attachment_id")) + attachment, err := repo_model.GetAttachmentByID(ctx, ctx.PathParamInt64("attachment_id")) if err != nil { ctx.NotFoundOrServerError("GetAttachmentByID", repo_model.IsErrAttachmentNotExist, err) return nil diff --git a/routers/api/v1/repo/issue_dependency.go b/routers/api/v1/repo/issue_dependency.go index c40e92c01b..712c71a682 100644 --- a/routers/api/v1/repo/issue_dependency.go +++ b/routers/api/v1/repo/issue_dependency.go @@ -61,7 +61,7 @@ func GetIssueDependencies(ctx *context.APIContext) { return } - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound("IsErrIssueNotExist", err) @@ -499,7 +499,7 @@ func RemoveIssueBlocking(ctx *context.APIContext) { } func getParamsIssue(ctx *context.APIContext) *issues_model.Issue { - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound("IsErrIssueNotExist", err) diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index 413693c5ed..2f5ea8931b 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/routers/api/v1/repo/issue_label.go @@ -47,7 +47,7 @@ func ListIssueLabels(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -163,7 +163,7 @@ func DeleteIssueLabel(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -178,7 +178,7 @@ func DeleteIssueLabel(ctx *context.APIContext) { return } - label, err := issues_model.GetLabelByID(ctx, ctx.ParamsInt64(":id")) + label, err := issues_model.GetLabelByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if issues_model.IsErrLabelNotExist(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) @@ -285,7 +285,7 @@ func ClearIssueLabels(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -309,7 +309,7 @@ func ClearIssueLabels(ctx *context.APIContext) { } func prepareForReplaceOrAdd(ctx *context.APIContext, form api.IssueLabelsOption) (*issues_model.Issue, []*issues_model.Label, error) { - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go index af3e06332a..0ef9033291 100644 --- a/routers/api/v1/repo/issue_pin.go +++ b/routers/api/v1/repo/issue_pin.go @@ -41,7 +41,7 @@ func PinIssue(ctx *context.APIContext) { // "$ref": "#/responses/forbidden" // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -98,7 +98,7 @@ func UnpinIssue(ctx *context.APIContext) { // "$ref": "#/responses/forbidden" // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -159,7 +159,7 @@ func MoveIssuePin(ctx *context.APIContext) { // "$ref": "#/responses/forbidden" // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -169,7 +169,7 @@ func MoveIssuePin(ctx *context.APIContext) { return } - err = issue.MovePin(ctx, int(ctx.ParamsInt64(":position"))) + err = issue.MovePin(ctx, int(ctx.PathParamInt64(":position"))) if err != nil { ctx.Error(http.StatusInternalServerError, "MovePin", err) return diff --git a/routers/api/v1/repo/issue_reaction.go b/routers/api/v1/repo/issue_reaction.go index 3ff3d19f13..8d43cd518b 100644 --- a/routers/api/v1/repo/issue_reaction.go +++ b/routers/api/v1/repo/issue_reaction.go @@ -51,7 +51,7 @@ func GetIssueCommentReactions(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - comment, err := issues_model.GetCommentByID(ctx, ctx.ParamsInt64(":id")) + comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if issues_model.IsErrCommentNotExist(err) { ctx.NotFound(err) @@ -188,7 +188,7 @@ func DeleteIssueCommentReaction(ctx *context.APIContext) { } func changeIssueCommentReaction(ctx *context.APIContext, form api.EditReactionOption, isCreateType bool) { - comment, err := issues_model.GetCommentByID(ctx, ctx.ParamsInt64(":id")) + comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if issues_model.IsErrCommentNotExist(err) { ctx.NotFound(err) @@ -295,7 +295,7 @@ func GetIssueReactions(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueWithAttrsByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueWithAttrsByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -419,7 +419,7 @@ func DeleteIssueReaction(ctx *context.APIContext) { } func changeIssueReaction(ctx *context.APIContext, form api.EditReactionOption, isCreateType bool) { - issue, err := issues_model.GetIssueWithAttrsByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueWithAttrsByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() diff --git a/routers/api/v1/repo/issue_stopwatch.go b/routers/api/v1/repo/issue_stopwatch.go index d9054e8f77..4605ae2110 100644 --- a/routers/api/v1/repo/issue_stopwatch.go +++ b/routers/api/v1/repo/issue_stopwatch.go @@ -161,7 +161,7 @@ func DeleteIssueStopwatch(ctx *context.APIContext) { } func prepareIssueStopwatch(ctx *context.APIContext, shouldExist bool) (*issues_model.Issue, error) { - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() diff --git a/routers/api/v1/repo/issue_subscription.go b/routers/api/v1/repo/issue_subscription.go index a535172462..e51baad0b6 100644 --- a/routers/api/v1/repo/issue_subscription.go +++ b/routers/api/v1/repo/issue_subscription.go @@ -104,7 +104,7 @@ func DelIssueSubscription(ctx *context.APIContext) { } func setIssueSubscription(ctx *context.APIContext, watch bool) { - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -115,7 +115,7 @@ func setIssueSubscription(ctx *context.APIContext, watch bool) { return } - user, err := user_model.GetUserByName(ctx, ctx.Params(":user")) + user, err := user_model.GetUserByName(ctx, ctx.PathParam(":user")) if err != nil { if user_model.IsErrUserNotExist(err) { ctx.NotFound() @@ -185,7 +185,7 @@ func CheckIssueSubscription(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() @@ -251,7 +251,7 @@ func GetIssueSubscribers(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound() diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go index f83855efac..8d5e9fdad4 100644 --- a/routers/api/v1/repo/issue_tracked_time.go +++ b/routers/api/v1/repo/issue_tracked_time.go @@ -75,7 +75,7 @@ func ListTrackedTimes(ctx *context.APIContext) { ctx.NotFound("Timetracker is disabled") return } - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound(err) @@ -181,7 +181,7 @@ func AddTime(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" form := web.GetForm(ctx).(*api.AddTimeOption) - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound(err) @@ -264,7 +264,7 @@ func ResetIssueTime(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound(err) @@ -337,7 +337,7 @@ func DeleteTime(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { ctx.NotFound(err) @@ -356,7 +356,7 @@ func DeleteTime(ctx *context.APIContext) { return } - time, err := issues_model.GetTrackedTimeByID(ctx, ctx.ParamsInt64(":id")) + time, err := issues_model.GetTrackedTimeByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if db.IsErrNotExist(err) { ctx.NotFound(err) @@ -422,7 +422,7 @@ func ListTrackedTimesByUser(ctx *context.APIContext) { ctx.Error(http.StatusBadRequest, "", "time tracking disabled") return } - user, err := user_model.GetUserByName(ctx, ctx.Params(":timetrackingusername")) + user, err := user_model.GetUserByName(ctx, ctx.PathParam(":timetrackingusername")) if err != nil { if user_model.IsErrUserNotExist(err) { ctx.NotFound(err) diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index 88444a2625..e5115980eb 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -143,7 +143,7 @@ func GetDeployKey(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - key, err := asymkey_model.GetDeployKeyByID(ctx, ctx.ParamsInt64(":id")) + key, err := asymkey_model.GetDeployKeyByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if asymkey_model.IsErrDeployKeyNotExist(err) { ctx.NotFound() @@ -279,7 +279,7 @@ func DeleteDeploykey(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - if err := asymkey_service.DeleteDeployKey(ctx, ctx.Doer, ctx.ParamsInt64(":id")); err != nil { + if err := asymkey_service.DeleteDeployKey(ctx, ctx.Doer, ctx.PathParamInt64(":id")); err != nil { if asymkey_model.IsErrKeyAccessDenied(err) { ctx.Error(http.StatusForbidden, "", "You do not have access to this key") } else { diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index b6eb51fd20..c2c43db6a4 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -99,7 +99,7 @@ func GetLabel(ctx *context.APIContext) { l *issues_model.Label err error ) - strID := ctx.Params(":id") + strID := ctx.PathParam(":id") if intID, err2 := strconv.ParseInt(strID, 10, 64); err2 != nil { l, err = issues_model.GetLabelInRepoByName(ctx, ctx.Repo.Repository.ID, strID) } else { @@ -212,7 +212,7 @@ func EditLabel(ctx *context.APIContext) { // "$ref": "#/responses/validationError" form := web.GetForm(ctx).(*api.EditLabelOption) - l, err := issues_model.GetLabelInRepoByID(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) + l, err := issues_model.GetLabelInRepoByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":id")) if err != nil { if issues_model.IsErrRepoLabelNotExist(err) { ctx.NotFound() @@ -276,7 +276,7 @@ func DeleteLabel(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - if err := issues_model.DeleteLabel(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil { + if err := issues_model.DeleteLabel(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":id")); err != nil { ctx.Error(http.StatusInternalServerError, "DeleteLabel", err) return } diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index b9534016e4..abe9e4006a 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -282,7 +282,7 @@ func DeleteMilestone(ctx *context.APIContext) { // getMilestoneByIDOrName get milestone by ID and if not available by name func getMilestoneByIDOrName(ctx *context.APIContext) *issues_model.Milestone { - mile := ctx.Params(":id") + mile := ctx.PathParam(":id") mileID, _ := strconv.ParseInt(mile, 0, 64) if mileID != 0 { diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go index eddd449206..310b82881e 100644 --- a/routers/api/v1/repo/mirror.go +++ b/routers/api/v1/repo/mirror.go @@ -224,7 +224,7 @@ func GetPushMirrorByName(ctx *context.APIContext) { return } - mirrorName := ctx.Params(":name") + mirrorName := ctx.PathParam(":name") // Get push mirror of a specific repo by remoteName pushMirror, exist, err := db.Get[repo_model.PushMirror](ctx, repo_model.PushMirrorOptions{ RepoID: ctx.Repo.Repository.ID, @@ -325,7 +325,7 @@ func DeletePushMirrorByRemoteName(ctx *context.APIContext) { return } - remoteName := ctx.Params(":name") + remoteName := ctx.PathParam(":name") // Delete push mirror on repo by name. err := repo_model.DeletePushMirrors(ctx, repo_model.PushMirrorOptions{RepoID: ctx.Repo.Repository.ID, RemoteName: remoteName}) if err != nil { diff --git a/routers/api/v1/repo/notes.go b/routers/api/v1/repo/notes.go index a4a1d4eab7..8689d25e15 100644 --- a/routers/api/v1/repo/notes.go +++ b/routers/api/v1/repo/notes.go @@ -52,7 +52,7 @@ func GetNote(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - sha := ctx.Params(":sha") + sha := ctx.PathParam(":sha") if !git.IsValidRefPattern(sha) { ctx.Error(http.StatusUnprocessableEntity, "no valid ref or sha", fmt.Sprintf("no valid ref or sha: %s", sha)) return diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 1fc94708da..ebe876da64 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -187,7 +187,7 @@ func GetPullRequest(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound() @@ -244,7 +244,7 @@ func GetPullRequestByBaseHead(ctx *context.APIContext) { var headRepoID int64 var headBranch string - head := ctx.Params("*") + head := ctx.PathParam("*") if strings.Contains(head, ":") { split := strings.SplitN(head, ":", 2) headBranch = split[1] @@ -272,7 +272,7 @@ func GetPullRequestByBaseHead(ctx *context.APIContext) { headBranch = head } - pr, err := issues_model.GetPullRequestByBaseHeadInfo(ctx, ctx.Repo.Repository.ID, headRepoID, ctx.Params(":base"), headBranch) + pr, err := issues_model.GetPullRequestByBaseHeadInfo(ctx, ctx.Repo.Repository.ID, headRepoID, ctx.PathParam(":base"), headBranch) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound() @@ -332,7 +332,7 @@ func DownloadPullDiffOrPatch(ctx *context.APIContext) { // "$ref": "#/responses/string" // "404": // "$ref": "#/responses/notFound" - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound() @@ -342,7 +342,7 @@ func DownloadPullDiffOrPatch(ctx *context.APIContext) { return } var patch bool - if ctx.Params(":diffType") == "diff" { + if ctx.PathParam(":diffType") == "diff" { patch = false } else { patch = true @@ -590,7 +590,7 @@ func EditPullRequest(ctx *context.APIContext) { // "$ref": "#/responses/validationError" form := web.GetForm(ctx).(*api.EditPullRequestOption) - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound() @@ -804,7 +804,7 @@ func IsPullRequestMerged(ctx *context.APIContext) { // "404": // description: pull request has not been merged - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound() @@ -862,7 +862,7 @@ func MergePullRequest(ctx *context.APIContext) { form := web.GetForm(ctx).(*forms.MergePullRequestForm) - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound("GetPullRequestByIndex", err) @@ -1221,7 +1221,7 @@ func UpdatePullRequest(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound() @@ -1320,7 +1320,7 @@ func CancelScheduledAutoMerge(ctx *context.APIContext) { // "423": // "$ref": "#/responses/repoArchivedError" - pullIndex := ctx.ParamsInt64(":index") + pullIndex := ctx.PathParamInt64(":index") pull, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, pullIndex) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { @@ -1406,7 +1406,7 @@ func GetPullRequestCommits(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound() @@ -1529,7 +1529,7 @@ func GetPullRequestFiles(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound() diff --git a/routers/api/v1/repo/pull_review.go b/routers/api/v1/repo/pull_review.go index 4b481790fb..c2e4966498 100644 --- a/routers/api/v1/repo/pull_review.go +++ b/routers/api/v1/repo/pull_review.go @@ -61,7 +61,7 @@ func ListPullReviews(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound("GetPullRequestByIndex", err) @@ -307,7 +307,7 @@ func CreatePullReview(ctx *context.APIContext) { // "$ref": "#/responses/validationError" opts := web.GetForm(ctx).(*api.CreatePullReviewOptions) - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound("GetPullRequestByIndex", err) @@ -534,7 +534,7 @@ func preparePullReviewType(ctx *context.APIContext, pr *issues_model.PullRequest // prepareSingleReview return review, related pull and false or nil, nil and true if an error happen func prepareSingleReview(ctx *context.APIContext) (*issues_model.Review, *issues_model.PullRequest, bool) { - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound("GetPullRequestByIndex", err) @@ -544,7 +544,7 @@ func prepareSingleReview(ctx *context.APIContext) (*issues_model.Review, *issues return nil, nil, true } - review, err := issues_model.GetReviewByID(ctx, ctx.ParamsInt64(":id")) + review, err := issues_model.GetReviewByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if issues_model.IsErrReviewNotExist(err) { ctx.NotFound("GetReviewByID", err) @@ -658,7 +658,7 @@ func DeleteReviewRequests(ctx *context.APIContext) { } func apiReviewRequest(ctx *context.APIContext, opts api.PullReviewRequestOptions, isAdd bool) { - pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index")) if err != nil { if issues_model.IsErrPullRequestNotExist(err) { ctx.NotFound("GetPullRequestByIndex", err) diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go index f92fb86f5c..ef587f6274 100644 --- a/routers/api/v1/repo/release.go +++ b/routers/api/v1/repo/release.go @@ -50,7 +50,7 @@ func GetRelease(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - id := ctx.ParamsInt64(":id") + id := ctx.PathParamInt64(":id") release, err := repo_model.GetReleaseForRepoByID(ctx, ctx.Repo.Repository.ID, id) if err != nil && !repo_model.IsErrReleaseNotExist(err) { ctx.Error(http.StatusInternalServerError, "GetReleaseForRepoByID", err) @@ -317,7 +317,7 @@ func EditRelease(ctx *context.APIContext) { // "$ref": "#/responses/notFound" form := web.GetForm(ctx).(*api.EditReleaseOption) - id := ctx.ParamsInt64(":id") + id := ctx.PathParamInt64(":id") rel, err := repo_model.GetReleaseForRepoByID(ctx, ctx.Repo.Repository.ID, id) if err != nil && !repo_model.IsErrReleaseNotExist(err) { ctx.Error(http.StatusInternalServerError, "GetReleaseForRepoByID", err) @@ -394,7 +394,7 @@ func DeleteRelease(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" - id := ctx.ParamsInt64(":id") + id := ctx.PathParamInt64(":id") rel, err := repo_model.GetReleaseForRepoByID(ctx, ctx.Repo.Repository.ID, id) if err != nil && !repo_model.IsErrReleaseNotExist(err) { ctx.Error(http.StatusInternalServerError, "GetReleaseForRepoByID", err) diff --git a/routers/api/v1/repo/release_attachment.go b/routers/api/v1/repo/release_attachment.go index 59fd83e3a2..4a2371e012 100644 --- a/routers/api/v1/repo/release_attachment.go +++ b/routers/api/v1/repo/release_attachment.go @@ -72,12 +72,12 @@ func GetReleaseAttachment(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - releaseID := ctx.ParamsInt64(":id") + releaseID := ctx.PathParamInt64(":id") if !checkReleaseMatchRepo(ctx, releaseID) { return } - attachID := ctx.ParamsInt64(":attachment_id") + attachID := ctx.PathParamInt64(":attachment_id") attach, err := repo_model.GetAttachmentByID(ctx, attachID) if err != nil { if repo_model.IsErrAttachmentNotExist(err) { @@ -126,7 +126,7 @@ func ListReleaseAttachments(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - releaseID := ctx.ParamsInt64(":id") + releaseID := ctx.PathParamInt64(":id") release, err := repo_model.GetReleaseByID(ctx, releaseID) if err != nil { if repo_model.IsErrReleaseNotExist(err) { @@ -199,7 +199,7 @@ func CreateReleaseAttachment(ctx *context.APIContext) { } // Check if release exists an load release - releaseID := ctx.ParamsInt64(":id") + releaseID := ctx.PathParamInt64(":id") if !checkReleaseMatchRepo(ctx, releaseID) { return } @@ -297,12 +297,12 @@ func EditReleaseAttachment(ctx *context.APIContext) { form := web.GetForm(ctx).(*api.EditAttachmentOptions) // Check if release exists an load release - releaseID := ctx.ParamsInt64(":id") + releaseID := ctx.PathParamInt64(":id") if !checkReleaseMatchRepo(ctx, releaseID) { return } - attachID := ctx.ParamsInt64(":attachment_id") + attachID := ctx.PathParamInt64(":attachment_id") attach, err := repo_model.GetAttachmentByID(ctx, attachID) if err != nil { if repo_model.IsErrAttachmentNotExist(err) { @@ -365,12 +365,12 @@ func DeleteReleaseAttachment(ctx *context.APIContext) { // "$ref": "#/responses/notFound" // Check if release exists an load release - releaseID := ctx.ParamsInt64(":id") + releaseID := ctx.PathParamInt64(":id") if !checkReleaseMatchRepo(ctx, releaseID) { return } - attachID := ctx.ParamsInt64(":attachment_id") + attachID := ctx.PathParamInt64(":attachment_id") attach, err := repo_model.GetAttachmentByID(ctx, attachID) if err != nil { if repo_model.IsErrAttachmentNotExist(err) { diff --git a/routers/api/v1/repo/release_tags.go b/routers/api/v1/repo/release_tags.go index f845fad53b..6df47af8d9 100644 --- a/routers/api/v1/repo/release_tags.go +++ b/routers/api/v1/repo/release_tags.go @@ -42,7 +42,7 @@ func GetReleaseByTag(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - tag := ctx.Params(":tag") + tag := ctx.PathParam(":tag") release, err := repo_model.GetRelease(ctx, ctx.Repo.Repository.ID, tag) if err != nil { @@ -95,7 +95,7 @@ func DeleteReleaseByTag(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" - tag := ctx.Params(":tag") + tag := ctx.PathParam(":tag") release, err := repo_model.GetRelease(ctx, ctx.Repo.Repository.ID, tag) if err != nil { diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 4f617d27af..1bcec8fcf7 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -491,7 +491,7 @@ func CreateOrgRepo(ctx *context.APIContext) { // "403": // "$ref": "#/responses/forbidden" opt := web.GetForm(ctx).(*api.CreateRepoOption) - org, err := organization.GetOrgByName(ctx, ctx.Params(":org")) + org, err := organization.GetOrgByName(ctx, ctx.PathParam(":org")) if err != nil { if organization.IsErrOrgNotExist(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) @@ -571,7 +571,7 @@ func GetByID(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - repo, err := repo_model.GetRepositoryByID(ctx, ctx.ParamsInt64(":id")) + repo, err := repo_model.GetRepositoryByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if repo_model.IsErrRepoNotExist(err) { ctx.NotFound() diff --git a/routers/api/v1/repo/status.go b/routers/api/v1/repo/status.go index 9e36ea0aed..8c910a68f9 100644 --- a/routers/api/v1/repo/status.go +++ b/routers/api/v1/repo/status.go @@ -53,7 +53,7 @@ func NewCommitStatus(ctx *context.APIContext) { // "$ref": "#/responses/notFound" form := web.GetForm(ctx).(*api.CreateStatusOption) - sha := ctx.Params("sha") + sha := ctx.PathParam("sha") if len(sha) == 0 { ctx.Error(http.StatusBadRequest, "sha not given", nil) return @@ -123,7 +123,7 @@ func GetCommitStatuses(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - getCommitStatuses(ctx, ctx.Params("sha")) + getCommitStatuses(ctx, ctx.PathParam("sha")) } // GetCommitStatusesByRef returns all statuses for any given commit ref @@ -177,7 +177,7 @@ func GetCommitStatusesByRef(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - filter := utils.ResolveRefOrSha(ctx, ctx.Params("ref")) + filter := utils.ResolveRefOrSha(ctx, ctx.PathParam("ref")) if ctx.Written() { return } @@ -257,7 +257,7 @@ func GetCombinedCommitStatusByRef(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - sha := utils.ResolveRefOrSha(ctx, ctx.Params("ref")) + sha := utils.ResolveRefOrSha(ctx, ctx.PathParam("ref")) if ctx.Written() { return } diff --git a/routers/api/v1/repo/tag.go b/routers/api/v1/repo/tag.go index f72034950f..a72df78666 100644 --- a/routers/api/v1/repo/tag.go +++ b/routers/api/v1/repo/tag.go @@ -102,7 +102,7 @@ func GetAnnotatedTag(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - sha := ctx.Params("sha") + sha := ctx.PathParam("sha") if len(sha) == 0 { ctx.Error(http.StatusBadRequest, "", "SHA not provided") return @@ -147,7 +147,7 @@ func GetTag(ctx *context.APIContext) { // "$ref": "#/responses/Tag" // "404": // "$ref": "#/responses/notFound" - tagName := ctx.Params("*") + tagName := ctx.PathParam("*") tag, err := ctx.Repo.GitRepo.GetTag(tagName) if err != nil { @@ -263,7 +263,7 @@ func DeleteTag(ctx *context.APIContext) { // "$ref": "#/responses/validationError" // "423": // "$ref": "#/responses/repoArchivedError" - tagName := ctx.Params("*") + tagName := ctx.PathParam("*") tag, err := repo_model.GetRelease(ctx, ctx.Repo.Repository.ID, tagName) if err != nil { @@ -358,7 +358,7 @@ func GetTagProtection(ctx *context.APIContext) { // "$ref": "#/responses/notFound" repo := ctx.Repo.Repository - id := ctx.ParamsInt64(":id") + id := ctx.PathParamInt64(":id") pt, err := git_model.GetProtectedTagByID(ctx, id) if err != nil { ctx.Error(http.StatusInternalServerError, "GetProtectedTagByID", err) @@ -522,7 +522,7 @@ func EditTagProtection(ctx *context.APIContext) { repo := ctx.Repo.Repository form := web.GetForm(ctx).(*api.EditTagProtectionOption) - id := ctx.ParamsInt64(":id") + id := ctx.PathParamInt64(":id") pt, err := git_model.GetProtectedTagByID(ctx, id) if err != nil { ctx.Error(http.StatusInternalServerError, "GetProtectedTagByID", err) @@ -617,7 +617,7 @@ func DeleteTagProtection(ctx *context.APIContext) { // "$ref": "#/responses/notFound" repo := ctx.Repo.Repository - id := ctx.ParamsInt64(":id") + id := ctx.PathParamInt64(":id") pt, err := git_model.GetProtectedTagByID(ctx, id) if err != nil { ctx.Error(http.StatusInternalServerError, "GetProtectedTagByID", err) diff --git a/routers/api/v1/repo/teams.go b/routers/api/v1/repo/teams.go index 0ecf3a39d8..ddd325482d 100644 --- a/routers/api/v1/repo/teams.go +++ b/routers/api/v1/repo/teams.go @@ -222,7 +222,7 @@ func changeRepoTeam(ctx *context.APIContext, add bool) { } func getTeamByParam(ctx *context.APIContext) *organization.Team { - team, err := organization.GetTeam(ctx, ctx.Repo.Owner.ID, ctx.Params(":team")) + team, err := organization.GetTeam(ctx, ctx.Repo.Owner.ID, ctx.PathParam(":team")) if err != nil { if organization.IsErrTeamNotExist(err) { ctx.Error(http.StatusNotFound, "TeamNotExit", err) diff --git a/routers/api/v1/repo/topic.go b/routers/api/v1/repo/topic.go index 9852caa989..6b9eedf6e0 100644 --- a/routers/api/v1/repo/topic.go +++ b/routers/api/v1/repo/topic.go @@ -162,7 +162,7 @@ func AddTopic(ctx *context.APIContext) { // "422": // "$ref": "#/responses/invalidTopicsError" - topicName := strings.TrimSpace(strings.ToLower(ctx.Params(":topic"))) + topicName := strings.TrimSpace(strings.ToLower(ctx.PathParam(":topic"))) if !repo_model.ValidateTopic(topicName) { ctx.JSON(http.StatusUnprocessableEntity, map[string]any{ @@ -229,7 +229,7 @@ func DeleteTopic(ctx *context.APIContext) { // "422": // "$ref": "#/responses/invalidTopicsError" - topicName := strings.TrimSpace(strings.ToLower(ctx.Params(":topic"))) + topicName := strings.TrimSpace(strings.ToLower(ctx.PathParam(":topic"))) if !repo_model.ValidateTopic(topicName) { ctx.JSON(http.StatusUnprocessableEntity, map[string]any{ diff --git a/routers/api/v1/repo/tree.go b/routers/api/v1/repo/tree.go index 353a996d5b..efb247c19e 100644 --- a/routers/api/v1/repo/tree.go +++ b/routers/api/v1/repo/tree.go @@ -56,7 +56,7 @@ func GetTree(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - sha := ctx.Params(":sha") + sha := ctx.PathParam(":sha") if len(sha) == 0 { ctx.Error(http.StatusBadRequest, "", "sha not provided") return diff --git a/routers/api/v1/shared/block.go b/routers/api/v1/shared/block.go index a1e65625ed..490a48f81c 100644 --- a/routers/api/v1/shared/block.go +++ b/routers/api/v1/shared/block.go @@ -40,7 +40,7 @@ func ListBlocks(ctx *context.APIContext, blocker *user_model.User) { } func CheckUserBlock(ctx *context.APIContext, blocker *user_model.User) { - blockee, err := user_model.GetUserByName(ctx, ctx.Params("username")) + blockee, err := user_model.GetUserByName(ctx, ctx.PathParam("username")) if err != nil { ctx.NotFound("GetUserByName", err) return @@ -60,7 +60,7 @@ func CheckUserBlock(ctx *context.APIContext, blocker *user_model.User) { } func BlockUser(ctx *context.APIContext, blocker *user_model.User) { - blockee, err := user_model.GetUserByName(ctx, ctx.Params("username")) + blockee, err := user_model.GetUserByName(ctx, ctx.PathParam("username")) if err != nil { ctx.NotFound("GetUserByName", err) return @@ -79,7 +79,7 @@ func BlockUser(ctx *context.APIContext, blocker *user_model.User) { } func UnblockUser(ctx *context.APIContext, doer, blocker *user_model.User) { - blockee, err := user_model.GetUserByName(ctx, ctx.Params("username")) + blockee, err := user_model.GetUserByName(ctx, ctx.PathParam("username")) if err != nil { ctx.NotFound("GetUserByName", err) return diff --git a/routers/api/v1/user/action.go b/routers/api/v1/user/action.go index bf78c2c864..22707196f4 100644 --- a/routers/api/v1/user/action.go +++ b/routers/api/v1/user/action.go @@ -49,7 +49,7 @@ func CreateOrUpdateSecret(ctx *context.APIContext) { opt := web.GetForm(ctx).(*api.CreateOrUpdateSecretOption) - _, created, err := secret_service.CreateOrUpdateSecret(ctx, ctx.Doer.ID, 0, ctx.Params("secretname"), opt.Data) + _, created, err := secret_service.CreateOrUpdateSecret(ctx, ctx.Doer.ID, 0, ctx.PathParam("secretname"), opt.Data) if err != nil { if errors.Is(err, util.ErrInvalidArgument) { ctx.Error(http.StatusBadRequest, "CreateOrUpdateSecret", err) @@ -91,7 +91,7 @@ func DeleteSecret(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - err := secret_service.DeleteSecretByName(ctx, ctx.Doer.ID, 0, ctx.Params("secretname")) + err := secret_service.DeleteSecretByName(ctx, ctx.Doer.ID, 0, ctx.PathParam("secretname")) if err != nil { if errors.Is(err, util.ErrInvalidArgument) { ctx.Error(http.StatusBadRequest, "DeleteSecret", err) @@ -138,7 +138,7 @@ func CreateVariable(ctx *context.APIContext) { opt := web.GetForm(ctx).(*api.CreateVariableOption) ownerID := ctx.Doer.ID - variableName := ctx.Params("variablename") + variableName := ctx.PathParam("variablename") v, err := actions_service.GetVariable(ctx, actions_model.FindVariablesOpts{ OwnerID: ownerID, @@ -198,7 +198,7 @@ func UpdateVariable(ctx *context.APIContext) { v, err := actions_service.GetVariable(ctx, actions_model.FindVariablesOpts{ OwnerID: ctx.Doer.ID, - Name: ctx.Params("variablename"), + Name: ctx.PathParam("variablename"), }) if err != nil { if errors.Is(err, util.ErrNotExist) { @@ -210,7 +210,7 @@ func UpdateVariable(ctx *context.APIContext) { } if opt.Name == "" { - opt.Name = ctx.Params("variablename") + opt.Name = ctx.PathParam("variablename") } if _, err := actions_service.UpdateVariable(ctx, v.ID, opt.Name, opt.Value); err != nil { if errors.Is(err, util.ErrInvalidArgument) { @@ -247,7 +247,7 @@ func DeleteVariable(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - if err := actions_service.DeleteVariableByName(ctx, ctx.Doer.ID, 0, ctx.Params("variablename")); err != nil { + if err := actions_service.DeleteVariableByName(ctx, ctx.Doer.ID, 0, ctx.PathParam("variablename")); err != nil { if errors.Is(err, util.ErrInvalidArgument) { ctx.Error(http.StatusBadRequest, "DeleteVariableByName", err) } else if errors.Is(err, util.ErrNotExist) { @@ -284,7 +284,7 @@ func GetVariable(ctx *context.APIContext) { v, err := actions_service.GetVariable(ctx, actions_model.FindVariablesOpts{ OwnerID: ctx.Doer.ID, - Name: ctx.Params("variablename"), + Name: ctx.PathParam("variablename"), }) if err != nil { if errors.Is(err, util.ErrNotExist) { diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index 88e314ed31..60354b1f26 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -160,7 +160,7 @@ func DeleteAccessToken(ctx *context.APIContext) { // "422": // "$ref": "#/responses/error" - token := ctx.Params(":id") + token := ctx.PathParam(":id") tokenID, _ := strconv.ParseInt(token, 0, 64) if tokenID == 0 { @@ -300,7 +300,7 @@ func DeleteOauth2Application(ctx *context.APIContext) { // "$ref": "#/responses/empty" // "404": // "$ref": "#/responses/notFound" - appID := ctx.ParamsInt64(":id") + appID := ctx.PathParamInt64(":id") if err := auth_model.DeleteOAuth2Application(ctx, appID, ctx.Doer.ID); err != nil { if auth_model.IsErrOAuthApplicationNotFound(err) { ctx.NotFound() @@ -332,7 +332,7 @@ func GetOauth2Application(ctx *context.APIContext) { // "$ref": "#/responses/OAuth2Application" // "404": // "$ref": "#/responses/notFound" - appID := ctx.ParamsInt64(":id") + appID := ctx.PathParamInt64(":id") app, err := auth_model.GetOAuth2ApplicationByID(ctx, appID) if err != nil { if auth_model.IsErrOauthClientIDInvalid(err) || auth_model.IsErrOAuthApplicationNotFound(err) { @@ -376,7 +376,7 @@ func UpdateOauth2Application(ctx *context.APIContext) { // "$ref": "#/responses/OAuth2Application" // "404": // "$ref": "#/responses/notFound" - appID := ctx.ParamsInt64(":id") + appID := ctx.PathParamInt64(":id") data := web.GetForm(ctx).(*api.CreateOAuth2ApplicationOptions) diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go index 5a2f995e1b..ba5c0fdc45 100644 --- a/routers/api/v1/user/gpg_key.go +++ b/routers/api/v1/user/gpg_key.go @@ -116,7 +116,7 @@ func GetGPGKey(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - key, err := asymkey_model.GetGPGKeyForUserByID(ctx, ctx.Doer.ID, ctx.ParamsInt64(":id")) + key, err := asymkey_model.GetGPGKeyForUserByID(ctx, ctx.Doer.ID, ctx.PathParamInt64(":id")) if err != nil { if asymkey_model.IsErrGPGKeyNotExist(err) { ctx.NotFound() @@ -280,7 +280,7 @@ func DeleteGPGKey(ctx *context.APIContext) { return } - if err := asymkey_model.DeleteGPGKey(ctx, ctx.Doer, ctx.ParamsInt64(":id")); err != nil { + if err := asymkey_model.DeleteGPGKey(ctx, ctx.Doer, ctx.PathParamInt64(":id")); err != nil { if asymkey_model.IsErrGPGKeyAccessDenied(err) { ctx.Error(http.StatusForbidden, "", "You do not have access to this key") } else { diff --git a/routers/api/v1/user/helper.go b/routers/api/v1/user/helper.go index 8b5c64e291..23a526cd67 100644 --- a/routers/api/v1/user/helper.go +++ b/routers/api/v1/user/helper.go @@ -12,7 +12,7 @@ import ( // GetUserByParamsName get user by name func GetUserByParamsName(ctx *context.APIContext, name string) *user_model.User { - username := ctx.Params(name) + username := ctx.PathParam(name) user, err := user_model.GetUserByName(ctx, username) if err != nil { if user_model.IsErrUserNotExist(err) { diff --git a/routers/api/v1/user/hook.go b/routers/api/v1/user/hook.go index 9d9ca5bf01..b4605c8a29 100644 --- a/routers/api/v1/user/hook.go +++ b/routers/api/v1/user/hook.go @@ -57,7 +57,7 @@ func GetHook(ctx *context.APIContext) { // "200": // "$ref": "#/responses/Hook" - hook, err := utils.GetOwnerHook(ctx, ctx.Doer.ID, ctx.ParamsInt64("id")) + hook, err := utils.GetOwnerHook(ctx, ctx.Doer.ID, ctx.PathParamInt64("id")) if err != nil { return } @@ -129,7 +129,7 @@ func EditHook(ctx *context.APIContext) { ctx, ctx.Doer, web.GetForm(ctx).(*api.EditHookOption), - ctx.ParamsInt64("id"), + ctx.PathParamInt64("id"), ) } @@ -154,6 +154,6 @@ func DeleteHook(ctx *context.APIContext) { utils.DeleteOwnerHook( ctx, ctx.Doer, - ctx.ParamsInt64("id"), + ctx.PathParamInt64("id"), ) } diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index d9456e7ec6..e4278c2ec0 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -55,7 +55,7 @@ func listPublicKeys(ctx *context.APIContext, user *user_model.User) { var count int fingerprint := ctx.FormString("fingerprint") - username := ctx.Params("username") + username := ctx.PathParam("username") if fingerprint != "" { var userID int64 // Unrestricted @@ -179,7 +179,7 @@ func GetPublicKey(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - key, err := asymkey_model.GetPublicKeyByID(ctx, ctx.ParamsInt64(":id")) + key, err := asymkey_model.GetPublicKeyByID(ctx, ctx.PathParamInt64(":id")) if err != nil { if asymkey_model.IsErrKeyNotExist(err) { ctx.NotFound() @@ -274,7 +274,7 @@ func DeletePublicKey(ctx *context.APIContext) { return } - id := ctx.ParamsInt64(":id") + id := ctx.PathParamInt64(":id") externallyManaged, err := asymkey_model.PublicKeyIsExternallyManaged(ctx, id) if err != nil { if asymkey_model.IsErrKeyNotExist(err) { diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index 09147cd2ae..fedad87fc4 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -113,7 +113,7 @@ func GetInfo(ctx *context.APIContext) { if !user_model.IsUserVisibleToViewer(ctx, ctx.ContextUser, ctx.Doer) { // fake ErrUserNotExist error message to not leak information about existence - ctx.NotFound("GetUserByName", user_model.ErrUserNotExist{Name: ctx.Params(":username")}) + ctx.NotFound("GetUserByName", user_model.ErrUserNotExist{Name: ctx.PathParam(":username")}) return } ctx.JSON(http.StatusOK, convert.ToUser(ctx, ctx.ContextUser, ctx.Doer)) |