fix approval page bug

Author: djyde

pages/api/open/approve.ts

@@ -2,7 +2,7 @@ import { NextApiRequest, NextApiResponse } from 'next'
 import { resolvedConfig } from '../../../utils.server'
 import jwt from 'jsonwebtoken'
 import { CommentService } from '../../../service/comment.service'
-import { SecretKey, TokenService } from '../../../service/token.service'
+import { SecretKey, TokenBody, TokenService } from '../../../service/token.service'
 
 export default async function handler(
   req: NextApiRequest,
@@ -49,22 +49,24 @@ export default async function handler(
       return
     }
 
-    let commentId
+    let tokenBody: TokenBody.ApproveComment
 
     try {
-      commentId = tokenService.validate(token, SecretKey.ApproveComment).commentId
+      tokenBody = tokenService.validate(token, SecretKey.ApproveComment) as TokenBody.ApproveComment
     } catch (e) {
       res.status(403)
       res.send('Invalid token')
       return
     }
 
     // firstly, approve comment
-    await commentService.approve(commentId)
+    await commentService.approve(tokenBody.commentId)
 
     // then append reply
     if (replyContent) {
-      await commentService.addCommentAsModerator(commentId, replyContent)
+      await commentService.addCommentAsModerator(tokenBody.commentId, replyContent, {
+        owner: tokenBody.owner
+      })
     }
 
     res.json({

service/comment.service.ts

@@ -1,5 +1,5 @@
-import { Comment, Page, Prisma } from '@prisma/client'
-import { RequestScopeService } from '.'
+import { Comment, Page, Prisma, User } from '@prisma/client'
+import { RequestScopeService, UserSession } from '.'
 import { prisma, resolvedConfig } from '../utils.server'
 import { PageService } from './page.service'
 import dayjs from 'dayjs'
@@ -191,8 +191,13 @@ export class CommentService extends RequestScopeService {
     return created
   }
 
-  async addCommentAsModerator(parentId: string, content: string) {
-    const session = await this.getSession()
+  async addCommentAsModerator(parentId: string, content: string, options?: {
+    owner?: User
+  }) {
+    const session = options?.owner ? {
+      user: options.owner,
+      uid: options.owner.id
+    } : await this.getSession()
     const parent = await prisma.comment.findUnique({
       where: {
         id: parentId,

service/notification.service.ts

@@ -1,6 +1,6 @@
 import { Comment } from '@prisma/client'
 import { RequestScopeService } from '.'
-import { prisma, resolvedConfig } from '../utils.server'
+import { getSession, prisma, resolvedConfig } from '../utils.server'
 import { UserService } from './user.service'
 import { markdown } from './comment.service'
 import { TokenService } from './token.service'
@@ -68,7 +68,8 @@ export class NotificationService extends RequestScopeService {
       let unsubscribeToken = this.tokenService.genUnsubscribeNewCommentToken(
         project.owner.id,
       )
-      const approveToken = this.tokenService.genApproveToken(comment.id)
+
+      const approveToken = await this.tokenService.genApproveToken(comment.id)
 
       const msg = {
         to: notificationEmail, // Change to your recipient

service/token.service.ts

@@ -1,5 +1,7 @@
+import { User } from '@prisma/client'
 import jwt from 'jsonwebtoken'
-import { resolvedConfig } from '../utils.server'
+import { UserSession } from '.'
+import { prisma, resolvedConfig } from '../utils.server'
 
 export enum UnSubscribeType {
   NEW_COMMENT = 'NEW_COMMENT',
@@ -17,7 +19,8 @@ export module TokenBody {
   }
 
   export type ApproveComment = {
-    commentId: string
+    commentId: string,
+    owner: User
   }
 
   export type UnsubscribeNewComment = {
@@ -38,11 +41,30 @@ export class TokenService {
     }) as string
   }
 
-  genApproveToken(commentId: string) {
+  async genApproveToken(commentId: string) {
+
+    const comment = await prisma.comment.findUnique({
+      where: {
+        id: commentId
+      },
+      select: {
+        page: {
+          select: {
+            project: {
+              select: {
+                owner: true
+              }
+            }
+          }
+        }
+      }
+    })
+
     return this.sign(
       SecretKey.ApproveComment,
       {
         commentId,
+        owner: comment.page.project.owner,
       } as TokenBody.ApproveComment,
       '3 days',
     )

service/webhook.service.ts

@@ -54,7 +54,7 @@ export class WebhookService extends RequestScopeService {
         },
       })
 
-      const approveToken = this.tokenService.genApproveToken(comment.id)
+      const approveToken = await this.tokenService.genApproveToken(comment.id)
       const approveLink = `${resolvedConfig.host}/open/approve?token=${approveToken}`
 
       statService.capture('webhook_trigger', {