Merge branch 'feature/handle-block-list' into feature/post-api

Author: winverse

packages/velog-prisma/prisma/migrations/20240225113821_add_dynamic_config_items_table/migration.sql

@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "dynamic_config_items" (
+    "id" UUID NOT NULL DEFAULT uuid_generate_v4(),
+    "value" VARCHAR(50) NOT NULL,
+    "type" VARCHAR(50) NOT NULL,
+
+    CONSTRAINT "dynamic_config_items_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "dynamic_config_items_value_idx" ON "dynamic_config_items"("value");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "dynamic_config_items_value_type_key" ON "dynamic_config_items"("value", "type");

packages/velog-prisma/prisma/schema.prisma

@@ -640,3 +640,13 @@ model Notification {
   @@index([fk_user_id])
   @@map("notifications")
 }
+
+model DynamicConfigItem {
+  id    String @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
+  value String @db.VarChar(50)
+  type  String @db.VarChar(50)
+
+  @@unique([value, type])
+  @@index([value])
+  @@map("dynamic_config_items")
+}

packages/velog-scripts/env/.env.example

@@ -2,4 +2,5 @@ DATABASE_URL=
 DISCORD_BOT_TOKEN=
 DISCORD_PRIVATE_POSTS_CHANNEL_ID=
 REDIS_HOST=
-SPAM_ACCOUNT_DISPLAY_NAME=
+SPAM_ACCOUNT_DISPLAY_NAME=
+BANNED_KEYWORDS=

packages/velog-scripts/env/env.mts

@@ -15,6 +15,7 @@ const env = z.object({
   discordPrivatePostsChannelId: z.string(),
   redisHost: z.string(),
   restorePostsUsername: z.string().optional(),
+  bannedKeywords: z.array(z.string()),
 })
 
 export const ENV = env.parse({
@@ -24,4 +25,5 @@ export const ENV = env.parse({
   discordPrivatePostsChannelId: process.env.DISCORD_PRIVATE_POSTS_CHANNEL_ID,
   redisHost: process.env.REDIS_HOST,
   restorePostsUsername: process.env.RESTORE_POSTS_USERNAME,
+  bannedKeywords: process.env.BANNED_KEYWORDS?.split(','),
 })

packages/velog-scripts/lib/blockList/BlockListService.mts

@@ -0,0 +1,29 @@
+import { DbService } from '../db/DbService.mjs'
+import { injectable, singleton } from 'tsyringe'
+
+interface Service {
+  addBlockList: (username: string) => Promise<void>
+  readBlockList: () => Promise<string[]>
+}
+
+@injectable()
+@singleton()
+export class BlockListService implements Service {
+  constructor(private readonly db: DbService) {}
+  public async addBlockList(username: string) {
+    await this.db.dynamicConfigItem.create({
+      data: {
+        value: username,
+        type: 'username',
+      },
+    })
+  }
+  public async readBlockList() {
+    const blockList = await this.db.dynamicConfigItem.findMany({
+      where: {
+        type: 'username',
+      },
+    })
+    return blockList.map((item) => item.value)
+  }
+}

packages/velog-scripts/package.json

@@ -10,6 +10,7 @@
     "private:posts": "pnpm env:copy -e development && ts-node ./scripts/privatePostsOfSpamAccount.mts",
     "check:gql": "pnpm prisma:copy && pnpm env:copy -e development && ts-node ./scripts/checkGql.mts",
     "restore:posts": "pnpm env:copy -e development && pnpm prisma:copy && ts-node ./scripts/restorePosts.mts",
+    "add:bannedKeyword": "pnpm env:copy -e development && pnpm prisma:copy && ts-node ./scripts/addBannedKeywords.mts",
     "env:copy": "tsx ./scripts/copyEnv.ts",
     "prisma:copy": "tsx ./scripts/copyPrisma.ts",
     "build": "tsc",

packages/velog-scripts/scripts/addBannedKeywords.mts

@@ -0,0 +1,34 @@
+import 'reflect-metadata'
+import { ENV } from '../env/env.mjs'
+import { DbService } from '../lib/db/DbService.mjs'
+import { container, injectable, singleton } from 'tsyringe'
+
+@singleton()
+@injectable()
+class Runner {
+  constructor(private readonly db: DbService) {}
+  public async run(bannedKeywords: string[]) {
+    const data = bannedKeywords.map((value) => ({
+      value,
+      type: 'banned',
+    }))
+
+    try {
+      await this.db.dynamicConfigItem.createMany({
+        data,
+      })
+    } catch (error) {
+      console.log(error)
+    }
+  }
+}
+
+;(async function () {
+  const bannedKeywords = ENV.bannedKeywords
+  if (!bannedKeywords) {
+    throw new Error('No banned keywords')
+  }
+
+  const runner = container.resolve(Runner)
+  runner.run(bannedKeywords)
+})()

packages/velog-scripts/scripts/checkGql.mts

@@ -244,5 +244,13 @@ type TargetInfo = {
 type Target = Record<string, TargetInfo>
 
 function whiteList() {
-  return ['logout', 'unregisterToken', 'acceptIntegration']
+  return [
+    'isLogged',
+    'logout',
+    'unregisterToken',
+    'acceptIntegration',
+    'readAllNotifications',
+    'removeAllNotifications',
+    'updateNotNoticeNotification',
+  ]
 }

packages/velog-scripts/scripts/privatePostsOfSpamAccount.mts

@@ -5,17 +5,16 @@ import { container, injectable } from 'tsyringe'
 import inquirer from 'inquirer'
 import { ENV } from '../env/env.mjs'
 import { DiscordService } from '../lib/discord/DiscordService.mjs'
-import { RedisService } from '../lib/redis/RedisService.mjs'
+import { BlockListService } from '../lib/blockList/BlockListService.mjs'
 
 interface IRunner {}
 
 @injectable()
 class Runner implements IRunner {
-  blockList!: string[]
   constructor(
     private readonly db: DbService,
     private readonly discord: DiscordService,
-    private readonly redis: RedisService,
+    private readonly blockList: BlockListService,
   ) {}
   public async run(names: string[]) {
     await this.init()
@@ -27,7 +26,7 @@ class Runner implements IRunner {
         const posts = await this.findWritenPostsByUserId(user.id)
 
         // add block list
-        await this.redis.addBlockList(username)
+        await this.blockList.addBlockList(username)
 
         if (posts.length === 0) {
           console.log(`${user.username} 유저의 비공개 처리 할 게시글이 없습니다.`)
@@ -88,9 +87,7 @@ class Runner implements IRunner {
   private async init() {
     try {
       await this.discord.connection()
-      await this.redis.connection()
-
-      this.blockList = await this.redis.readBlockList()
+      await this.db.$connect()
     } catch (error) {
       throw error
     }
@@ -133,7 +130,8 @@ class Runner implements IRunner {
     username: string,
     displayName: string | null,
   ): Promise<AskDeletePostsResult> {
-    if (this.blockList.includes(username)) {
+    const blockedList = await this.blockList.readBlockList()
+    if (blockedList.includes(username)) {
       return {
         posts,
         is_set_private: true,

packages/velog-server/src/graphql/resolvers/userResolvers.ts

@@ -84,7 +84,6 @@ const userResolvers: Resolvers = {
     checkEmailExists: async (_, { input }) => {
       const userService = container.resolve(UserService)
       const user = await userService.findByEmail(input.email)
-      console.log('user', user)
       return !!user
     },
   },

packages/velog-server/src/services/UserService/index.ts

@@ -253,13 +253,13 @@ export class UserService implements Service {
     try {
       if (ENV.dockerEnv === 'development') {
         console.log(`Login URL: ${ENV.clientV3Host}/email-change?code=${code}`)
+      } else {
+        await this.mail.sendMail({
+          to: email,
+          from: '[email protected]',
+          ...template,
+        })
       }
-
-      await this.mail.sendMail({
-        to: email,
-        from: '[email protected]',
-        ...template,
-      })
     } catch (error) {
       console.error('change email error', error)
       throw error

packages/velog-server/src/template/changeEmailTemplate.ts

@@ -9,9 +9,9 @@ export const changeEmailTemplate: ChangeEmailTemplateArgs = (username, email, co
   <a href="https://velog.io">
     <img src="https://images.velog.io/email-logo.png" style="display: block; width: 128px; margin: 0 auto;"/>
   </a>
-  <div style="max-width: 100%; width: 400px; margin: 0 auto; padding: 1rem; text-align: justify; background: #f8f9fa; border: 1px solid #dee2e6; box-sizing: border-box; border-radius: 4px; color: #868e96; margin-top: 0.5rem; box-sizing: border-box;">
-    <b style="black">안녕하세요!</b>
-    ${username}의 이메일을 ${email}로 ${text}하는 것을 승인하겠습니까?
+  <div style="max-width: 100%; margin: 0 auto; padding: 1rem; text-align: justify; background: #f8f9fa; border: 1px solid #dee2e6; box-sizing: border-box; border-radius: 4px; color: #868e96; margin-top: 0.5rem; box-sizing: border-box;">
+    <div><b style="black">안녕하세요!</b></div>
+    <p style="word-wrap: break-word; word-break: break-all;">${username}의 이메일을 ${email}로 ${text}하는 것을 승인하겠습니까?</p>
   </div>
   <a href="${endpoint}/email-change?code=${code}" style="text-decoration: none; width: 400px; text-align:center; display:block; margin: 0 auto; margin-top: 1rem; background: #845ef7; padding-top: 1rem; color: white; font-size: 1.25rem; padding-bottom: 1rem; font-weight: 600; border-radius: 4px;">
     ${text}하기
@@ -25,6 +25,7 @@ export const changeEmailTemplate: ChangeEmailTemplateArgs = (username, email, co
   </div>
 </div>
   `
+
   return {
     subject,
     body,

packages/velog-web/src/app/notifications/page.tsx

@@ -1,14 +1,14 @@
+import RequireLogin from '@/components/RequireLogin'
 import NotificationList from '@/features/notification/components/NotificationList'
 import NotificationSelector from '@/features/notification/components/NotificationSelector'
 import NotificationTitle from '@/features/notification/components/NotificationTitle'
 import getCurrentUser from '@/prefetch/getCurrentUser'
-import { notFound } from 'next/navigation'
 
 export default async function NotificationPage() {
   const user = await getCurrentUser()
 
   if (!user) {
-    notFound()
+    return <RequireLogin />
   }
 
   return (

packages/velog-web/src/app/setting/page.tsx

@@ -1,3 +1,4 @@
+import RequireLogin from '@/components/RequireLogin'
 import SettingEmailRow from '@/features/setting/components/SettingEmailRow'
 import SettingEmailRulesRow from '@/features/setting/components/SettingEmailRulesRow'
 import SettingSocialInfoRow from '@/features/setting/components/SettingSocialInfoRow'
@@ -13,7 +14,7 @@ export default async function SettingPage() {
   const user = await getCurrentUser()
 
   if (!user) {
-    notFound()
+    return <RequireLogin />
   }
 
   const velogConfig = await getVelogConfig({ username: user.username })

packages/velog-web/src/components/Error/ErrorScreenTemplate/ErrorScreenTemplate.module.css

@@ -2,7 +2,6 @@
   display: flex;
   width: 100%;
   height: 100%;
-  min-height: 100svh;
   align-items: center;
   justify-content: center;
   flex-direction: column;

packages/velog-web/src/components/RequireLogin/RequireLogin.module.css

@@ -0,0 +1,3 @@
+.block {
+  height: 70svh;
+}

packages/velog-web/src/components/RequireLogin/RequireLogin.test.tsx

@@ -0,0 +1,8 @@
+import RequireLogin from './RequireLogin'
+import { render } from '@testing-library/react'
+
+describe('RequireLogin', () => {
+  it('renders successfully', () => {
+    render(<RequireLogin />)
+  })
+})

packages/velog-web/src/components/RequireLogin/RequireLogin.tsx

@@ -0,0 +1,50 @@
+'use client'
+
+import styles from './RequireLogin.module.css'
+import { bindClassNames } from '@/lib/styles/bindClassNames'
+import ErrorScreenTemplate from '@/components/Error/ErrorScreenTemplate'
+import { UndrawLogin } from '@/assets/vectors/components'
+import { useModal } from '@/state/modal'
+import { useEffect } from 'react'
+import { useAuth } from '@/state/auth'
+import { usePathname, useRouter } from 'next/navigation'
+
+const cx = bindClassNames(styles)
+
+type Props = {
+  redirectTo?: string
+}
+
+function RequireLogin({ redirectTo }: Props) {
+  const pathname = usePathname()
+  const router = useRouter()
+  const { actions } = useModal()
+
+  const redirectToPath = redirectTo || pathname
+
+  const {
+    value: { currentUser },
+  } = useAuth()
+
+  const onButtonClick = () => {
+    actions.showModal('login', redirectToPath)
+  }
+
+  useEffect(() => {
+    if (!currentUser) return
+    router.push(redirectToPath)
+  }, [router, currentUser, redirectToPath])
+
+  return (
+    <div className={cx('block')}>
+      <ErrorScreenTemplate
+        Illustration={UndrawLogin}
+        message="로그인 후 이용해주세요."
+        onButtonClick={onButtonClick}
+        buttonText="로그인"
+      />
+    </div>
+  )
+}
+
+export default RequireLogin

packages/velog-web/src/components/RequireLogin/index.tsx

@@ -0,0 +1 @@
+export { default } from './RequireLogin'