From 226ccce4fa22c3019f60863807e57e7670790488 Mon Sep 17 00:00:00 2001
From: Matthew Hague <matthew.hague@rhul.ac.uk>
Date: Wed, 7 Aug 2024 08:25:50 +0100
Subject: [PATCH] refactor(moodle): change type of cookie jar in bulk-upload

---
 moodle/bulk-enrol.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/moodle/bulk-enrol.py b/moodle/bulk-enrol.py
index 160962c..505d968 100644
--- a/moodle/bulk-enrol.py
+++ b/moodle/bulk-enrol.py
@@ -60,13 +60,13 @@ class Student:
     userid : str
     email : str
 
-def get_moodle_cookies() -> Dict[str, Optional[str]]:
+def get_moodle_cookies() -> Dict[str, str]:
     """Gets current moodle cookies from firefox"""
     cookie_jar = browser_cookie3.firefox(domain_name=MOODLE_DOMAIN)
     cookies = {
         c.name : c.value
         for c in cookie_jar
-        if c.name == MOODLE_SESSION_COOKIE
+        if c.name == MOODLE_SESSION_COOKIE and c.value is not None
     }
 
     if len(cookies) == 0:
@@ -79,7 +79,7 @@ def get_moodle_cookies() -> Dict[str, Optional[str]]:
     return cookies
 
 def get_enrol_info(
-    cookies : Dict[str, Optional[str]], participants_url : str
+    cookies : Dict[str, str], participants_url : str
 ) -> EnrolInfo:
     info = EnrolInfo()
 
@@ -96,7 +96,7 @@ def get_enrol_info(
     return info
 
 def get_user(
-    cookies : Dict[str, Optional[str]], info : EnrolInfo, search : str
+    cookies : Dict[str, str], info : EnrolInfo, search : str
 ) -> Optional[Student]:
     url = GET_USER_URL.format(sesskey=info.sesskey, cookies=cookies)
     r = requests.post(url, cookies=cookies, json=[{
@@ -134,7 +134,7 @@ def get_user(
                 pass
 
 def enrol_user(
-    cookies : Dict[str, Optional[str]], info : EnrolInfo, userid : str
+    cookies : Dict[str, str], info : EnrolInfo, userid : str
 ):
     requests.get(ENROL_URL.format(
         courseid=info.courseid,
-- 
GitLab