Merge branch '5-issue' into 'main'
Move struct to lib Closes #5 See merge request h6n/users!14
This commit is contained in:
commit
de845830ef
3 changed files with 6 additions and 4 deletions
|
|
@ -5,6 +5,7 @@ import (
|
||||||
|
|
||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
logins "gitlab.g3e.fr/h6n/users/internal"
|
logins "gitlab.g3e.fr/h6n/users/internal"
|
||||||
|
login_lib "gitlab.g3e.fr/h6n/users/lib/login"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Login
|
// Login
|
||||||
|
|
@ -16,7 +17,7 @@ import (
|
||||||
// @Param request body logins.RequestLogin true "request body"
|
// @Param request body logins.RequestLogin true "request body"
|
||||||
// @Success 200 {object} logins.ResponseLogin
|
// @Success 200 {object} logins.ResponseLogin
|
||||||
func login(c echo.Context) error {
|
func login(c echo.Context) error {
|
||||||
var request logins.RequestLogin
|
var request login_lib.RequestLogin
|
||||||
if err := c.Bind(&request); err != nil {
|
if err := c.Bind(&request); err != nil {
|
||||||
return c.JSON(http.StatusBadRequest, err)
|
return c.JSON(http.StatusBadRequest, err)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import (
|
||||||
"github.com/biscuit-auth/biscuit-go/v2"
|
"github.com/biscuit-auth/biscuit-go/v2"
|
||||||
"github.com/biscuit-auth/biscuit-go/v2/parser"
|
"github.com/biscuit-auth/biscuit-go/v2/parser"
|
||||||
"gitlab.g3e.fr/h6n/users/lib"
|
"gitlab.g3e.fr/h6n/users/lib"
|
||||||
|
login_lib "gitlab.g3e.fr/h6n/users/lib/login"
|
||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
@ -18,8 +19,8 @@ func CheckPasswordHash(password, hash string) bool {
|
||||||
return err == nil
|
return err == nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateLogin(db *gorm.DB, request RequestLogin) (ResponseLogin, error) {
|
func CreateLogin(db *gorm.DB, request login_lib.RequestLogin) (login_lib.ResponseLogin, error) {
|
||||||
var response ResponseLogin
|
var response login_lib.ResponseLogin
|
||||||
|
|
||||||
var user = Users{Email: request.Username}
|
var user = Users{Email: request.Username}
|
||||||
if err := db.First(&user); err.Error != nil {
|
if err := db.First(&user); err.Error != nil {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package logins
|
package login_lib
|
||||||
|
|
||||||
type (
|
type (
|
||||||
// RequestLogin model info
|
// RequestLogin model info
|
||||||
Loading…
Add table
Add a link
Reference in a new issue