Moving removeUnauthorizedPathFromSession() to OIDCRedirect so the val…

…ue is cleared right after being used rather than on logout

src/components/OIDCRedirect.js

@@ -1,7 +1,9 @@
 import { withRouter, Redirect, useLocation } from 'react-router';
 import queryString from 'query-string';
 import { useStripes } from '../StripesContext';
-import { getUnauthorizedPathFromSession } from '../loginServices';
+import { getUnauthorizedPathFromSession, removeUnauthorizedPathFromSession } from '../loginServices';
+
+const unauthorizedPath = getUnauthorizedPathFromSession();
 
 /**
  * OIDCRedirect authenticated route handler for /oidc-landing.
@@ -29,8 +31,10 @@ const OIDCRedirect = () => {
 
   const getUrl = () => {
     if (stripes.okapi.authnUrl) {
-      const unauthorizedPath = getUnauthorizedPathFromSession();
-      if (unauthorizedPath) return unauthorizedPath;
+      if (unauthorizedPath) {
+        removeUnauthorizedPathFromSession();
+        return unauthorizedPath;
+      }
     }
 
     const params = getParams();

src/loginServices.js

@@ -514,9 +514,6 @@ export async function logout(okapiUrl, store) {
       localStorage.removeItem(SESSION_NAME);
       localStorage.removeItem(RTR_TIMEOUT_EVENT);
 
-      // Clear saved entry path so that subsequent logins will use default base URL.
-      removeUnauthorizedPathFromSession();
-
       store.dispatch(setIsAuthenticated(false));
       store.dispatch(clearCurrentUser());
       store.dispatch(clearOkapiToken());