jwt manager updated & cleanup

.kubernetes/comfigmap.yaml

@@ -8,6 +8,7 @@ data:
     Server:
       Port: 3000
       Development: true
+      LogLevel: -1
     MongoDB:
       URI: "mongodb://localhost:27017"
       User: "admin"

handler/handler.go

@@ -2,30 +2,30 @@ package handler
 
 import (
 	"github.com/PulseyTeam/game-server/config"
+	"github.com/PulseyTeam/game-server/jwt"
 	pb "github.com/PulseyTeam/game-server/proto"
-	"github.com/PulseyTeam/game-server/service"
 	"go.mongodb.org/mongo-driver/mongo"
 )
 
 type MultiplayerHandler struct {
 	pb.UnimplementedMultiplayerServiceServer
 	rooms      map[string]map[string]*pb.Player
-	jwtManager *service.JWTManager
+	jwtManager *jwt.Manager
 	mongoDB    *mongo.Client
 	cfg        *config.Config
 }
 
 type AuthHandler struct {
 	pb.UnimplementedAuthServiceServer
-	jwtManager *service.JWTManager
+	jwtManager *jwt.Manager
 	mongoDB    *mongo.Client
 	cfg        *config.Config
 }
 
-func NewMultiplayerHandler(cfg *config.Config, mongoDB *mongo.Client, jwtManager *service.JWTManager) *MultiplayerHandler {
+func NewMultiplayerHandler(cfg *config.Config, mongoDB *mongo.Client, jwtManager *jwt.Manager) *MultiplayerHandler {
 	return &MultiplayerHandler{cfg: cfg, mongoDB: mongoDB, jwtManager: jwtManager}
 }
 
-func NewAuthHandler(cfg *config.Config, mongoDB *mongo.Client, jwtManager *service.JWTManager) *AuthHandler {
+func NewAuthHandler(cfg *config.Config, mongoDB *mongo.Client, jwtManager *jwt.Manager) *AuthHandler {
 	return &AuthHandler{cfg: cfg, mongoDB: mongoDB, jwtManager: jwtManager}
 }

handler/room.go

@@ -14,17 +14,17 @@ import (
 )
 
 func (h *MultiplayerHandler) RoomConnect(ctx context.Context, request *pb.RoomConnectRequest) (*pb.RoomConnectResponse, error) {
-	collection := h.mongoDB.Database(h.cfg.MongoDB.DB).Collection("game_sessions")
+	collection := h.mongoDB.Database(h.cfg.MongoDB.DB).Collection(model.GameSessionCollection)
 
 	gameSession := model.GameSession{}
 	filter := bson.D{
 		primitive.E{Key: "map_id", Value: request.GetMapId()},
-		primitive.E{Key: "status", Value: model.SessionWaiting},
+		primitive.E{Key: "status", Value: model.StatusWaiting},
 	}
 
 	err := collection.FindOne(ctx, filter).Decode(&gameSession)
 	if err == nil {
-		return &pb.RoomConnectResponse{RoomId: gameSession.ID.String()}, nil
+		return &pb.RoomConnectResponse{RoomId: gameSession.ID.Hex()}, nil
 	} else {
 		//Todo refactor
 		log.Warn().Msgf("find error: %v", err)
@@ -33,17 +33,17 @@ func (h *MultiplayerHandler) RoomConnect(ctx context.Context, request *pb.RoomCo
 	result, err := collection.InsertOne(ctx, model.GameSession{
 		ID:         primitive.NewObjectID(),
 		MapID:      request.GetMapId(),
-		Status:     model.SessionWaiting,
+		Status:     model.StatusWaiting,
 		StartedAt:  time.Now(),
 		FinishedAt: nil,
 	})
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to create resource")
 	}
 
-	insertedID := result.InsertedID.(primitive.ObjectID).String()
+	insertedID := result.InsertedID.(primitive.ObjectID).Hex()
 
-	log.Trace().Msgf("game session (created): %v", insertedID)
+	log.Trace().Msgf("game session created: %v", insertedID)
 
 	return &pb.RoomConnectResponse{RoomId: insertedID}, nil
 }

handler/user.go

@@ -12,8 +12,8 @@ import (
 	"google.golang.org/grpc/status"
 )
 
-func (h *AuthHandler) Login(ctx context.Context, request *pb.LoginRequest) (*pb.LoginResponse, error) {
-	collection := h.mongoDB.Database(h.cfg.MongoDB.DB).Collection("users")
+func (a *AuthHandler) Login(ctx context.Context, request *pb.LoginRequest) (*pb.LoginResponse, error) {
+	collection := a.mongoDB.Database(a.cfg.MongoDB.DB).Collection(model.UserCollection)
 
 	findUser := &model.User{}
 	filter := bson.D{primitive.E{Key: "username", Value: request.GetUsername()}}
@@ -29,16 +29,16 @@ func (h *AuthHandler) Login(ctx context.Context, request *pb.LoginRequest) (*pb.
 		return nil, status.Errorf(codes.Unauthenticated, "authentication failed")
 	}
 
-	accessToken, err := h.jwtManager.Generate(findUser)
+	accessToken, err := a.jwtManager.Generate(findUser)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "cannot generate access token")
 	}
 
 	return &pb.LoginResponse{AccessToken: accessToken}, nil
 }
 
-func (h *AuthHandler) Register(ctx context.Context, request *pb.RegisterRequest) (*pb.RegisterResponse, error) {
-	collection := h.mongoDB.Database(h.cfg.MongoDB.DB).Collection("users")
+func (a *AuthHandler) Register(ctx context.Context, request *pb.RegisterRequest) (*pb.RegisterResponse, error) {
+	collection := a.mongoDB.Database(a.cfg.MongoDB.DB).Collection(model.UserCollection)
 
 	findUser := model.User{}
 	filter := bson.D{primitive.E{Key: "username", Value: request.GetUsername()}}
@@ -67,7 +67,7 @@ func (h *AuthHandler) Register(ctx context.Context, request *pb.RegisterRequest)
 		return nil, status.Errorf(codes.Internal, "failed to create resource")
 	}
 
-	accessToken, err := h.jwtManager.Generate(newUser)
+	accessToken, err := a.jwtManager.Generate(newUser)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "cannot generate access token")
 	}

service/jwt_manager.go → jwt/manager.go

@@ -1,4 +1,4 @@
-package service
+package jwt
 
 import (
 	"fmt"
@@ -7,7 +7,12 @@ import (
 	"time"
 )
 
-type JWTManager struct {
+const (
+	secretKey     = "0pPeA3tn0BUesH9dtjptZsZpuYHZtCDFqUFH7EdiVw4U8APE6uTNg53LXqq1EAa"
+	tokenDuration = 4 * time.Hour
+)
+
+type Manager struct {
 	secretKey     string
 	tokenDuration time.Duration
 }
@@ -17,14 +22,15 @@ type UserClaims struct {
 	Username string `json:"username"`
 }
 
-func NewJWTManager(secretKey string, tokenDuration time.Duration) *JWTManager {
-	return &JWTManager{secretKey, tokenDuration}
+func NewManager() *Manager {
+	return &Manager{secretKey, tokenDuration}
 }
 
-func (manager *JWTManager) Generate(user *model.User) (string, error) {
+func (manager *Manager) Generate(user *model.User) (string, error) {
 	claims := UserClaims{
 		StandardClaims: jwt.StandardClaims{
 			ExpiresAt: time.Now().Add(manager.tokenDuration).Unix(),
+			IssuedAt:  time.Now().Unix(),
 			Subject:   user.ID.Hex(),
 		},
 		Username: user.Username,
@@ -34,7 +40,7 @@ func (manager *JWTManager) Generate(user *model.User) (string, error) {
 	return token.SignedString([]byte(manager.secretKey))
 }
 
-func (manager *JWTManager) Verify(accessToken string) (*UserClaims, error) {
+func (manager *Manager) Verify(accessToken string) (*UserClaims, error) {
 	token, err := jwt.ParseWithClaims(
 		accessToken,
 		&UserClaims{},

model/game_session.go

@@ -5,17 +5,19 @@ import (
 	"time"
 )
 
-const (
-	SessionWaiting  = "waiting"
-	SessionReady    = "ready"
-	SessionPlaying  = "playing"
-	SessionFinished = "finished"
-)
+const GameSessionCollection = "game_sessions"
 
 type GameSession struct {
 	ID         primitive.ObjectID `bson:"_id"`
-	MapID      string             `json:"map_id"`
-	Status     string             `json:"status"`
-	StartedAt  time.Time          `json:"started_at"`
-	FinishedAt *time.Time         `json:"finished_at"`
+	MapID      string             `bson:"map_id"`
+	Status     string             `bson:"status"`
+	StartedAt  time.Time          `bson:"started_at"`
+	FinishedAt *time.Time         `bson:"finished_at"`
 }
+
+const (
+	StatusWaiting  = "waiting"
+	StatusReady    = "ready"
+	StatusPlaying  = "playing"
+	StatusFinished = "finished"
+)

model/user.go

@@ -6,12 +6,14 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
+const UserCollection = "users"
+
 type User struct {
 	ID        primitive.ObjectID `bson:"_id"`
-	Username  string             `json:"username"`
-	Password  string             `json:"password"`
-	Settings  *[]string          `json:"settings"`
-	Cosmetics *[]string          `json:"cosmetics"`
+	Username  string             `bson:"username"`
+	Password  string             `bson:"password"`
+	Settings  *[]string          `bson:"settings"`
+	Cosmetics *[]string          `bson:"cosmetics"`
 }
 
 func (u *User) HashPassword() error {