FIX: Fetching of assignments without permissions

HarryDeKat · Dec 4, 2023 · 45e088e · 45e088e
2 parents 5e0f9e6 + b8f383f
commit 45e088e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/lib/apis/magister.dart b/lib/apis/magister.dart
@@ -63,17 +63,20 @@ class Magister implements Api {
     dynamic futures = await Future.wait([
       api.dio.get(
           "/api/personen/${person.id}/afspraken?status=1&tot=${DateTime.now().add(const Duration(days: 60)).toIso8601String()}&van=${DateTime.now().toIso8601String()}"),
-      api.dio.get(
-          "/api/personen/${person.id}/opdrachten?skip=0&top=250&einddatum=${DateTime.now().add(const Duration(days: 60)).toIso8601String()}&startdatum=${DateTime.now().toIso8601String()}"),
+      if (person.config.supportsAssignments)
+        api.dio.get(
+            "/api/personen/${person.id}/opdrachten?skip=0&top=250&einddatum=${DateTime.now().add(const Duration(days: 60)).toIso8601String()}&startdatum=${DateTime.now().toIso8601String()}"),
     ]);
 
     person.calendarEvents = (futures[0].data["Items"] as List)
         .map((event) => magisterCalendarEvent(event)!)
         .toList();
 
-    person.calendarEvents.addAll((futures[1].data["Items"] as List)
-        .map((assignment) => magisterAssignmentToCalendarEvent(assignment)!)
-        .toList());
+    if (person.config.supportsAssignments) {
+      person.calendarEvents.addAll((futures[1].data["Items"] as List)
+          .map((assignment) => magisterAssignmentToCalendarEvent(assignment)!)
+          .toList());
+    }
 
     for (CalendarEvent event in person.calendarEvents) {
       if (event.description != null) {

diff --git a/lib/apis/magister/api.dart b/lib/apis/magister/api.dart
@@ -205,6 +205,12 @@ class MagisterApi extends Magister {
         res["Persoon"]["Geboortedatum"] ?? DateTime.now().toIso8601String());
 
     Future<void> initPerson(Person person) async {
+      person.config.supportsAssignments = perms
+              .firstWhereOrNull((p) => p.name == "EloOpdracht")
+              ?.accessType
+              .contains("Read") ??
+          false;
+
       await refreshProfilePicture(person);
       await refreshCalendarEvents(person);
       await setSchoolYears(person);

diff --git a/lib/hive/adapters.dart b/lib/hive/adapters.dart
@@ -149,6 +149,8 @@ class PersonConfig {
   bool useForGradeCheck = true;
   @HiveField(2, defaultValue: false)
   bool useForTestCheck = false;
+  @HiveField(3, defaultValue: true)
+  bool supportsAssignments = true;
 }
 
 enum FilterTypes { quarterCode, subject, teacher, inputString, pta, dateRange }

diff --git a/lib/hive/adapters.g.dart b/lib/hive/adapters.g.dart