diff --git a/docs/auth/autologout.md b/docs/auth/autologout.md index 2ba42fa1dc..1c20f3f613 100644 --- a/docs/auth/autologout.md +++ b/docs/auth/autologout.md @@ -22,7 +22,7 @@ This is how it looks like: ## Quick start -To enable and configure Auto Logout, you will need to add the `` component to your Backstage's instance entry point, located at `App.tsx`. +To enable and configure Auto Logout, you will need to add the `` component to your Backstage's instance entry point, located at `App.tsx`. Here's how to add it: @@ -34,9 +34,10 @@ import { AutoLogoutProvider } from '@backstage/core-components'; export default app.createRoot( <> // ... - + + {routes} - + // ... , ); @@ -44,39 +45,17 @@ export default app.createRoot( ## Configuration -You can further adjust the Auto Logout settings by tweaking the available `` properties: +You can further adjust the Auto Logout settings by tweaking the available `` properties: ```ts - - {routes} - +/> ``` -If you prefer to have different settings for each Backstage instance deployed at your infrastructure, you can instead leverage the `` which reads the Auto Logout settings from `app-config`. - -To do so, adjust your `App.tsx` as follows: - -```ts -import { ConfigBasedAutoLogoutProvider } from '@backstage/core-components'; - -// ... App.tsx contents - -export default app.createRoot( - <> - // ... - - {routes} - - // ... - , -); -``` - -And add these lines into your `app-config`: +If you prefer to have different settings for each Backstage instance deployed at your infrastructure, you can instead leverage your `app-config` and place some configuration properties: ```yaml auth: @@ -84,13 +63,13 @@ auth: enabled: true ``` +Bear in mind that, in case the same property is found both in the `` component and the `app-config` file then the properties set in the React component take precedence over configuration properties found inside your `app-config`. You will now be able to configure the AutoLogoutProvider through your `app-config`. These are the available settings: -| Configuration Key | Component Property | Description | Allowed Values | Default Value | -| ----------------------------------------- | ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `auth.autologout.enabled` | `enabled` | Enable/disable the Auto Logout feature. | `true`/`false` | With `` default is enabled (`true`). With `` default is disabled (`false`) | -| `auth.autologout.idleTimeoutMinutes` | `idleTimeoutMinutes` | Sets the idle time (in minutes) after which the user will be logged out. | `>= 0.5` minutes | `60` | -| `auth.autologout.promptBeforeIdleSeconds` | `promptBeforeIdleSeconds` | Determines the time (in seconds) prior to idle state when a prompt will appear. A value of 0 disables the prompt. This must be less than the value of `idleTimeoutMinutes`. | `>= 0` seconds | `10` | -| `auth.autologout.events` | `events` | Specifies the list of events used to detect user activity. | Allowed values are standard [DOM events](https://developer.mozilla.org/en-US/docs/Web/Events) | `'mousemove', 'keydown', 'wheel', 'DOMMouseScroll', 'mousewheel', 'mousedown', 'touchstart' 'touchmove', 'MSPointerDown', 'MSPointerMove', 'visibilitychange'` | -| `auth.autologout.useWorkerTimers` | `useWorkerTimers` | Enables or disables the use of Node's worker thread timers instead of main thread timers. This can be beneficial if the browser is terminating timers in inactive tabs, like those used by auto logout. In case of browser incompatibility, try setting this to false. | `true`/`false` | `true` | -| `auth.autologout.logoutIfDisconnected` | `logoutIfDisconnected` | Enable/disable auto logout for disconnected users. Disconnected users are those who are logged in but do not have any active Backstage tabs open in their browsers. If enabled, such users will be automatically logged out after `idleTimeoutMinutes`. | `true`/`false` | `true` | +| Configuration Key | Component Property | Description | Allowed Values | Default Value | +| ----------------------------------------- | ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------- | ----------------------------------------------------------------------------------------------------------------------------- | +| `auth.autologout.enabled` | `enabled` | Enable/disable the Auto Logout feature. | `true`/`false` | With `` default is enabled (`true`). With `` default is disabled (`false`) | +| `auth.autologout.idleTimeoutMinutes` | `idleTimeoutMinutes` | Sets the idle time (in minutes) after which the user will be logged out. | `>= 0.5` minutes | `60` | +| `auth.autologout.promptBeforeIdleSeconds` | `promptBeforeIdleSeconds` | Determines the time (in seconds) prior to idle state when a prompt will appear. A value of 0 disables the prompt. This must be less than the value of `idleTimeoutMinutes`. | `>= 0` seconds | `10` | +| `auth.autologout.useWorkerTimers` | `useWorkerTimers` | Enables or disables the use of Node's worker thread timers instead of main thread timers. This can be beneficial if the browser is terminating timers in inactive tabs, like those used by auto logout. In case of browser incompatibility, try setting this to false. | `true`/`false` | `true` | +| `auth.autologout.logoutIfDisconnected` | `logoutIfDisconnected` | Enable/disable auto logout for disconnected users. Disconnected users are those who are logged in but do not have any active Backstage tabs open in their browsers. If enabled, such users will be automatically logged out after `idleTimeoutMinutes`. | `true`/`false` | `true` | diff --git a/packages/core-components/config.d.ts b/packages/core-components/config.d.ts index a10d84f232..fac678ef2a 100644 --- a/packages/core-components/config.d.ts +++ b/packages/core-components/config.d.ts @@ -49,13 +49,6 @@ export interface Config { */ useWorkerTimers?: boolean; - /** - * List of events that the autologout event listener will catch to detect if the user is active - * These events are standard DOM events. - * @visibility frontend - */ - events?: string[]; - /** * Enable/disable the automatic logout also on users that are logged in but with no Backstage tabs open. * Default is true. diff --git a/packages/core-components/package.json b/packages/core-components/package.json index a25999c2b3..202d558e46 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -110,11 +110,5 @@ "dist", "config.d.ts" ], - "configSchema": "config.d.ts", - "jest": { - "resetMocks": false, - "setupFiles": [ - "jest-localstorage-mock" - ] - } + "configSchema": "config.d.ts" } diff --git a/packages/core-components/src/components/AutoLogoutProvider/AutoLogoutProvider.tsx b/packages/core-components/src/components/AutoLogout/AutoLogout.tsx similarity index 57% rename from packages/core-components/src/components/AutoLogoutProvider/AutoLogoutProvider.tsx rename to packages/core-components/src/components/AutoLogout/AutoLogout.tsx index 44c79cc4d7..abb898a0f2 100644 --- a/packages/core-components/src/components/AutoLogoutProvider/AutoLogoutProvider.tsx +++ b/packages/core-components/src/components/AutoLogout/AutoLogout.tsx @@ -14,13 +14,19 @@ * limitations under the License. */ -import { identityApiRef, useApi } from '@backstage/core-plugin-api'; -import React, { PropsWithChildren, useEffect, useMemo, useState } from 'react'; +import { + ConfigApi, + configApiRef, + IdentityApi, + identityApiRef, + useApi, +} from '@backstage/core-plugin-api'; +import React, { useEffect, useMemo, useState } from 'react'; import { EventsType, - IdleTimerProvider, IIdleTimer, workerTimers, + useIdleTimer, } from 'react-idle-timer'; import { @@ -34,10 +40,10 @@ import { DefaultTimestampStore, TimestampStore } from './timestampStore'; export type AutoLogoutTrackableEvent = EventsType; /** @public */ -export type AutoLogoutProviderProps = { +export type AutoLogoutProps = { /** * Enable/disable the AutoLogoutMechanism. - * defaults to true + * defauls to true. */ enabled?: boolean; /** @@ -60,11 +66,6 @@ export type AutoLogoutProviderProps = { * defaults to true. */ useWorkerTimers?: boolean; - /** - * List of DOM events that the AutoLogoutProvider will track to determine if the user is active or not. - * default list includes all the needed events for keyboard/pointers/mouse devices. - */ - events?: AutoLogoutTrackableEvent[]; /** * Enable/disable the autologout for disconnected users. * disconnected users are the ones that are logged in but have no Backstage tab open in their browsers. @@ -74,6 +75,153 @@ export type AutoLogoutProviderProps = { logoutIfDisconnected?: boolean; }; +type AutoLogoutInternalProps = Omit, 'enabled'> & { + events: AutoLogoutTrackableEvent[]; + promptOpen: boolean; + setPromptOpen: (value: boolean) => void; + remainingTimeCountdown: number; + setRemainingTimeCountdown: (amount: number) => void; + identityApi: IdentityApi; + lastSeenOnlineStore: TimestampStore; +}; + +const ConditionalAutoLogout = ({ + idleTimeoutMinutes, + events, + useWorkerTimers, + logoutIfDisconnected, + promptBeforeIdleSeconds, + promptOpen, + setPromptOpen, + remainingTimeCountdown, + setRemainingTimeCountdown, + identityApi, + lastSeenOnlineStore, +}: AutoLogoutInternalProps): JSX.Element => { + const promptBeforeIdleMillis = promptBeforeIdleSeconds * 1000; + const promptBeforeIdle = promptBeforeIdleMillis > 0 ? true : false; + + const onPrompt = () => { + // onPrompt will be called `promptBeforeIdle` milliseconds before `timeout`. + // All events are disabled while the prompt is active. + // If the user wishes to stay active, call the `activate()` method. + // You can get the remaining prompt time with the `getRemainingTime()` method, + setPromptOpen(true); + setRemainingTimeCountdown(promptBeforeIdleMillis); + }; + + const onIdle = () => { + // onIdle will be called after the timeout is reached. + // Events will be rebound as long as `stopOnMount` is not set. + setPromptOpen(false); + setRemainingTimeCountdown(0); + identityApi.signOut(); + }; + + const onActive = () => { + // onActive will only be called if `activate()` is called while `isPrompted()` + // is true. Here you will also want to close your modal and perform + // any active actions. + setPromptOpen(false); + setRemainingTimeCountdown(0); + }; + + const onAction = ( + _event?: Event | undefined, + _idleTimer?: IIdleTimer | null, + ) => { + // onAction will be called if any user event is detected. The list of events that triggers a user event detection is the list of configured events + // If any user event is detected we update the Last seen online in storage + lastSeenOnlineStore.save(new Date()); + }; + + const timer = useIdleTimer({ + timeout: idleTimeoutMinutes * 60 * 1000, + events: events, + crossTab: true, + name: 'autologout-timer', + timers: useWorkerTimers ? workerTimers : undefined, + onIdle: onIdle, + onActive: promptBeforeIdle ? onActive : undefined, + onAction: logoutIfDisconnected ? onAction : undefined, + onPrompt: promptBeforeIdle ? onPrompt : undefined, + promptBeforeIdle: promptBeforeIdle ? promptBeforeIdleMillis : undefined, + syncTimers: 1000, + }); + + return ( + <> + {promptBeforeIdle && ( + + )} + + ); +}; + +const defaultConfig: Required = { + enabled: true, + idleTimeoutMinutes: 0.5, + promptBeforeIdleSeconds: 10, + useWorkerTimers: true, + logoutIfDisconnected: true, +}; + +/** + * A list of DOM events that the activity tracker will use to determine if the user is active or not. + */ +const defaultTrackedEvents: AutoLogoutTrackableEvent[] = [ + 'mousemove', + 'keydown', + 'wheel', + 'DOMMouseScroll', + 'mousewheel', + 'mousedown', + 'touchstart', + 'touchmove', + 'MSPointerDown', + 'MSPointerMove', + 'visibilitychange', +]; + +/** + * Parses configuration for the AutoLogout. Properties configured in `app-config` take precedence over the props passed to the React component. + * If neither props nor config properties are found, a default value will be set accordingly. + */ +const parseConfig = ( + configApi: ConfigApi, + props: AutoLogoutProps, +): Required => { + return { + enabled: + configApi.getOptionalBoolean('auth.autologout.enabled') ?? + props.enabled ?? + defaultConfig.enabled, + idleTimeoutMinutes: + configApi.getOptionalNumber('auth.autologout.idleTimeoutMinutes') ?? + props.idleTimeoutMinutes ?? + defaultConfig.idleTimeoutMinutes, + promptBeforeIdleSeconds: + configApi.getOptionalNumber('auth.autologout.promptBeforeIdleSeconds') ?? + props.promptBeforeIdleSeconds ?? + defaultConfig.promptBeforeIdleSeconds, + useWorkerTimers: + configApi.getOptionalBoolean('auth.autologout.useWorkerTimers') ?? + props.useWorkerTimers ?? + defaultConfig.useWorkerTimers, + logoutIfDisconnected: + configApi.getOptionalBoolean('auth.autologout.logoutIfDisconnected') ?? + props.logoutIfDisconnected ?? + defaultConfig.logoutIfDisconnected, + }; +}; + /** * The Autologout feature enables platform engineers to add a mechanism to log out users after a configurable amount of time of inactivity. * When enabled, the mechanism will track user actions (mouse movement, mouse click, key pressing, taps, etc.) in order to determine if they are active or not. @@ -81,28 +229,19 @@ export type AutoLogoutProviderProps = { * * @public */ -export const AutoLogoutProvider = ({ - children, - enabled = true, - idleTimeoutMinutes = 60, - promptBeforeIdleSeconds = 10, - useWorkerTimers = true, - events = [ - 'mousemove', - 'keydown', - 'wheel', - 'DOMMouseScroll', - 'mousewheel', - 'mousedown', - 'touchstart', - 'touchmove', - 'MSPointerDown', - 'MSPointerMove', - 'visibilitychange', - ], - logoutIfDisconnected = true, -}: PropsWithChildren): JSX.Element => { +export const AutoLogout = (props: AutoLogoutProps): JSX.Element => { const identityApi = useApi(identityApiRef); + const configApi = useApi(configApiRef); + + const { + enabled, + idleTimeoutMinutes, + promptBeforeIdleSeconds, + logoutIfDisconnected, + useWorkerTimers, + }: AutoLogoutProps = useMemo(() => { + return parseConfig(configApi, props); + }, [configApi, props]); useEffect(() => { if (idleTimeoutMinutes < 0.5) { @@ -142,70 +281,22 @@ export const AutoLogoutProvider = ({ }); if (!enabled) { - return <>{children}; + return <>; } - const promptBeforeIdleMillis = promptBeforeIdleSeconds * 1000; - const promptBeforeIdle = promptBeforeIdleMillis > 0 ? true : false; - - const onPrompt = () => { - // onPrompt will be called `promptBeforeIdle` milliseconds before `timeout`. - // All events are disabled while the prompt is active. - // If the user wishes to stay active, call the `activate()` method. - // You can get the remaining prompt time with the `getRemainingTime()` method, - setPromptOpen(true); - setRemainingTimeCountdown(promptBeforeIdleMillis); - }; - - const onIdle = () => { - // onIdle will be called after the timeout is reached. - // Events will be rebound as long as `stopOnMount` is not set. - setPromptOpen(false); - setRemainingTimeCountdown(0); - identityApi.signOut(); - }; - - const onActive = () => { - // onActive will only be called if `activate()` is called while `isPrompted()` - // is true. Here you will also want to close your modal and perform - // any active actions. - setPromptOpen(false); - setRemainingTimeCountdown(0); - }; - - const onAction = ( - _event?: Event | undefined, - _idleTimer?: IIdleTimer | null, - ) => { - // onAction will be called if any user event is detected. The list of events that triggers a user event detection is the list of configured events - // If any user event is detected we update the Last seen online in storage - lastSeenOnlineStore.save(new Date()); - }; - return ( - - {promptBeforeIdle && ( - - )} - {children} - + ); }; diff --git a/packages/core-components/src/components/AutoLogoutProvider/AutologoutProvider.test.tsx b/packages/core-components/src/components/AutoLogout/Autologout.test.tsx similarity index 72% rename from packages/core-components/src/components/AutoLogoutProvider/AutologoutProvider.test.tsx rename to packages/core-components/src/components/AutoLogout/Autologout.test.tsx index 204a8ab2cc..a60d09338e 100644 --- a/packages/core-components/src/components/AutoLogoutProvider/AutologoutProvider.test.tsx +++ b/packages/core-components/src/components/AutoLogout/Autologout.test.tsx @@ -18,10 +18,10 @@ import { createMocks } from 'react-idle-timer'; import { MessageChannel } from 'worker_threads'; import { ApiProvider } from '@backstage/core-app-api'; import { identityApiRef } from '@backstage/core-plugin-api'; -import { renderWithEffects, TestApiRegistry } from '@backstage/test-utils'; +import { TestApiRegistry } from '@backstage/test-utils'; import React from 'react'; -import { AutoLogoutProvider } from './AutoLogoutProvider'; +import { AutoLogout } from './AutoLogout'; import { cleanup, render } from '@testing-library/react'; // Mock the signOut function of identityApiRef @@ -43,29 +43,15 @@ describe('AutoLogoutProvider', () => { jest.clearAllMocks(); }); - it('renders children even when enabled is false', async () => { - const { queryByText } = await renderWithEffects( - - -
Test Child
- - , - ); - - expect(queryByText('Test Child')).not.toBeNull(); - expect(mockSignOut).not.toHaveBeenCalled(); - }); - it('should throw error if idleTimeoutMinutes is smaller than promptBeforeSeconds', async () => { expect(() => render( - -
Test Child
- + /> , ), ).toThrow(); @@ -75,9 +61,8 @@ describe('AutoLogoutProvider', () => { expect(() => render( - -
Test Child
- + +
Test Child
, ), ).toThrow(); diff --git a/packages/core-components/src/components/AutoLogoutProvider/StillTherePrompt.tsx b/packages/core-components/src/components/AutoLogout/StillTherePrompt.tsx similarity index 94% rename from packages/core-components/src/components/AutoLogoutProvider/StillTherePrompt.tsx rename to packages/core-components/src/components/AutoLogout/StillTherePrompt.tsx index bbe5759a62..e0cfc8dd56 100644 --- a/packages/core-components/src/components/AutoLogoutProvider/StillTherePrompt.tsx +++ b/packages/core-components/src/components/AutoLogout/StillTherePrompt.tsx @@ -21,9 +21,10 @@ import DialogContent from '@material-ui/core/DialogContent'; import DialogContentText from '@material-ui/core/DialogContentText'; import DialogTitle from '@material-ui/core/DialogTitle'; import React, { useEffect } from 'react'; -import { useIdleTimerContext } from 'react-idle-timer'; +import { IIdleTimer } from 'react-idle-timer'; export interface StillTherePromptProps { + idleTimer: IIdleTimer; promptTimeoutMillis: number; remainingTime: number; setRemainingTime: (amount: number) => void; @@ -33,13 +34,13 @@ export interface StillTherePromptProps { export const StillTherePrompt = (props: StillTherePromptProps) => { const { + idleTimer, setOpen, open, promptTimeoutMillis, remainingTime, setRemainingTime, } = props; - const idleTimer = useIdleTimerContext(); useEffect(() => { const interval = setInterval(() => { @@ -63,7 +64,7 @@ export const StillTherePrompt = (props: StillTherePromptProps) => { const seconds = timeTillPrompt > 1 ? 'seconds' : 'second'; return ( - + Logging out due to inactivity diff --git a/packages/core-components/src/components/AutoLogoutProvider/disconnectedUsers.test.ts b/packages/core-components/src/components/AutoLogout/disconnectedUsers.test.ts similarity index 100% rename from packages/core-components/src/components/AutoLogoutProvider/disconnectedUsers.test.ts rename to packages/core-components/src/components/AutoLogout/disconnectedUsers.test.ts diff --git a/packages/core-components/src/components/AutoLogoutProvider/disconnectedUsers.ts b/packages/core-components/src/components/AutoLogout/disconnectedUsers.ts similarity index 100% rename from packages/core-components/src/components/AutoLogoutProvider/disconnectedUsers.ts rename to packages/core-components/src/components/AutoLogout/disconnectedUsers.ts diff --git a/packages/core-components/src/components/AutoLogoutProvider/index.ts b/packages/core-components/src/components/AutoLogout/index.ts similarity index 87% rename from packages/core-components/src/components/AutoLogoutProvider/index.ts rename to packages/core-components/src/components/AutoLogout/index.ts index 2b9d0e9738..470689e45f 100644 --- a/packages/core-components/src/components/AutoLogoutProvider/index.ts +++ b/packages/core-components/src/components/AutoLogout/index.ts @@ -13,5 +13,4 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -export * from './AutoLogoutProvider'; -export * from './ConfigBasedAutoLogoutProvider'; +export * from './AutoLogout'; diff --git a/packages/core-components/src/components/AutoLogoutProvider/timestampStore.test.ts b/packages/core-components/src/components/AutoLogout/timestampStore.test.ts similarity index 100% rename from packages/core-components/src/components/AutoLogoutProvider/timestampStore.test.ts rename to packages/core-components/src/components/AutoLogout/timestampStore.test.ts diff --git a/packages/core-components/src/components/AutoLogoutProvider/timestampStore.ts b/packages/core-components/src/components/AutoLogout/timestampStore.ts similarity index 100% rename from packages/core-components/src/components/AutoLogoutProvider/timestampStore.ts rename to packages/core-components/src/components/AutoLogout/timestampStore.ts diff --git a/packages/core-components/src/components/AutoLogoutProvider/ConfigBasedAutoLogoutProvider.tsx b/packages/core-components/src/components/AutoLogoutProvider/ConfigBasedAutoLogoutProvider.tsx deleted file mode 100644 index 1eceedaa3b..0000000000 --- a/packages/core-components/src/components/AutoLogoutProvider/ConfigBasedAutoLogoutProvider.tsx +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2023 The Backstage Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { configApiRef, useApi } from '@backstage/core-plugin-api'; -import { PropsWithChildren, useMemo } from 'react'; -import { - AutoLogoutProvider, - AutoLogoutProviderProps, - AutoLogoutTrackableEvent, -} from './AutoLogoutProvider'; -import React from 'react'; - -/** @public */ -export type ConfigBasedAutoLogoutProviderProps = {}; - -/** - * A config based flavour of the AutoLogoutProvider. - * It allows to configure Autologout settings through `app-config` - * - * @public - */ -export const ConfigBasedAutoLogoutProvider = ({ - children, -}: PropsWithChildren): JSX.Element => { - const configApi = useApi(configApiRef); - - const props: AutoLogoutProviderProps = useMemo(() => { - return { - enabled: configApi.getOptionalBoolean('auth.autologout.enabled'), - idleTimeoutMinutes: configApi.getOptionalNumber( - 'auth.autologout.idleTimeoutMinutes', - ), - promptBeforeIdleSeconds: configApi.getOptionalNumber( - 'auth.autologout.promptBeforeIdleSeconds', - ), - useWorkerTimers: configApi.getOptionalBoolean( - 'auth.autologout.useWorkerTimers', - ), - events: configApi - .getOptionalStringArray('auth.autologout.events') - ?.map(event => event as AutoLogoutTrackableEvent), - logoutIfDisconnected: configApi.getOptionalBoolean( - 'auth.autologout.logoutIfDisconnected', - ), - }; - }, [configApi]); - - return ( - - {children} - - ); -}; diff --git a/packages/core-components/src/components/index.ts b/packages/core-components/src/components/index.ts index 62bc99ad53..a58208fabb 100644 --- a/packages/core-components/src/components/index.ts +++ b/packages/core-components/src/components/index.ts @@ -15,7 +15,7 @@ */ export * from './AlertDisplay'; -export * from './AutoLogoutProvider'; +export * from './AutoLogout'; export * from './Avatar'; export * from './LinkButton'; export * from './CodeSnippet'; diff --git a/packages/core-components/src/layout/SignInPage/providers.tsx b/packages/core-components/src/layout/SignInPage/providers.tsx index d72f26e53f..6d6dfe84b2 100644 --- a/packages/core-components/src/layout/SignInPage/providers.tsx +++ b/packages/core-components/src/layout/SignInPage/providers.tsx @@ -31,7 +31,7 @@ import { commonProvider } from './commonProvider'; import { guestProvider } from './guestProvider'; import { customProvider } from './customProvider'; import { IdentityApiSignOutProxy } from './IdentityApiSignOutProxy'; -import { LAST_SEEN_ONLINE_STORAGE_KEY } from '../../components/AutoLogoutProvider/disconnectedUsers'; +import { LAST_SEEN_ONLINE_STORAGE_KEY } from '../../components/AutoLogout/disconnectedUsers'; const PROVIDER_STORAGE_KEY = '@backstage/core:SignInPage:provider'; diff --git a/packages/core-components/src/setupTests.ts b/packages/core-components/src/setupTests.ts index 963c0f188b..fe6fab0620 100644 --- a/packages/core-components/src/setupTests.ts +++ b/packages/core-components/src/setupTests.ts @@ -15,3 +15,4 @@ */ import '@testing-library/jest-dom'; +import 'jest-localstorage-mock';