Merge pull request #41 from fy23-gw-gackathon/fix/#40_auth_error_resp…

…onse ref #40 fix auth response
fy23-gw-gackathon · May 17, 2023 · 425b851 · 425b851
2 parents 685cbfa + a87bf4e
commit 425b851
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/infrastructure/middleware/auth.go b/infrastructure/middleware/auth.go
@@ -29,7 +29,7 @@ func Authentication(
 		} else {
 			uid, err := repo.GetUserIDFromToken(context.Background(), token)
 			if err != nil {
-				c.AbortWithStatusJSON(http.StatusUnauthorized, err.Error())
+				c.JSON(http.StatusUnauthorized, entity.ErrorResponse{Message: err.Error()})
 				return
 			}
 			userID = *uid
@@ -40,7 +40,7 @@ func Authentication(
 			var err error
 			user, err = repo.GetOrganizationUser(c, code, userID)
 			if err != nil {
-				c.AbortWithStatusJSON(http.StatusForbidden, err.Error())
+				c.JSON(http.StatusUnauthorized, entity.ErrorResponse{Message: err.Error()})
 				return
 			}
 		} else {

diff --git a/main.go b/main.go
@@ -51,22 +51,19 @@ func main() {
 	api := app.Group("/api/v1")
 	api.GET("/users/me", handleResponse(userController.GetMe))
 	api.PUT("/reports/:reportId", handleResponse(reportController.ReviewReport, http.StatusNoContent))
-	orgs := api.Group("/organizations")
-	orgs.Use(middleware.Authentication(userPersistence, cfg))
-	{
-		orgs.GET("/", handleResponse(organizationController.GetOrganizations))
-		orgs.GET("/:organizationCode", handleResponse(organizationController.GetOrganization))
-		orgs.PUT("/:organizationCode", handleResponse(organizationController.UpdateOrganization))
+	api.Use(middleware.Authentication(userPersistence, cfg))
+	api.GET("/organizations", handleResponse(organizationController.GetOrganizations))
+	api.GET("/organizations/:organizationCode", handleResponse(organizationController.GetOrganization))
+	api.PUT("/organizations/:organizationCode", handleResponse(organizationController.UpdateOrganization))
 
-		orgs.GET("/:organizationCode/reports", handleResponse(reportController.GetReports))
-		orgs.POST("/:organizationCode/reports", handleResponse(reportController.CreateReport, http.StatusCreated))
-		orgs.GET("/:organizationCode/reports/:reportId", handleResponse(reportController.GetReport))
+	api.GET("/organizations/:organizationCode/reports", handleResponse(reportController.GetReports))
+	api.POST("/organizations/:organizationCode/reports", handleResponse(reportController.CreateReport, http.StatusCreated))
+	api.GET("/organizations/:organizationCode/reports/:reportId", handleResponse(reportController.GetReport))
 
-		orgs.GET("/:organizationCode/users", handleResponse(userController.GetUsers))
-		orgs.POST("/:organizationCode/users", handleResponse(userController.InviteUser))
-		orgs.PUT("/:organizationCode/users/:userId", handleResponse(userController.UpdateUserRole))
-		orgs.DELETE("/:organizationCode/users/:userId", handleResponse(userController.DeleteUser))
-	}
+	api.GET("/organizations/:organizationCode/users", handleResponse(userController.GetUsers))
+	api.POST("/organizations/:organizationCode/users", handleResponse(userController.InviteUser))
+	api.PUT("/organizations/:organizationCode/users/:userId", handleResponse(userController.UpdateUserRole))
+	api.DELETE("/organizations/:organizationCode/users/:userId", handleResponse(userController.DeleteUser))
 
 	runApp(app, cfg.App.Port)
 }