ci: teacher auth

Author: faretek1

scratchattach/site/classroom.py

@@ -91,13 +91,17 @@ def update(self):
                 if pfx in script.text:
                     educator_username = commons.webscrape_count(script.text, pfx, sfx, str)
 
-            ret = {"id": self.id,
-                   "title": title,
-                   "description": description,
-                   "status": status,
-                   "educator": {"username": educator_username},
-                   "is_closed": True
-                   }
+            ret: typed_dicts.ClassroomDict = {
+                "id": self.id,
+                "title": title,
+                "description": description,
+                "educator": {},
+                "status": status,
+                "is_closed": True
+                }
+
+            if educator_username:
+                ret["educator"]["username"] = educator_username
 
             return self._update_from_dict(ret)
         return success
@@ -136,7 +140,7 @@ def student_names(self, *, page=1) -> list[str]:
             response = requests.get(f"https://scratch.mit.edu/classes/{self.id}/")
             soup = BeautifulSoup(response.text, "html.parser")
             found = set("")
-            
+
             for result in soup.css.select("ul.scroll-content .user a"):
                 result_text = result.text.strip()
                 if result_text in found:
@@ -185,7 +189,7 @@ def class_studio_ids(self, *, page: int = 1) -> list[int]:
             ret = []
             response = requests.get(f"https://scratch.mit.edu/classes/{self.id}/")
             soup = BeautifulSoup(response.text, "html.parser")
-            
+
             for result in soup.css.select("ul.scroll-content .gallery a[href]:not([class])"):
                 value = result["href"]
                 if not isinstance(value, str):

scratchattach/site/session.py

@@ -49,7 +49,7 @@ def enforce_ratelimit(__type: str, name: str, amount: int = 5, duration: int = 6
     cache = ratelimit_cache
     cache.setdefault(__type, [])
     uses = cache[__type]
-    while uses[-1] < time.time() - duration:
+    while uses and uses[-1] < time.time() - duration:
         uses.pop()
     if len(uses) < amount:
         uses.insert(0, time.time())
@@ -94,6 +94,7 @@ class Session(BaseSiteComponent):
 
     has_outstanding_email_confirmation: bool = field(repr=False, default=False)
     is_teacher: bool = field(repr=False, default=False)
+    is_teacher_invitee: bool = field(repr=False, default=False)
     _session: Optional[Session] = field(kw_only=True, default=None)
 
     def __str__(self) -> str:
@@ -139,6 +140,7 @@ def _update_from_dict(self, data: Union[dict, typed_dicts.SessionDict]):
 
         self.new_scratcher = data["permissions"]["new_scratcher"]
         self.is_teacher = data["permissions"]["educator"]
+        self.is_teacher_invitee = data["permissions"]["educator_invitee"]
 
         self.mute_status = data["permissions"]["mute_status"]
 

scratchattach/site/typed_dicts.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from scratchattach.cloud import _base
-from typing import TypedDict, Union, Optional
+from typing import TypedDict, Union, Optional, Required, NotRequired
 
 class SessionUserDict(TypedDict):
     id: int
@@ -67,11 +67,11 @@ class UserProfileDict(TypedDict):
     images: dict[str, str]
 
 class UserDict(TypedDict):
-    id: int
-    username: str
-    scratchteam: bool
-    history: UserHistoryDict
-    profile: UserProfileDict
+    id: NotRequired[int]
+    username: NotRequired[str]
+    scratchteam: NotRequired[bool]
+    history: NotRequired[UserHistoryDict]
+    profile: NotRequired[UserProfileDict]
 
 class CloudLogActivityDict(TypedDict):
     user: str
@@ -93,7 +93,8 @@ class ClassroomDict(TypedDict):
     title: str
     description: str
     status: str
-    date_start: str
-    date_end: Optional[str]
-    images: dict[str, str]
+    date_start: NotRequired[str]
+    date_end: NotRequired[Optional[str]]
+    images: NotRequired[dict[str, str]]
     educator: UserDict
+    is_closed: NotRequired[bool]

tests/test_editor_obfuscation.py

@@ -23,6 +23,5 @@ def test_project():
     body.export("obfuscated.sb3")
 
 
-
 if __name__ == '__main__':
     test_project()

tests/util/auth.toml

@@ -7,4 +7,8 @@
 note = "gAAAAABozoVANH3_fARiCOFvv-O6pHd8DU2kb5vzs7xIxzE3JoWnsFByK5LdoLnnfh0pXpmSpo0KS1j4uwl3XvF-Qm3Sm63Fwy_H224EAdqF_d2hWdVxJkn7HmAJTT445AyrtdFYgrg9"
 
 [auth]
-scratchattachv2="gAAAAABozo75u7Eov4zakrObMqLVs6wmwSNXQ7KroU5ntU7vZvM49fW-RnEWl1ZCnqIxAnjsPW5OUOBO2IS_MJYfuRl2CVNtaJojaO1s0uHk8_vZhh_YVMI="
+scratchattachv2 = "gAAAAABozo75u7Eov4zakrObMqLVs6wmwSNXQ7KroU5ntU7vZvM49fW-RnEWl1ZCnqIxAnjsPW5OUOBO2IS_MJYfuRl2CVNtaJojaO1s0uHk8_vZhh_YVMI="
+
+[teacher_auth]
+username = "gAAAAABo2AwGrm5MsCqFTz7yPBZf8F--b3529aCsi9olynL0DKBi5EllZR1jNtsTt4vUPdke7eyEHBToMfN00QgxAU4RmlH3GCAK4TpXs7Qd7eI4iGD1hIU="
+password = "gAAAAABo2AwLc-oRH45T6V-xlcpbaqH4Ds93nMCrMbgUv_AHoQhTO1L7NkU54npm54-Zjs7YVlkOSFS5kffWzJeMZB7maNAv1WKnHJ4YvzF_R7PlIaeIBa8="