Merge branch 'dev' into feature/i18n

userfront/lib/features/auth/presentation/approve_qr_screen.dart

@@ -134,13 +134,16 @@ class _ApproveQrScreenState extends State<ApproveQrScreen> {
                 style: TextStyle(color: Colors.grey.shade600),
               ),
               const SizedBox(height: 40),
-              
+
               if (_message != null)
                 Padding(
                   padding: const EdgeInsets.only(bottom: 20),
                   child: Text(
                     _message!,
-                    style: TextStyle(color: _success ? Colors.green : Colors.red, fontWeight: FontWeight.bold),
+                    style: TextStyle(
+                      color: _success ? Colors.green : Colors.red,
+                      fontWeight: FontWeight.bold,
+                    ),
                     textAlign: TextAlign.center,
                   ),
                 ),
@@ -155,7 +158,7 @@ class _ApproveQrScreenState extends State<ApproveQrScreen> {
                     backgroundColor: Colors.blue,
                   ),
                 ),
-              
+
               if (!isLoggedIn && !_success)
                 Padding(
                   padding: const EdgeInsets.only(top: 16),

userfront/lib/features/auth/presentation/consent_screen.dart

@@ -17,7 +17,7 @@ class _ConsentScreenState extends State<ConsentScreen> {
   bool _isLoading = true;
   bool _isSubmitting = false;
   String? _error;
-  
+
   // 사용자가 선택한 스코프 목록
   final Set<String> _selectedScopes = {};
 
@@ -41,8 +41,10 @@ class _ConsentScreenState extends State<ConsentScreen> {
 
   Future<void> _fetchConsentInfo() async {
     try {
-      final info = await AuthProxyService.getConsentInfo(widget.consentChallenge);
-      
+      final info = await AuthProxyService.getConsentInfo(
+        widget.consentChallenge,
+      );
+
       // [Skip Logic] 백엔드에서 자동 승인되어 리다이렉트 URL이 온 경우 즉시 이동
       if (info['redirectTo'] != null) {
         webWindow.redirectTo(info['redirectTo']);
@@ -52,19 +54,20 @@ class _ConsentScreenState extends State<ConsentScreen> {
       // 백엔드에서 전달받은 커스텀 스코프 정보(scope_details) 적용
       if (info['scope_details'] != null) {
         final details = info['scope_details'] as Map<String, dynamic>;
-        
+
         details.forEach((scope, detail) {
           if (detail is Map<String, dynamic>) {
             // 설명 업데이트
-            if (detail['description'] != null && detail['description'].toString().isNotEmpty) {
+            if (detail['description'] != null &&
+                detail['description'].toString().isNotEmpty) {
               _scopeDescriptions[scope] = detail['description'].toString();
             }
             // 필수 여부 업데이트
             if (detail['mandatory'] == true) {
               _mandatoryScopes.add(scope);
             } else {
-              // openid는 기본적으로 필수지만 설정에서 굳이 껐다면? 
-              // 안전을 위해 openid는 항상 필수로 유지하는 것이 좋지만, 
+              // openid는 기본적으로 필수지만 설정에서 굳이 껐다면?
+              // 안전을 위해 openid는 항상 필수로 유지하는 것이 좋지만,
               // 여기서는 서버 설정을 존중하되 openid는 예외처리 할 수도 있음.
               // 우선 서버 설정이 있으면 반영 (단, openid는 제거하지 않음)
               if (scope != 'openid') {
@@ -76,7 +79,8 @@ class _ConsentScreenState extends State<ConsentScreen> {
       }
 
       // 초기 선택 상태 설정: 모든 요청된 스코프를 기본 선택
-      final requestedScopes = (info['requested_scope'] as List<dynamic>?)?.cast<String>() ?? [];
+      final requestedScopes =
+          (info['requested_scope'] as List<dynamic>?)?.cast<String>() ?? [];
       _selectedScopes.addAll(requestedScopes);
 
       setState(() {
@@ -102,7 +106,7 @@ class _ConsentScreenState extends State<ConsentScreen> {
         widget.consentChallenge,
         grantScope: _selectedScopes.toList(),
       );
-      
+
       if (result['redirectTo'] != null) {
         webWindow.redirectTo(result['redirectTo']);
       } else {
@@ -142,7 +146,9 @@ class _ConsentScreenState extends State<ConsentScreen> {
     if (confirmed == true) {
       setState(() => _isSubmitting = true);
       try {
-        final resp = await AuthProxyService.rejectConsent(widget.consentChallenge);
+        final resp = await AuthProxyService.rejectConsent(
+          widget.consentChallenge,
+        );
         final redirectTo = resp['redirectTo'];
         if (redirectTo != null) {
           webWindow.redirectTo(redirectTo);
@@ -152,9 +158,9 @@ class _ConsentScreenState extends State<ConsentScreen> {
       } catch (e) {
         setState(() => _isSubmitting = false);
         if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text('취소 처리 중 오류가 발생했습니다: $e')),
-          );
+          ScaffoldMessenger.of(
+            context,
+          ).showSnackBar(SnackBar(content: Text('취소 처리 중 오류가 발생했습니다: $e')));
         }
       }
     }
@@ -164,13 +170,13 @@ class _ConsentScreenState extends State<ConsentScreen> {
   Widget build(BuildContext context) {
     // 배경색을 약간 어둡게 처리하거나, 전체적인 테마 색상을 사용
     return Scaffold(
-      backgroundColor: Colors.grey[100], 
+      backgroundColor: Colors.grey[100],
       body: Center(
         child: _isLoading
             ? const CircularProgressIndicator()
             : _error != null
-                ? _buildErrorCard()
-                : _buildConsentCard(context),
+            ? _buildErrorCard()
+            : _buildConsentCard(context),
       ),
     );
   }
@@ -196,7 +202,9 @@ class _ConsentScreenState extends State<ConsentScreen> {
     final clientName = _consentInfo?['client']?['client_name'] ?? '알 수 없는 앱';
     final clientId = _consentInfo?['client']?['client_id'] ?? '-';
     final clientLogo = _consentInfo?['client']?['logo_uri'];
-    final requestedScopes = (_consentInfo?['requested_scope'] as List<dynamic>?)?.cast<String>() ?? [];
+    final requestedScopes =
+        (_consentInfo?['requested_scope'] as List<dynamic>?)?.cast<String>() ??
+        [];
 
     return SingleChildScrollView(
       child: Container(
@@ -204,7 +212,9 @@ class _ConsentScreenState extends State<ConsentScreen> {
         margin: const EdgeInsets.all(16),
         child: Card(
           elevation: 8,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(16),
+          ),
           child: Padding(
             padding: const EdgeInsets.all(32.0),
             child: Column(
@@ -235,7 +245,8 @@ class _ConsentScreenState extends State<ConsentScreen> {
                   ),
                   child: Row(
                     children: [
-                      if (clientLogo != null && clientLogo.toString().isNotEmpty)
+                      if (clientLogo != null &&
+                          clientLogo.toString().isNotEmpty)
                         Padding(
                           padding: const EdgeInsets.only(right: 16),
                           child: CircleAvatar(
@@ -286,7 +297,10 @@ class _ConsentScreenState extends State<ConsentScreen> {
                   children: [
                     const Text(
                       '요청된 권한',
-                      style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                     Text(
                       '총 ${requestedScopes.length}개',
@@ -354,7 +368,10 @@ class _ConsentScreenState extends State<ConsentScreen> {
                         )
                       : const Text(
                           '동의하고 계속하기',
-                          style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+                          style: TextStyle(
+                            fontSize: 16,
+                            fontWeight: FontWeight.bold,
+                          ),
                         ),
                 ),
                 const SizedBox(height: 12),