Merge pull request #218 from sixwaaaay/account

feat: update account

Author: sixwaaaay

.github/workflows/account-ci.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: "1.21"
 
       - name: Build account Binary Executable
         run: |

cmd/account/accounthandler.go

@@ -15,24 +15,18 @@ package main
 
 import (
 	"regexp"
-	"time"
 
+	pb "codeberg.org/sixwaaaay/sharing-pb"
 	"github.com/labstack/echo/v4"
-	"github.com/sixwaaaay/sharing/pkg/encoder"
-	"github.com/sixwaaaay/sharing/pkg/pb"
-	"github.com/sixwaaaay/sharing/pkg/sign"
 )
 
 type AccountHandler struct {
 	client pb.UserServiceClient
-	jwt    sign.JWT
+	signer signer
 }
 
-func NewAccountHandler(client pb.UserServiceClient, jwt sign.JWT) *AccountHandler {
-	return &AccountHandler{
-		client: client,
-		jwt:    jwt,
-	}
+func NewAccountHandler(client pb.UserServiceClient, signer signer) *AccountHandler {
+	return &AccountHandler{client: client, signer: signer}
 }
 
 func (h *AccountHandler) Update(e *echo.Echo) {
@@ -85,22 +79,16 @@ func (h *AccountHandler) Login(ctx echo.Context) error {
 		return ctx.JSON(400, err)
 	}
 	u := reply.GetUser()
-	option := sign.SignOption{
-		Username: u.Name,
-		UserID:   u.Id,
-		Duration: time.Duration(h.jwt.TTL) * time.Second,
-		Secret:   []byte(h.jwt.Secret),
-	}
-	token, err := sign.GenSignedToken(option)
+	token, err := h.signer(u.Id, u.Name)
 	if err != nil {
 		return ctx.JSON(400, err)
 	}
 
-	resp := &pb.JSONLoginReply{
-		Account: u,
+	resp := &LoginReply{
+		Account: covert(u),
 		Token:   token,
 	}
-	return encoder.Marshal(ctx.Response(), resp)
+	return ctx.JSON(200, resp)
 }
 
 type RegisterRequest struct {
@@ -140,20 +128,50 @@ func (h *AccountHandler) Register(ctx echo.Context) error {
 		return ctx.JSON(400, err)
 	}
 	u := reply.GetUser()
-	option := sign.SignOption{
-		Username: u.Name,
-		UserID:   u.Id,
-		Duration: time.Duration(h.jwt.TTL) * time.Second,
-		Secret:   []byte(h.jwt.Secret),
-	}
-	token, err := sign.GenSignedToken(option)
+
+	token, err := h.signer(u.Id, u.Name)
 	if err != nil {
 		return ctx.JSON(400, err)
 	}
 
-	resp := &pb.JSONLoginReply{
-		Account: u,
+	resp := &LoginReply{
+		Account: covert(u),
 		Token:   token,
 	}
-	return encoder.Marshal(ctx.Response(), resp)
+	return ctx.JSON(200, resp)
+}
+
+type Account struct {
+	Id            int64  `json:"id"`
+	Name          string `json:"name"`
+	IsFollow      bool   `json:"is_follow"`
+	AvatarUrl     string `json:"avatar_url"`
+	BgUrl         string `json:"bg_url"`
+	Bio           string `json:"bio"`
+	LikesGiven    int32  `json:"likes_given"`
+	LikesReceived int32  `json:"likes_received"`
+	VideosPosted  int32  `json:"videos_posted"`
+	Following     int32  `json:"following"`
+	Followers     int32  `json:"followers"`
+}
+
+type LoginReply struct {
+	Account *Account `json:"account"`
+	Token   string   `json:"token"`
+}
+
+func covert(u *pb.User) *Account {
+	return &Account{
+		Id:            u.Id,
+		Name:          u.Name,
+		IsFollow:      u.IsFollow,
+		AvatarUrl:     u.AvatarUrl,
+		BgUrl:         u.BgUrl,
+		Bio:           u.Bio,
+		LikesGiven:    u.LikesGiven,
+		LikesReceived: u.LikesReceived,
+		VideosPosted:  u.VideosPosted,
+		Following:     u.Following,
+		Followers:     u.Followers,
+	}
 }

cmd/account/configs/config.yaml

@@ -1,9 +1,7 @@
 ListenOn: :8080
-UserService:
-  Address: shauser:8080
-JWT:
-  SECRET: $JWT_SECRET
-  TTL: 1296000 # 15day 15 * 24 * 60 * 60
+UserServiceAddress: shauser:8080
+SECRET: $JWT_SECRET
+TTL: 360h # 15day 15 * 24 * 60 * 60
 Oauth:
   clientid: $OAUTH_CLIENT_ID
   clientsecret: $OAUTH_CLIENT_SECRET

cmd/account/go.mod

@@ -1,21 +1,22 @@
 module github.com/sixwaaaay/sharing/cmd/account
 
-go 1.19
+go 1.21
 
 require (
+	codeberg.org/sixwaaaay/sharing-pb v0.1.2
+	github.com/golang-jwt/jwt/v5 v5.2.0
 	github.com/labstack/echo/v4 v4.11.1
 	github.com/labstack/gommon v0.4.0
 	github.com/sixwaaaay/must v0.1.0
-	github.com/sixwaaaay/sharing v0.9.1
+	github.com/sixwaaaay/token v0.1.1
+	github.com/spf13/viper v1.15.0
 	go.uber.org/automaxprocs v1.5.3
 	golang.org/x/oauth2 v0.15.0
 )
 
 require (
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -27,7 +28,6 @@ require (
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.15.0 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
@@ -36,9 +36,9 @@ require (
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/grpc v1.54.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
+	google.golang.org/grpc v1.60.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect