qcanvas 0.0.5.1a0__tar.gz → 0.0.5.2a0__tar.gz

{qcanvas-0.0.5.1a0 → qcanvas-0.0.5.2a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 0.0.5.1a0
+Version: 0.0.5.2a0
 Summary: A canvas client
 Author: QCanvas
 Classifier: Operating System :: OS Independent

{qcanvas-0.0.5.1a0 → qcanvas-0.0.5.2a0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name="qcanvas"
-version = "0.0.5.1a"
+version = "0.0.5.2a"
 authors= [ {name="QCanvas"} ]
 description="A canvas client"
 requires-python=">=3.11,<=3.12"

{qcanvas-0.0.5.1a0 → qcanvas-0.0.5.2a0}/qcanvas/net/canvas/canvas_client.py

@@ -132,6 +132,27 @@ class CanvasClient(SelfAuthenticating):
 
             return LegacyFile.from_dict(json.loads(response.text))
 
+    @retry(
+        wait=wait_exponential(exp_base=1.2, max=10) + wait_random(0, 1),
+        retry=retry_if_exception_type(RatelimitedException),
+        stop=stop_after_attempt(8)
+    )
+    async def get_temp_session_link(self) -> str | None:
+        """
+        Gets the link which will authenticate a browser/open canvas using a 'legacy session token'
+        Returns
+        -------
+        str | None
+            The url as a string if the request succeeded, None if it didn't
+        """
+
+        token_response = await self.client.get(self.canvas_url.join("login/session_token"), **self.get_headers())
+
+        if token_response.is_success:
+            return json.loads(token_response.text)["session_url"]
+        else:
+            return None
+
     @retry(
         stop=stop_after_attempt(3),
         wait=wait_fixed(5) + wait_random(0, 1),

{qcanvas-0.0.5.1a0 → qcanvas-0.0.5.2a0}/qcanvas/ui/main_ui.py

@@ -3,8 +3,8 @@ import sys
 import traceback
 from typing import Sequence, Optional
 
-from PySide6.QtCore import Slot, Signal, Qt, QUrl
-from PySide6.QtGui import QDesktopServices
+from PySide6.QtCore import Slot, Signal, Qt, QUrl, QObject
+from PySide6.QtGui import QDesktopServices, QKeySequence
 from PySide6.QtWidgets import *
 from qasync import asyncSlot
 
@@ -20,6 +20,7 @@ from qcanvas.util import self_updater
 from qcanvas.util.app_settings import settings
 from qcanvas.util.constants import app_name
 from qcanvas.util.course_indexer import DataManager
+from qcanvas.util.helpers.qaction_helper import create_qaction
 
 _aux_settings = settings.auxiliary
 _no_course_selected_text = "No course selected"
@@ -103,9 +104,11 @@ class AppMainWindow(QMainWindow):
     def setup_menu_bar(self):
         menu_bar = self.menuBar()
 
-        menu_bar.addMenu(ThemeSelectionMenu())
-        view_menu = menu_bar.addMenu("View")
+        app_menu: QMenu = menu_bar.addMenu("App")
+        view_menu: QMenu = menu_bar.addMenu("View")
 
+        app_menu.addAction(self.setup_quick_authentication_action(app_menu))
+        app_menu.addMenu(ThemeSelectionMenu())
         view_menu.addMenu(self.setup_group_by_menu())
 
     def setup_group_by_menu(self) -> QMenu:
@@ -115,6 +118,18 @@ class AppMainWindow(QMainWindow):
 
         return file_grouping_menu
 
+    def setup_quick_authentication_action(self, parent: QObject):
+        return create_qaction(
+            name="Quick canvas login",
+            shortcut=QKeySequence("Ctrl+O"),
+            triggered=self.open_quick_auth_in_browser,
+            parent=parent
+        )
+
+    @asyncSlot()
+    async def open_quick_auth_in_browser(self):
+        QDesktopServices.openUrl(await self.data_manager.client.get_temp_session_link())
+
     def closeEvent(self, event):
         settings.geometry = self.saveGeometry()
         settings.window_state = self.saveState()

{qcanvas-0.0.5.1a0 → qcanvas-0.0.5.2a0}/qcanvas/util/course_indexer/data_manager.py

@@ -83,7 +83,7 @@ class DataManager:
                  sessionmaker: AsyncSessionMaker,
                  link_scanners: Sequence[ResourceScanner]):
 
-        self._client = client
+        self.client = client
         self._link_scanners = link_scanners
         self._session_maker = sessionmaker
 
@@ -188,7 +188,7 @@ class DataManager:
 
     async def synchronize_with_canvas(self, progress_reporter: ProgressReporter = noop_reporter):
         section = progress_reporter.section("Loading index", 0)
-        raw_query = (await self._client.do_graphql_query(gql(queries.all_courses.DEFINITION), detailed=True))
+        raw_query = (await self.client.do_graphql_query(gql(queries.all_courses.DEFINITION), detailed=True))
         section.increment_progress()
 
         await self.load_courses_data(queries.AllCoursesQueryData(**raw_query).all_courses, progress_reporter)
@@ -343,7 +343,7 @@ class DataManager:
         Fetches information about the specified file from canvas
         """
         _logger.debug(f"Fetching file (for module file) %s %s", file.m_id, file.display_name)
-        result = await self._client.get_file(file.m_id, course_id)
+        result = await self.client.get_file(file.m_id, course_id)
         resource = db.convert_file(file, result.size)
         resource.id = f"{canvas_resource_id_prefix}:{resource.id}"
         resource.course_id = course_id
@@ -369,7 +369,7 @@ class DataManager:
 
         try:
             # Get the page
-            result = await self._client.get_page(page.m_id, course_id)
+            result = await self.client.get_page(page.m_id, course_id)
         except BaseException as e:
             # Handle any errors
             _logger.error(e)