Skip to content
This repository was archived by the owner on Oct 19, 2026. It is now read-only.

Commit 3b44eef

Browse files
authored
[mono]FIX: auth logic for review resolve (#1510)
* [mono]FIX: auth logic for review resolve Signed-off-by: AidCheng <cn.aiden.cheng@gmail.com> * UPDATE: format Signed-off-by: AidCheng <cn.aiden.cheng@gmail.com> --------- Signed-off-by: AidCheng <cn.aiden.cheng@gmail.com>
1 parent 0a8645a commit 3b44eef

3 files changed

Lines changed: 21 additions & 8 deletions

File tree

‎jupiter/src/storage/conversation_storage.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,11 @@ impl ConversationStorage {
111111
&self,
112112
mr_link: &str,
113113
review_id: &i64,
114-
username: &str,
115114
state: bool,
116115
) -> Result<(), MegaError> {
117116
let mut conversation = mega_conversation::Entity::find()
118117
.filter(mega_conversation::Column::Id.eq(*review_id))
119118
.filter(mega_conversation::Column::ConvType.eq(ConvTypeEnum::Review))
120-
.filter(mega_conversation::Column::Username.eq(username))
121119
.filter(mega_conversation::Column::Link.eq(mr_link))
122120
.one(self.get_connection())
123121
.await

‎jupiter/src/storage/mr_storage.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,20 @@ impl MrStorage {
176176
Ok(assignees.first().cloned())
177177
}
178178

179+
pub async fn is_assignee(&self, link: &str, username: &str) -> Result<(), MegaError> {
180+
let assignee = mega_mr::Entity::find()
181+
.filter(mega_mr::Column::Link.eq(link))
182+
.find_with_related(item_assignees::Entity)
183+
.filter(item_assignees::Column::ItemId.eq(username))
184+
.all(self.get_connection())
185+
.await?;
186+
if assignee.is_empty() {
187+
return Err(MegaError::with_message("Not an assignee"));
188+
}
189+
190+
Ok(())
191+
}
192+
179193
pub async fn new_mr(
180194
&self,
181195
path: &str,

‎mono/src/api/mr/mr_router.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -633,15 +633,16 @@ async fn review_resolve(
633633
Path(link): Path<String>,
634634
Json(payload): Json<ChangeReviewStatePayload>,
635635
) -> Result<Json<CommonResult<String>>, ApiError> {
636+
state
637+
.storage
638+
.mr_storage()
639+
.is_assignee(&link, &user.username)
640+
.await?;
641+
636642
state
637643
.storage
638644
.conversation_storage()
639-
.change_review_state(
640-
&link,
641-
&payload.conversation_id,
642-
&user.campsite_user_id,
643-
payload.resolved,
644-
)
645+
.change_review_state(&link, &payload.conversation_id, payload.resolved)
645646
.await?;
646647

647648
Ok(Json(CommonResult::success(None)))

0 commit comments

Comments
 (0)