Feature/app 25 Add Middleware

ost-cas-fee-adv-22-23 · Apr 24, 2023 · 8c6d92f · 8c6d92f · vercel · Apr 24, 2023
2 parents 5e0011d + f5bbaf8
commit 8c6d92f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 23 deletions.
diff --git a/next.config.js b/next.config.js
@@ -1,5 +1,6 @@
 const withPWA = require('next-pwa')({
   dest: 'public',
+  disable: process.env.NODE_ENV === 'development',
 });
 
 module.exports = withPWA({

diff --git a/src/components/header.tsx b/src/components/header.tsx
@@ -40,7 +40,7 @@ export const Header: FC = () => {
               <SettingsIcon size={24} />
             </IconButton>
           </div>
-          <a href="#" onClick={() => signOut()}>
+          <a href="#" onClick={() => signOut({ redirect: true, callbackUrl: '/login' })}>
             <IconButton label={'Logout'} variant={'purple'} iconText={'Logout'}>
               <LogoutIcon size={24} />
             </IconButton>

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -0,0 +1,5 @@
+export { default } from 'next-auth/middleware';
+
+export const config = {
+  matcher: ['/', '/mumble/:id?', '/profile/:id?', '/tag/:id?'],
+};
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
@@ -44,6 +44,9 @@ export default NextAuth({
   session: {
     maxAge: 12 * 60 * 60, // 12 hours
   },
+  pages: {
+    signIn: '/login',
+  },
   callbacks: {
     async jwt({ token, user, account }) {
       if (account) {

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -36,18 +36,9 @@ export default function PageHome({ mumbles, users, error, count }: InferGetServe
 export const getServerSideProps: GetServerSideProps = async (context) => {
   const session = await getSession(context);
 
-  if (!session) {
-    return {
-      redirect: {
-        destination: '/login',
-        permanent: false,
-      },
-    };
-  }
-
   try {
     const { count, mumbles } = await fetchMumbles({ limit: 10 });
-    const { users } = await fetchUsers({ accessToken: session.accessToken });
+    const { users } = await fetchUsers({ accessToken: session?.accessToken });
 
     return { props: { count, mumbles, users } };
   } catch (error) {

diff --git a/src/pages/login.tsx b/src/pages/login.tsx
@@ -29,7 +29,7 @@ export default function Home() {
       <div className={'flex justify-center items-center'}>
         <div>
           <h1 className={'label-XL'}>Anmelden</h1>
-          <Button label="Let's mumble" onClick={() => signIn('zitadel')} size="L" variant="gradient">
+          <Button label="Let's mumble" onClick={() => signIn('zitadel', { callbackUrl: '/' })} size="L" variant="gradient">
             <MumbleIcon size={16} />
           </Button>
         </div>

diff --git a/src/services/posts.ts b/src/services/posts.ts
@@ -65,10 +65,6 @@ export const createPost = async (postArgs: PostArgs) => {
 export const commentPost = async (params: { postId: string; comment: string; accessToken?: string }) => {
   const { postId, comment, accessToken } = params || {};
 
-  if (!accessToken) {
-    throw new Error('No access token');
-  }
-
   const res = await axios.post(
     `${process.env.NEXT_PUBLIC_QWACKER_API_URL}posts/${postId}`,
     { text: comment },
@@ -87,10 +83,6 @@ export const commentPost = async (params: { postId: string; comment: string; acc
 export const fetchMumbleById = async (params?: { postId: string; accessToken?: string }) => {
   const { postId, accessToken } = params || {};
 
-  if (!accessToken) {
-    throw new Error('No access token');
-  }
-
   const url = `${process.env.NEXT_PUBLIC_QWACKER_API_URL}posts/${postId}`;
 
   const res = await axios.get(url, {
@@ -108,9 +100,6 @@ export const fetchMumbleById = async (params?: { postId: string; accessToken?: s
 
 export const fetchReplies = async (params?: { postId: string; accessToken?: string }) => {
   const { postId, accessToken } = params || {};
-  if (!accessToken) {
-    throw new Error('No access token');
-  }
 
   const url = `${process.env.NEXT_PUBLIC_QWACKER_API_URL}posts/${postId}/replies`;