Clean session param in server-side term prop

giscus · Nov 20, 2021 · 96edcb4 · 96edcb4 · vercel · Nov 20, 2021
1 parent 17686cd
commit 96edcb4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/utils.ts b/lib/utils.ts
@@ -24,6 +24,16 @@ export function getOriginHost(origin: string) {
   }
 }
 
+export function cleanSessionParam(url: string) {
+  try {
+    const newUrl = new URL(url);
+    newUrl.searchParams.delete('giscus');
+    return newUrl.toString();
+  } catch (err) {
+    return url;
+  }
+}
+
 export function isEmpty(v: unknown) {
   return v === null || v === undefined || v === '' || Number.isNaN(v);
 }

diff --git a/pages/widget.tsx b/pages/widget.tsx
@@ -7,7 +7,7 @@ import { assertOrigin } from '../lib/config';
 import { ConfigContext, ThemeContext } from '../lib/context';
 import { decodeState } from '../lib/oauth/state';
 import { ISetConfigMessage } from '../lib/types/giscus';
-import { getOriginHost } from '../lib/utils';
+import { cleanSessionParam, getOriginHost } from '../lib/utils';
 import { env, Theme } from '../lib/variables';
 import { getAppAccessToken } from '../services/github/getAppAccessToken';
 import { getRepoConfig } from '../services/github/getConfig';
@@ -17,7 +17,7 @@ import Router from 'next/router';
 export async function getServerSideProps({ query, res }: GetServerSidePropsContext) {
   const session = (query.session as string) || '';
   const repo = (query.repo as string) || '';
-  const term = (query.term as string) || '';
+  const term = cleanSessionParam((query.term as string) || '');
   const category = (query.category as string) || '';
   const number = +query.number || 0;
   const repoId = (query.repoId as string) || '';