aboutsummaryrefslogtreecommitdiff
path: root/internal/route
diff options
context:
space:
mode:
Diffstat (limited to 'internal/route')
-rw-r--r--internal/route/api/v1/user/app.go4
-rw-r--r--internal/route/lfs/route.go4
-rw-r--r--internal/route/lfs/route_test.go26
-rw-r--r--internal/route/repo/http.go4
-rw-r--r--internal/route/user/setting.go8
5 files changed, 23 insertions, 23 deletions
diff --git a/internal/route/api/v1/user/app.go b/internal/route/api/v1/user/app.go
index 5afa34fb..dce7d421 100644
--- a/internal/route/api/v1/user/app.go
+++ b/internal/route/api/v1/user/app.go
@@ -14,7 +14,7 @@ import (
)
func ListAccessTokens(c *context.APIContext) {
- tokens, err := db.AccessTokens.List(c.User.ID)
+ tokens, err := db.AccessTokens.List(c.Req.Context(), c.User.ID)
if err != nil {
c.Error(err, "list access tokens")
return
@@ -28,7 +28,7 @@ func ListAccessTokens(c *context.APIContext) {
}
func CreateAccessToken(c *context.APIContext, form api.CreateAccessTokenOption) {
- t, err := db.AccessTokens.Create(c.User.ID, form.Name)
+ t, err := db.AccessTokens.Create(c.Req.Context(), c.User.ID, form.Name)
if err != nil {
if db.IsErrAccessTokenAlreadyExist(err) {
c.ErrorStatus(http.StatusUnprocessableEntity, err)
diff --git a/internal/route/lfs/route.go b/internal/route/lfs/route.go
index 388dde0c..78a45fde 100644
--- a/internal/route/lfs/route.go
+++ b/internal/route/lfs/route.go
@@ -72,7 +72,7 @@ func authenticate() macaron.Handler {
// If username and password authentication failed, try again using username as an access token.
if auth.IsErrBadCredentials(err) {
- token, err := db.AccessTokens.GetBySHA1(username)
+ token, err := db.AccessTokens.GetBySHA1(c.Req.Context(), username)
if err != nil {
if db.IsErrAccessTokenNotExist(err) {
askCredentials(c.Resp)
@@ -82,7 +82,7 @@ func authenticate() macaron.Handler {
}
return
}
- if err = db.AccessTokens.Save(token); err != nil {
+ if err = db.AccessTokens.Save(c.Req.Context(), token); err != nil {
log.Error("Failed to update access token: %v", err)
}
diff --git a/internal/route/lfs/route_test.go b/internal/route/lfs/route_test.go
index 119b925e..a07121cc 100644
--- a/internal/route/lfs/route_test.go
+++ b/internal/route/lfs/route_test.go
@@ -31,7 +31,7 @@ func Test_authenticate(t *testing.T) {
header http.Header
mockUsersStore *db.MockUsersStore
mockTwoFactorsStore *db.MockTwoFactorsStore
- mockAccessTokensStore *db.MockAccessTokensStore
+ mockAccessTokensStore func() db.AccessTokensStore
expStatusCode int
expHeader http.Header
expBody string
@@ -74,10 +74,10 @@ func Test_authenticate(t *testing.T) {
return nil, auth.ErrBadCredentials{}
},
},
- mockAccessTokensStore: &db.MockAccessTokensStore{
- MockGetBySHA1: func(sha string) (*db.AccessToken, error) {
- return nil, db.ErrAccessTokenNotExist{}
- },
+ mockAccessTokensStore: func() db.AccessTokensStore {
+ mock := db.NewMockAccessTokensStore()
+ mock.GetBySHA1Func.SetDefaultReturn(nil, db.ErrAccessTokenNotExist{})
+ return mock
},
expStatusCode: http.StatusUnauthorized,
expHeader: http.Header{
@@ -119,13 +119,10 @@ func Test_authenticate(t *testing.T) {
return &db.User{ID: 1, Name: "unknwon"}, nil
},
},
- mockAccessTokensStore: &db.MockAccessTokensStore{
- MockGetBySHA1: func(sha string) (*db.AccessToken, error) {
- return &db.AccessToken{}, nil
- },
- MockSave: func(t *db.AccessToken) error {
- return nil
- },
+ mockAccessTokensStore: func() db.AccessTokensStore {
+ mock := db.NewMockAccessTokensStore()
+ mock.GetBySHA1Func.SetDefaultReturn(&db.AccessToken{}, nil)
+ return mock
},
expStatusCode: http.StatusOK,
expHeader: http.Header{},
@@ -136,7 +133,10 @@ func Test_authenticate(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
db.SetMockUsersStore(t, test.mockUsersStore)
db.SetMockTwoFactorsStore(t, test.mockTwoFactorsStore)
- db.SetMockAccessTokensStore(t, test.mockAccessTokensStore)
+
+ if test.mockAccessTokensStore != nil {
+ db.SetMockAccessTokensStore(t, test.mockAccessTokensStore())
+ }
r, err := http.NewRequest("GET", "/", nil)
if err != nil {
diff --git a/internal/route/repo/http.go b/internal/route/repo/http.go
index b5bbefc1..575719f1 100644
--- a/internal/route/repo/http.go
+++ b/internal/route/repo/http.go
@@ -131,7 +131,7 @@ func HTTPContexter() macaron.Handler {
// If username and password combination failed, try again using username as a token.
if authUser == nil {
- token, err := db.AccessTokens.GetBySHA1(authUsername)
+ token, err := db.AccessTokens.GetBySHA1(c.Req.Context(), authUsername)
if err != nil {
if db.IsErrAccessTokenNotExist(err) {
askCredentials(c, http.StatusUnauthorized, "")
@@ -141,7 +141,7 @@ func HTTPContexter() macaron.Handler {
}
return
}
- if err = db.AccessTokens.Save(token); err != nil {
+ if err = db.AccessTokens.Save(c.Req.Context(), token); err != nil {
log.Error("Failed to update access token: %v", err)
}
diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go
index 5d879f42..cf2226c5 100644
--- a/internal/route/user/setting.go
+++ b/internal/route/user/setting.go
@@ -581,7 +581,7 @@ func SettingsApplications(c *context.Context) {
c.Title("settings.applications")
c.PageIs("SettingsApplications")
- tokens, err := db.AccessTokens.List(c.User.ID)
+ tokens, err := db.AccessTokens.List(c.Req.Context(), c.User.ID)
if err != nil {
c.Errorf(err, "list access tokens")
return
@@ -596,7 +596,7 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) {
c.PageIs("SettingsApplications")
if c.HasError() {
- tokens, err := db.AccessTokens.List(c.User.ID)
+ tokens, err := db.AccessTokens.List(c.Req.Context(), c.User.ID)
if err != nil {
c.Errorf(err, "list access tokens")
return
@@ -607,7 +607,7 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) {
return
}
- t, err := db.AccessTokens.Create(c.User.ID, f.Name)
+ t, err := db.AccessTokens.Create(c.Req.Context(), c.User.ID, f.Name)
if err != nil {
if db.IsErrAccessTokenAlreadyExist(err) {
c.Flash.Error(c.Tr("settings.token_name_exists"))
@@ -624,7 +624,7 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) {
}
func SettingsDeleteApplication(c *context.Context) {
- if err := db.AccessTokens.DeleteByID(c.User.ID, c.QueryInt64("id")); err != nil {
+ if err := db.AccessTokens.DeleteByID(c.Req.Context(), c.User.ID, c.QueryInt64("id")); err != nil {
c.Flash.Error("DeleteAccessTokenByID: " + err.Error())
} else {
c.Flash.Success(c.Tr("settings.delete_token_success"))
Powered by cgit, Themed by Ted Yin.