[fix] #114

homenoc · Aug 23, 2021 · 82c2d70 · 82c2d70
1 parent c9b34ec
commit 82c2d70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/api/core/user/v0/slack.go b/pkg/api/core/user/v0/slack.go
@@ -13,8 +13,8 @@ func noticeSlack(loginUser, before core.User, after user.Input) {
 	attachment := slack.Attachment{}
 
 	groupStr := "なし"
-	if loginUser.Group != nil {
-		groupStr = strconv.Itoa(int(*loginUser.GroupID)) + "-" + before.Group.Org
+	if loginUser.GroupID != nil {
+		groupStr = strconv.Itoa(int(*loginUser.GroupID)) + "-" + loginUser.Group.Org
 	}
 
 	attachment.Text = &[]string{"User情報の更新"}[0]

diff --git a/pkg/api/core/user/v0/user.go b/pkg/api/core/user/v0/user.go
@@ -396,10 +396,12 @@ func Update(c *gin.Context) {
 			c.JSON(http.StatusInternalServerError, common.Error{Error: userResult.Err.Error()})
 			return
 		}
-		if userResult.User[0].GroupID != authResult.User.GroupID {
-			c.JSON(http.StatusInternalServerError, common.Error{Error: fmt.Sprintf("failed group authentication")})
+
+		if userResult.User[0].GroupID == nil || *userResult.User[0].GroupID != *authResult.User.GroupID {
+			c.JSON(http.StatusBadRequest, common.Error{Error: "error: This user does not belong to your group."})
 			return
 		}
+
 		serverData = userResult.User[0]
 	}