fix hp

Author: Ivanhahanov

middlewares/jwt.go

@@ -50,7 +50,9 @@ var JwtMiddlewareStruct = jwt.GinJWTMiddleware{
 	IdentityHandler: func(c *gin.Context) interface{} {
 		claims := jwt.ExtractClaims(c)
 		return &models.JWTTeam{
-			TeamName: claims[identityKey].(string),
+			Login:    claims[identityKey].(string),
+			TeamName: claims["name"].(string),
+			Address:  claims["address"].(string),
 		}
 	},
 	Authenticator: func(c *gin.Context) (interface{}, error) {

models/scoreboard.go

@@ -13,12 +13,13 @@ type Score struct {
 }
 
 type ScoreService struct {
-	SLA    float64 `bson:"sla" json:"sla"`
-	State  int     `bson:"state" json:"state"`
-	Gained int     `bson:"gained" json:"gained"`
-	Lost   int     `bson:"lost" json:"lost"`
-	HP     int     `bson:"hp" json:"hp"`
-	Cost   int     `bson:"cost" json:"cost"`
+	SLA     float64 `bson:"sla" json:"sla"`
+	State   int     `bson:"state" json:"state"`
+	Gained  int     `bson:"gained" json:"gained"`
+	Lost    int     `bson:"lost" json:"lost"`
+	HP      int     `bson:"hp" json:"hp"`
+	TotalHP int     `bson:"total_hp" json:"total_hp"`
+	Cost    int     `bson:"cost" json:"cost"`
 }
 
 type OutputScoreboard struct {

routers/openvpn.go

@@ -53,9 +53,7 @@ func DownloadVpnConfig(username string) (string, error) {
 		log.Fatal(err)
 	}
 
-	vpnConfig := string(responseData)
-
-	return vpnConfig, nil
+	return string(responseData), nil
 }
 
 func (vpnRoute *VpnRoute) WriteTeamsRoutes() error {

routers/team.go

@@ -12,6 +12,7 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"strings"
 	"time"
 )
 
@@ -109,11 +110,12 @@ func CreateTeam(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"detail": hashErr.Error()})
 		return
 	}
-
+	login := slug.Make(team.Name)
+	login = strings.Replace(login, "-", "_", -1)
 	dbTeam := &models.Team{
 		ID:        primitive.NewObjectID(),
 		Name:      team.Name,
-		Login:     slug.Make(team.Name),
+		Login:     login,
 		Address:   ipAddress,
 		Hash:      hash,
 		SshPubKey: team.SshPubKey,
@@ -133,6 +135,7 @@ func CreateTeam(c *gin.Context) {
 	}
 	c.JSON(http.StatusOK, gin.H{
 		"message": fmt.Sprintf("The team %s created", team.Name),
+		"login":   login,
 	})
 }