Fixed an issue with HMI not getting fetched correctly

src/api/hatAPI.ts

@@ -37,8 +37,8 @@ export const getPublicProfile = (path: string) => {
   return get<BundleValues>(path, { method: 'get', headers });
 };
 
-export const resetPassword = (resetToken: string, body: { newPassword: string }) => {
-  const path = `/control/v2/auth/passwordreset/confirm/${resetToken}`;
+export const resetPassword = (pda: string, resetToken: string, body: { newPassword: string }) => {
+  const path = `https://${pda}/control/v2/auth/passwordreset/confirm/${resetToken}`;
   const headers = { 'Content-Type': 'application/json' };
 
   return post(path, {}, { method: 'post', headers: headers, body: JSON.stringify(body) });

src/app/PrivateRoute.tsx

@@ -18,7 +18,7 @@ type Query = {
   redirect_uri?: string;
 };
 
-export function PrivateRoute({ children, newAuth, ...rest }: OwnProps) {
+export function PrivateRoute({ children, ...rest }: OwnProps) {
   const isAuthenticated = useSelector(selectIsAuthenticated);
   // TODO Add the type to the state useState<Query>
   const [query, setQuery] = useState({});
@@ -54,7 +54,7 @@ export function PrivateRoute({ children, newAuth, ...rest }: OwnProps) {
         ) : (
           <DelayedRedirect
             to={{
-              pathname: newAuth ? '/auth/login' : '/user/login',
+              pathname: '/auth/login',
               state: { from: location, query: query },
             }}
             delay={100}

src/features/applications/applicationsSlice.ts

@@ -97,11 +97,11 @@ export const getApplications = (): AppThunk => async (dispatch, getState) => {
 };
 
 export const getApplicationHmi =
-  (applicationId: string): AppThunk =>
+  (applicationId: string, pda: string): AppThunk =>
     async (dispatch) => {
       try {
         dispatch(setAppsHmiState('pending'));
-        const apps = await HatClientService.getInstance().getApplicationHmi(applicationId);
+        const apps = await HatClientService.getInstance().getApplicationHmi(applicationId, pda);
 
         if (apps?.parsedBody) {
           dispatch(setAppsHmi(apps.parsedBody));

src/features/authentication/AuthChangePassword.tsx

@@ -17,6 +17,9 @@ import {
 import FormatMessage from '../messages/FormatMessage';
 import { selectLanguage } from '../language/languageSlice';
 import { selectMessages } from '../messages/messagesSlice';
+import { isEmail } from "../../utils/validations";
+import { pdaLookupWithEmail } from "../../services/HattersService";
+import { PdaLookupResponse } from "../../types/Hatters";
 
 type Query = {
   email?: string;
@@ -45,6 +48,7 @@ export const AuthChangePassword: React.FC<ChangePasswordProps> = ({ passwordStre
   const [score, setScore] = useState(0);
   const [errorMessage, setErrorMessage] = useState('');
   const [errorSuggestion, setErrorSuggestion] = useState('');
+  const [lookupResponse, setLookupResponse] = useState<PdaLookupResponse | null>(null);
   const dispatch = useDispatch();
   const [openPopup, setOpenPopup] = useState(false);
   const [passwordMatch, setPasswordMatch] = useState<boolean | undefined>(undefined);
@@ -78,7 +82,11 @@ export const AuthChangePassword: React.FC<ChangePasswordProps> = ({ passwordStre
 
   const resetPasswordRequest = async () => {
     try {
-      const res = await resetPassword(resetToken, { newPassword: password });
+      const res = await resetPassword(
+        lookupResponse?.hatName + '.' + lookupResponse?.hatCluster,
+        resetToken,
+        { newPassword: password }
+      );
 
       if (res) {
         setSuccessfulResponse(new Date());
@@ -128,16 +136,33 @@ export const AuthChangePassword: React.FC<ChangePasswordProps> = ({ passwordStre
     }
   };
 
+  const getPdaDetails = async (emailAddress?: string) => {
+    try {
+      if (!emailAddress) return;
+
+      const res = await pdaLookupWithEmail(emailAddress);
+      if (res.parsedBody) {
+        setLookupResponse(res.parsedBody);
+      }
+    } catch (e) {
+      setErrorMessage(messages['ds.auth.error.oops']);
+    }
+  };
+
   useEffect(() => {
-    const { email, application_id } = queryString.parse(window.location.search) as Query;
-    setEmail(email || '');
+    const { email, application_id } = queryString.parse(location.search) as Query;
+    if (email && isEmail(email) && !lookupResponse) {
+      setEmail(email);
+      getPdaDetails(email);
+    }
 
-    if (!parentApp && application_id) {
-      dispatch(getApplicationHmi(application_id));
+    if (!parentApp && application_id && lookupResponse) {
+      dispatch(getApplicationHmi(application_id, lookupResponse?.hatName + '.' + lookupResponse?.hatCluster));
     } else {
       dispatch(setAppsHmiState('completed'));
     }
-  }, [dispatch, parentApp]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dispatch, parentApp, lookupResponse]);
 
   useEffect(() => {
     passwordMatchDebounce(password, passwordConfirm, score);

src/features/authentication/AuthLogin.tsx

@@ -62,7 +62,7 @@ const AuthLogin: React.FC = () => {
 
   const getPdaDetails = async () => {
     try {
-      if (!email) return;
+      if (!email) return history.replace('/');
 
       const res = await pdaLookupWithEmail(email);
 
@@ -128,12 +128,12 @@ const AuthLogin: React.FC = () => {
   };
 
   useEffect(() => {
-    if (applicationId && !parentApp) {
-      dispatch(getApplicationHmi(applicationId));
+    if (applicationId && lookupResponse && !parentApp) {
+      dispatch(getApplicationHmi(applicationId, lookupResponse?.hatName + '.' + lookupResponse?.hatCluster));
     } else {
       dispatch(setAppsHmiState('completed'));
     }
-  }, [dispatch, parentApp, applicationId]);
+  }, [dispatch, parentApp, applicationId, lookupResponse]);
 
   if (!lookupResponse) {
     return null;

src/features/authentication/AuthVerifyEmail.tsx

@@ -165,18 +165,18 @@ export const AuthVerifyEmail: React.FC<AuthVerifyEmailProps> = ({ passwordStreng
 
   useEffect(() => {
     const { email, application_id } = queryString.parse(location.search) as Query;
-    if (email && isEmail(email)) {
+    if (email && isEmail(email) && !lookupResponse) {
       setEmail(email);
       getPdaDetails(email);
     }
 
-    if (!parentApp && application_id) {
-      dispatch(getApplicationHmi(application_id));
+    if (!parentApp && application_id && lookupResponse) {
+      dispatch(getApplicationHmi(application_id, lookupResponse?.hatName + '.' + lookupResponse?.hatCluster));
     } else {
       dispatch(setAppsHmiState('completed'));
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dispatch, parentApp]);
+  }, [dispatch, parentApp, lookupResponse]);
 
   useEffect(() => {
     passwordMatchDebounce(password, passwordConfirm, score);

src/features/hat-login/HatLoginParamValidation.tsx

@@ -27,18 +27,18 @@ const HatLoginParamValidation: React.FC<Props> = (props) => {
     const applicationIdSafe = applicationId?.toLowerCase();
     const redirectParam = redirect_uri || redirect;
 
-    if (emailStored !== email) {
+    if (email && (emailStored !== email)) {
       dispatch(logoutUser());
       return;
     }
 
     if (!redirectParam) {
-      dispatch(setRedirectError('application_misconfigured', 'redirect_is_required '));
+      dispatch(setRedirectError('application_misconfigured', 'redirect_is_required'));
       return;
     }
 
     if (!applicationIdSafe) {
-      dispatch(setRedirectError('application_misconfigured', 'application_id_is_required '));
+      dispatch(setRedirectError('application_misconfigured', 'application_id_is_required'));
       return;
     }
 

src/services/HatClientService.ts

@@ -65,8 +65,8 @@ export class HatClientService {
     return get<HatApplication>(path, { method: 'get', headers: { 'x-auth-token': token } });
   }
 
-  public async getApplicationHmi(applicationId: string) {
-    const path = `${this.pathPrefix}/applications/${applicationId}/hmi`;
+  public async getApplicationHmi(applicationId: string, pda: string) {
+    const path = `https://${pda}${this.pathPrefix}/applications/${applicationId}/hmi`;
 
     return get<HatApplicationContent>(path);
   }