fix failed to get notify detail due to msp_env scope type

chengjoey · Mar 5, 2024 · 44fbe5c · 44fbe5c
1 parent 5bd7dfa
commit 44fbe5c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/apistructs/notify_group.go b/apistructs/notify_group.go
@@ -18,6 +18,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	"net/url"
 	"time"
@@ -132,6 +133,18 @@ type NotifyGroupDetail struct {
 	DingdingList           []Target       `json:"dingdingList"`
 	DingdingWorkNoticeList []Target       `json:"dingdingWorknoticeList"`
 	WebHookList            []string       `json:"webhookList"`
+	Label                  string         `json:"-"`
+}
+
+func (n *NotifyGroupDetail) GetScopeDetail() (scopeID, scopeType string) {
+	label := make(map[string]string)
+	err := json.Unmarshal([]byte(n.Label), &label)
+	if err != nil {
+		return
+	}
+	scopeID = label[MSPMemberScopeId]
+	scopeType = label[MSPMemberScope]
+	return
 }
 
 // CreateNotifyGroupRequest 创建通知组请求

diff --git a/internal/core/legacy/services/notify/notify_group.go b/internal/core/legacy/services/notify/notify_group.go
@@ -214,6 +214,7 @@ func (o *NotifyGroup) GetDetail(id int64, orgID int64) (*apistructs.NotifyGroupD
 	result.Targets = group.Targets
 	result.DingdingList = uniqueTargetList(result.DingdingList)
 	result.DingdingWorkNoticeList = uniqueTargetList(result.DingdingWorkNoticeList)
+	result.Label = group.Label
 	return result, nil
 }
 

diff --git a/internal/core/messenger/notifygroup/group.service.go b/internal/core/messenger/notifygroup/group.service.go
@@ -293,7 +293,11 @@ func (n *notifyGroupService) GetNotifyGroupDetail(ctx context.Context, request *
 		return nil, errors.NewInternalServerError(err)
 	}
 	userIdStr := apis.GetUserID(ctx)
-	err = n.checkNotifyPermission(ctx, userIdStr, notifyGroup.ScopeType, notifyGroup.ScopeID, apistructs.GetAction)
+	scopeType, scopeID := notifyGroup.ScopeType, notifyGroup.ScopeID
+	if scopeType == apistructs.MSPScope {
+		scopeID, scopeType = notifyGroup.GetScopeDetail()
+	}
+	err = n.checkNotifyPermission(ctx, userIdStr, scopeType, scopeID, apistructs.GetAction)
 	if err != nil {
 		return nil, errors.NewPermissionError(apistructs.NotifyResource, apistructs.GetAction, err.Error())
 	}