Merge pull request #2 from daystram/dev

daystram · Jan 24, 2021 · aa0272f · aa0272f
2 parents 07ae6bc + 5c88bfb
commit aa0272f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/controllers/v1/auth.go b/controllers/v1/auth.go
@@ -37,6 +37,6 @@ func POSTRegister(c *gin.Context) {
 		c.JSON(http.StatusUnauthorized, datatransfers.Response{Error: "failed registering user"})
 		return
 	}
-	c.JSON(http.StatusOK, datatransfers.Response{Data: "user created"})
+	c.JSON(http.StatusCreated, datatransfers.Response{Data: "user created"})
 	return
 }
diff --git a/controllers/v1/user.go b/controllers/v1/user.go
@@ -20,7 +20,7 @@ func GETUser(c *gin.Context) {
 	}
 	var user models.User
 	if user, err = handlers.Handler.RetrieveUser(userInfo.Username); err != nil {
-		c.JSON(http.StatusUnauthorized, datatransfers.Response{Error: "cannot find user"})
+		c.JSON(http.StatusNotFound, datatransfers.Response{Error: "cannot find user"})
 		return
 	}
 	c.JSON(http.StatusOK, datatransfers.Response{Data: datatransfers.UserInfo{
@@ -40,9 +40,9 @@ func PUTUser(c *gin.Context) {
 		return
 	}
 	if err = handlers.Handler.UpdateUser(uint(c.GetInt(constants.IsAuthenticatedKey)), user); err != nil {
-		c.JSON(http.StatusBadRequest, datatransfers.Response{Error: "failed updating user"})
+		c.JSON(http.StatusNotModified, datatransfers.Response{Error: "failed updating user"})
 		return
 	}
-	c.JSON(http.StatusOK, datatransfers.Response{Data: "OK"})
+	c.JSON(http.StatusOK, datatransfers.Response{Data: user})
 	return
 }
diff --git a/datatransfers/auth.go b/datatransfers/auth.go
@@ -6,7 +6,7 @@ import (
 )
 
 type JWTClaims struct {
-	ID        uint  `json:"id,omitempty"`
+	ID        uint  `json:"sub,omitempty"`
 	ExpiresAt int64 `json:"exp,omitempty"`
 	IssuedAt  int64 `json:"iat,omitempty"`
 }

diff --git a/handlers/init.go b/handlers/init.go
@@ -37,7 +37,7 @@ func InitializeHandler() {
 	// Initialize DB
 	var db *gorm.DB
 	db, err = gorm.Open(postgres.Open(
-		fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable",
+		fmt.Sprintf("host=%s port=%d dbname=%s user=%s password=%s sslmode=disable",
 			config.AppConfig.DBHostname, config.AppConfig.DBPort, config.AppConfig.DBDatabase,
 			config.AppConfig.DBUsername, config.AppConfig.DBPassword),
 	), &gorm.Config{})