Merge pull request #323 from DevKor-github/312-로그-아웃-구현

312 로그아웃, 회원탈퇴 구현 및 버그 수정

Author: jjoonleo

lib/core/constants/endpoint.dart

@@ -7,12 +7,20 @@ class Endpoint {
   static const _signInWithGoogle = '/oauth2/google/login';
   static const _signInWithApple = '/oauth2/apple/login';
   static const _getUser = '/users/me';
+  static const _deleteGoogleMe = '/oauth2/google/me';
+  static const _deleteAppleMe = '/oauth2/apple/me';
+  static const _feedback = '/feedback';
+  static const _deleteUser = '/users/me/delete';
 
   static get signIn => _signIn;
   static get signUp => _signUp;
   static get signInWithGoogle => _signInWithGoogle;
   static get signInWithApple => _signInWithApple;
   static get getUser => _getUser;
+  static get deleteGoogleMe => _deleteGoogleMe;
+  static get deleteAppleMe => _deleteAppleMe;
+  static get feedback => _feedback;
+  static get deleteUser => _deleteUser;
 
   // schedule
   static const _schedules = '/schedules';

lib/data/data_sources/authentication_remote_data_source.dart

@@ -7,6 +7,7 @@ import 'package:on_time_front/data/models/sign_in_with_google_request_model.dart
 import 'package:on_time_front/data/models/sign_in_with_apple_request_model.dart';
 import 'package:on_time_front/domain/entities/token_entity.dart';
 import 'package:on_time_front/domain/entities/user_entity.dart';
+import 'package:uuid/uuid.dart';
 
 abstract interface class AuthenticationRemoteDataSource {
   Future<(UserEntity, TokenEntity)> signIn(String email, String password);
@@ -21,6 +22,16 @@ abstract interface class AuthenticationRemoteDataSource {
       SignInWithAppleRequestModel signInWithAppleRequestModel);
 
   Future<UserEntity> getUser();
+
+  Future<void> deleteGoogleMe();
+
+  Future<void> deleteAppleMe();
+
+  Future<void> postFeedback(String message);
+
+  Future<void> deleteUser();
+
+  Future<String?> getUserSocialType();
 }
 
 @Injectable(as: AuthenticationRemoteDataSource)
@@ -130,4 +141,79 @@ class AuthenticationRemoteDataSourceImpl
       rethrow;
     }
   }
