fixed GetUserByToken
This commit is contained in:
parent
8afc68814e
commit
ff0ecce741
|
@ -12,7 +12,6 @@ import (
|
|||
"golang-test/message"
|
||||
"golang-test/validators"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
//func tokenGenerator() string {
|
||||
|
@ -25,8 +24,8 @@ import (
|
|||
// a := tokenGenerator()
|
||||
// fmt.Println(a)
|
||||
// }
|
||||
type Token struct {
|
||||
gorm.Model
|
||||
|
||||
type TokenStruct struct {
|
||||
UserID uint
|
||||
token string
|
||||
}
|
||||
|
@ -80,19 +79,19 @@ func generateToken() string {
|
|||
return base64.StdEncoding.EncodeToString(b)
|
||||
}
|
||||
|
||||
func GetUserByToken(c *gin.Context, token string) database.User {
|
||||
var tokenStruct Token
|
||||
func GetUserByToken(c *gin.Context, token string) (database.User, error) {
|
||||
var tokenObject TokenStruct
|
||||
var err error
|
||||
var user database.User
|
||||
|
||||
db := database.Connector()
|
||||
validate := validators.Validate
|
||||
if err := db.Where("token = ?", token).First(&tokenStruct).Error; err != nil {
|
||||
return nil
|
||||
if err := db.Where("token = ?", token).First(&tokenObject).Error; err != nil {
|
||||
return user, err
|
||||
}
|
||||
var user database.User
|
||||
if err := db.First(&user, tokenStruct.UserID).Error; err != nil {
|
||||
return err
|
||||
if err := db.First(&user, tokenObject.UserID).Error; err != nil {
|
||||
return user, err
|
||||
}
|
||||
return user
|
||||
return user, err
|
||||
}
|
||||
|
||||
func EditUser(c *gin.Context, token string, user database.User) {
|
||||
|
|
Loading…
Reference in New Issue