(Component: ComponentType
) => { + return (props: P) => { + const languageState: LanguageState = useAppSelector((state) => state.language); + const languageCode = languageState.id; + const rawParams = useParams(); + const params = useMemo(() => rawParams, [rawParams]); + const navigate = useNavigate(); + + useEffect(() => { + const currentUrl = window.location.pathname; + if (languageCode && !currentUrl.includes(languageCode)) { + let newUrl = currentUrl; + + for (const param in params) { + if (params[param as keyof RouteParams]) { + newUrl = newUrl.replace(`:${param}`, params[param as keyof RouteParams] as string); + } + } + + newUrl = newUrl.replace(':language', languageCode); + + navigate(newUrl, { replace: true }); + } + }, [languageCode, navigate, params]); + + return ; + }; +}; + +export default withLanguageParam; diff --git a/met-web/src/routes/NotFound.tsx b/met-web/src/routes/NotFound.tsx index 6bf059988..b58a3b9d7 100644 --- a/met-web/src/routes/NotFound.tsx +++ b/met-web/src/routes/NotFound.tsx @@ -9,7 +9,6 @@ const listItemStyle = { marginBottom: 1 }; const marginStyle = { mr: 2 }; const tenantId = sessionStorage.getItem('tenantId'); -const LanguageId = sessionStorage.getItem('languageId'); const SuggestionsList = ({ translate }: { translate: (key: string) => string }) => ( @@ -18,7 +17,7 @@ const SuggestionsList = ({ translate }: { translate: (key: string) => string }) {translate('notFound.list.0')} {translate('notFound.list.1')}{' '} - + {translate('notFound.list.2')} {' '} {translate('notFound.list.3')} diff --git a/met-web/src/routes/UnauthenticatedRoutes.tsx b/met-web/src/routes/UnauthenticatedRoutes.tsx index b1ef03ef5..98fc9efeb 100644 --- a/met-web/src/routes/UnauthenticatedRoutes.tsx +++ b/met-web/src/routes/UnauthenticatedRoutes.tsx @@ -12,6 +12,17 @@ import ManageSubscription from '../components/engagement/view/widgets/Subscribe/ import { FormCAC } from 'components/FormCAC'; import ScrollToTop from 'components/scrollToTop'; import { RedirectLogin } from './RedirectLogin'; +import withLanguageParam from './LanguageParam'; + +const ManageSubscriptionWrapper = withLanguageParam(ManageSubscription); +const EngagementViewWrapper = withLanguageParam(EngagementView); +const PublicDashboardWrapper = withLanguageParam(PublicDashboard); +const EngagementCommentsWrapper = withLanguageParam(EngagementComments); +const EditSurveyWrapper = withLanguageParam(EditSurvey); +const SurveySubmitWrapper = withLanguageParam(SurveySubmit); +const FormCACWrapper = withLanguageParam(FormCAC); +const RedirectLoginWrapper = withLanguageParam(RedirectLogin); + const UnauthenticatedRoutes = () => { return ( <> @@ -19,20 +30,26 @@ const UnauthenticatedRoutes = () => { } /> } + path="/engagements/:engagementId/:subscriptionStatus/:scriptionKey/:language" + element={} + /> + } /> + } /> + } + /> + } /> + } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> + } /> + } /> + } /> + } /> + } /> + } /> } /> } /> } /> diff --git a/met-web/src/services/userService/index.ts b/met-web/src/services/userService/index.ts index d1dacefee..526752648 100644 --- a/met-web/src/services/userService/index.ts +++ b/met-web/src/services/userService/index.ts @@ -98,7 +98,7 @@ const refreshToken = (dispatch: Dispatch) => { }, 60000); }; -const doLogin = (redirectUri?: string) => KeycloakData.login({ redirectUri: (redirectUri ?? getBaseUrl()) + '/' }); +const doLogin = (redirectUri?: string) => KeycloakData.login({ redirectUri: redirectUri ?? getBaseUrl() }); const doLogout = async () => { // Remove tokens from session storage @@ -108,11 +108,10 @@ const doLogout = async () => { sessionStorage.removeItem('refreshToken'); clearInterval(refreshInterval); const baseURL = getBaseUrl(); - const language = sessionStorage.getItem('languageId'); // Check if the ID token is available and pass it as id_token_hint const logoutOptions = { - redirectUri: `${baseURL}/${language}`, + redirectUri: `${baseURL}`, id_token_hint: idToken, };