Merge pull request #424 from bannzai/fix/function/user_delete

Bugfix for delete account
bannzai · Nov 13, 2021 · 7758d40 · 7758d40
2 parents 3f98771 + f917d81
commit 7758d40
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/lib/database/database.dart b/lib/database/database.dart
@@ -5,7 +5,7 @@ import 'package:pilll/service/auth.dart';
 
 final databaseProvider = Provider<DatabaseConnection>((ref) {
   final stream = ref.watch(authStateStreamProvider);
-  final uid = stream.data?.value.uid;
+  final uid = stream.data?.value?.uid;
   print("database uid is $uid");
   if (uid == null) {
     throw UnimplementedError("Must be called service/auth.dart callSignin");

diff --git a/lib/domain/initial_setting/initial_setting_store.dart b/lib/domain/initial_setting/initial_setting_store.dart
@@ -58,8 +58,13 @@ class InitialSettingStateStore extends StateNotifier<InitialSettingState> {
   _subscribe() {
     _authCanceller?.cancel();
     _authCanceller = _authService.subscribe().listen((user) async {
+      print("watch sign state user: $user");
+      if (user == null) {
+        return;
+      }
       print(
           "watch sign state uid: ${user.uid}, isAnonymous: ${user.isAnonymous}");
+
       final isAccountCooperationDidEnd = !user.isAnonymous;
       if (isAccountCooperationDidEnd) {
         final userService = UserService(DatabaseConnection(user.uid));

diff --git a/lib/domain/settings/setting_account_list/components/delete_user_button.dart b/lib/domain/settings/setting_account_list/components/delete_user_button.dart
@@ -34,7 +34,6 @@ class DeleteUserButton extends StatelessWidget {
                 text: "退会する",
                 onPressed: () async {
                   await _delete(context);
-                  Navigator.of(context).pop();
                 },
               ),
             ],

diff --git a/lib/domain/settings/setting_account_list/setting_account_cooperation_list_page_store.dart b/lib/domain/settings/setting_account_list/setting_account_cooperation_list_page_store.dart
@@ -39,7 +39,7 @@ class SettingAccountCooperationListPageStore
     _authCanceller?.cancel();
     _authCanceller = _authService.subscribe().listen((user) {
       print(
-          "watch sign state uid: ${user.uid}, isAnonymous: ${user.isAnonymous}");
+          "watch sign state uid: ${user?.uid}, isAnonymous: ${user?.isAnonymous}");
       state = state.copyWith(user: user);
     });
   }

diff --git a/lib/service/auth.dart b/lib/service/auth.dart
@@ -18,7 +18,7 @@ final authStateStreamProvider = StreamProvider(
 );
 
 class AuthService {
-  Stream<User> subscribe() {
+  Stream<User?> subscribe() {
     return _subscribe();
   }
 
@@ -37,13 +37,13 @@ class AuthInfo {
   AuthInfo(this.uid);
 }
 
-Stream<User> _subscribe() {
+Stream<User?> _subscribe() {
   return StreamGroup.merge(
     [
       _cacheOrAuth().asStream(),
       FirebaseAuth.instance.userChanges(),
     ],
-  ).skipWhile((element) => element == null).cast();
+  );
 }
 
 Future<User?> callSignin() async {