Fixed an issue with HMI not getting fetched correctly

src/api/hatAPI.ts

@@ -23,11 +23,10 @@ export const newUserAccessToken = (pda: string, username: string, password: stri
   return get<{ accessToken: string }>(path, { headers: headers });
 };
 
-export const recoverPassword = (body: { email: string }) => {
-  const path = `/control/v2/auth/passwordReset`;
+export const recoverPassword = (pda: string, body: { email: string }) => {
+  const path = `https://${pda}/control/v2/auth/passwordReset`;
   const headers = { 'Content-Type': 'application/json' };
 
-  //todo create new post function to accept headers, body
   return post(path, {}, { method: 'post', headers: headers, body: JSON.stringify(body) });
 };
 
@@ -37,8 +36,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/AppRouter.tsx

@@ -27,14 +27,6 @@ const HatClaim = React.lazy(
     ),
 );
 
-const Login = React.lazy(
-  () =>
-    import(
-      /* webpackChunkName: "user_login" */
-      '../components/user/Login'
-    ),
-);
-
 const Feed = React.lazy(
   () =>
     import(
@@ -51,14 +43,6 @@ const HatLogin = React.lazy(
     ),
 );
 
-const PasswordRecover = React.lazy(
-  () =>
-    import(
-      /* webpackChunkName: "password_recover" */
-      '../components/user/PasswordRecover'
-    ),
-);
-
 const AuthLogin = React.lazy(
   () =>
     import(
@@ -181,18 +165,6 @@ const AppRouter = () => (
           <LandingLoginPage />
         </LayoutRoute>
 
-        <LayoutRoute path="/hat/claim/:claimToken">
-          <HatClaim />
-        </LayoutRoute>
-
-        <LayoutRoute path="/user/login/">
-          <Login />
-        </LayoutRoute>
-
-        <LayoutRoute path="/user/password/recover">
-          <PasswordRecover />
-        </LayoutRoute>
-
         <LayoutRoute path="/auth/login" issuedByFooter footerBackgroundColor="#fff">
           <AuthLogin />
         </LayoutRoute>
@@ -209,14 +181,30 @@ const AppRouter = () => (
           <AuthVerifyEmail />
         </LayoutRoute>
 
-        <PrivateLayoutRoute path={'/hatlogin'}>
-          <HatLogin />
-        </PrivateLayoutRoute>
-
         <PrivateLayoutRoute path={'/auth/oauth'} newAuth issuedByFooter footerBackgroundColor="#fff">
           <Oauth />
         </PrivateLayoutRoute>
 
+
+        {/*
+          The following routes are deprecated.
+        */}
+        <LayoutRoute path="/hat/claim/:claimToken">
+          <HatClaim />
+        </LayoutRoute>
+
+        <LayoutRoute path="/user/login/">
+          <AuthLogin />
+        </LayoutRoute>
+
+        <LayoutRoute path="/user/password/recover">
+          <AuthRecoverPassword />
+        </LayoutRoute>
+
+        <PrivateLayoutRoute path={'/hatlogin'}>
+          <HatLogin />
+        </PrivateLayoutRoute>
+
         <PrivateLayoutRoute path={'/hat-setup-login'}>
           <HatLogin />
         </PrivateLayoutRoute>

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/components/Landing/LandingLoginView.tsx

@@ -4,12 +4,13 @@ import { Input } from 'hmi';
 import { pdaLookupWithEmail } from '../../services/HattersService';
 import { PdaLookupResponse } from '../../types/Hatters';
 import { config } from '../../app.config';
-import { useHistory } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 import { newUserAccessToken } from '../../api/hatAPI';
 import { loginWithToken } from '../../features/authentication/authenticationSlice';
 import { HatClientService } from '../../services/HatClientService';
 import Cookies from 'js-cookie';
 import { useDispatch } from 'react-redux';
+import FormatMessage from "../../features/messages/FormatMessage";
 
 const LandingLoginView: React.FC = () => {
   const history = useHistory();
@@ -101,6 +102,10 @@ const LandingLoginView: React.FC = () => {
           <button className="ds-hmi-btn ds-hmi-btn-primary" onClick={onLogin}>
             Login
           </button>
+
+          <Link className={'auth-login-btn-link'} to={'/auth/recover-password'}>
+            <FormatMessage id={'ds.auth.login.forgotPassword'} />
+          </Link>
         </>
       )}