diff --git a/pages/bots/[id]/index.tsx b/pages/bots/[id]/index.tsx index bdb866f..5168797 100644 --- a/pages/bots/[id]/index.tsx +++ b/pages/bots/[id]/index.tsx @@ -205,7 +205,7 @@ const Bots: NextPage = ({ data, date, user, theme, setTheme }) => { } export const getServerSideProps = async (ctx: Context) => { - const parsed = parseCookie(ctx) + const parsed = parseCookie(ctx.req) const data = await get.bot.load(ctx.query.id) ?? { id: '' } const user = await get.Authorization(parsed?.token) return { diff --git a/pages/bots/[id]/vote.tsx b/pages/bots/[id]/vote.tsx index 4632a01..9c7e5cc 100644 --- a/pages/bots/[id]/vote.tsx +++ b/pages/bots/[id]/vote.tsx @@ -1,15 +1,16 @@ -import { NextPage, NextPageContext } from 'next' +import { NextPage } from 'next' import Link from 'next/link' import dynamic from 'next/dynamic' import { useRouter } from 'next/router' -import { Bot, User } from '@types' +import { Bot, CsrfContext, User } from '@types' import { get } from '@utils/Query' import { makeBotURL, parseCookie, checkBotFlag } from '@utils/Tools' import { ParsedUrlQuery } from 'querystring' import NotFound from 'pages/404' +import { getToken } from '@utils/Csrf' const Container = dynamic(() => import('@components/Container')) @@ -24,7 +25,8 @@ const Advertisement = dynamic(() => import('@components/Advertisement')) const Tooltip = dynamic(() => import('@components/Tooltip')) const Markdown = dynamic(() => import ('@components/Markdown')) -const VoteBot: NextPage = ({ data }) => { +const VoteBot: NextPage = ({ data, user, csrfToken }) => { + console.log(csrfToken) const router = useRouter() if(!data?.id) return if((checkBotFlag(data.flags, 'trusted') || checkBotFlag(data.flags, 'partnered')) && data.vanity && data.vanity !== router.query.id) router.push(`/bots/${data.vanity}`) @@ -54,11 +56,13 @@ const VoteBot: NextPage = ({ data }) => { } export const getServerSideProps = async (ctx: Context) => { - const parsed = parseCookie(ctx) + const parsed = parseCookie(ctx.req) const data = await get.bot.load(ctx.query.id) const user = await get.Authorization(parsed?.token) + return { props: { + csrfToken: getToken(ctx.req, ctx.res), data, user: await get.user.load(user || '') }, @@ -66,12 +70,13 @@ export const getServerSideProps = async (ctx: Context) => { } interface VoteBotProps { + csrfToken: string vote: boolean data: Bot user: User } -interface Context extends NextPageContext { +interface Context extends CsrfContext { query: URLQuery } diff --git a/pages/callback/discord.tsx b/pages/callback/discord.tsx index 48fc71a..5522a3c 100644 --- a/pages/callback/discord.tsx +++ b/pages/callback/discord.tsx @@ -43,7 +43,7 @@ const DiscordCallback:NextPage = ({ data }) => { } export const getServerSideProps = async(ctx: NextPageContext) => { - const parsed = parseCookie(ctx) + const parsed = parseCookie(ctx.req) const token = verify(parsed?.token ?? '') if(!token) return { props: { data: null } } diff --git a/pages/panel.tsx b/pages/panel.tsx index 6f6aa62..d7d5ac1 100644 --- a/pages/panel.tsx +++ b/pages/panel.tsx @@ -46,7 +46,7 @@ const Panel:NextPage = ({ logged, user, submits }) => { } export const getServerSideProps = async (ctx: NextPageContext) => { - const parsed = parseCookie(ctx) + const parsed = parseCookie(ctx.req) const user = await get.Authorization(parsed?.token) || '' const submits = await get.botSubmits.load(user) diff --git a/utils/Tools.ts b/utils/Tools.ts index 9b750d3..88c7158 100644 --- a/utils/Tools.ts +++ b/utils/Tools.ts @@ -5,6 +5,7 @@ import cookie from 'cookie' import { BotFlags, ImageOptions, UserFlags } from '@types' import { KoreanbotsEndPoints, Oauth } from './Constants' import { NextRouter } from 'next/router' +import { IncomingMessage } from 'http' export function formatNumber(value: number):string { const suffixes = ['', '만', '억', '조','해'] @@ -95,8 +96,8 @@ export function bufferToStream(binary: Buffer) { return readableInstanceStream } -export function parseCookie(ctx: NextPageContext): { [key: string]: string } { - return cookie.parse(ctx.req.headers.cookie || '') +export function parseCookie(req: { headers: { cookie?: string }}): { [key: string]: string } { + return cookie.parse(req.headers.cookie || '') } export function redirectTo(router: NextRouter, to: string) {