login [nfc]: Pass GlobalStore to logOutAccount

This allows us to call it from model code when GlobalStore is available.

Signed-off-by: Zixuan James Li <[email protected]>

Author: PIG208

lib/widgets/actions.dart

@@ -20,9 +20,7 @@ import '../notifications/receive.dart';
 import 'dialog.dart';
 import 'store.dart';
 
-Future<void> logOutAccount(BuildContext context, int accountId) async {
-  final globalStore = GlobalStoreWidget.of(context);
-
+Future<void> logOutAccount(GlobalStore globalStore, int accountId) async {
   final account = globalStore.getAccount(accountId);
   if (account == null) return; // TODO(log)
 

lib/widgets/app.dart

@@ -249,7 +249,7 @@ class ChooseAccountPage extends StatelessWidget {
                   actionButtonText: zulipLocalizations.logOutConfirmationDialogConfirmButton,
                   onActionButtonPress: () {
                     // TODO error handling if db write fails?
-                    logOutAccount(context, accountId);
+                    logOutAccount(GlobalStoreWidget.of(context), accountId);
                   });
               },
               child: Text(zulipLocalizations.chooseAccountPageLogOutButton)),

test/widgets/actions_test.dart

@@ -20,6 +20,7 @@ import 'package:zulip/widgets/actions.dart';
 import 'package:zulip/widgets/app.dart';
 import 'package:zulip/widgets/inbox.dart';
 import 'package:zulip/widgets/page.dart';
+import 'package:zulip/widgets/store.dart';
 
 import '../api/fake_api.dart';
 import '../example_data.dart' as eg;
@@ -109,7 +110,7 @@ void main() {
       final newConnection = separateConnection()
         ..prepare(delay: unregisterDelay, json: {'msg': '', 'result': 'success'});
 
-      final future = logOutAccount(context, eg.selfAccount.id);
+      final future = logOutAccount(GlobalStoreWidget.of(context), eg.selfAccount.id);
       // Unregister-token request and account removal dispatched together
       checkSingleUnregisterRequest(newConnection);
       check(testBinding.globalStore.takeDoRemoveAccountCalls())
@@ -141,7 +142,7 @@ void main() {
       final newConnection = separateConnection()
         ..prepare(delay: unregisterDelay, exception: exception);
 
-      final future = logOutAccount(context, eg.selfAccount.id);
+      final future = logOutAccount(GlobalStoreWidget.of(context), eg.selfAccount.id);
       // Unregister-token request and account removal dispatched together
       checkSingleUnregisterRequest(newConnection);
       check(testBinding.globalStore.takeDoRemoveAccountCalls())
@@ -211,7 +212,7 @@ void main() {
       testNavObserver.onRemoved = (route, prevRoute) => removedRoutes.add(route);
 
       final context = tester.element(find.byType(MaterialApp));
-      final future = logOutAccount(context, account1.id);
+      final future = logOutAccount(GlobalStoreWidget.of(context), account1.id);
       await tester.pump(TestGlobalStore.removeAccountDuration);
       await future;
       check(removedRoutes).single.identicalTo(account1Route);

test/widgets/home_test.dart

@@ -15,6 +15,7 @@ import 'package:zulip/widgets/inbox.dart';
 import 'package:zulip/widgets/message_list.dart';
 import 'package:zulip/widgets/page.dart';
 import 'package:zulip/widgets/profile.dart';
+import 'package:zulip/widgets/store.dart';
 import 'package:zulip/widgets/subscription_list.dart';
 import 'package:zulip/widgets/theme.dart';
 
@@ -454,7 +455,7 @@ void main () {
     checkOnLoadingPage();
 
     final element = tester.element(find.byType(MaterialApp));
-    final future = logOutAccount(element, eg.selfAccount.id);
+    final future = logOutAccount(GlobalStoreWidget.of(element), eg.selfAccount.id);
     await tester.pump(TestGlobalStore.removeAccountDuration);
     await future;
     // No error expected from briefly not having
@@ -472,7 +473,7 @@ void main () {
     checkOnHomePage(tester, expectedAccount: eg.selfAccount);
 
     final element = tester.element(find.byType(HomePage));
-    final future = logOutAccount(element, eg.selfAccount.id);
+    final future = logOutAccount(GlobalStoreWidget.of(element), eg.selfAccount.id);
     await tester.pump(TestGlobalStore.removeAccountDuration);
     await future;
     // No error expected from briefly not having