+
+  @override
+  Future<void> deleteGoogleMe() async {
+    try {
+      final result = await dio.delete(Endpoint.deleteGoogleMe);
+      if (result.statusCode == 200) {
+        return;
+      } else {
+        throw Exception('Error deleting Google user');
+      }
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> deleteAppleMe() async {
+    try {
+      final result = await dio.delete(Endpoint.deleteAppleMe);
+      if (result.statusCode == 200) {
+        return;
+      } else {
+        throw Exception('Error deleting Apple user');
+      }
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> postFeedback(String message) async {
+    try {
+      final feedbackId = const Uuid().v4();
+      final result = await dio.post(Endpoint.feedback, data: {
+        'feedbackId': feedbackId,
+        'message': message,
+      });
+      if (result.statusCode == 200) {
+        return;
+      } else {
+        throw Exception('Error posting feedback');
+      }
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> deleteUser() async {
+    try {
+      final result = await dio.delete(Endpoint.deleteUser);
+      if (result.statusCode == 200) {
+        return;
+      } else {
+        throw Exception('Error deleting user');
+      }
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<String?> getUserSocialType() async {
+    try {
+      final result = await dio.get(Endpoint.getUser);
+      if (result.statusCode == 200) {
+        final data = result.data['data'] as Map<String, dynamic>;
+        return data['socialType'] as String?;
+      } else {
+        throw Exception('Error getting user social type');
+      }
+    } catch (e) {
+      rethrow;
+    }
+  }
 }

lib/data/models/sign_in_with_google_request_model.dart

@@ -5,15 +5,17 @@ part 'sign_in_with_google_request_model.g.dart';
 @JsonSerializable()
 class SignInWithGoogleRequestModel {
   final String idToken;
-
+  final String refreshToken;
+  
   SignInWithGoogleRequestModel({
     required this.idToken,
+    required this.refreshToken,
   });
 
   Map<String, dynamic> toJson() {
     return {
       'idToken': idToken,
-      'refreshToken': '',
+      'refreshToken': refreshToken,
     };
   }
 }

lib/data/repositories/user_repository_impl.dart

@@ -25,8 +25,8 @@ class UserRepositoryImpl implements UserRepository {
   @override
   GoogleSignIn get googleSignIn => _googleSignIn;
 
-  UserRepositoryImpl(this._authenticationRemoteDataSource, this._tokenLocalDataSource);
-
+  UserRepositoryImpl(
+      this._authenticationRemoteDataSource, this._tokenLocalDataSource);
 
   @override
   Future<UserEntity> getUser() async {
@@ -78,9 +78,11 @@ class UserRepositoryImpl implements UserRepository {
       final GoogleSignInAuthentication googleAuth =
           await googleUser.authentication;
       final String? idToken = googleAuth.idToken;
+      final String? accessToken = googleAuth.accessToken;
       if (idToken != null) {
         final signInWithGoogleRequestModel = SignInWithGoogleRequestModel(
           idToken: idToken,
+          refreshToken: accessToken ?? '',
         );
         await _tokenLocalDataSource.deleteToken();
         final result = await _authenticationRemoteDataSource
@@ -121,6 +123,51 @@ class UserRepositoryImpl implements UserRepository {
     }
   }
 
+  @override
+  Future<void> deleteUser() async {
+    try {
+      await _authenticationRemoteDataSource.deleteUser();
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> deleteGoogleUser() async {
+    try {
+      await _authenticationRemoteDataSource.deleteGoogleMe();
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> deleteAppleUser() async {
+    try {
+      await _authenticationRemoteDataSource.deleteAppleMe();
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> postFeedback(String message) async {
+    try {
+      await _authenticationRemoteDataSource.postFeedback(message);
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  @override
+  Future<String?> getUserSocialType() async {
+    try {
+      return await _authenticationRemoteDataSource.getUserSocialType();
+    } catch (e) {
+      return null;
+    }
+  }
+
   @override
   Stream<UserEntity> get userStream =>
       _userStreamController.asBroadcastStream();

lib/domain/repositories/user_repository.dart

@@ -23,4 +23,14 @@ abstract interface class UserRepository {
   });
 
   Future<void> getUser();
+
+  Future<void> deleteUser();
+
+  Future<void> deleteGoogleUser();
+
+  Future<void> deleteAppleUser();
+
+  Future<void> postFeedback(String message);
+
+  Future<String?> getUserSocialType();
 }

lib/domain/use-cases/delete_user_use_case.dart

@@ -0,0 +1,26 @@
+import 'package:injectable/injectable.dart';
+import 'package:on_time_front/domain/repositories/user_repository.dart';
+import 'package:on_time_front/presentation/shared/constants/constants.dart';
+
+@Injectable()
+class DeleteUserUseCase {
+  final UserRepository _userRepository;
+
+  DeleteUserUseCase(this._userRepository);
+
+  Future<void> call(String feedbackMessage) async {
+    try {
+      await _userRepository.postFeedback(feedbackMessage);
+    } catch (_) {}
+
+    final socialTypeString = await _userRepository.getUserSocialType();
+    final socialType = socialTypeFromString(socialTypeString);
+    if (socialType == SocialType.google) {
+      await _userRepository.deleteGoogleUser();
+    } else if (socialType == SocialType.apple) {
+      await _userRepository.deleteAppleUser();
+    } else {
+      await _userRepository.deleteUser();
+    }
+  }
+}

lib/l10n/app_en.arb

@@ -287,6 +287,10 @@
     "@appSettings": {
         "description": "Title for the app settings section"
     },
+    "accountSettings": "Account Settings",
+    "@accountSettings": {
+        "description": "Title for the account settings section"
+    },
     "editDefaultPreparation": "Edit Default Preparation / Spare Time",
     "@editDefaultPreparation": {
         "description": "Setting tile for editing default preparation and spare time"
@@ -295,6 +299,14 @@
     "@allowAppNotifications": {
         "description": "Setting tile for allowing app notifications"
     },
+    "logOut": "Log out",
+    "@logOut": {
+        "description": "Setting tile for logging out"
+    },
+    "deleteAccount": "Delete account",
+    "@deleteAccount": {
+        "description": "Setting tile for deleting the account"
+    },
     "editSpareTime": "Edit spare time",
     "@editSpareTime": {
         "description": "Section title for editing spare time"
@@ -306,5 +318,46 @@
     "totalTime": "Total time: ",
     "@totalTime": {
         "description": "Label for total preparation time"
+    },
+    "logOutConfirm": "Do you want to log out?",
+    "@logOutConfirm": {
+        "description": "Confirmation text shown in the logout modal"
+    },
+    "deleteAccountConfirmTitle": "Are you sure you want to delete your account?",
+    "@deleteAccountConfirmTitle": {
+        "description": "Title of the delete account confirmation modal"
+    },
+    "deleteAccountConfirmDescription": "If you keep preparing with OnTime, you can reduce lateness by 60%.",
+    "@deleteAccountConfirmDescription": {
+        "description": "Description of the delete account confirmation modal"
+    },
+    "keepUsing": "I'll keep using it",
+    "@keepUsing": {
+        "description": "Button label to keep using the app"
+    },
+    "deleteAnyway": "Delete anyway",
+    "@deleteAnyway": {
+        "description": "Button label to proceed with deletion anyway"
+    },
+    "deleteFeedbackTitle": "We hope to meet you again with a better service",
+    "@deleteFeedbackTitle": {
+        "description": "Delete feedback modal title"
+    },
+    "deleteFeedbackDescription": "Please let us know what was inconvenient so OnTime can improve.",
+    "@deleteFeedbackDescription": {
+        "description": "Delete feedback modal description"
+    },
+    "deleteFeedbackPlaceholder": "Please tell us the reason for leaving.",
+    "@deleteFeedbackPlaceholder": {
+        "description": "Placeholder for delete feedback input"
+    },
+    "keepUsingLong": "Keep using without deleting",
+    "@keepUsingLong": {
+        "description": "Button to keep using instead of deleting"
+    },
+    "sendFeedbackAndDelete": "Send feedback and delete",
+    "@sendFeedbackAndDelete": {
+        "description": "Button to send feedback and delete"
     }
+    
 } 

lib/l10n/app_ko.arb

@@ -66,10 +66,24 @@
     "myPageTitle": "마이페이지",
     "myAccount": "내 계정",
     "appSettings": "앱 설정",
+    "accountSettings": "계정 설정",
     "editDefaultPreparation": "기본 준비과정 / 여유시간 수정",
-    "allowAppNotifications": "앱 알림 허용"
-,
+    "allowAppNotifications": "앱 알림 허용",
+    "logOut": "로그아웃",
+    "deleteAccount": "회원 탈퇴",
     "editSpareTime": "여유시간 수정",
     "editPreparationTime": "준비시간 수정",
-    "totalTime": "총 시간: "
+    "totalTime": "총 시간: ",
+    "logOutConfirm": "로그아웃 하시겠어요?"
+,
+    "deleteAccountConfirmTitle": "정말 탈퇴하시나요?",
+    "deleteAccountConfirmDescription": "계속 온타임과 준비를 함께하면\n지각을 60% 줄일 수 있어요.",
+    "keepUsing": "계속 사용할게요",
+    "deleteAnyway": "그래도 탈퇴할게요"
+,
+    "deleteFeedbackTitle": "더 좋은 서비스로 다시 만나요",
+    "deleteFeedbackDescription": "더 나은 온타임이 될 수 있도록,\n어떤 점이 불편하셨는지\n알려주시면 감사하겠습니다.",
+    "deleteFeedbackPlaceholder": "탈퇴하시는 이유를 알려주세요.",
+    "keepUsingLong": "탈퇴하지 않고 계속 사용하기",
+    "sendFeedbackAndDelete": "의견 보내고 탈퇴하기"
 }