devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated redirect implementation

Browse Source
This commit is contained in:
Joao Ramos
2024-03-11 17:00:38 +00:00
parent 330c177ff9
commit 37c3c6f7f4
14 changed files with 111 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/action.tsx
View File

@@ -23,11 +23,11 @@ export function getServerSideProps({
res: any;
}) {
if (!query || !query.oobCode || !query.mode) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {},
redirect: {
destination: "/login",
permanent: false,
}
};
}

20
src/pages/exam.tsx
View File

@@ -10,24 +10,20 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
const user = req.session.user;
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/login",
permanent: false,
}
};
}
if (shouldRedirectHome(user)) {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/",
permanent: false,
}
};
}

20
src/pages/exercises.tsx
View File

@@ -10,24 +10,20 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
const user = req.session.user;
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/login",
permanent: false,
}
};
}
if (shouldRedirectHome(user)) {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/",
permanent: false,
}
};
}

20
src/pages/generation.tsx
View File

@@ -26,24 +26,20 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
const user = req.session.user;
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/login",
permanent: false,
}
};
}
if (shouldRedirectHome(user) || user.type !== "developer") {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/",
permanent: false,
}
};
}

20
src/pages/index.tsx
View File

@@ -35,6 +35,7 @@ import Select from "react-select";
import {USER_TYPE_LABELS} from "@/resources/user";
export const getServerSideProps = withIronSessionSsr(({req, res}) => {
debugger;
const user = req.session.user;
const envVariables: {[key: string]: string} = {};
@@ -45,14 +46,11 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
});
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
envVariables,
},
redirect: {
destination: "/login",
permanent: false,
}
};
}
@@ -61,7 +59,13 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
};
}, sessionOptions);
export default function Home({envVariables}: {envVariables: {[key: string]: string}}) {
interface Props {
user: any;
envVariables: {[key: string]: string};
}
export default function Home(props: Props) {
const { envVariables} = props;
debugger;
const [showDiagnostics, setShowDiagnostics] = useState(false);
const [showDemographicInput, setShowDemographicInput] = useState(false);
const [selectedScreen, setSelectedScreen] = useState<Type>("admin");

11
src/pages/list/users.tsx
View File

@@ -22,14 +22,11 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
});
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
envVariables,
},
redirect: {
destination: "/login",
permanent: false,
}
};
}

13
src/pages/login.tsx
View File

@@ -31,15 +31,12 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
});
if (user && user.isVerified) {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
envVariables,
},
};
redirect: {
destination: "/",
permanent: false,
}
};
}
return {

26
src/pages/payment-record.tsx
View File

@@ -42,25 +42,21 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
const user = req.session.user;
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
};
redirect: {
destination: "/login",
permanent: false,
}
};
}
if (shouldRedirectHome(user) || !["admin", "developer"].includes(user.type)) {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
};
return {
redirect: {
destination: "/",
permanent: false,
}
};
}
return {

15
src/pages/payment.tsx
View File

@@ -7,6 +7,7 @@ import PaymentDue from "./(status)/PaymentDue";
import { useRouter } from "next/router";
export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
debugger;
const user = req.session.user;
const envVariables: { [key: string]: string } = {};
@@ -17,15 +18,12 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
});
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
envVariables,
},
};
redirect: {
destination: "/login",
permanent: false,
}
};
}
return {
@@ -38,6 +36,7 @@ export default function Home({
}: {
envVariables: { [key: string]: string };
}) {
debugger;
const { user } = useUser({ redirectTo: "/login" });
const router = useRouter();

20
src/pages/profile.tsx
View File

@@ -37,24 +37,20 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
const user = req.session.user;
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/login",
permanent: false,
}
};
}
if (shouldRedirectHome(user)) {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/",
permanent: false,
}
};
}

20
src/pages/record.tsx
View File

@@ -30,24 +30,20 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
const user = req.session.user;
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/login",
permanent: false,
}
};
}
if (shouldRedirectHome(user)) {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/",
permanent: false,
}
};
}

20
src/pages/settings.tsx
View File

@@ -18,24 +18,20 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
const user = req.session.user;
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/login",
permanent: false,
}
};
}
if (shouldRedirectHome(user) || user.type !== "developer") {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/",
permanent: false,
}
};
}

20
src/pages/stats.tsx
View File

@@ -35,24 +35,20 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
const user = req.session.user;
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/login",
permanent: false,
}
};
}
if (shouldRedirectHome(user)) {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
redirect: {
destination: "/",
permanent: false,
}
};
}

28
src/pages/tickets.tsx
View File

@@ -35,28 +35,24 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
const user = req.session.user;
if (!user || !user.isVerified) {
res.setHeader("location", "/login");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
};
return {
redirect: {
destination: "/login",
permanent: false,
}
};
}
if (
shouldRedirectHome(user) ||
["admin", "developer", "agent"].includes(user.type)
) {
res.setHeader("location", "/");
res.statusCode = 302;
res.end();
return {
props: {
user: null,
},
};
return {
redirect: {
destination: "/",
permanent: false,
}
};
}
return {