fix: Slack notification not sent on page update #8841
Conversation
|
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -168,7 +169,7 @@ | |||
| options.grant = grant; | |||
| options.userRelatedGrantUserGroupIds = userRelatedGrantUserGroupIds; | |||
| } | |||
| const previousRevision = await Revision.findById(revisionId); | |||
| previousRevision = await Revision.findById<IRevisionHasId>(revisionId); | |||
Check failure
Code scanning / CodeQL
Database query built from user-controlled sources High
There was a problem hiding this comment.
この failure はちゃんと消えるような実装をしてください
There was a problem hiding this comment.
xss.process() を使ってサニタイズしたものを渡すように改修しました
| @@ -68,6 +68,7 @@ declare global { | |||
| export type SaveOptions = { | |||
| wip: boolean, | |||
| slackChannels: string, | |||
| isSlackEnabled: boolean, | |||
There was a problem hiding this comment.
- スイッチ (下記の画像) の ON/OFF によって isSlackEnabled が書き換わる
PUT /_api/v3/pageのリクエストボディに isSlackEnabled を含めるように改修
| if (isSlackEnabled) { | ||
| try { | ||
| const option = revisionId != null ? { previousRevision: revisionId } : undefined; | ||
| const option = previousRevision != null ? { previousRevision } : undefined; |
There was a problem hiding this comment.
crowi.userNotificationService.fire() の第5引数には IRevisionHasId 相当の値のオブジェクトを渡すように改修 (v6踏襲)
参考
growi/apps/app/src/server/routes/page.js
Line 536 in 41c32d5
| @@ -25,6 +25,10 @@ const prepareAttachmentTextForCreate = function(page, siteUrl) { | |||
| }; | |||
|
|
|||
| const prepareAttachmentTextForUpdate = function(page, siteUrl, previousRevision) { | |||
| if (previousRevision == null) { | |||
| return; | |||
| } | |||
There was a problem hiding this comment.
少しでも type safe に近づくように、jsdoc で previousRevision の型だけでも明示するようにしてください
| @@ -168,7 +169,7 @@ | |||
| options.grant = grant; | |||
| options.userRelatedGrantUserGroupIds = userRelatedGrantUserGroupIds; | |||
| } | |||
| const previousRevision = await Revision.findById(revisionId); | |||
| previousRevision = await Revision.findById<IRevisionHasId>(revisionId); | |||
There was a problem hiding this comment.
この failure はちゃんと消えるような実装をしてください
This reverts commit c4510d9.
|
reg-suit detected visual differences. Check this report, and review them. 🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴 🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵 What do the circles mean?The number of circles represent the number of changed images.🔴 : Changed items, ⚪ : New items, ⚫ : Deleted items, and 🔵 Passed items How can I change the check status?If reviewers approve this PR, the reg context status will be green automatically. |
yuki-takei
deleted the
fix/146980-slack-notification-not-sent-on-page-update
branch
Tasks
#146960 [v7] slack 連携した slack に対して wiki からの通知が飛ばない件の修正
┗ #146980 修正