Release v1.138.1 - staging → master

Fixed Authentication redirect issue (#11925)

Release v1.138.1 - staging → master

Author: bnussman-akamai

packages/manager/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2025-03-26] - v1.138.1
+
+### Fixed:
+
+- Authentication redirect issue ([#11925](https://github.com/linode/manager/pull/11925))
+
 ## [2025-03-25] - v1.138.0
 
 

packages/manager/cypress/e2e/core/parentChild/token-expiration.spec.ts

@@ -78,6 +78,6 @@ describe('Parent/Child token expiration', () => {
           .click();
       });
 
-    cy.url().should('endWith', '/login');
+    cy.url().should('endWith', '/logout');
   });
 });

packages/manager/package.json

@@ -2,7 +2,7 @@
   "name": "linode-manager",
   "author": "Linode",
   "description": "The Linode Manager website",
-  "version": "1.138.0",
+  "version": "1.138.1",
   "private": true,
   "type": "module",
   "bugs": {

packages/manager/src/components/AccessPanel/UserSSHKeyPanel.test.tsx

@@ -22,7 +22,7 @@ describe('UserSSHKeyPanel', () => {
           return HttpResponse.json(makeResourcePage([]));
         }),
         http.get('*/account/users', () => {
-          return HttpResponse.json(makeResourcePage([]));
+          return HttpResponse.json(makeResourcePage([]), { status: 401 });
         })
       );
       const { queryByTestId } = renderWithTheme(
@@ -46,7 +46,7 @@ describe('UserSSHKeyPanel', () => {
           return HttpResponse.json(makeResourcePage(sshKeys));
         }),
         http.get('*/account/users', () => {
-          return HttpResponse.json(makeResourcePage([]));
+          return HttpResponse.json(makeResourcePage([]), { status: 401 });
         })
       );
       const { getByText } = renderWithTheme(

packages/manager/src/features/Account/SwitchAccountDrawer.tsx

@@ -6,14 +6,15 @@ import { NotFound } from 'src/components/NotFound';
 import { PARENT_USER_SESSION_EXPIRED } from 'src/features/Account/constants';
 import { useParentChildAuthentication } from 'src/features/Account/SwitchAccounts/useParentChildAuthentication';
 import { setTokenInLocalStorage } from 'src/features/Account/SwitchAccounts/utils';
+import { useCurrentToken } from 'src/hooks/useAuthentication';
 import { sendSwitchToParentAccountEvent } from 'src/utilities/analytics/customEventAnalytics';
-import { getAuthToken } from 'src/utilities/authentication';
 import { getStorage, setStorage } from 'src/utilities/storage';
 
 import { ChildAccountList } from './SwitchAccounts/ChildAccountList';
 import { updateParentTokenInLocalStorage } from './SwitchAccounts/utils';
 
 import type { APIError, UserType } from '@linode/api-v4';
+import type { State as AuthState } from 'src/store/authentication';
 
 interface Props {
   onClose: () => void;
@@ -22,7 +23,7 @@ interface Props {
 }
 
 interface HandleSwitchToChildAccountProps {
-  currentTokenWithBearer?: string;
+  currentTokenWithBearer?: AuthState['token'];
   euuid: string;
   event: React.MouseEvent<HTMLElement>;
   onClose: (e: React.SyntheticEvent<HTMLElement>) => void;
@@ -38,9 +39,9 @@ export const SwitchAccountDrawer = (props: Props) => {
   const [query, setQuery] = React.useState<string>('');
 
   const isProxyUser = userType === 'proxy';
-  const currentParentTokenWithBearer: string =
+  const currentParentTokenWithBearer =
     getStorage('authentication/parent_token/token') ?? '';
-  const currentTokenWithBearer = getAuthToken().token;
+  const currentTokenWithBearer = useCurrentToken() ?? '';
 
   const {
     createToken,

packages/manager/src/features/Account/SwitchAccounts/useParentChildAuthentication.tsx

@@ -10,13 +10,13 @@ import {
   isParentTokenValid,
   updateCurrentTokenBasedOnUserType,
 } from 'src/features/Account/SwitchAccounts/utils';
-import { getAuthToken } from 'src/utilities/authentication';
+import { useCurrentToken } from 'src/hooks/useAuthentication';
 import { getStorage } from 'src/utilities/storage';
 
 import type { Token, UserType } from '@linode/api-v4';
 
 export const useParentChildAuthentication = () => {
-  const currentTokenWithBearer = getAuthToken().token;
+  const currentTokenWithBearer = useCurrentToken() ?? '';
 
   const {
     error: createTokenError,

packages/manager/src/features/Account/SwitchAccounts/utils.ts

@@ -1,6 +1,7 @@
 import { getStorage, setStorage } from 'src/utilities/storage';
 
 import type { Token, UserType } from '@linode/api-v4';
+import type { State as AuthState } from 'src/store/authentication';
 
 export interface ProxyTokenCreationParams {
   /**
@@ -20,7 +21,7 @@ export interface ProxyTokenCreationParams {
 export const updateParentTokenInLocalStorage = ({
   currentTokenWithBearer,
 }: {
-  currentTokenWithBearer?: string;
+  currentTokenWithBearer?: AuthState['token'];
 }) => {
   const parentToken: Token = {
     created: getStorage('authentication/created'),

packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.test.tsx

@@ -3,7 +3,6 @@ import * as React from 'react';
 
 import { profileFactory } from 'src/factories';
 import { HttpResponse, http, server } from 'src/mocks/testServer';
-import { clearAuthToken, setAuthToken } from 'src/utilities/authentication';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { TimezoneForm, getOptionLabel } from './TimezoneForm';
@@ -19,8 +18,6 @@ describe('Timezone change form', () => {
         );
       })
     );
-
-    clearAuthToken();
   });
 
   it('should render input label', () => {
@@ -30,9 +27,9 @@ describe('Timezone change form', () => {
   });
 
   it('should show a message if an admin is logged in as a customer', async () => {
-    setAuthToken({ expiration: 'never', scopes: '*', token: 'admin 123' });
-
-    const { getByTestId } = renderWithTheme(<TimezoneForm />);
+    const { getByTestId } = renderWithTheme(<TimezoneForm />, {
+      customStore: { authentication: { loggedInAsCustomer: true } },
+    });
 
     expect(getByTestId('admin-notice')).toBeInTheDocument();
   });
@@ -44,9 +41,9 @@ describe('Timezone change form', () => {
   });
 
   it("should include text with the user's current time zone in the admin warning", async () => {
-    setAuthToken({ expiration: 'never', scopes: '*', token: 'admin 123' });
-
-    const { queryByTestId } = renderWithTheme(<TimezoneForm />);
+    const { queryByTestId } = renderWithTheme(<TimezoneForm />, {
+      customStore: { authentication: { loggedInAsCustomer: true } },
+    });
 
     await waitFor(() => {
       expect(queryByTestId('admin-notice')).toHaveTextContent(

packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx

@@ -7,7 +7,7 @@ import * as React from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
 import { timezones } from 'src/assets/timezones/timezones';
-import { isLoggedInAsCustomer } from 'src/utilities/authentication';
+import { useAuthentication } from 'src/hooks/useAuthentication';
 
 import type { Profile } from '@linode/api-v4';
 
@@ -40,6 +40,7 @@ const timezoneOptions = getTimezoneOptions();
 type Values = Pick<Profile, 'timezone'>;
 
 export const TimezoneForm = () => {
+  const { loggedInAsCustomer } = useAuthentication();
   const { enqueueSnackbar } = useSnackbar();
   const { data: profile } = useProfile();
   const { mutateAsync: updateProfile } = useMutateProfile();
@@ -67,7 +68,7 @@ export const TimezoneForm = () => {
 
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
-      {isLoggedInAsCustomer() && (
+      {loggedInAsCustomer && (
         <Notice dataTestId="admin-notice" variant="error">
           While you are logged in as a customer, all times, dates, and graphs
           will be displayed in the user&rsquo;s timezone ({profile?.timezone}).

packages/manager/src/features/TopMenu/TopMenu.tsx

@@ -7,7 +7,7 @@ import { AppBar } from 'src/components/AppBar';
 import { Link } from 'src/components/Link';
 import { StyledAkamaiLogo } from 'src/components/PrimaryNav/PrimaryNav.styles';
 import { Toolbar } from 'src/components/Toolbar';
-import { isLoggedInAsCustomer } from 'src/utilities/authentication';
+import { useAuthentication } from 'src/hooks/useAuthentication';
 
 import { Community } from './Community';
 import { CreateMenu } from './CreateMenu/CreateMenu';
@@ -36,6 +36,8 @@ export interface TopMenuProps {
 export const TopMenu = React.memo((props: TopMenuProps) => {
   const { openSideMenu, username } = props;
 
+  const { loggedInAsCustomer } = useAuthentication();
+
   const isNarrowViewport = useMediaQuery((theme: Theme) =>
     theme.breakpoints.down(960)
   );
@@ -45,7 +47,7 @@ export const TopMenu = React.memo((props: TopMenuProps) => {
 
   return (
     <>
-      {isLoggedInAsCustomer() && <InternalAdminBanner username={username} />}
+      {loggedInAsCustomer && <InternalAdminBanner username={username} />}
       <AppBar data-qa-appbar>
         <Toolbar variant="dense">
           {isNarrowViewport && (