Merge branch 'main' into mobile/native-video-player

mobile/lib/providers/authentication.provider.dart

@@ -170,8 +170,10 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
     UserPreferencesResponseDto? userPreferences;
     try {
       final responses = await Future.wait([
-        _apiService.usersApi.getMyUser(),
-        _apiService.usersApi.getMyPreferences(),
+        _apiService.usersApi.getMyUser().timeout(const Duration(seconds: 7)),
+        _apiService.usersApi
+            .getMyPreferences()
+            .timeout(const Duration(seconds: 7)),
       ]);
       userResponse = responses[0] as UserAdminResponseDto;
       userPreferences = responses[1] as UserPreferencesResponseDto;

mobile/lib/utils/openapi_patching.dart

@@ -4,14 +4,30 @@ dynamic upgradeDto(dynamic value, String targetType) {
   switch (targetType) {
     case 'UserPreferencesResponseDto':
       if (value is Map) {
-        if (value['rating'] == null) {
-          value['rating'] = RatingResponse().toJson();
-        }
-
-        if (value['download']['includeEmbeddedVideos'] == null) {
-          value['download']['includeEmbeddedVideos'] = false;
-        }
+        addDefault(value, 'download.includeEmbeddedVideos', false);
+        addDefault(value, 'folders', FoldersResponse().toJson());
+        addDefault(value, 'memories', MemoriesResponse().toJson());
+        addDefault(value, 'ratings', RatingsResponse().toJson());
+        addDefault(value, 'people', PeopleResponse().toJson());
+        addDefault(value, 'tags', TagsResponse().toJson());
       }
       break;
   }
 }
+
+addDefault(dynamic value, String keys, dynamic defaultValue) {
+  // Loop through the keys and assign the default value if the key is not present
+  List<String> keyList = keys.split('.');
+  dynamic current = value;
+
+  for (int i = 0; i < keyList.length - 1; i++) {
+    if (current[keyList[i]] == null) {
+      current[keyList[i]] = {};
+    }
+    current = current[keyList[i]];
+  }
+
+  if (current[keyList.last] == null) {
+    current[keyList.last] = defaultValue;
+  }
+}