feat: add accounnt and profile urls in env files

.env

@@ -7,6 +7,8 @@ DISCOVERY_API_BASE_URL=''
 ECOMMERCE_BASE_URL=''
 ENABLE_DEMOGRAPHICS_COLLECTION=''
 FAVICON_URL=''
+ACCOUNT_SETTINGS_URL=''
+ACCOUNT_PROFILE_URL=''
 LANGUAGE_PREFERENCE_COOKIE_NAME=''
 LMS_BASE_URL=''
 LOGIN_URL=''

.env.development

@@ -6,6 +6,8 @@ DEMOGRAPHICS_BASE_URL='http://localhost:18360'
 DISCOVERY_API_BASE_URL=''
 ECOMMERCE_BASE_URL='http://localhost:18130'
 ENABLE_DEMOGRAPHICS_COLLECTION=''
+ACCOUNT_SETTINGS_URL=http://localhost:1997
+ACCOUNT_PROFILE_URL=http://localhost:1995
 FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'

.env.test

@@ -4,6 +4,8 @@ CREDENTIALS_BASE_URL='http://localhost:18150'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
 DEMOGRAPHICS_BASE_URL='http://localhost:18360'
 DISCOVERY_API_BASE_URL=''
+ACCOUNT_SETTINGS_URL='http://localhost:1997'
+ACCOUNT_PROFILE_URL='http://localhost:1995'
 ECOMMERCE_BASE_URL='http://localhost:18130'
 ENABLE_DEMOGRAPHICS_COLLECTION=''
 FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico

src/account-settings/name-change/NameChange.jsx

@@ -69,7 +69,7 @@ const NameChangeModal = ({
   useEffect(() => {
     if (saveState === 'complete') {
       handleClose();
-      navigate(`/id-verification?next=${encodeURIComponent('account/settings')}`);
+      navigate(`/id-verification?next=${encodeURIComponent('/')}`);
     }
   }, [handleClose, navigate, saveState]);
 

src/hooks.js

@@ -36,17 +36,20 @@ export function useAsyncCall(asyncFunc) {
 export function useRedirect() {
   const [redirect, setRedirect] = useState({
     location: 'dashboard',
+    isAccountMFERedirect: false,
     text: 'id.verification.return.dashboard',
   });
 
   useEffect(() => {
     if (sessionStorage.getItem('courseId')) {
       setRedirect({
+        isAccountMFERedirect: false,
         location: `courses/${sessionStorage.getItem('courseId')}`,
         text: 'id.verification.return.course',
       });
     } else if (sessionStorage.getItem('next')) {
       setRedirect({
+        isAccountMFERedirect: true,
         location: sessionStorage.getItem('next'),
         text: 'id.verification.return.generic',
       });

src/id-verification/panels/SubmittedPanel.jsx

@@ -12,8 +12,9 @@ import BasePanel from './BasePanel';
 
 const SubmittedPanel = (props) => {
   const { userId } = useContext(IdVerificationContext);
-  const { location: returnUrl, text: returnText } = useRedirect();
+  const { location: returnUrl, text: returnText, isAccountMFERedirect } = useRedirect();
   const panelSlug = 'submitted';
+  const URL = isAccountMFERedirect ? returnUrl : `${getConfig().LMS_BASE_URL}/${returnUrl}`;
 
   useEffect(() => {
     sendTrackEvent('edx.id_verification.submitted', {
@@ -32,7 +33,7 @@ const SubmittedPanel = (props) => {
       </p>
       <a
         className="btn btn-primary"
-        href={`${getConfig().LMS_BASE_URL}/${returnUrl}`}
+        href={URL}
         data-testid="return-button"
       >
         {props.intl.formatMessage(messages[returnText])}

src/id-verification/tests/panels/SubmittedPanel.test.jsx

@@ -82,6 +82,6 @@ describe('SubmittedPanel', () => {
     )));
     const button = await screen.findByTestId('return-button');
     expect(button).toHaveTextContent(/Return/);
-    expect(button).toHaveAttribute('href', `${process.env.LMS_BASE_URL}/some_page`);
+    expect(button).toHaveAttribute('href', 'some_page');
   });
 });