mythic-insight/calcom
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Merge pull request #171 from emrysal/feature/simplify-code-by-handling-auth-in-shell-component

Browse source 
Removed redirect clientside session logic from pages and moved to shell
This commit is contained in:
Bailey Pumfleet 2021-05-07 20:39:02 +01:00 committed by GitHub
commit 7cf0504ce6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/Shell.tsx
View file

@ -27,11 +27,14 @@ export default function Shell(props) {
}
const logoutHandler = () => {
signOut();
router.push('/');
signOut({ redirect: false }).then( () => router.push('/auth/logout') );
}
return (
if ( ! loading && ! session ) {
router.replace('/auth/login');
}
return session && (
<div>
<div className="bg-gray-800 pb-32">
<nav className="bg-gray-800">
@ -146,4 +149,4 @@ export default function Shell(props) {
</main>
</div>
);
}
}

8
pages/availability/event/[type].tsx
View file

@ -17,10 +17,6 @@ export default function EventType(props) {
if (loading) {
return <p className="text-gray-400">Loading...</p>;
} else {
if (!session) {
window.location.href = "/auth/login";
}
}
async function updateEventTypeHandler(event) {
@ -164,7 +160,9 @@ export default function EventType(props) {
export async function getServerSideProps(context) {
const session = await getSession(context);
if (!session) {
return { redirect: { permanent: false, destination: '/auth/login' } };
}
const user = await prisma.user.findFirst({
where: {
email: session.user.email,

17
pages/availability/index.tsx
View file

@ -28,10 +28,6 @@ export default function Availability(props) {
if (loading) {
return <p className="text-gray-400">Loading...</p>;
} else {
if (!session) {
window.location.href = "/auth/login";
}
}
function toggleAddModal() {
@ -141,11 +137,11 @@ export default function Availability(props) {
</tr>
</thead>
<tbody className="bg-white divide-y divide-gray-200">
{props.types.map((eventType) =>
{props.types.map((eventType) =>
<tr>
<td className="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900">
{eventType.title}
{eventType.hidden &&
{eventType.hidden &&
<span className="ml-2 inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-gray-100 text-gray-800">
Hidden
</span>
@ -186,7 +182,7 @@ export default function Availability(props) {
</div>
</div>
</div>
{showAddModal &&
{showAddModal &&
<div className="fixed z-10 inset-0 overflow-y-auto" aria-labelledby="modal-title" role="dialog" aria-modal="true">
<div className="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
<div className="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity" aria-hidden="true"></div>
@ -284,7 +280,7 @@ export default function Availability(props) {
</div>
</div>
}
{showChangeTimesModal &&
{showChangeTimesModal &&
<div className="fixed z-10 inset-0 overflow-y-auto" aria-labelledby="modal-title" role="dialog" aria-modal="true">
<div className="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
<div className="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity" aria-hidden="true"></div>
@ -353,6 +349,9 @@ export default function Availability(props) {
export async function getServerSideProps(context) {
const session = await getSession(context);
if (!session) {
return { redirect: { permanent: false, destination: '/auth/login' } };
}
const user = await prisma.user.findFirst({
where: {
@ -382,4 +381,4 @@ export async function getServerSideProps(context) {
return {
props: {user, types}, // will be passed to the page component as props
}
}
}

5
pages/index.tsx
View file

@ -6,14 +6,9 @@ import { signIn, useSession, getSession } from 'next-auth/client';
export default function Home(props) {
const [ session, loading ] = useSession();
if (loading) {
return <p className="text-gray-400">Loading...</p>;
}
if (!session) {
window.location.href = "/auth/login";
return;
}
return(
<div>

4
pages/integrations/[integration].tsx
View file

@ -13,10 +13,6 @@ export default function integration(props) {
if (loading) {
return <p className="text-gray-400">Loading...</p>;
} else {
if (!session) {
window.location.href = "/";
}
}
function toggleShowAPIKey() {

8
pages/integrations/index.tsx
View file

@ -13,10 +13,6 @@ export default function Home({ integrations }) {
if (loading) {
return <p className="text-gray-400">Loading...</p>;
} else {
if (!session) {
window.location.href = "/";
}
}
function toggleAddModal() {
@ -181,7 +177,9 @@ const validJson = (jsonString: string) => {
export async function getServerSideProps(context) {
const session = await getSession(context);
if (!session) {
return { redirect: { permanent: false, destination: '/auth/login' } };
}
const user = await prisma.user.findFirst({
where: {
email: session.user.email,

7
pages/settings/password.tsx
View file

@ -15,10 +15,6 @@ export default function Settings(props) {
if (loading) {
return <p className="text-gray-400">Loading...</p>;
} else {
if (!session) {
window.location.href = "/auth/login";
}
}
const closeSuccessModal = () => { setSuccessModalOpen(false); }
@ -88,6 +84,9 @@ export default function Settings(props) {
export async function getServerSideProps(context) {
const session = await getSession(context);
if (!session) {
return { redirect: { permanent: false, destination: '/auth/login' } };
}
const user = await prisma.user.findFirst({
where: {

7
pages/settings/profile.tsx
View file

@ -22,10 +22,6 @@ export default function Settings(props) {
if (loading) {
return <p className="text-gray-400">Loading...</p>;
} else {
if (!session) {
window.location.href = "/auth/login";
}
}
const closeSuccessModal = () => { setSuccessModalOpen(false); }
@ -159,6 +155,9 @@ export default function Settings(props) {
export async function getServerSideProps(context) {
const session = await getSession(context);
if (!session) {
return { redirect: { permanent: false, destination: '/auth/login' } };
}
const user = await prisma.user.findFirst({
where: {