From 783a02188970ba5800514f7c64f6a818f65c04a1 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 8 Apr 2022 02:59:56 +0800 Subject: Never use /api/v1 from Gitea UI Pages (#19318) Reusing `/api/v1` from Gitea UI Pages have pros and cons. Pros: 1) Less code copy Cons: 1) API/v1 have to support shared session with page requests. 2) You need to consider for each other when you want to change something about api/v1 or page. This PR moves all dependencies to API/v1 from UI Pages. Partially replace #16052 --- routers/api/v1/utils/utils.go | 68 ------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 routers/api/v1/utils/utils.go (limited to 'routers/api/v1/utils/utils.go') diff --git a/routers/api/v1/utils/utils.go b/routers/api/v1/utils/utils.go deleted file mode 100644 index 7564857115..0000000000 --- a/routers/api/v1/utils/utils.go +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2017 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package utils - -import ( - "net/url" - "strings" - "time" - - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/convert" -) - -// GetQueryBeforeSince return parsed time (unix format) from URL query's before and since -func GetQueryBeforeSince(ctx *context.APIContext) (before, since int64, err error) { - qCreatedBefore, err := prepareQueryArg(ctx, "before") - if err != nil { - return 0, 0, err - } - - qCreatedSince, err := prepareQueryArg(ctx, "since") - if err != nil { - return 0, 0, err - } - - before, err = parseTime(qCreatedBefore) - if err != nil { - return 0, 0, err - } - - since, err = parseTime(qCreatedSince) - if err != nil { - return 0, 0, err - } - return before, since, nil -} - -// parseTime parse time and return unix timestamp -func parseTime(value string) (int64, error) { - if len(value) != 0 { - t, err := time.Parse(time.RFC3339, value) - if err != nil { - return 0, err - } - if !t.IsZero() { - return t.Unix(), nil - } - } - return 0, nil -} - -// prepareQueryArg unescape and trim a query arg -func prepareQueryArg(ctx *context.APIContext, name string) (value string, err error) { - value, err = url.PathUnescape(ctx.FormString(name)) - value = strings.TrimSpace(value) - return -} - -// GetListOptions returns list options using the page and limit parameters -func GetListOptions(ctx *context.APIContext) db.ListOptions { - return db.ListOptions{ - Page: ctx.FormInt("page"), - PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), - } -} -- cgit v1.2.3