konrad
/
Library
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

fixed lint + gofmt
the build was successful Details

This commit is contained in:
konrad 2018-01-23 16:20:37 +01:00 committed by kolaente
parent bcb8b08001
commit d309d5b3b6
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/error.go
View File

@ -42,7 +42,7 @@ type ErrUserDoesNotExist struct {
UserID int64 UserID int64
} }
// IsErrNoUsername checks if an error is a ErrUsernameExists. // IsErrUserDoesNotExist checks if an error is a ErrUsernameExists.
func IsErrUserDoesNotExist(err error) bool { func IsErrUserDoesNotExist(err error) bool {
_, ok := err.(ErrUserDoesNotExist) _, ok := err.(ErrUserDoesNotExist)
return ok return ok

5
routes/api/v1/user_show.go
View File

@ -1,12 +1,13 @@
package v1 package v1
import ( import (
"git.mowie.cc/konrad/Library/models"
"github.com/labstack/echo" "github.com/labstack/echo"
"net/http" "net/http"
"strconv" "strconv"
"git.mowie.cc/konrad/Library/models"
) )
// UserShow gets all informations about a user
func UserShow(c echo.Context) error { func UserShow(c echo.Context) error {
// Check if the user is admin // Check if the user is admin
@ -39,4 +40,4 @@ func UserShow(c echo.Context) error {
} }
return c.JSON(http.StatusOK, userInfos) return c.JSON(http.StatusOK, userInfos)
} }

7
routes/api/v1/user_update_password.go
View File

@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/labstack/echo"
"git.mowie.cc/konrad/Library/models" "git.mowie.cc/konrad/Library/models"
"github.com/labstack/echo"
) )
type datPassword struct { type datPassword struct {
@ -28,7 +28,6 @@ func UserChangePassword(c echo.Context) error {
return c.JSON(http.StatusInternalServerError, models.Message{"Error getting user infos."}) return c.JSON(http.StatusInternalServerError, models.Message{"Error getting user infos."})
} }
// Check if the user is admin or itself // Check if the user is admin or itself
userJWTinfo, err := models.GetCurrentUser(c) userJWTinfo, err := models.GetCurrentUser(c)
if !models.IsAdmin(c) || userJWTinfo.ID == userID { if !models.IsAdmin(c) || userJWTinfo.ID == userID {
@ -59,7 +58,7 @@ func UserChangePassword(c echo.Context) error {
if !exists { if !exists {
return c.JSON(http.StatusNotFound, models.Message{"User not found."}) return c.JSON(http.StatusNotFound, models.Message{"User not found."})
} }
err = models.UpdateUserPassword(userID, datPw.Password) err = models.UpdateUserPassword(userID, datPw.Password)
if err != nil { if err != nil {
@ -67,4 +66,4 @@ func UserChangePassword(c echo.Context) error {
} }
return c.JSON(http.StatusOK, models.Message{"The password was updated successfully"}) return c.JSON(http.StatusOK, models.Message{"The password was updated successfully"})
} }