Merge pull request #109 from cesmii/main

Main -> develop - Azure AD login loop fix

Author: scoxen1

frontend/public/index.html

@@ -6,6 +6,8 @@
     <meta name="theme-color" content="#000000" />
     <meta name="description"
           content="The Profile Designer allows disparate manufacturers and engineers to build manufacturing profiles that could be shared amongst a community of smart manufacturing entities. The profile is a class definition (or collection of class definitions) describing a piece of manufacturing equipment (or conceivably, a manufacturing process or manufactured good). Profiles have relationships to other profiles within the scope of the user's work context. These relationships are of the kinds typically seen in a UML (Unified Modeling Language) diagram, including inheritance, aggregation (or composition), interface implementation, and dependency." />
+    <meta http-equiv="Cache-Control" content="max-age: 3600, no-cache, no-store, must-revalidate">
+    <meta http-equiv="Pragma" content="no-cache">
     <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.png" sizes="32x32">
     <link rel="icon" href="%PUBLIC_URL%/CESMII-Icon-192x192.png" sizes="192x192">

frontend/src/components/OnLoginHandler.js

@@ -361,8 +361,21 @@ export const handleMSALEvent = (message, setLoadingProps) => {
                     prompt: 'select_account'  //always present the account selection - even if already logged in cached.
                 };
 
-                Msal_Instance.acquireTokenRedirect(loginRequest);
                 console.error(generateLogMessageString(`handleMSALEvent||${message.eventType}||${message.error}`, CLASS_NAME));
+
+                //if it is a token failure AND the interaction mode is silent, it will go into a 
+                //loop of trying to login, failing, trying to login, failing, etc. 
+                //it seems to happen when the access token expires and then the site cannot get a 
+                //refresh token from the server. 
+                //break the cycle by forcing a logout, then starting fresh.
+                if (message.interactionType === InteractionType.Silent) {
+                    forceLogout(instance);
+                    //instance.loginRedirect(loginRequest);
+                }
+                else {
+                    instance.acquireTokenRedirect(loginRequest);
+                }
+
             }
             else {
                 handleLoginError(message.error, setLoadingProps);