Refactor AuthStatus type

guardian · Jan 27, 2025 · 1d5b862 · 1d5b862
1 parent 0e0f77b
commit 1d5b862
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/dotcom-rendering/src/components/TopBarMyAccount.tsx b/dotcom-rendering/src/components/TopBarMyAccount.tsx
@@ -14,11 +14,7 @@ import {
 import { useEffect, useState } from 'react';
 import type { UserProfile } from '../lib/discussion';
 import { getZIndex } from '../lib/getZIndex';
-import type {
-	AuthStatus,
-	SignedInWithCookies,
-	SignedInWithOkta,
-} from '../lib/identity';
+import type { SignedInWithCookies, SignedInWithOkta } from '../lib/identity';
 import { createAuthenticationEventParams } from '../lib/identity-component-event';
 import {
 	addNotificationsToDropdownLinks,
@@ -27,6 +23,7 @@ import {
 import type { Notification } from '../lib/notification';
 import { nestedOphanComponents } from '../lib/ophan-helpers';
 import { useApi } from '../lib/useApi';
+import type { AuthStatusOrPending } from '../lib/useAuthStatus';
 import { useBraze } from '../lib/useBraze';
 import { palette as themePalette } from '../palette';
 import ProfileIcon from '../static/icons/profile.svg';
@@ -40,7 +37,7 @@ interface MyAccountProps {
 	idUrl: string;
 	discussionApiUrl: string;
 	idApiUrl: string;
-	authStatus: AuthStatus;
+	authStatus: AuthStatusOrPending;
 }
 
 // when SignedIn, authStatus can only be one of the two SignedIn states

diff --git a/dotcom-rendering/src/lib/identity.ts b/dotcom-rendering/src/lib/identity.ts
@@ -41,7 +41,6 @@ export type SignedInWithOkta = {
 };
 
 export type AuthStatus =
-	| { kind: 'Pending' }
 	| SignedOutWithCookies
 	| SignedInWithCookies
 	| SignedOutWithOkta

diff --git a/dotcom-rendering/src/lib/useAuthStatus.ts b/dotcom-rendering/src/lib/useAuthStatus.ts
@@ -6,6 +6,8 @@ import {
 	getSignedInStatusWithOkta,
 } from './identity';
 
+export type AuthStatusOrPending = AuthStatus | { kind: 'Pending' };
+
 /**
  * A hook to find out if a user is signed in.
  * Returns `'Pending'` until status is known.
@@ -25,8 +27,8 @@ export const useIsSignedIn = (): boolean | 'Pending' => {
 	}
 };
 
-export const useAuthStatus = (): AuthStatus => {
-	const [authStatus, setAuthStatus] = useState<AuthStatus>({
+export const useAuthStatus = (): AuthStatusOrPending => {
+	const [authStatus, setAuthStatus] = useState<AuthStatusOrPending>({
 		kind: 'Pending',
 	});