feat: keep login status

Author: nk-akun

api/entrance.go

@@ -16,9 +16,9 @@ func AppRun() {
 
 	r.Use(gin.RecoveryWithWriter(&recoverWriter{}))
 	r.Use(middleware.JSONRequestContextHandler(func(c *gin.Context) model.APIRequest {
-		if c.Request.URL.Path == "/api/register" {
+		if c.Request.URL.Path == "/api/user/register" {
 			return new(model.RegisterRequest)
-		} else if c.Request.URL.Path == "/api/login" {
+		} else if c.Request.URL.Path == "/api/user/login" {
 			return new(model.LoginRequest)
 		} else if c.Request.URL.Path == "/api/topics" {
 			return new(model.ArticleRequest)
@@ -38,9 +38,10 @@ func AppRun() {
 		user.GET("/configs", guest.GetConfigs)
 
 		// user.Use()
-		user.POST("/register", guest.RegisterByEmail)
-		user.POST("/login", guest.Login)
-		user.GET("/currentUser", guest.GetCurrentUser)
+		user.POST("/user/register", guest.RegisterByEmail)
+		user.POST("/user/login", guest.Login)
+		user.POST("/user/logout", guest.Logout)
+		user.GET("/user/current", guest.GetCurrentUser)
 
 		user.POST("/topic", guest.PostArticle)
 		user.GET("/topics", guest.GetArticleList)

api/guest/users.go

@@ -10,7 +10,8 @@ import (
 
 // GetCurrentUser ...
 func GetCurrentUser(c *gin.Context) {
-	service.UserService.GetCurrentUser(c)
+	user := service.UserService.GetCurrentUser(c)
+	setAPIResponse(c, user, "", true)
 }
 
 // RegisterByEmail ...
@@ -30,11 +31,16 @@ func Login(c *gin.Context) {
 		setAPIResponse(c, nil, err.Error(), false)
 	} else {
 		token := service.UserService.SetToken(user.ID)
-		value := model.NewResponseValue().Set("token", token).Set("user", user)
-		setAPIResponse(c, value, "登录成功", true)
+		data := model.NewResponseValue().Set("token", token).Set("user", user)
+		setAPIResponse(c, data.Value, "登录成功", true)
 	}
 }
 
+// Logout ...
+func Logout(c *gin.Context) {
+
+}
+
 // TestForUser is the test api for user
 func TestForUser(c *gin.Context) {
 	fmt.Println(c.Request.URL.Query())

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/mitchellh/mapstructure v1.3.3 // indirect
 	github.com/natefinch/lumberjack v2.0.0+incompatible
 	github.com/pelletier/go-toml v1.8.1 // indirect
-	github.com/satori/go.uuid v1.2.0 // indirect
+	github.com/satori/go.uuid v1.2.0
 	github.com/spf13/afero v1.4.0 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect

model/model.go

@@ -1,7 +1,7 @@
 package model
 
 // Models stores the models which will be create as tables in the mysql
-var Models = []interface{}{&User{}, &Article{}, &Comment{}, &UserLikeArticle{}}
+var Models = []interface{}{&User{}, &Article{}, &Comment{}, &UserLikeArticle{}, &UserToken{}}
 
 // Model ...
 type Model struct {
@@ -12,7 +12,7 @@ type Model struct {
 type User struct {
 	Model
 	Username              string `gorm:"column:username;type:varchar(20);unique;not null" json:"username"`
-	Nickname              string `gorm:"column:nickname;type:varchar(30)" json:"nick_name"`
+	Nickname              string `gorm:"column:nickname;type:varchar(30)" json:"nickname"`
 	Password              string `gorm:"column:password;type:varchar(100);not null" json:"password"`
 	AvatarURL             string `gorm:"column:avatar_url;type:varchar(200)" json:"avatar_url"`
 	Gender                string `gorm:"column:gender;type:tinyint;default:2" json:"gender"`
@@ -37,7 +37,7 @@ type User struct {
 type UserToken struct {
 	Model
 	UserID     int64  `gorm:"column:user_id;type:int" json:"user_id"`
-	Token      string `gorm:"size:32;unique;not null" json:"token"`
+	Token      string `gorm:"type:varchar(40);unique;not null" json:"token"`
 	ExpiredAt  int64  `gorm:"column:expired_at;type:int" json:"expired_at"`
 	CreateTime int64  `gorm:"column:create_time;default:null" json:"create_time"`
 }

repository/token_repo.go

@@ -20,7 +20,14 @@ func (r *userTokenRepository) Create(db *gorm.DB, userToken *model.UserToken) er
 	return db.Create(userToken).Error
 }
 
+func (r *userTokenRepository) DeleteByToken(db *gorm.DB, token string) error {
+	return db.Where("token = ?", token).Delete(&model.UserToken{}).Error
+}
+
 func (r *userTokenRepository) GetUserIDByToken(db *gorm.DB, token string) (*model.UserToken, error) {
+	if token == "" {
+		return nil, nil
+	}
 	return r.take(db, "token = ?", token)
 }
 

service/users.go

@@ -139,6 +139,11 @@ func (s *userService) loginByUsername(username string, password string) (*model.
 	return user, nil
 }
 
+func (s *userService) Logout(c *gin.Context) error {
+	token := s.GetToken(c)
+	return repository.UserTokenRepository.DeleteByToken(util.DB(), token)
+}
+
 func (s *userService) SetToken(userID int64) string {
 	token := uuid.NewV4().String()
 	expireTime := time.Now().Add(time.Hour * 24 * time.Duration(model.TokenExpireDays))

site/components/MyNav.vue

@@ -91,6 +91,7 @@ export default {
   },
   computed: {
     user() {
+      console.log(this.$store.state.user.current)
       return this.$store.state.user.current
     },
     isOwnerOrAdmin() {

site/package-lock.json

@@ -16,6 +16,7 @@
     "@nuxt/types": "^2.14.7",
     "@nuxtjs/axios": "^5.12.5",
     "@nuxtjs/google-adsense": "^1.1.3",
+    "JSON": "^1.0.0",
     "cookie-universal-nuxt": "^2.1.4",
     "element-ui": "^2.13.2",
     "nuxt": "^2.14.1",

site/package.json

@@ -30,7 +30,6 @@ export default {
   async asyncData({ $axios, params }) {
     try {
       const [topicsPage] = await Promise.all([$axios.get('/api/topics')])
-      console.log(topicsPage)
       return { topicsPage }
     } catch (e) {
       console.error(e)