gitea/opengist
0
0
Fork 0
mirror of https://github.com/thomiceli/opengist.git synced 2025-06-21 17:28:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enhanced model structs with DTOs

Browse Source
This commit is contained in:
Thomas Miceli
2023-03-17 14:56:39 +01:00
parent 42176c42c5
commit 167abd4ae5
10 changed files with 212 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/web/admin.go
View File

@ -6,6 +6,7 @@ import (
"opengist/internal/git"
"opengist/internal/models"
"runtime"
"strconv"
)
func adminIndex(ctx echo.Context) error {
@ -78,7 +79,13 @@ func adminGists(ctx echo.Context) error {
}
func adminUserDelete(ctx echo.Context) error {
if err := models.DeleteUser(ctx.Param("user")); err != nil {
userId, _ := strconv.ParseUint(ctx.Param("user"), 10, 64)
user, err := models.GetUserById(uint(userId))
if err != nil {
return errorRes(500, "Cannot retrieve user", err)
}
if err := user.Delete(); err != nil {
return errorRes(500, "Cannot delete this user", err)
}
@ -96,7 +103,7 @@ func adminGistDelete(ctx echo.Context) error {
return errorRes(500, "Cannot delete the repository", err)
}
if err = models.DeleteGist(gist); err != nil {
if err = gist.Delete(); err != nil {
return errorRes(500, "Cannot delete this gist", err)
}

35
internal/web/auth.go
View File

@ -22,35 +22,35 @@ func processRegister(ctx echo.Context) error {
sess := getSession(ctx)
var user = new(models.User)
if err := ctx.Bind(user); err != nil {
var dto = new(models.UserDTO)
if err := ctx.Bind(dto); err != nil {
return errorRes(400, "Cannot bind data", err)
}
if err := ctx.Validate(user); err != nil {
if err := ctx.Validate(dto); err != nil {
addFlash(ctx, validationMessages(&err), "error")
return html(ctx, "auth_form.html")
}
if exists, err := models.UserExists(dto.Username); err != nil || exists {
addFlash(ctx, "Username already exists", "error")
return html(ctx, "auth_form.html")
}
user := dto.ToUser()
password, err := argon2id.hash(user.Password)
if err != nil {
return errorRes(500, "Cannot hash password", err)
}
user.Password = password
var count int64
if err = models.DoesUserExists(user.Username, &count); err != nil || count >= 1 {
addFlash(ctx, "Username already exists", "error")
return html(ctx, "auth_form.html")
}
if err = models.CreateUser(user); err != nil {
if err = user.Create(); err != nil {
return errorRes(500, "Cannot create user", err)
}
if user.ID == 1 {
user.IsAdmin = true
if err = models.SetAdminUser(user); err != nil {
if err = user.SetAdmin(); err != nil {
return errorRes(500, "Cannot set user admin", err)
}
}
@ -68,15 +68,18 @@ func login(ctx echo.Context) error {
}
func processLogin(ctx echo.Context) error {
var err error
sess := getSession(ctx)
user := &models.User{}
if err := ctx.Bind(user); err != nil {
dto := &models.UserDTO{}
if err = ctx.Bind(dto); err != nil {
return errorRes(400, "Cannot bind data", err)
}
password := user.Password
password := dto.Password
if err := models.GetLoginUser(user); err != nil {
var user *models.User
if user, err = models.GetUserByUsername(dto.Username); err != nil {
addFlash(ctx, "Invalid credentials", "error")
return redirect(ctx, "/login")
}

93
internal/web/gist.go
View File

@ -4,6 +4,7 @@ import (
"archive/zip"
"bytes"
"errors"
"fmt"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
"gorm.io/gorm"
@ -59,7 +60,7 @@ func gistInit(next echo.HandlerFunc) echo.HandlerFunc {
setData(ctx, "nbCommits", nbCommits)
if currUser := getUserLogged(ctx); currUser != nil {
hasLiked, err := models.UserHasLikedGist(currUser, gist)
hasLiked, err := currUser.HasLiked(gist)
if err != nil {
return errorRes(500, "Cannot get user like status", err)
}
@ -108,12 +109,12 @@ func allGists(ctx echo.Context) error {
setData(ctx, "htmlTitle", "All gists from "+fromUser)
setData(ctx, "fromUser", fromUser)
var count int64
if err = models.DoesUserExists(fromUser, &count); err != nil {
var exists bool
if exists, err = models.UserExists(fromUser); err != nil {
return errorRes(500, "Error fetching user", err)
}
if count == 0 {
if !exists {
return notFound("User not found")
}
@ -130,7 +131,7 @@ func allGists(ctx echo.Context) error {
return html(ctx, "all.html")
}
func gist(ctx echo.Context) error {
func gistIndex(ctx echo.Context) error {
gist := getData(ctx, "gist").(*models.Gist)
userName := gist.User.Username
gistName := gist.Uuid
@ -244,21 +245,22 @@ func processCreate(ctx echo.Context) error {
return errorRes(400, "Bad request", err)
}
dto := new(models.GistDTO)
var gist *models.Gist
if isCreate {
gist = new(models.Gist)
setData(ctx, "htmlTitle", "Create a new gist")
} else {
gist = getData(ctx, "gist").(*models.Gist)
setData(ctx, "htmlTitle", "Edit "+gist.Title)
}
if err := ctx.Bind(gist); err != nil {
if err := ctx.Bind(dto); err != nil {
fmt.Println(err)
return errorRes(400, "Cannot bind data", err)
}
gist.Files = make([]models.File, 0)
dto.Files = make([]models.File, 0)
for i := 0; i < len(ctx.Request().PostForm["content"]); i++ {
name := ctx.Request().PostForm["name"][i]
content := ctx.Request().PostForm["content"][i]
@ -272,33 +274,13 @@ func processCreate(ctx echo.Context) error {
return errorRes(400, "Invalid character unescaped", err)
}
gist.Files = append(gist.Files, models.File{
dto.Files = append(dto.Files, models.File{
Filename: name,
Content: escapedValue,
})
}
user := getUserLogged(ctx)
gist.NbFiles = len(gist.Files)
if isCreate {
uuidGist, err := uuid.NewRandom()
if err != nil {
return errorRes(500, "Error creating an UUID", err)
}
gist.Uuid = strings.Replace(uuidGist.String(), "-", "", -1)
gist.UserID = user.ID
}
if gist.Title == "" {
if ctx.Request().PostForm["name"][0] == "" {
gist.Title = "gist:" + gist.Uuid
} else {
gist.Title = ctx.Request().PostForm["name"][0]
}
}
err = ctx.Validate(gist)
err = ctx.Validate(dto)
if err != nil {
addFlash(ctx, validationMessages(&err), "error")
if isCreate {
@ -321,6 +303,33 @@ func processCreate(ctx echo.Context) error {
}
}
if isCreate {
gist = dto.ToGist()
} else {
gist = dto.ToExistingGist(gist)
}
user := getUserLogged(ctx)
gist.NbFiles = len(gist.Files)
if isCreate {
uuidGist, err := uuid.NewRandom()
if err != nil {
return errorRes(500, "Error creating an UUID", err)
}
gist.Uuid = strings.Replace(uuidGist.String(), "-", "", -1)
gist.UserID = user.ID
}
if gist.Title == "" {
if ctx.Request().PostForm["name"][0] == "" {
gist.Title = "gist:" + gist.Uuid
} else {
gist.Title = ctx.Request().PostForm["name"][0]
}
}
if len(gist.Files) > 0 {
split := strings.Split(gist.Files[0].Content, "\n")
if len(split) > 10 {
@ -359,11 +368,11 @@ func processCreate(ctx echo.Context) error {
}
if isCreate {
if err = models.CreateGist(gist); err != nil {
if err = gist.Create(); err != nil {
return errorRes(500, "Error creating the gist", err)
}
} else {
if err = models.UpdateGist(gist); err != nil {
if err = gist.Update(); err != nil {
return errorRes(500, "Error updating the gist", err)
}
}
@ -375,7 +384,7 @@ func toggleVisibility(ctx echo.Context) error {
var gist = getData(ctx, "gist").(*models.Gist)
gist.Private = !gist.Private
if err := models.UpdateGist(gist); err != nil {
if err := gist.Update(); err != nil {
return errorRes(500, "Error updating this gist", err)
}
@ -391,7 +400,7 @@ func deleteGist(ctx echo.Context) error {
return errorRes(500, "Error deleting the repository", err)
}
if err := models.DeleteGist(gist); err != nil {
if err := gist.Delete(); err != nil {
return errorRes(500, "Error deleting this gist", err)
}
@ -403,15 +412,15 @@ func like(ctx echo.Context) error {
var gist = getData(ctx, "gist").(*models.Gist)
currentUser := getUserLogged(ctx)
hasLiked, err := models.UserHasLikedGist(currentUser, gist)
hasLiked, err := currentUser.HasLiked(gist)
if err != nil {
return errorRes(500, "Error checking if user has liked a gist", err)
}
if hasLiked {
err = models.RemoveUserLike(gist, getUserLogged(ctx))
err = gist.RemoveUserLike(getUserLogged(ctx))
} else {
err = models.AppendUserLike(gist, getUserLogged(ctx))
err = gist.AppendUserLike(getUserLogged(ctx))
}
if err != nil {
@ -429,7 +438,7 @@ func fork(ctx echo.Context) error {
var gist = getData(ctx, "gist").(*models.Gist)
currentUser := getUserLogged(ctx)
alreadyForked, err := models.GetForkedGist(gist, currentUser)
alreadyForked, err := gist.GetForkParent(currentUser)
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return errorRes(500, "Error checking if gist is already forked", err)
}
@ -459,14 +468,14 @@ func fork(ctx echo.Context) error {
ForkedID: gist.ID,
}
if err = models.CreateForkedGist(newGist); err != nil {
if err = newGist.CreateForked(); err != nil {
return errorRes(500, "Error forking the gist in database", err)
}
if err = git.ForkClone(gist.User.Username, gist.Uuid, currentUser.Username, newGist.Uuid); err != nil {
return errorRes(500, "Error cloning the repository while forking", err)
}
if err = models.IncrementGistForkCount(gist); err != nil {
if err = gist.IncrementForkCount(); err != nil {
return errorRes(500, "Error incrementing the fork count", err)
}
@ -567,7 +576,7 @@ func likes(ctx echo.Context) error {
pageInt := getPage(ctx)
likers, err := models.GetUsersLikesForGist(gist, pageInt-1)
likers, err := gist.GetUsersLikes(pageInt - 1)
if err != nil {
return errorRes(500, "Error getting users who liked this gist", err)
}
@ -591,7 +600,7 @@ func forks(ctx echo.Context) error {
fromUserID = currentUser.ID
}
forks, err := models.GetUsersForksForGist(gist, fromUserID, pageInt-1)
forks, err := gist.GetForks(fromUserID, pageInt-1)
if err != nil {
return errorRes(500, "Error getting users who liked this gist", err)
}

2
internal/web/git-http.go
View File

@ -134,7 +134,7 @@ func pack(ctx echo.Context, serviceType string) error {
// updatedAt is updated only if serviceType is receive-pack
if serviceType == "receive-pack" {
_ = models.GistLastActiveNow(getData(ctx, "gist").(*models.Gist).ID)
_ = getData(ctx, "gist").(*models.Gist).SetLastActiveNow()
}
return nil
}

14
internal/web/run.go
View File

@ -51,7 +51,7 @@ func Start() {
return nil
},
}))
e.Use(middleware.Recover())
//e.Use(middleware.Recover())
e.Use(middleware.Secure())
e.Renderer = &Template{
@ -148,8 +148,8 @@ func Start() {
g3 := g1.Group("/:user/:gistname")
{
g3.Use(gistInit)
g3.GET("", gist)
g3.GET("/rev/:revision", gist)
g3.GET("", gistIndex)
g3.GET("/rev/:revision", gistIndex)
g3.GET("/revisions", revisions)
g3.GET("/archive/:revision", downloadZip)
g3.POST("/visibility", toggleVisibility, logged, writePermission)
@ -203,8 +203,10 @@ func sessionInit(next echo.HandlerFunc) echo.HandlerFunc {
return func(ctx echo.Context) error {
sess := getSession(ctx)
if sess.Values["user"] != nil {
user := &models.User{ID: sess.Values["user"].(uint)}
if err := models.GetLoginUserById(user); err != nil {
var err error
var user *models.User
if user, err = models.GetUserById(sess.Values["user"].(uint)); err != nil {
sess.Values["user"] = nil
saveSession(sess, ctx)
setData(ctx, "userLogged", nil)
@ -232,7 +234,7 @@ func writePermission(next echo.HandlerFunc) echo.HandlerFunc {
return func(ctx echo.Context) error {
gist := getData(ctx, "gist")
user := getUserLogged(ctx)
if !models.UserCanWrite(user, gist.(*models.Gist)) {
if !gist.(*models.Gist).CanWrite(user) {
return redirect(ctx, "/"+gist.(*models.Gist).User.Username+"/"+gist.(*models.Gist).Uuid)
}
return next(ctx)

11
internal/web/ssh.go
View File

@ -27,15 +27,16 @@ func sshKeysProcess(ctx echo.Context) error {
user := getUserLogged(ctx)
var key = new(models.SSHKey)
if err := ctx.Bind(key); err != nil {
var dto = new(models.SSHKeyDTO)
if err := ctx.Bind(dto); err != nil {
return errorRes(400, "Cannot bind data", err)
}
if err := ctx.Validate(key); err != nil {
if err := ctx.Validate(dto); err != nil {
addFlash(ctx, validationMessages(&err), "error")
return redirect(ctx, "/ssh-keys")
}
key := dto.ToSSHKey()
key.UserID = user.ID
@ -48,7 +49,7 @@ func sshKeysProcess(ctx echo.Context) error {
sha := sha256.Sum256(pubKey.Marshal())
key.SHA = base64.StdEncoding.EncodeToString(sha[:])
if err := models.AddSSHKey(key); err != nil {
if err := key.Create(); err != nil {
return errorRes(500, "Cannot add SSH key", err)
}
@ -70,7 +71,7 @@ func sshKeysDelete(ctx echo.Context) error {
return redirect(ctx, "/ssh-keys")
}
if err := models.RemoveSSHKey(key); err != nil {
if err := key.Delete(); err != nil {
return errorRes(500, "Cannot delete SSH key", err)
}