mirror of
https://github.com/arnaucube/gogame.git
synced 2026-02-07 03:26:39 +01:00
allow cors origin in config file, move resources from user to planet
This commit is contained in:
@@ -73,15 +73,9 @@ func handleGetUser(c *gin.Context) {
|
||||
fail(c, err, "error on getting user")
|
||||
return
|
||||
}
|
||||
// resources, err := user.GetResources()
|
||||
// if err != nil {
|
||||
// fail(c, err, "error on getting user resources")
|
||||
// return
|
||||
// }
|
||||
|
||||
c.JSON(200, gin.H{
|
||||
"user": user,
|
||||
// "resources": resources,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -94,15 +88,9 @@ func handleGetResources(c *gin.Context) {
|
||||
fail(c, err, "error on getting user")
|
||||
return
|
||||
}
|
||||
resources, err := user.GetResources()
|
||||
if err != nil {
|
||||
fail(c, err, "error on getting user resources")
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(200, gin.H{
|
||||
"user": user,
|
||||
"resources": resources,
|
||||
"user": user,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -132,7 +120,7 @@ func handleGetPlanet(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
planet, err := gameservice.GetBuildings(user, bson.ObjectIdHex(planetid))
|
||||
planet, err := gameservice.GetPlanet(user, bson.ObjectIdHex(planetid))
|
||||
if err != nil {
|
||||
fail(c, err, "error upgrading building")
|
||||
return
|
||||
|
||||
@@ -24,7 +24,7 @@ var gameservice *gamesrv.Service
|
||||
func newApiService() *gin.Engine {
|
||||
api := gin.Default()
|
||||
api.Use(cors.New(cors.Config{
|
||||
AllowOrigins: []string{"http://127.0.0.1:8080"},
|
||||
AllowOrigins: []string{serverConfig.Server.CorsOriginsAllowed},
|
||||
AllowMethods: []string{"GET", "POST"},
|
||||
AllowHeaders: []string{"Authorization", "Content-Type"},
|
||||
AllowCredentials: true,
|
||||
|
||||
Reference in New Issue
Block a user