robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

defect fix for language and login - crm precedence then current session

Browse Source
This commit is contained in:
robbond
2026-04-08 12:17:28 +01:00
parent 56e854ca2b
commit 1b2f8e29c6
6 changed files with 169 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/api/auth/[...nextauth].js
+79 -44
View File
@@ -15,9 +15,12 @@ import { PrismaClient } from "@prisma/client";
import NextAuth from "next-auth";
import EmailProvider from "next-auth/providers/email";
import { consoleLogger } from "../../../actions/core/logger";
import { getPortalLogin } from "../../../actions/services/accountService";
const prisma = new PrismaClient();
const WELSH_LANGUAGE_CODE = 846040000;
const appendParamsAndPathToNewUrl = (fromUrl, toUrl) => {
const fromUrlObj = new URL(fromUrl);
const params = fromUrlObj.searchParams;
@@ -34,14 +37,64 @@ const appendParamsAndPathToNewUrl = (fromUrl, toUrl) => {
return toUrlObj.toString();
};
const resolveLocale = (req) =>
const resolveRequestLocale = (req) =>
req?.query?.locale ||
req?.body?.locale ||
req?.cookies?.pedw_locale ||
"en";
const resolveCrmLocale = async (email) => {
if (!email) return null;
try {
const portalUserObj = await getPortalLogin(email);
const preferredLanguage =
portalUserObj?.value?.[0]?.pinswg_preferredlanguage;
if (preferredLanguage === WELSH_LANGUAGE_CODE) {
return "cy";
}
if (preferredLanguage != null) {
return "en";
}
return null;
} catch (error) {
consoleLogger(error);
return null;
}
};
const resolveEffectiveLocale = async (req, email) => {
const crmLocale = await resolveCrmLocale(email);
if (crmLocale) return crmLocale;
return resolveRequestLocale(req);
};
const buildLocalizedVerificationUrl = ({ url, email, effectiveLocale }) => {
const { host, protocol, searchParams } = new URL(url);
const baseDomain = `${protocol}//${host}`;
const newURL =
effectiveLocale === "cy"
? baseDomain +
"/api/auth/callback/email?callbackUrl=" +
encodeURIComponent(baseDomain + "/cy") +
"&token=" +
searchParams.get("token") +
"&email=" +
encodeURIComponent(email) +
"&locale=" +
effectiveLocale
: url;
return appendParamsAndPathToNewUrl(url, newURL);
};
const authOptions = (req, res) => {
const locale = resolveLocale(req);
const requestLocale = resolveRequestLocale(req);
return {
providers: [
@@ -50,7 +103,10 @@ const authOptions = (req, res) => {
name: "emailAPI",
type: "email",
async sendVerificationRequest({ identifier: email, url }) {
const { host, protocol, searchParams } = new URL(url);
const effectiveLocale = await resolveEffectiveLocale(
req,
email
);
console.log(
"============================================================\n",
@@ -58,23 +114,11 @@ const authOptions = (req, res) => {
"============================================================\n"
);
const baseDomain = `${protocol}//${host}`;
const effectiveLocale = resolveLocale(req);
const newURL =
effectiveLocale === "cy"
? baseDomain +
"/api/auth/callback/email?callbackUrl=" +
encodeURIComponent(baseDomain + "/cy") +
"&token=" +
searchParams.get("token") +
"&email=" +
encodeURIComponent(email) +
"&locale=" +
effectiveLocale
: url;
const formURL = appendParamsAndPathToNewUrl(url, newURL);
const formURL = buildLocalizedVerificationUrl({
url,
email,
effectiveLocale
});
console.log(
"============================================================\n",
@@ -90,12 +134,13 @@ const authOptions = (req, res) => {
EmailProvider({
maxAge: 2 * 60 * 60,
async sendVerificationRequest({ identifier: email, url }) {
const { host, protocol, searchParams } = new URL(url);
const baseDomain = `${protocol}//${host}`;
const templateId = "b1b5704b-9bb8-4deb-a75c-d887ca902661";
const templateIdcy = "0614ce53-cd5f-421f-a1a5-8c8486a9113a";
const effectiveLocale = resolveLocale(req);
const effectiveLocale = await resolveEffectiveLocale(
req,
email
);
console.log(
"============================================================\n",
@@ -103,20 +148,11 @@ const authOptions = (req, res) => {
"============================================================\n"
);
const newURL =
effectiveLocale === "cy"
? baseDomain +
"/api/auth/callback/email?callbackUrl=" +
encodeURIComponent(baseDomain + "/cy") +
"&token=" +
searchParams.get("token") +
"&email=" +
encodeURIComponent(email) +
"&locale=" +
effectiveLocale
: url;
const formURL = appendParamsAndPathToNewUrl(url, newURL);
const formURL = buildLocalizedVerificationUrl({
url,
email,
effectiveLocale
});
console.log(
"============================================================\n",
@@ -178,11 +214,11 @@ const authOptions = (req, res) => {
}
},
pages: {
signIn: (locale === "cy" ? "/cy" : "") + "/auth/signin",
error: (locale === "cy" ? "/cy" : "") + "/auth/error",
signIn: (requestLocale === "cy" ? "/cy" : "") + "/auth/signin",
error: (requestLocale === "cy" ? "/cy" : "") + "/auth/error",
verifyRequest:
(locale === "cy" ? "/cy" : "") + "/auth/verify-request",
newUser: (locale === "cy" ? "/cy" : "") + "/account/register"
(requestLocale === "cy" ? "/cy" : "") + "/auth/verify-request",
newUser: (requestLocale === "cy" ? "/cy" : "") + "/account/register"
},
callbacks: {
session: async (session, user) => {
@@ -196,9 +232,8 @@ const authOptions = (req, res) => {
if (url.startsWith("/")) return `${baseUrl}${url}`;
if (new URL(url).origin === baseUrl) return url;
const effectiveLocale = resolveLocale(req);
const newUrl =
effectiveLocale === "cy"
requestLocale === "cy"
? process.env.CY_API_ROOT
: process.env.NEXTAUTH_URL;