diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-04-04 21:14:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-04 21:14:15 +0800 |
| commit | 34145c990d4fd9f278f29cdf9c61378a75e9b934 (patch) | |
| tree | 7b151bbd5aef9e487759953e3a775a82244d268d /internal/route/api | |
| parent | 2bd9d0b9c8238ded727cd98a3ace20b53c10a44f (diff) | |
lfs: implement HTTP routes (#6035)
* Bootstrap with GORM
* Fix lint error
* Set conn max lifetime to one minute
* Fallback to use gorm v1
* Define HTTP routes
* Finish authentication
* Save token updated
* Add docstring
* Finish authorization
* serveBatch rundown
* Define types in lfsutil
* Finish Batch
* authutil
* Finish basic
* Formalize response error
* Fix lint errors
* authutil: add tests
* dbutil: add tests
* lfsutil: add tests
* strutil: add tests
* Formalize 401 response
Diffstat (limited to 'internal/route/api')
| -rw-r--r-- | internal/route/api/v1/admin/user.go | 4 | ||||
| -rw-r--r-- | internal/route/api/v1/api.go | 2 | ||||
| -rw-r--r-- | internal/route/api/v1/repo/repo.go | 4 | ||||
| -rw-r--r-- | internal/route/api/v1/user/app.go | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/internal/route/api/v1/admin/user.go b/internal/route/api/v1/admin/user.go index c339edd2..06c6569f 100644 --- a/internal/route/api/v1/admin/user.go +++ b/internal/route/api/v1/admin/user.go @@ -23,7 +23,7 @@ func parseLoginSource(c *context.APIContext, u *db.User, sourceID int64, loginNa return } - source, err := db.GetLoginSourceByID(sourceID) + source, err := db.LoginSources.GetByID(sourceID) if err != nil { if errors.IsLoginSourceNotExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) @@ -45,7 +45,7 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) { Email: form.Email, Passwd: form.Password, IsActive: true, - LoginType: db.LOGIN_PLAIN, + LoginType: db.LoginPlain, } parseLoginSource(c, u, form.SourceID, form.LoginName) diff --git a/internal/route/api/v1/api.go b/internal/route/api/v1/api.go index 01f23d42..1ef21505 100644 --- a/internal/route/api/v1/api.go +++ b/internal/route/api/v1/api.go @@ -55,7 +55,7 @@ func repoAssignment() macaron.Handler { } if c.IsTokenAuth && c.User.IsAdmin { - c.Repo.AccessMode = db.ACCESS_MODE_OWNER + c.Repo.AccessMode = db.AccessModeOwner } else { mode, err := db.UserAccessMode(c.UserID(), r) if err != nil { diff --git a/internal/route/api/v1/repo/repo.go b/internal/route/api/v1/repo/repo.go index 71b94d75..8ac7fd87 100644 --- a/internal/route/api/v1/repo/repo.go +++ b/internal/route/api/v1/repo/repo.go @@ -131,8 +131,8 @@ func listUserRepositories(c *context.APIContext, username string) { i := numOwnRepos for repo, access := range accessibleRepos { repos[i] = repo.APIFormat(&api.Permission{ - Admin: access >= db.ACCESS_MODE_ADMIN, - Push: access >= db.ACCESS_MODE_WRITE, + Admin: access >= db.AccessModeAdmin, + Push: access >= db.AccessModeWrite, Pull: true, }) i++ diff --git a/internal/route/api/v1/user/app.go b/internal/route/api/v1/user/app.go index 99a422cc..98532ae2 100644 --- a/internal/route/api/v1/user/app.go +++ b/internal/route/api/v1/user/app.go @@ -30,8 +30,8 @@ func ListAccessTokens(c *context.APIContext) { func CreateAccessToken(c *context.APIContext, form api.CreateAccessTokenOption) { t := &db.AccessToken{ - UID: c.User.ID, - Name: form.Name, + UserID: c.User.ID, + Name: form.Name, } if err := db.NewAccessToken(t); err != nil { if errors.IsAccessTokenNameAlreadyExist(err) { |