fix api 500 and redirect to login if not authenticated when accessing /settings/team
This commit is contained in:
parent
3aa1e1716d
commit
e10030e18b
2 changed files with 24 additions and 10 deletions
|
@ -30,8 +30,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return res.status(201).setHeader('Location', process.env.BASE_URL + '/api/teams/1').send(null);
|
return res.status(201).json({ message: 'Team created' });
|
||||||
}
|
}
|
||||||
|
|
||||||
res.status(404).send(null);
|
res.status(404).json({ message: 'Team not found' });
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { GetServerSideProps } from "next";
|
||||||
import Head from 'next/head';
|
import Head from 'next/head';
|
||||||
import prisma from '../../lib/prisma';
|
import prisma from '../../lib/prisma';
|
||||||
import Modal from '../../components/Modal';
|
import Modal from '../../components/Modal';
|
||||||
|
@ -18,14 +19,16 @@ export default function Teams(props) {
|
||||||
const [invites, setInvites] = useState([]);
|
const [invites, setInvites] = useState([]);
|
||||||
const [showCreateTeamModal, setShowCreateTeamModal] = useState(false);
|
const [showCreateTeamModal, setShowCreateTeamModal] = useState(false);
|
||||||
|
|
||||||
const loadTeams = () => fetch('/api/user/membership').then((res: any) => res.json()).then(
|
const loadData = () => fetch('/api/user/membership').then((res: any) => res.json()).then(
|
||||||
(data) => {
|
(data) => {
|
||||||
setTeams(data.membership.filter((m) => m.role !== "INVITEE"));
|
setTeams(data.membership && data.membership.filter((m) => m.role !== "INVITEE"));
|
||||||
setInvites(data.membership.filter((m) => m.role === "INVITEE"));
|
setInvites(data.membership && data.membership.filter((m) => m.role === "INVITEE"));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => { loadTeams(); }, []);
|
useEffect(() => {
|
||||||
|
loadData();
|
||||||
|
}, []);
|
||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return <p className="text-gray-400">Loading...</p>;
|
return <p className="text-gray-400">Loading...</p>;
|
||||||
|
@ -40,7 +43,7 @@ export default function Teams(props) {
|
||||||
'Content-Type': 'application/json'
|
'Content-Type': 'application/json'
|
||||||
}
|
}
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
loadTeams();
|
loadData();
|
||||||
setShowCreateTeamModal(false);
|
setShowCreateTeamModal(false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -86,14 +89,14 @@ export default function Teams(props) {
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
{!!teams.length &&
|
{!!teams.length &&
|
||||||
<TeamList teams={teams} onChange={loadTeams}>
|
<TeamList teams={teams} onChange={loadData}>
|
||||||
</TeamList>
|
</TeamList>
|
||||||
}
|
}
|
||||||
|
|
||||||
{!!invites.length && <div>
|
{!!invites.length && <div>
|
||||||
<h2 className="text-lg leading-6 font-medium text-gray-900">Open Invitations</h2>
|
<h2 className="text-lg leading-6 font-medium text-gray-900">Open Invitations</h2>
|
||||||
<ul className="border px-2 rounded mt-2 mb-2 divide-y divide-gray-200">
|
<ul className="border px-2 rounded mt-2 mb-2 divide-y divide-gray-200">
|
||||||
{invites.map((team) => <TeamListItem onChange={loadTeams} key={team.id} team={team}></TeamListItem>)}
|
{invites.map((team) => <TeamListItem onChange={loadData} key={team.id} team={team}></TeamListItem>)}
|
||||||
</ul>
|
</ul>
|
||||||
</div>}
|
</div>}
|
||||||
</div>
|
</div>
|
||||||
|
@ -153,4 +156,15 @@ export default function Teams(props) {
|
||||||
</SettingsShell>
|
</SettingsShell>
|
||||||
</Shell>
|
</Shell>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const getServerSideProps: GetServerSideProps = async (context) => {
|
||||||
|
const session = await getSession(context);
|
||||||
|
if (!session) {
|
||||||
|
return { redirect: { permanent: false, destination: "/auth/login" } };
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
props: { }, // will be passed to the page component as props
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
Loading…
Reference in a new issue