Skip to content

Allow logging out without triggering auth token deletion when offline #1637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivan-ottinger merged 3 commits into from
Aug 6, 2025
Merged

Allow logging out without triggering auth token deletion when offline #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
634d5ca
Enable `Log out` button when offline
ivan-ottinger Aug 5, 2025
a78bf1d
Disable auth token delete request when offline
ivan-ottinger Aug 5, 2025
65cd594
Merge branch 'trunk' into remove/log-out-button-block-when-offline
wojtekn Aug 6, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions src/components/auth-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useI18n } from '@wordpress/react-i18n';
import { createContext, useState, useEffect, useMemo, useCallback, ReactNode } from 'react';
import WPCOM from 'wpcom';
import { useIpcListener } from 'src/hooks/use-ipc-listener';
import { useOffline } from 'src/hooks/use-offline';
import { getIpcApi } from 'src/lib/get-ipc-api';
import { useI18nLocale } from 'src/stores';
import { setWpcomClient } from 'src/stores/wpcom-api';
Expand Down Expand Up @@ -39,6 +40,7 @@ const AuthProvider: React.FC< AuthProviderProps > = ( { children } ) => {
const [ user, setUser ] = useState< AuthContextType[ 'user' ] >( undefined );
const locale = useI18nLocale();
const { __ } = useI18n();
const isOffline = useOffline();

const authenticate = useCallback( () => getIpcApi().authenticate(), [] );

Expand Down Expand Up @@ -66,21 +68,25 @@ const AuthProvider: React.FC< AuthProviderProps > = ( { children } ) => {

const logout = useCallback( async () => {
try {
client?.request(
{
apiNamespace: 'wpcom/v2',
method: 'DELETE',
path: '/studio-app/token',
},
( err: unknown, response: unknown ) => {
if ( err ) {
console.error( 'Failed to revoke token:', err );
Sentry.captureException( err );
} else {
console.log( 'Token revoked:', response );
if ( ! isOffline && client ) {
client.request(
{
apiNamespace: 'wpcom/v2',
method: 'DELETE',
path: '/studio-app/token',
},
( err: unknown, response: unknown ) => {
if ( err ) {
console.error( 'Failed to revoke token:', err );
Sentry.captureException( err );
} else {
console.log( 'Token revoked:', response );
}
}
}
);
);
} else if ( isOffline ) {
console.log( 'Offline: Skipping token revocation request' );
}

await getIpcApi().clearAuthenticationToken();
setIsAuthenticated( false );
Expand All @@ -91,7 +97,7 @@ const AuthProvider: React.FC< AuthProviderProps > = ( { children } ) => {
console.error( err );
Sentry.captureException( err );
}
}, [ client ] );
}, [ client, isOffline ] );

useEffect( () => {
async function run() {
Expand Down
4 changes: 1 addition & 3 deletions src/modules/user-settings/components/account-tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import Button from 'src/components/button';
import { Gravatar } from 'src/components/gravatar';
import { Tooltip } from 'src/components/tooltip';
import { WPCOM_PROFILE_URL } from 'src/constants';
import { useOffline } from 'src/hooks/use-offline';
import { getIpcApi } from 'src/lib/get-ipc-api';

export const UserInfo = ( {
Expand All @@ -14,7 +13,6 @@ export const UserInfo = ( {
onLogout: () => void;
} ) => {
const { __ } = useI18n();
const isOffline = useOffline();
return (
<div className="flex w-full gap-5">
<div className="flex w-full items-center gap-3">
Expand All @@ -32,7 +30,7 @@ export const UserInfo = ( {
<span className="text-a8c-gray-700 text-[10px] leading-[10px]">{ user?.email }</span>
</div>
</div>
<Button variant="secondary" className="!gap-3" onClick={ onLogout } disabled={ isOffline }>
<Button variant="secondary" className="!gap-3" onClick={ onLogout }>
{ __( 'Log out' ) }
</Button>
</div>
Expand Down