sign out if revoking current device

Author: bernhardoj

src/libs/actions/User.ts

@@ -66,6 +66,7 @@ import {getDeviceInfoWithID} from './Device';
 import {openOldDotLink} from './Link';
 import {showReportActionNotification} from './Report';
 import {resendValidateCode as sessionResendValidateCode} from './Session';
+import redirectToSignIn from './SignInRedirect';
 
 type DomainOnyxUpdate =
     | OnyxUpdate<`${typeof ONYXKEYS.COLLECTION.DOMAIN}${string}`>
@@ -81,7 +82,11 @@ type LockAccountOnyxKey =
     | `${typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${string}`
     | `${typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${string}`;
 
-function revokeDevice(login: NewLogin) {
+function revokeDevice(login: NewLogin, autoGeneratedLogin: string | undefined) {
+    if (!autoGeneratedLogin) {
+        return;
+    }
+
     const loginKey = getLoginKey(login);
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.LOGINS>> = [
         {
@@ -124,6 +129,11 @@ function revokeDevice(login: NewLogin) {
         optimisticData,
         successData,
         failureData,
+    }).then(() => {
+        if (login.partnerUserID !== autoGeneratedLogin) {
+            return;
+        }
+        redirectToSignIn();
     });
 }
 

src/pages/settings/Security/DeviceManagementPage.tsx

@@ -2,6 +2,7 @@ import {FlashList} from '@shopify/flash-list';
 import type {ListRenderItemInfo} from '@shopify/flash-list';
 import React from 'react';
 import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
 import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -14,13 +15,19 @@ import {clearRevokeError, revokeDevice} from '@libs/actions/User';
 import Navigation from '@libs/Navigation/Navigation';
 import {getDeviceLogins, getLastLogin, getLoginKey} from '@libs/UserUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Credentials} from '@src/types/onyx';
 import type {Login} from '@src/types/onyx/Logins';
 
+function autoGeneratedLoginSelector(credentials: OnyxEntry<Credentials>) {
+    return credentials?.autoGeneratedLogin;
+}
+
 function DeviceManagementPage() {
     const styles = useThemeStyles();
     const {translate, datetimeToRelative} = useLocalize();
 
     const [logins] = useOnyx(ONYXKEYS.LOGINS, {selector: getDeviceLogins});
+    const [autoGeneratedLogin] = useOnyx(ONYXKEYS.CREDENTIALS, {selector: autoGeneratedLoginSelector});
 
     const renderItem = ({item}: ListRenderItemInfo<Login>) => {
         const {deviceName, deviceVersion, os, osVersion} = item.additionalData ?? {};
@@ -39,7 +46,7 @@ function DeviceManagementPage() {
                     danger
                     small
                     text={translate('deviceManagementPage.revoke')}
-                    onPress={() => revokeDevice(item)}
+                    onPress={() => revokeDevice(item, autoGeneratedLogin)}
                 />
             </OfflineWithFeedback>
         );