Get all Moodle cookies and wait for timing click

moodle/quiz-change-times.py

@@ -42,7 +42,6 @@ QUIZ_ID_GRP = 1
 WAIT_TIMEOUT = 60 # seconds
 
 MOODLE_DOMAIN = "moodle.royalholloway.ac.uk"
-MOODLE_SESSION_COOKIE = "MoodleSession"
 
 class Browser:
     """Simple container of browser setup and teardown
@@ -78,7 +77,6 @@ class Browser:
         return [
             { "name" : c.name, "value" : c.value }
             for c in cookie_jar
-            if c.name == MOODLE_SESSION_COOKIE
         ]
 
 def get_quiz_edit_url(quiz_url : str) -> str:
@@ -154,9 +152,13 @@ def update_quiz(
 
     # Open edit timing section
     browser.driver.get(get_quiz_edit_url(quiz))
-    browser.driver.find_element(
+    expander = browser.driver.find_element(
         By.CSS_SELECTOR, "#id_timing .ftoggler a"
-    ).click()
+    )
+    WebDriverWait(browser.driver, WAIT_TIMEOUT).until(
+        ec.element_to_be_clickable(expander)
+    )
+    expander.click()
 
     # Make sure open/close quiz checkbox matches notime
     check_box = browser.driver.find_element(

moodle/quiz-download-data.py

@@ -26,7 +26,6 @@ from collections import namedtuple
 from typing import Dict, List
 
 MOODLE_DOMAIN = "moodle.royalholloway.ac.uk"
-MOODLE_SESSION_COOKIE = "MoodleSession"
 RESPONSES_DOWNLOAD_URL = "https://moodle.royalholloway.ac.uk/mod/quiz/report.php?download=csv&id={}&mode=responses&attempts=all_with"
 SCORES_DOWNLOAD_URL = "https://moodle.royalholloway.ac.uk/mod/quiz/report.php?download=csv&id={}&mode=overview&attempts=all_with"
 
@@ -38,7 +37,6 @@ def get_moodle_cookies() -> Dict[str, str]:
     cookies = {
         c.name : c.value
         for c in cookie_jar
-        if c.name == MOODLE_SESSION_COOKIE
     }
 
     if len(cookies) == 0:

moodle/select-users.py

@@ -50,7 +50,6 @@ PASS_CMD = [os.path.expanduser('~/.config/mutt/getpass.sh'), 'rhul']
 
 MOODLE_URL = "https://moodle.royalholloway.ac.uk"
 MOODLE_DOMAIN = "moodle.royalholloway.ac.uk"
-MOODLE_SESSION_COOKIE = "MoodleSession"
 
 WAIT_TIMEOUT = 10 # s
 
@@ -99,7 +98,6 @@ class Browser:
         return [
             { "name" : c.name, "value" : c.value }
             for c in cookie_jar
-            if c.name == MOODLE_SESSION_COOKIE
         ]
 
 class LDAPEmailGetter: