reps raised with correct return url
This commit is contained in:
+35
-23
@@ -43,7 +43,7 @@ const SignIn = (props) => {
|
||||
<div className="govuk-grid-column-two-thirds ">
|
||||
<form
|
||||
method="post"
|
||||
action={"/api/auth/signin/email"}
|
||||
action="/api/auth/signin/email"
|
||||
>
|
||||
<div className="govuk-form-group">
|
||||
<input
|
||||
@@ -90,32 +90,44 @@ const SignIn = (props) => {
|
||||
);
|
||||
};
|
||||
|
||||
// export async function getServerSideProps(context) {
|
||||
// //console.log("-1-1-1-1-", context.query.callbackUrl, context.locale);
|
||||
// //console.log("------ " + context.query.callbackUrl);
|
||||
// // setCookie(context, "next-auth.callback-url", context.query.callbackUrl, {
|
||||
// // path: "/",
|
||||
// // });
|
||||
|
||||
// const csrfToken = await getCsrfToken(context);
|
||||
// let callback =
|
||||
// context.locale != "cy"
|
||||
// ? process.env.NEXTAUTH_URL
|
||||
// : "https://" + process.env.I18N_DOMAIN + ":3000";
|
||||
|
||||
// context.query.callbackUrl = callback;
|
||||
|
||||
// let formURL =
|
||||
// new URL(callback).protocol +
|
||||
// "//" +
|
||||
// new URL(callback).hostname +
|
||||
// ":" +
|
||||
// new URL(callback).port; // +
|
||||
// // "/api/auth/signin/email";
|
||||
|
||||
// //console.log("******", formURL, callback, csrfToken);
|
||||
// return {
|
||||
// props: { csrfToken: csrfToken, callbackUrl: formURL, redirect: true },
|
||||
// };
|
||||
// }
|
||||
|
||||
export async function getServerSideProps(context) {
|
||||
//console.log("-1-1-1-1-", context.query.callbackUrl, context.locale);
|
||||
//console.log("------ " + context.query.callbackUrl);
|
||||
// setCookie(context, "next-auth.callback-url", context.query.callbackUrl, {
|
||||
// path: "/",
|
||||
// });
|
||||
|
||||
const csrfToken = await getCsrfToken(context);
|
||||
let callback =
|
||||
context.locale != "cy"
|
||||
? process.env.NEXTAUTH_URL
|
||||
: "https://" + process.env.I18N_DOMAIN + ":3000";
|
||||
console.log("-1-1-1-1-", context.query.callbackUrl, context.locale);
|
||||
let formURL = context.query.callbackUrl;
|
||||
console.log("formUrl:", formURL);
|
||||
|
||||
context.query.callbackUrl = callback;
|
||||
|
||||
let formURL =
|
||||
new URL(callback).protocol +
|
||||
"//" +
|
||||
new URL(callback).hostname +
|
||||
":" +
|
||||
new URL(callback).port; // +
|
||||
// "/api/auth/signin/email";
|
||||
|
||||
//console.log("******", formURL, callback, csrfToken);
|
||||
formURL = typeof formURL == "undefined" ? null : formURL;
|
||||
return {
|
||||
props: { csrfToken: csrfToken, callbackUrl: formURL, redirect: true },
|
||||
props: { csrfToken: csrfToken, callbackUrl: formURL },
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user