Merge branch 'main' into feat/investigate-schedule-data-flow

Author: jjoonleo

ios/Podfile.lock

@@ -213,7 +213,7 @@ SPEC CHECKSUMS:
   FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
   FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
   FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
-  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_appauth: 914057fda669db5073d3ca9d94ea932e7df3c964
   flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13

lib/core/dio/interceptors/token_interceptor.dart

@@ -74,6 +74,17 @@ class TokenInterceptor implements InterceptorsWrapper {
           _requestsNeedRetry.clear();
           _isRefreshing = false;
         } else {
+          for (final requestNeedRetry in _requestsNeedRetry) {
+            requestNeedRetry.handler.reject(
+              DioException(
+                requestOptions: requestNeedRetry.options,
+                response: response,
+                type: err.type,
+                error: err.error,
+                message: err.message,
+              ),
+            );
+          }
           _requestsNeedRetry.clear();
           // if refresh fail, force logout user here
           try {

lib/data/repositories/user_repository_impl.dart

@@ -1,3 +1,4 @@
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:injectable/injectable.dart';
@@ -34,6 +35,13 @@ class UserRepositoryImpl implements UserRepository {
       final user = await _authenticationRemoteDataSource.getUser();
       _userStreamController.add(user);
       return user;
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 401) {
+        await _tokenLocalDataSource.deleteToken();
+        _userStreamController.add(const UserEntity.empty());
+        return const UserEntity.empty();
+      }
+      rethrow;
     } catch (e) {
       rethrow;
     }

lib/l10n/app_ko.arb

@@ -1,7 +1,7 @@
 {
     "calendarTitle": "캘린더",
     "error": "오류",
-    "noSchedules": "일정이 없습니다",
+    "noSchedules": "약속이 없어요",
     "setSpareTimeTitle": "여유시간을 설정해주세요",
     "setSpareTimeDescription": "설정한 여유시간만큼 일찍 도착할 수 있어요.",
     "setSpareTimeWarning": "여유시간은 혹시 모를 상황을 위해 꼭 설정해야 돼요.",

lib/l10n/app_localizations_ko.dart

@@ -15,7 +15,7 @@ class AppLocalizationsKo extends AppLocalizations {
   String get error => '오류';
 
   @override
-  String get noSchedules => '일정이 없습니다';
+  String get noSchedules => '약속이 없어요';
 
   @override
   String get setSpareTimeTitle => '여유시간을 설정해주세요';

lib/main.dart

@@ -1,6 +1,7 @@
+import 'dart:async';
+
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:on_time_front/core/constants/environment_variable.dart';
@@ -25,7 +26,13 @@ void main() async {
   debugPrint('[FCM Main] Notification Permission: $permission');
 
   if (permission == AuthorizationStatus.authorized) {
-    await NotificationService.instance.initialize();
+    unawaited(
+      NotificationService.instance.initialize().catchError(
+        (Object error, StackTrace stackTrace) {
+          debugPrint('[FCM Main] NotificationService initialize 실패: $error');
+        },
+      ),
+    );
   } else {
     debugPrint('[FCM Main] 알림 권한이 없어 NotificationService를 초기화하지 않습니다');
   }

lib/presentation/app/bloc/auth/auth_state.dart

@@ -11,7 +11,7 @@ class AuthState extends Equatable {
       : this._(
           status: user.map<AuthStatus>(
             (entity) => entity.isOnboardingCompleted
-                ? AuthStatus.unauthenticated
+                ? AuthStatus.authenticated
                 : AuthStatus.onboardingNotCompleted,
             empty: (_) => AuthStatus.unauthenticated,
           ),

lib/presentation/app/screens/app.dart

@@ -30,12 +30,28 @@ class App extends StatelessWidget {
 class AppView extends StatelessWidget {
   const AppView({super.key});
 
+  @override
+  Widget build(BuildContext context) {
+    return const _AppRouterView();
+  }
+}
+
+class _AppRouterView extends StatefulWidget {
+  const _AppRouterView();
+
+  @override
+  State<_AppRouterView> createState() => _AppRouterViewState();
+}
+
+class _AppRouterViewState extends State<_AppRouterView> {
+  late final _router =
+      goRouterConfig(context.read<AuthBloc>(), context.read<ScheduleBloc>());
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp.router(
       theme: themeData,
-      routerConfig: goRouterConfig(
-          context.read<AuthBloc>(), context.read<ScheduleBloc>()),
+      routerConfig: _router,
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
     );