Token API done without verification

model/channel.go

@@ -5,28 +5,32 @@ import (
 )
 
 type Channel struct {
-	Id     int    `json:"id"`
-	Type   int    `json:"type" gorm:"default:0"`
-	Key    string `json:"key"`
-	Status int    `json:"status" gorm:"default:1"`
+	Id           int    `json:"id"`
+	Type         int    `json:"type" gorm:"default:0"`
+	Key          string `json:"key"`
+	Status       int    `json:"status" gorm:"default:1"`
+	Name         string `json:"name" gorm:"unique;index"`
+	Weight       int    `json:"weight"`
+	CreatedTime  int64  `json:"created_time" gorm:"bigint"`
+	AccessedTime int64  `json:"accessed_time" gorm:"bigint"`
 }
 
 func GetAllChannels(startIdx int, num int) ([]*Channel, error) {
 	var channels []*Channel
 	var err error
-	err = DB.Order("id desc").Limit(num).Offset(startIdx).Find(&channels).Error
+	err = DB.Order("id desc").Limit(num).Offset(startIdx).Omit("key").Find(&channels).Error
 	return channels, err
 }
 
 func SearchChannels(keyword string) (channels []*Channel, err error) {
-	err = DB.Select([]string{"id", "key"}, keyword, keyword).Find(&channels).Error
+	err = DB.Omit("key").Where("id = ? or name LIKE ?", keyword, keyword+"%").Find(&channels).Error
 	return channels, err
 }
 
 func GetChannelById(id int) (*Channel, error) {
 	channel := Channel{Id: id}
 	var err error = nil
-	err = DB.Select([]string{"id", "type"}).First(&channel, "id = ?", id).Error
+	err = DB.Omit("key").First(&channel, "id = ?", id).Error
 	return &channel, err
 }
 
@@ -42,7 +46,6 @@ func (channel *Channel) Update() error {
 	return err
 }
 
-// Delete Make sure link is valid! Because we will use os.Remove to delete it!
 func (channel *Channel) Delete() error {
 	var err error
 	err = DB.Delete(channel).Error

model/token.go

@@ -0,0 +1,52 @@
+package model
+
+import (
+	_ "gorm.io/driver/sqlite"
+)
+
+type Token struct {
+	Id           int    `json:"id"`
+	UserId       int    `json:"user_id"`
+	Key          string `json:"key"`
+	Status       int    `json:"status" gorm:"default:1"`
+	Name         string `json:"name" gorm:"unique;index"`
+	CreatedTime  int64  `json:"created_time" gorm:"bigint"`
+	AccessedTime int64  `json:"accessed_time" gorm:"bigint"`
+}
+
+func GetAllUserTokens(userId int, startIdx int, num int) ([]*Token, error) {
+	var tokens []*Token
+	var err error
+	err = DB.Where("userId = ?", userId).Order("id desc").Limit(num).Offset(startIdx).Omit("key").Find(&tokens).Error
+	return tokens, err
+}
+
+func SearchUserTokens(userId int, keyword string) (tokens []*Token, err error) {
+	err = DB.Where("userId = ?", userId).Omit("key").Where("id = ? or name LIKE ?", keyword, keyword+"%").Find(&tokens).Error
+	return tokens, err
+}
+
+func GetTokenById(id int) (*Token, error) {
+	token := Token{Id: id}
+	var err error = nil
+	err = DB.Omit("key").Select([]string{"id", "type"}).First(&token, "id = ?", id).Error
+	return &token, err
+}
+
+func (token *Token) Insert() error {
+	var err error
+	err = DB.Create(token).Error
+	return err
+}
+
+func (token *Token) Update() error {
+	var err error
+	err = DB.Model(token).Updates(token).Error
+	return err
+}
+
+func (token *Token) Delete() error {
+	var err error
+	err = DB.Delete(token).Error
+	return err
+}

model/user.go

@@ -15,11 +15,11 @@ type User struct {
 	DisplayName      string `json:"display_name" gorm:"index" validate:"max=20"`
 	Role             int    `json:"role" gorm:"type:int;default:1"`   // admin, common
 	Status           int    `json:"status" gorm:"type:int;default:1"` // enabled, disabled
-	Token            string `json:"token" gorm:"index"`
 	Email            string `json:"email" gorm:"index" validate:"max=50"`
 	GitHubId         string `json:"github_id" gorm:"column:github_id;index"`
 	WeChatId         string `json:"wechat_id" gorm:"column:wechat_id;index"`
 	VerificationCode string `json:"verification_code" gorm:"-:all"` // this field is only for Email verification, don't save it to database!
+	Balance          int    `json:"balance" gorm:"type:int;default:0"`
 }
 
 func GetMaxUserId() int {
@@ -29,12 +29,12 @@ func GetMaxUserId() int {
 }
 
 func GetAllUsers(startIdx int, num int) (users []*User, err error) {
-	err = DB.Order("id desc").Limit(num).Offset(startIdx).Select([]string{"id", "username", "display_name", "role", "status", "email"}).Find(&users).Error
+	err = DB.Order("id desc").Limit(num).Offset(startIdx).Omit("password").Find(&users).Error
 	return users, err
 }
 
 func SearchUsers(keyword string) (users []*User, err error) {
-	err = DB.Select([]string{"id", "username", "display_name", "role", "status", "email"}).Where("id = ? or username LIKE ? or email LIKE ? or display_name LIKE ?", keyword, keyword+"%", keyword+"%", keyword+"%").Find(&users).Error
+	err = DB.Omit("password").Where("id = ? or username LIKE ? or email LIKE ? or display_name LIKE ?", keyword, keyword+"%", keyword+"%", keyword+"%").Find(&users).Error
 	return users, err
 }
 
@@ -47,7 +47,7 @@ func GetUserById(id int, selectAll bool) (*User, error) {
 	if selectAll {
 		err = DB.First(&user, "id = ?", id).Error
 	} else {
-		err = DB.Select([]string{"id", "username", "display_name", "role", "status", "email", "wechat_id", "github_id"}).First(&user, "id = ?", id).Error
+		err = DB.Omit("password").First(&user, "id = ?", id).Error
 	}
 	return &user, err
 }