Fix some issues on UI

hoangvvo · Sep 24, 2021 · f406411 · f406411
1 parent 23f295c
commit f406411
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/api-lib/auth/passport.js b/api-lib/auth/passport.js
@@ -6,7 +6,6 @@ passport.serializeUser((user, done) => {
   done(null, user._id);
 });
 
-// passport#160
 passport.deserializeUser((req, id, done) => {
   findUserForAuth(req.db, id).then(
     (user) => done(null, user),

diff --git a/assets/base.css b/assets/base.css
@@ -1,3 +1,4 @@
+/* Inspired by Vercel design */
 @import 'node_modules/modern-normalize/modern-normalize.css';
 
 :root {

diff --git a/page-components/VerifyEmail/index.jsx b/page-components/VerifyEmail/index.jsx
@@ -5,7 +5,6 @@ import Link from 'next/link';
 import styles from './VerifyEmail.module.css';
 
 export const VerifyEmail = ({ valid }) => {
-  valid = true;
   return (
     <Wrapper className={styles.root}>
       <Container column alignItems="center">
@@ -18,7 +17,7 @@ export const VerifyEmail = ({ valid }) => {
             : 'It looks like you may have clicked on an invalid link. Please close this window and try again.'}
         </Text>
         <Spacer size={4} axis="vertical" />
-        <Link href="/">
+        <Link href="/" passHref>
           <ButtonLink variant="ghost" type="success" size="large">
             Go back home
           </ButtonLink>

diff --git a/pages/api/users/index.js b/pages/api/users/index.js
@@ -1,6 +1,6 @@
 import { ValidateProps } from '@/api-lib/constants';
 import { findUserByEmail, findUserByUsername, insertUser } from '@/api-lib/db';
-import { auths, database, validateBody } from '@/api-lib/middlewares';
+import { database, validateBody } from '@/api-lib/middlewares';
 import { ncOpts } from '@/api-lib/nc';
 import { slugUsername } from '@/lib/user';
 import nc from 'next-connect';
@@ -9,7 +9,7 @@ import normalizeEmail from 'validator/lib/normalizeEmail';
 
 const handler = nc(ncOpts);
 
-handler.use(database, ...auths);
+handler.use(database);
 
 handler.post(
   validateBody({

diff --git a/pages/forget-password/[token].jsx b/pages/forget-password/[token].jsx
@@ -18,15 +18,13 @@ const ResetPasswordTokenPage = ({ valid, token }) => {
 export async function getServerSideProps(context) {
   await nc().use(database).run(context.req, context.res);
 
-  const { token } = context.query;
-
   const tokenDoc = await findTokenByIdAndType(
     context.req.db,
-    context.query.token,
+    context.params.token,
     'passwordReset'
   );
 
-  return { props: { token, valid: !!tokenDoc } };
+  return { props: { token: context.params.token, valid: !!tokenDoc } };
 }
 
 export default ResetPasswordTokenPage;
diff --git a/pages/verify-email/[token].jsx b/pages/verify-email/[token].jsx
@@ -9,7 +9,7 @@ export default function EmailVerifyPage({ valid }) {
   return (
     <>
       <Head>
-        <title>Sign up</title>
+        <title>Email verification</title>
       </Head>
       <VerifyEmail valid={valid} />
     </>
@@ -21,7 +21,7 @@ export async function getServerSideProps(context) {
   handler.use(database);
   await handler.run(context.req, context.res);
 
-  const { token } = context.query;
+  const { token } = context.params;
 
   const deletedToken = await findAndDeleteTokenByIdAndType(
     context.req.db,