updated welsh translations

pages/auth/signin.js

@@ -6,10 +6,20 @@ import Footer from "../../components/footer";
 import Header from "../../components/header";
 import Breadcrumbs from "../../components/breadcrumbs";
 import { getCsrfToken } from "next-auth/react";
+import { parseCookies, setCookie, destroyCookie } from "nookies";
+import { ca } from "date-fns/locale";
 
 const SignIn = (props) => {
     let { t, lang } = useTranslation();
-    const { footerLinks, pages, csrfToken } = props;
+    const { footerLinks, pages, csrfToken, callbackUrl } = props;
+
+    let formURL =
+        new URL(window.location.href).protocol +
+        "//" +
+        new URL(window.location.href).hostname +
+        ":" +
+        new URL(window.location.href).port +
+        "/api/auth/signin/email";
 
     return (
         <div>
@@ -33,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
@@ -42,6 +52,12 @@ const SignIn = (props) => {
                                             type="hidden"
                                             defaultValue={csrfToken}
                                         />
+                                        <input
+                                            className="govuk-input"
+                                            name="callbackUrl"
+                                            type="hidden"
+                                            defaultValue={callbackUrl}
+                                        />
                                         <label
                                             className="govuk-label"
                                             htmlFor="email"
@@ -75,9 +91,31 @@ 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 },
+        props: { csrfToken: csrfToken, callbackUrl: formURL, redirect: true },
     };
 }
 

pages/auth/verify-request.js

@@ -56,7 +56,7 @@ const SignIn = (props) => {
 export async function getServerSideProps(context) {
     const csrfToken = await getCsrfToken(context);
     return {
-        props: { csrfToken },
+        props: { csrfToken, locale: context.locale },
     };
 }