♻️refactor(http): add network security & include messages (#49)

hawks-atlanta · Oct 24, 2023 · d191be3 · d191be3
1 parent 7e53442
commit d191be3
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 20 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"

diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,5 @@
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">capyfile1.bucaramanga.upb.edu.co</domain>
+    </domain-config>
+</network-security-config>
diff --git a/lib/features/auth/presentation/providers/share_provider.dart b/lib/features/auth/presentation/providers/share_provider.dart
@@ -57,12 +57,18 @@ class ShareNotifier extends StateNotifier<ShareState> {
   }
 
   Future<bool> unShareFile(String fileUUID, String otherUsername) async {
-    removeUserFromShareList(
-        otherUsername); //Todo: remove here when delete endpoint is done
     try {
-      await fileRepository.unShareFile(fileUUID, otherUsername);
-      //TODO: using here removeUserFromShareList(otherUsername);
-      return true;
+      final response =
+          await fileRepository.unShareFile(fileUUID, otherUsername);
+      if (response) {
+        removeUserFromShareList(otherUsername);
+        state = state.copyWith(errorMessage: '');
+        return true;
+      } else {
+        state = state.copyWith(
+            errorMessage: 'Error when using unShareFile, response is false');
+      }
+      return false;
     } on CustomError catch (e) {
       state = state.copyWith(errorMessage: e.message);
       return false;

diff --git a/lib/features/drive/infrastructure/datasources/file_datasource_impl.dart b/lib/features/drive/infrastructure/datasources/file_datasource_impl.dart
@@ -295,6 +295,8 @@ class FilesDatasourceImpl extends FileDataSource {
       if (e.type == DioExceptionType.connectionTimeout) {
         throw CustomError('Review your internet connection');
       }
+
+
       throw Exception(e.toString());
     } catch (e) {
       throw Exception(e.toString());
@@ -320,6 +322,9 @@ class FilesDatasourceImpl extends FileDataSource {
       if (e.type == DioExceptionType.connectionTimeout) {
         throw CustomError('Review your internet connection');
       }
+      if (e.response?.statusCode == 500) {
+        throw CustomError('Internal Server Error');
+      }
       throw Exception(e.toString());
     } catch (e) {
       throw Exception(e.toString());
@@ -345,7 +350,10 @@ class FilesDatasourceImpl extends FileDataSource {
         throw CustomError('Token Wrong');
       }
       if (e.response?.statusCode == 404) {
-        throw CustomError('File $fileUUID not found');
+        throw CustomError('File $fileUUID not found (Server)');
+      }
+      if (e.response?.statusCode == 500) {
+        throw CustomError('Internal Server Error');
       }
       if (e.type == DioExceptionType.connectionTimeout) {
         throw CustomError('Review your internet connection');

diff --git a/lib/features/drive/presentation/providers/files_get_provider.dart b/lib/features/drive/presentation/providers/files_get_provider.dart
@@ -112,11 +112,15 @@ class FilesGetNotifier extends StateNotifier<FilesGetState> {
   }
 
   Future<bool> deleteFile(List<String> fileUUID) async {
-    removeFileFromfilesList(fileUUID); //Todo: remove here when delete endpoint is done
     try {
       final response = await filesRepository.deleteFile(fileUUID);
-      //TODO: using here removeFileFromfilesList(fileUUID);
-      return response;
+      if (response) {
+        removeFileFromfilesList(fileUUID);
+        return true;
+      } else {
+        state = state.copyWith(errorMessage: 'Failed to delete file');
+        return false;
+      }
     } on CustomError catch (e) {
       state = state.copyWith(errorMessage: e.message);
       return false;

diff --git a/lib/features/drive/presentation/widgets/files_two_columns_view.dart b/lib/features/drive/presentation/widgets/files_two_columns_view.dart
@@ -47,18 +47,22 @@ class FileOrFolderWidgetState extends ConsumerState<FilesTwoColumnsView> {
                   Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      Padding(
-                        padding: const EdgeInsets.only(bottom: 8.0),
-                        child: Text(
-                          widget.file.name,
-                          maxLines: 2,
-                          overflow: TextOverflow.ellipsis,
-                          style: const TextStyle(fontSize: 16),
-                          textAlign: TextAlign.center,
+                      Flexible(
+                        child: Padding(
+                          padding: const EdgeInsets.only(bottom: 8.0),
+                          child: Text(
+                            widget.file.name,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: const TextStyle(fontSize: 16),
+                            textAlign: TextAlign.center,
+                          ),
                         ),
                       ),
                     ],
                   ),
+
+
                 ],
               ),
             ),

diff --git a/lib/features/shared/widgets/drive/dialog_rename_folder.dart b/lib/features/shared/widgets/drive/dialog_rename_folder.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:login_mobile/features/shared/shared.dart';
 
 class DialogWidget extends StatelessWidget {
   final String? title;
@@ -18,7 +17,7 @@ class DialogWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final textStyles = Theme.of(context).textTheme;
+    //final textStyles = Theme.of(context).textTheme;
 
     return AlertDialog(
       title: Text(title ?? ''),

diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt
@@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
 # https://github.com/flutter/flutter/issues/57146.
 set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
 
+# Set fallback configurations for older versions of the flutter tool.
+if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
+  set(FLUTTER_TARGET_PLATFORM "windows-x64")
+endif()
+
 # === Flutter Library ===
 set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
 
@@ -92,7 +97,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E env
     ${FLUTTER_TOOL_ENVIRONMENT}
     "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
-      windows-x64 $<CONFIG>
+      ${FLUTTER_TARGET_PLATFORM} $<CONFIG>
   VERBATIM
 )
 add_custom_target(flutter_assemble DEPENDS