rebase-cleanup: restore logout AND ITS TESTS

CHANGELOG.md

@@ -2,20 +2,26 @@
 
 ## 10.2.0 IN PROGRESS
 
-* Utilize the `tenant` procured through the SSO login process. Refs STCOR-769.
 * Remove tag-based selectors from Login, ResetPassword, Forgot UserName/Password form CSS. Refs STCOR-712.
-* Provide `useUserTenantPermissions` hook. Refs STCOR-830.
-* Load DayJS locale data as part of `loginServices`. STCOR-771.
-* Turn on `<StrictMode>`; ignore it with `stripes.config.js` `disableStrictMode: true`. Refs STCOR-841.
-* Make branding optional. Refs STCOR-847.
-* Idle-session timeout and "Keep working?" modal. Refs STCOR-776.
+* Utilize the `tenant` procured through the SSO login process. Refs STCOR-769.
 * Use keycloak URLs in place of users-bl for tenant-switch. Refs US1153537.
+* Provide `useUserTenantPermissions` hook. Refs STCOR-830.
 * Fix 404 error page when logging in after changing password in Eureka. Refs STCOR-845.
 
 ## [10.1.1](https://github.com/folio-org/stripes-core/tree/v10.1.1) (2024-03-25)
 [Full Changelog](https://github.com/folio-org/stripes-core/compare/v10.1.0...v10.1.1)
 
+## [10.1.1](https://github.com/folio-org/stripes-core/tree/v10.1.1) (2024-03-25)
+[Full Changelog](https://github.com/folio-org/stripes-core/compare/v10.1.0...v10.1.1)
+
 * Utilize the `tenant` procured through the SSO login process. Refs STCOR-769.
+* Remove tag-based selectors from Login, ResetPassword, Forgot UserName/Password form CSS. Refs STCOR-712.
+* Provide `useUserTenantPermissions` hook. Refs STCOR-830.
+* Load DayJS locale data as part of `loginServices`. STCOR-771.
+* Turn on `<StrictMode>`; ignore it with `stripes.config.js` `disableStrictMode: true`. Refs STCOR-841.
+* Use keycloak URLs in place of users-bl for tenant-switch. Refs US1153537.
+* Make branding optional. Refs STCOR-847.
+* Idle-session timeout and "Keep working?" modal. Refs STCOR-776.
 
 ## [10.1.0](https://github.com/folio-org/stripes-core/tree/v10.1.0) (2024-03-12)
 [Full Changelog](https://github.com/folio-org/stripes-core/compare/v10.0.0...v10.1.0)

src/RootWithIntl.js

@@ -27,6 +27,7 @@ import {
   Settings,
   HandlerManager,
   TitleManager,
+  Login,
   Logout,
   LogoutTimeout,
   OverlayContainer,
@@ -40,7 +41,6 @@ import {
 import StaleBundleWarning from './components/StaleBundleWarning';
 import { StripesContext } from './StripesContext';
 import { CalloutContext } from './CalloutContext';
-import AuthnLogin from './components/AuthnLogin';
 
 const RootWithIntl = ({ stripes, token = '', isAuthenticated = false, disableAuth, history = {} }) => {
   const connect = connectFor('@folio/core', stripes.epics, stripes.logger);
@@ -163,7 +163,11 @@ const RootWithIntl = ({ stripes, token = '', isAuthenticated = false, disableAut
                       />
                       <TitledRoute
                         name="login"
-                        component={<AuthnLogin stripes={connectedStripes} />}
+                        component={
+                          <Login
+                            autoLogin={connectedStripes.config.autoLogin}
+                            stripes={connectedStripes}
+                          />}
                       />
                     </Switch>
                   }

src/RootWithIntl.test.js

@@ -8,9 +8,9 @@
 import { Login } from './components';
 import PreLoginLanding from './components/PreLoginLanding';
 
-// import {
-//   renderLogoutComponent
-// } from './RootWithIntl';
+import {
+  renderLogoutComponent
+} from './RootWithIntl';
 
 import AuthnLogin from './components/AuthnLogin';
 
@@ -54,12 +54,12 @@
     });
   });
 
-  // describe('renderLogoutComponent', () => {
-  //   it('handles legacy logout', () => {
-  //     const stripes = { okapi: {}, config: {} };
-  //     render(renderLogoutComponent(stripes));
+  describe('renderLogoutComponent', () => {
+    it('handles legacy logout', () => {
+      const stripes = { okapi: {}, config: {} };
+      render(renderLogoutComponent(stripes));
 
-  //     expect(screen.getByText(/<internalredirect>/)).toBeInTheDocument();
-  //   });
-  // });
+      expect(screen.getByText(/<internalredirect>/)).toBeInTheDocument();
+    });
+  });
 });

src/components/LogoutTimeout/LogoutTimeout.js

@@ -44,12 +44,12 @@ const LogoutTimeout = () => {
           </Row>
           <Row center="xs">
             <Col xs={12}>
-              <Headline size="large"><FormattedMessage id="stripes-core.rtr.idleSession.sessionExpiredSoSad" /></Headline>
+              <Headline size="large"><FormattedMessage id="rtr.idleSession.sessionExpiredSoSad" /></Headline>
             </Col>
           </Row>
           <Row center="xs">
             <Col xs={12}>
-              <Button to="/"><FormattedMessage id="stripes-core.rtr.idleSession.logInAgain" /></Button>
+              <Button to="/"><FormattedMessage id="rtr.idleSession.logInAgain" /></Button>
             </Col>
           </Row>
         </div>

src/components/LogoutTimeout/LogoutTimeout.test.js

@@ -16,7 +16,7 @@ describe('LogoutTimeout', () => {
     mockUseStripes.mockReturnValue({ okapi: { isAuthenticated: false } });
 
     render(<LogoutTimeout />);
-    screen.getByText('stripes-core.rtr.idleSession.sessionExpiredSoSad');
+    screen.getByText('rtr.idleSession.sessionExpiredSoSad');
   });
 
   it('if authenticated, renders a redirect', async () => {

src/components/MainNav/MainNav.js

@@ -116,6 +116,14 @@ class MainNav extends Component {
     });
   }
 
+  // Return the user to the login screen, but after logging in they will return to their previous activity.
+  returnToLogin() {
+    const { okapi } = this.store.getState();
+
+    return getLocale(okapi.url, this.store, okapi.tenant)
+      .then(sessionLogout(okapi.url, this.store));
+  }
+
   // return the user to the login screen, but after logging in they will be brought to the default screen.
   logout() {
     const { okapi } = this.store.getState();

src/components/Root/FXHR.test.js

@@ -1,5 +1,6 @@
 import { rtr } from './token-util';
 import { getTokenExpiry } from '../../loginServices';
+import { RTRError } from './Errors';
 import FXHR from './FXHR';
 
 jest.mock('./token-util', () => ({

src/components/Root/Root.js

@@ -21,7 +21,7 @@
 import createApolloClient from '../../createApolloClient';
 import createReactQueryClient from '../../createReactQueryClient';
 import { setSinglePlugin, setBindings, setIsAuthenticated, setOkapiToken, setTimezone, setCurrency, updateCurrentUser } from '../../okapiActions';
-import { loadTranslations, checkOkapiSession } from '../../loginServices';
+import { loadTranslations, checkOkapiSession, addRtrEventListeners } from '../../loginServices';
 import { getQueryResourceKey, getCurrentModule } from '../../locationService';
 import Stripes from '../../Stripes';
 import RootWithIntl from '../../RootWithIntl';

src/components/Root/token-util.js

@@ -65,7 +65,6 @@ export const resourceMapper = (resource, fx) => {
 export const isAuthenticationRequest = (resource, oUrl) => {
   const isPermissibleResource = (string) => {
     const permissible = [
-      '/authn/token',
       '/bl-users/login-with-expiry',
       '/bl-users/_self',
     ];

src/components/Root/token-util.test.js

@@ -1,3 +1,4 @@
+import { waitFor } from '@folio/jest-config-stripes/testing-library/react';
 import { RTRError, UnexpectedResourceError } from './Errors';
 import {
   configureRtr,

src/discoverServices.js

@@ -114,21 +114,18 @@
             return Promise.all(list);
           }
 
-          // eslint-disable-next-line no-console
           console.error(`>>> NO APPLICATIONS AVAILABLE FOR ${okapi.tenant}`, json);
           store.dispatch({ type: 'DISCOVERY_FAILURE', code: response.status });
           throw response;
         });
       } else {
-        // eslint-disable-next-line no-console
         console.error(`>>> COULD NOT RETRIEVE APPLICATIONS FOR ${okapi.tenant}`, response);
         store.dispatch({ type: 'DISCOVERY_FAILURE', code: response.status });
         throw response;
       }
     })
     .catch(reason => {
-      // eslint-disable-next-line no-console
       console.error(`@@ COULD NOT RETRIEVE APPLICATIONS FOR ${okapi.tenant}`, reason);
       store.dispatch({ type: 'DISCOVERY_FAILURE', message: reason });
     });
 }

src/loginServices.js

@@ -111,18 +111,6 @@
   return localforage.setItem(SESSION_NAME, val);
 };
 
-/**
- * removeUnauthorizedPathFromSession, setUnauthorizedPathToSession, getUnauthorizedPathFromSession
- * remove/set/get unauthorized_path to/from session storage.
- * Used to restore path on returning from login if user accessed a bookmarked
- * URL while unauthenticated and was redirected to login.
- *
- * @see components/OIDCRedirect
- */
-const UNAUTHORIZED_PATH = 'unauthorized_path';
-export const removeUnauthorizedPathFromSession = () => sessionStorage.removeItem(UNAUTHORIZED_PATH);
-export const setUnauthorizedPathToSession = (pathname) => sessionStorage.setItem(UNAUTHORIZED_PATH, pathname);
-export const getUnauthorizedPathFromSession = () => sessionStorage.getItem(UNAUTHORIZED_PATH);
 
 // export config values for storing user locale
 export const userLocaleConfig = {
@@ -478,12 +466,10 @@
     fetch(`${okapiUrl}/authn/logout`, {
       method: 'POST',
       mode: 'cors',
-      credentials: 'include',
-      headers: getHeaders(store.getState()?.okapi?.tenant),
+      credentials: 'include'
     })
     :
     Promise.resolve();
-
   return logoutPromise
     // clear private-storage
     .then(() => {
@@ -537,6 +523,8 @@
  * @returns {Promise}
  */
 export function createOkapiSession(store, tenant, token, data) {
+  // @@ new StripesSession(store, data);
+
   // clear any auth-n errors
   store.dispatch(setAuthError(null));
 
@@ -552,7 +540,7 @@
   // which doesn't provide it, then set an invalid AT value and a near-future (+10 minutes) RT value.
   // the invalid AT will prompt an RTR cycle which will either give us new AT/RT values
   // (if the RT was valid) or throw an RTR_ERROR (if the RT was not valid).
   const tokenExpiration = {
     atExpires: data.tokenExpiration?.accessTokenExpiration ? new Date(data.tokenExpiration.accessTokenExpiration).getTime() : -1,
     rtExpires: data.tokenExpiration?.refreshTokenExpiration ? new Date(data.tokenExpiration.refreshTokenExpiration).getTime() : Date.now() + (10 * 60 * 1000),
   };
@@ -564,7 +552,6 @@
     user,
     perms,
     tenant: sessionTenant,
-    tokenExpiration,
   };
 
   // localStorage events emit across tabs so we can use it like a
@@ -609,6 +596,41 @@
     });
 }
 
+/**
+ * handleRtrError
+ * Clear out the redux store and logout.
+ *
+ * @param {*} event
+ * @param {*} store
+ * @returns void
+ */
+export const handleRtrError = (event, store) => {
+  logger.log('rtr', 'rtr error; logging out', event.detail);
+  store.dispatch(setIsAuthenticated(false));
+  store.dispatch(clearCurrentUser());
+  store.dispatch(resetStore());
+  localforage.removeItem(SESSION_NAME)
+    .then(localforage.removeItem('loginResponse'));
+};
+
+/**
+ * addRtrEventListeners
+ * RTR_ERROR_EVENT: RTR error, logout
+ * RTR_ROTATION_EVENT: configure a timer for auto-logout
+ *
+ * @param {*} okapiConfig
+ * @param {*} store
+ */
+export function addRtrEventListeners(okapiConfig, store) {
+  document.addEventListener(RTR_ERROR_EVENT, (e) => {
+    handleRtrError(e, store);
+  });
+
+  // document.addEventListener(RTR_ROTATION_EVENT, (e) => {
+  //   handleRtrRotation(e, store);
+  // });
+}
+
 /**
  * getSSOEnabled
  * return a promise that fetches from /saml/check and dispatches checkSSO.
@@ -952,9 +974,9 @@
  *
  * @returns {Promise}
  */
-export async function updateTenant(okapiConfig, tenant) {
+export async function updateTenant(okapi, tenant) {
   const okapiSess = await getOkapiSession();
-  const userWithPermsResponse = await fetchUserWithPerms(okapiConfig.url, tenant, okapiConfig.token);
+  const userWithPermsResponse = await fetchUserWithPerms(okapi.url, tenant, okapi.token);
   const userWithPerms = await userWithPermsResponse.json();
   await localforage.setItem(SESSION_NAME, { ...okapiSess, tenant, ...spreadUserWithPerms(userWithPerms) });
 }

src/loginServices.test.js

@@ -1,4 +1,5 @@
 import localforage from 'localforage';
+import { config } from 'stripes-config';
 
 import {
   createOkapiSession,
@@ -475,6 +476,7 @@
       global.fetch = jest.fn().mockImplementation(() => Promise.resolve());
       const store = {
         dispatch: jest.fn(),
+        getState: jest.fn(),
       };
       window.sessionStorage.clear();
 
@@ -496,6 +498,7 @@
       localStorage.setItem(SESSION_NAME, 'true');
       const store = {
         dispatch: jest.fn(),
+        getState: jest.fn(),
       };
       window.sessionStorage.clear();
 

src/okapiReducer.test.js

@@ -13,7 +13,7 @@
         rtrModalIsVisible: true,
         rtrTimeout: 123,
       };
-      const ct = jest.spyOn(window, 'clearTimeout');
+      const ct = jest.spyOn(window, 'clearTimeout')
       const o = okapiReducer(state, { type: 'SET_IS_AUTHENTICATED', isAuthenticated: false });
       expect(o.isAuthenticated).toBe(false);
       expect(o.rtrModalIsVisible).toBe(false);

yarn.lock

@@ -1581,10 +1581,11 @@
     webpack-bundle-analyzer "^4.4.2"
     yargs "^17.3.1"
 
-"@folio/stripes-components@^12.2.0":
-  version "12.2.1000004329"
-  resolved "https://repository.folio.org/repository/npm-folioci/@folio/stripes-components/-/stripes-components-12.2.1000004329.tgz#87b8c3c508b055ccaa92613b8cca46531973eaf2"
-  integrity sha512-EZh2OJ99xCzIy1nmZebkF+ezr5rdWrx0MVTh7F5HFoZ3zDhvH4cf8abukghMXDbQFXf91Ybaei7WIblGf3/65A==
+"@folio/stripes-components@^12.0.0":
+  version "12.2.1000004277"
+  resolved "https://repository.folio.org/repository/npm-folioci/@folio/stripes-components/-/stripes-components-12.2.1000004277.tgz#c49e1bc61b9e629705ce5d562c33800879d9f156"
+  integrity sha512-3Y724MLT+dsmHg8EBdaSXzRH+SOzE/z2g46GK4k0QTHOZsp3QkehmsV5KwmnRbTpENe/e4X9HLaZiout5fzPVg==
+
   dependencies:
     "@csstools/postcss-global-data" "^2.1.1"
     "@folio/stripes-react-hotkeys" "^3.0.5"
@@ -6943,13 +6944,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
-inactivity-timer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/inactivity-timer/-/inactivity-timer-1.0.0.tgz#054bf48274efea5c82713cb051b945fb42ec59bb"
-  integrity sha512-kxWME4cNy0TKfy9wwJ2L3oCV1JDFQTPGtYdw3Zvpiv5GbZwfnCwfESJgM1MQaYcrzLYOziiU3YEAgWOafL7Kdw==
-  dependencies:
-    ms "^2.1.1"
-
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
@@ -8893,7 +8887,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -9564,6 +9558,22 @@ possible-typed-array-names@^1.0.0:
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
   integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
 
+postcss-calc@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6"
+  integrity sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==
+  dependencies:
+    postcss-selector-parser "^6.0.11"
+    postcss-value-parser "^4.2.0"
+
+postcss-color-function@folio-org/postcss-color-function:
+  version "4.1.0"
+  resolved "https://codeload.github.com/folio-org/postcss-color-function/tar.gz/c128aad740ae740fb571c4b6493f467dd51efe85"
+  dependencies:
+    css-color-function "~1.3.3"
+    postcss-message-helpers "^2.0.0"
+    postcss-value-parser "^4.1.0"
+
 postcss-custom-media@^9.0.1:
   version "9.1.5"
   resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-9.1.5.tgz#20c5822dd15155d768f8dd84e07a6ffd5d01b054"