codegrade 16.1.66__tar.gz → 16.1.68__tar.gz

{codegrade-16.1.66 → codegrade-16.1.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codegrade
-Version: 16.1.66
+Version: 16.1.68
 Summary: A client library for accessing CodeGrade
 License: AGPL-3.0-only OR BSD-3-Clause-Clear
 Requires-Python: >=3.8.0,<4.0

{codegrade-16.1.66 → codegrade-16.1.68}/cg_maybe/__init__.py

@@ -1,6 +1,4 @@
 """This module implements the ``Maybe`` monad.
-
-
 """
 from . import utils
 from ._just import Just

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/__init__.py

@@ -7,7 +7,7 @@ from functools import wraps
 from .client import AuthenticatedClient, Client
 
 __all__ = ("login", "AuthenticatedClient", "Client", "login_from_cli")
-__version__ = "16.1.66"
+__version__ = "16.1.68"
 
 
 @wraps(AuthenticatedClient.get)

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/client.py

@@ -538,7 +538,7 @@ class Client(_BaseClient):
         return httpx.Client(
             base_url=self.base_url,
             headers={
-                "User-Agent": "CodeGradeAPI/16.1.66",
+                "User-Agent": "CodeGradeAPI/16.1.68",
             },
             follow_redirects=True,
         )
@@ -558,7 +558,7 @@ class AuthenticatedClient(_BaseClient):
             base_url=self.base_url,
             headers={
                 "Authorization": f"Bearer {self.token}",
-                "User-Agent": "CodeGradeAPI/16.1.66",
+                "User-Agent": "CodeGradeAPI/16.1.68",
             },
             follow_redirects=True,
         )

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/models/__init__.py

@@ -10,6 +10,12 @@ from ._submission_rubric_item_data_parser import (
 )
 from .about import About
 from .abstract_role import AbstractRole
+from .access_token_modal_warning_time_setting import (
+    AccessTokenModalWarningTimeSetting,
+)
+from .access_token_toast_warning_time_setting import (
+    AccessTokenToastWarningTimeSetting,
+)
 from .add_users_section_data import AddUsersSectionData
 from .ai_assistant_enabled_setting import AiAssistantEnabledSetting
 from .all_auto_test_results import AllAutoTestResults
@@ -675,6 +681,9 @@ from .start_payment_course_price_redirect_data import (
 )
 from .started_transaction import StartedTransaction
 from .student_payment_enabled_setting import StudentPaymentEnabledSetting
+from .student_payment_main_option_setting import (
+    StudentPaymentMainOptionSetting,
+)
 from .student_view_enabled_setting import StudentViewEnabledSetting
 from .submission_validator_input_data import SubmissionValidatorInputData
 from .submissions_per_page_enabled_setting import (

codegrade-16.1.68/codegrade/models/access_token_modal_warning_time_setting.py

@@ -0,0 +1,58 @@
+"""The module that defines the ``AccessTokenModalWarningTimeSetting`` model.
+
+SPDX-License-Identifier: AGPL-3.0-only OR BSD-3-Clause-Clear
+"""
+
+import datetime
+import typing as t
+from dataclasses import dataclass, field
+
+import cg_request_args as rqa
+
+from ..utils import to_dict
+
+
+@dataclass
+class AccessTokenModalWarningTimeSetting:
+    """ """
+
+    name: "t.Literal['ACCESS_TOKEN_MODAL_WARNING_TIME']"
+    value: "t.Optional[datetime.timedelta]"
+
+    raw_data: t.Optional[t.Dict[str, t.Any]] = field(init=False, repr=False)
+
+    data_parser: t.ClassVar = rqa.Lazy(
+        lambda: rqa.FixedMapping(
+            rqa.RequiredArgument(
+                "name",
+                rqa.StringEnum("ACCESS_TOKEN_MODAL_WARNING_TIME"),
+                doc="",
+            ),
+            rqa.RequiredArgument(
+                "value",
+                rqa.Nullable(rqa.RichValue.TimeDelta),
+                doc="",
+            ),
+        ).use_readable_describe(True)
+    )
+
+    def to_dict(self) -> t.Dict[str, t.Any]:
+        res: t.Dict[str, t.Any] = {
+            "name": to_dict(self.name),
+            "value": to_dict(self.value),
+        }
+        return res
+
+    @classmethod
+    def from_dict(
+        cls: t.Type["AccessTokenModalWarningTimeSetting"],
+        d: t.Dict[str, t.Any],
+    ) -> "AccessTokenModalWarningTimeSetting":
+        parsed = cls.data_parser.try_parse(d)
+
+        res = cls(
+            name=parsed.name,
+            value=parsed.value,
+        )
+        res.raw_data = d
+        return res

codegrade-16.1.68/codegrade/models/access_token_toast_warning_time_setting.py

@@ -0,0 +1,58 @@
+"""The module that defines the ``AccessTokenToastWarningTimeSetting`` model.
+
+SPDX-License-Identifier: AGPL-3.0-only OR BSD-3-Clause-Clear
+"""
+
+import datetime
+import typing as t
+from dataclasses import dataclass, field
+
+import cg_request_args as rqa
+
+from ..utils import to_dict
+
+
+@dataclass
+class AccessTokenToastWarningTimeSetting:
+    """ """
+
+    name: "t.Literal['ACCESS_TOKEN_TOAST_WARNING_TIME']"
+    value: "t.Optional[datetime.timedelta]"
+
+    raw_data: t.Optional[t.Dict[str, t.Any]] = field(init=False, repr=False)
+
+    data_parser: t.ClassVar = rqa.Lazy(
+        lambda: rqa.FixedMapping(
+            rqa.RequiredArgument(
+                "name",
+                rqa.StringEnum("ACCESS_TOKEN_TOAST_WARNING_TIME"),
+                doc="",
+            ),
+            rqa.RequiredArgument(
+                "value",
+                rqa.Nullable(rqa.RichValue.TimeDelta),
+                doc="",
+            ),
+        ).use_readable_describe(True)
+    )
+
+    def to_dict(self) -> t.Dict[str, t.Any]:
+        res: t.Dict[str, t.Any] = {
+            "name": to_dict(self.name),
+            "value": to_dict(self.value),
+        }
+        return res
+
+    @classmethod
+    def from_dict(
+        cls: t.Type["AccessTokenToastWarningTimeSetting"],
+        d: t.Dict[str, t.Any],
+    ) -> "AccessTokenToastWarningTimeSetting":
+        parsed = cls.data_parser.try_parse(d)
+
+        res = cls(
+            name=parsed.name,
+            value=parsed.value,
+        )
+        res.raw_data = d
+        return res

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/models/all_site_settings.py

@@ -706,6 +706,14 @@ class AllSiteSettings(FrontendSiteSettings):
             res["RESET_TOKEN_TIME"] = to_dict(self.reset_token_time.value)
         if self.site_email.is_just:
             res["SITE_EMAIL"] = to_dict(self.site_email.value)
+        if self.access_token_toast_warning_time.is_just:
+            res["ACCESS_TOKEN_TOAST_WARNING_TIME"] = to_dict(
+                self.access_token_toast_warning_time.value
+            )
+        if self.access_token_modal_warning_time.is_just:
+            res["ACCESS_TOKEN_MODAL_WARNING_TIME"] = to_dict(
+                self.access_token_modal_warning_time.value
+            )
         if self.max_lines.is_just:
             res["MAX_LINES"] = to_dict(self.max_lines.value)
         if self.notification_poll_time.is_just:
@@ -788,6 +796,10 @@ class AllSiteSettings(FrontendSiteSettings):
             res["STUDENT_PAYMENT_ENABLED"] = to_dict(
                 self.student_payment_enabled.value
             )
+        if self.student_payment_main_option.is_just:
+            res["STUDENT_PAYMENT_MAIN_OPTION"] = to_dict(
+                self.student_payment_main_option.value
+            )
         if self.editor_enabled.is_just:
             res["EDITOR_ENABLED"] = to_dict(self.editor_enabled.value)
         if self.new_auto_test_enabled.is_just:
@@ -1185,6 +1197,8 @@ class AllSiteSettings(FrontendSiteSettings):
             login_token_before_time=parsed.LOGIN_TOKEN_BEFORE_TIME,
             reset_token_time=parsed.RESET_TOKEN_TIME,
             site_email=parsed.SITE_EMAIL,
+            access_token_toast_warning_time=parsed.ACCESS_TOKEN_TOAST_WARNING_TIME,
+            access_token_modal_warning_time=parsed.ACCESS_TOKEN_MODAL_WARNING_TIME,
             max_lines=parsed.MAX_LINES,
             notification_poll_time=parsed.NOTIFICATION_POLL_TIME,
             release_message_max_time=parsed.RELEASE_MESSAGE_MAX_TIME,
@@ -1209,6 +1223,7 @@ class AllSiteSettings(FrontendSiteSettings):
             peer_feedback_enabled=parsed.PEER_FEEDBACK_ENABLED,
             at_image_caching_enabled=parsed.AT_IMAGE_CACHING_ENABLED,
             student_payment_enabled=parsed.STUDENT_PAYMENT_ENABLED,
+            student_payment_main_option=parsed.STUDENT_PAYMENT_MAIN_OPTION,
             editor_enabled=parsed.EDITOR_ENABLED,
             new_auto_test_enabled=parsed.NEW_AUTO_TEST_ENABLED,
             server_time_correction_enabled=parsed.SERVER_TIME_CORRECTION_ENABLED,

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/models/assignment.py

@@ -93,7 +93,7 @@ class Assignment(TimeframeLike):
     #: Can you upload files to this assignment.
     files_upload_enabled: "bool"
     #: Can you connect git to this assignment. Deprecated, use
-    #: `webhook_configuration`\` instead.
+    #: `webhook_configuration` instead.
     webhook_upload_enabled: "bool"
     #: Settings for the git connection to this assignment.
     webhook_configuration: "t.Union[WebhookConfigurationEnabledAsJSON, WebhookConfigurationDisabledAsJSON]"
@@ -106,8 +106,8 @@ class Assignment(TimeframeLike):
     #: `amount_in_cool_off_period` amount.
     cool_off_period: "datetime.timedelta"
     #: The maximum amount of time a user can submit within
-    #: `amount_in_cool_off_period`. This value is always \>= 0, if this value
-    #: is 0 a user can submit an unlimited amount of time.
+    #: `amount_in_cool_off_period`. This value is always greater than or equal
+    #: to 0, if this value is 0 a user can submit an unlimited amount of time.
     amount_in_cool_off_period: "int"
     #: The moment reminder emails will be sent. This will be `None` if you
     #: don't have the permission to see this or if it is unset.
@@ -303,7 +303,7 @@ class Assignment(TimeframeLike):
                     rqa.SimpleValue.bool,
                     doc=(
                         "Can you connect git to this assignment. Deprecated,"
-                        " use `webhook_configuration`\\` instead."
+                        " use `webhook_configuration` instead."
                     ),
                 ),
                 rqa.RequiredArgument(
@@ -346,8 +346,8 @@ class Assignment(TimeframeLike):
                     doc=(
                         "The maximum amount of time a user can submit within"
                         " `amount_in_cool_off_period`. This value is always"
-                        " \\>= 0, if this value is 0 a user can submit an"
-                        " unlimited amount of time."
+                        " greater than or equal to 0, if this value is 0 a"
+                        " user can submit an unlimited amount of time."
                     ),
                 ),
                 rqa.RequiredArgument(

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/models/base_lms_capabilities.py

@@ -57,20 +57,22 @@ class BaseLMSCapabilities:
     #: don't want to send replacement variables to an LMS we know it will never
     #: support. This property contains a list of custom replacement groups
     #: supported by this LMS.  For example: we have a replacement variable
-    #: called `name'`, this variable will be included (parsed and returned as
-    #: wanted config), if the `supported_custom_replacement_groups` contains
-    #: `['$com']`. It will also be included if it contains `['$com',
-    #: 'custom_lms']`. However, it will not be included if it only contains
-    #: `custom_lms']` or `['$com', 'other_lms']`.
+    #: called `'$com.custom_lms.User.name'`, this variable will be included
+    #: (parsed and returned as wanted config), if the
+    #: `supported_custom_replacement_groups` contains `['$com']`. It will also
+    #: be included if it contains `['$com', 'custom_lms']`. However, it will
+    #: not be included if it only contains `['$com.custom_lms']` or `['$com',
+    #: 'other_lms']`.
     supported_custom_replacement_groups: "t.Sequence[t.Sequence[str]]"
-    #: Should we use the `id` in the url.  Some LMSes do not provide both the
-    #: `iss` and the `client_id` in all launches. This means that finding the
-    #: correct `LTI1p3Provider` is not always correct (especially as the `iss`
-    #: often gets used multiple times). For some LMSes therefore it is a better
-    #: idea to simply include the id of the provider in the launch url, and
-    #: verify with the given information that the provider could theoretically
-    #: be the correct one (i.e. all given information matches with the
-    #: information in the LTI provider that belongs to the `id`).
+    #: Should we use the `LTI1p3Provider.id` in the url.  Some LMSes do not
+    #: provide both the `iss` and the `client_id` in all launches. This means
+    #: that finding the correct `LTI1p3Provider` is not always correct
+    #: (especially as the `iss` often gets used multiple times). For some LMSes
+    #: therefore it is a better idea to simply include the id of the provider
+    #: in the launch url, and verify with the given information that the
+    #: provider could theoretically be the correct one (i.e. all given
+    #: information matches with the information in the LTI provider that
+    #: belongs to the `id`).
     use_id_in_urls: "bool"
     #: Does this LMS require actual deep linking, where the user inputs a name
     #: and deadline.
@@ -156,12 +158,13 @@ class BaseLMSCapabilities:
                     " replacement variables to an LMS we know it will never"
                     " support. This property contains a list of custom"
                     " replacement groups supported by this LMS.  For example:"
-                    " we have a replacement variable called `name'`, this"
-                    " variable will be included (parsed and returned as wanted"
-                    " config), if the `supported_custom_replacement_groups`"
-                    " contains `['$com']`. It will also be included if it"
-                    " contains `['$com', 'custom_lms']`. However, it will not"
-                    " be included if it only contains `custom_lms']` or"
+                    " we have a replacement variable called"
+                    " `'$com.custom_lms.User.name'`, this variable will be"
+                    " included (parsed and returned as wanted config), if the"
+                    " `supported_custom_replacement_groups` contains"
+                    " `['$com']`. It will also be included if it contains"
+                    " `['$com', 'custom_lms']`. However, it will not be"
+                    " included if it only contains `['$com.custom_lms']` or"
                     " `['$com', 'other_lms']`."
                 ),
             ),
@@ -169,9 +172,9 @@ class BaseLMSCapabilities:
                 "use_id_in_urls",
                 rqa.SimpleValue.bool,
                 doc=(
-                    "Should we use the `id` in the url.  Some LMSes do not"
-                    " provide both the `iss` and the `client_id` in all"
-                    " launches. This means that finding the correct"
+                    "Should we use the `LTI1p3Provider.id` in the url.  Some"
+                    " LMSes do not provide both the `iss` and the `client_id`"
+                    " in all launches. This means that finding the correct"
                     " `LTI1p3Provider` is not always correct (especially as"
                     " the `iss` often gets used multiple times). For some"
                     " LMSes therefore it is a better idea to simply include"

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/models/frontend_site_settings.py

@@ -65,6 +65,12 @@ class FrontendSiteSettings:
     reset_token_time: Maybe["datetime.timedelta"] = Nothing
     #: The email shown to users as the email of CodeGrade.
     site_email: Maybe["str"] = Nothing
+    #: The amount of time before an access token expires when we will show a
+    #: toast message warning the user that their session is about to expire.
+    access_token_toast_warning_time: Maybe["datetime.timedelta"] = Nothing
+    #: The amount of time before an access token expires when we will show a
+    #: modal with a warning that the user's session is about to expire.
+    access_token_modal_warning_time: Maybe["datetime.timedelta"] = Nothing
     #: The maximum amount of lines that we should in render in one go. If a
     #: file contains more lines than this we will show a warning asking the
     #: user what to do.
@@ -140,6 +146,11 @@ class FrontendSiteSettings:
     #: to enable this deploy config needs to be updated, so don't just enable
     #: it.
     student_payment_enabled: Maybe["bool"] = Nothing
+    #: Define what will be shown as the main option for student payment, the
+    #: default will show stripe as the main payment option.
+    student_payment_main_option: Maybe[
+        "t.Literal['coupon', 'stripe']"
+    ] = Nothing
     #: Can students submit using the online editor.
     editor_enabled: Maybe["bool"] = Nothing
     #: Can AutoTest configurations be created and run using the 2.0
@@ -446,6 +457,24 @@ class FrontendSiteSettings:
                 rqa.SimpleValue.str,
                 doc="The email shown to users as the email of CodeGrade.",
             ),
+            rqa.OptionalArgument(
+                "ACCESS_TOKEN_TOAST_WARNING_TIME",
+                rqa.RichValue.TimeDelta,
+                doc=(
+                    "The amount of time before an access token expires when we"
+                    " will show a toast message warning the user that their"
+                    " session is about to expire."
+                ),
+            ),
+            rqa.OptionalArgument(
+                "ACCESS_TOKEN_MODAL_WARNING_TIME",
+                rqa.RichValue.TimeDelta,
+                doc=(
+                    "The amount of time before an access token expires when we"
+                    " will show a modal with a warning that the user's session"
+                    " is about to expire."
+                ),
+            ),
             rqa.OptionalArgument(
                 "MAX_LINES",
                 rqa.SimpleValue.int,
@@ -634,6 +663,15 @@ class FrontendSiteSettings:
                     " be updated, so don't just enable it."
                 ),
             ),
+            rqa.OptionalArgument(
+                "STUDENT_PAYMENT_MAIN_OPTION",
+                rqa.StringEnum("coupon", "stripe"),
+                doc=(
+                    "Define what will be shown as the main option for student"
+                    " payment, the default will show stripe as the main"
+                    " payment option."
+                ),
+            ),
             rqa.OptionalArgument(
                 "EDITOR_ENABLED",
                 rqa.SimpleValue.bool,
@@ -1146,6 +1184,12 @@ class FrontendSiteSettings:
         )
         self.reset_token_time = maybe_from_nullable(self.reset_token_time)
         self.site_email = maybe_from_nullable(self.site_email)
+        self.access_token_toast_warning_time = maybe_from_nullable(
+            self.access_token_toast_warning_time
+        )
+        self.access_token_modal_warning_time = maybe_from_nullable(
+            self.access_token_modal_warning_time
+        )
         self.max_lines = maybe_from_nullable(self.max_lines)
         self.notification_poll_time = maybe_from_nullable(
             self.notification_poll_time
@@ -1206,6 +1250,9 @@ class FrontendSiteSettings:
         self.student_payment_enabled = maybe_from_nullable(
             self.student_payment_enabled
         )
+        self.student_payment_main_option = maybe_from_nullable(
+            self.student_payment_main_option
+        )
         self.editor_enabled = maybe_from_nullable(self.editor_enabled)
         self.new_auto_test_enabled = maybe_from_nullable(
             self.new_auto_test_enabled
@@ -1434,6 +1481,14 @@ class FrontendSiteSettings:
             res["RESET_TOKEN_TIME"] = to_dict(self.reset_token_time.value)
         if self.site_email.is_just:
             res["SITE_EMAIL"] = to_dict(self.site_email.value)
+        if self.access_token_toast_warning_time.is_just:
+            res["ACCESS_TOKEN_TOAST_WARNING_TIME"] = to_dict(
+                self.access_token_toast_warning_time.value
+            )
+        if self.access_token_modal_warning_time.is_just:
+            res["ACCESS_TOKEN_MODAL_WARNING_TIME"] = to_dict(
+                self.access_token_modal_warning_time.value
+            )
         if self.max_lines.is_just:
             res["MAX_LINES"] = to_dict(self.max_lines.value)
         if self.notification_poll_time.is_just:
@@ -1516,6 +1571,10 @@ class FrontendSiteSettings:
             res["STUDENT_PAYMENT_ENABLED"] = to_dict(
                 self.student_payment_enabled.value
             )
+        if self.student_payment_main_option.is_just:
+            res["STUDENT_PAYMENT_MAIN_OPTION"] = to_dict(
+                self.student_payment_main_option.value
+            )
         if self.editor_enabled.is_just:
             res["EDITOR_ENABLED"] = to_dict(self.editor_enabled.value)
         if self.new_auto_test_enabled.is_just:
@@ -1757,6 +1816,8 @@ class FrontendSiteSettings:
             login_token_before_time=parsed.LOGIN_TOKEN_BEFORE_TIME,
             reset_token_time=parsed.RESET_TOKEN_TIME,
             site_email=parsed.SITE_EMAIL,
+            access_token_toast_warning_time=parsed.ACCESS_TOKEN_TOAST_WARNING_TIME,
+            access_token_modal_warning_time=parsed.ACCESS_TOKEN_MODAL_WARNING_TIME,
             max_lines=parsed.MAX_LINES,
             notification_poll_time=parsed.NOTIFICATION_POLL_TIME,
             release_message_max_time=parsed.RELEASE_MESSAGE_MAX_TIME,
@@ -1781,6 +1842,7 @@ class FrontendSiteSettings:
             peer_feedback_enabled=parsed.PEER_FEEDBACK_ENABLED,
             at_image_caching_enabled=parsed.AT_IMAGE_CACHING_ENABLED,
             student_payment_enabled=parsed.STUDENT_PAYMENT_ENABLED,
+            student_payment_main_option=parsed.STUDENT_PAYMENT_MAIN_OPTION,
             editor_enabled=parsed.EDITOR_ENABLED,
             new_auto_test_enabled=parsed.NEW_AUTO_TEST_ENABLED,
             server_time_correction_enabled=parsed.SERVER_TIME_CORRECTION_ENABLED,

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/models/result_data_post_login_link_login.py

@@ -3,6 +3,7 @@
 SPDX-License-Identifier: AGPL-3.0-only OR BSD-3-Clause-Clear
 """
 
+import datetime
 import typing as t
 from dataclasses import dataclass, field
 
@@ -24,6 +25,8 @@ class ResultDataPostLoginLinkLogin:
     access_token: "str"
     #: The restrictions of this access token.
     restrictions: "SessionRestrictionData"
+    #: When this token expires.
+    expires_at: "datetime.datetime"
 
     raw_data: t.Optional[t.Dict[str, t.Any]] = field(init=False, repr=False)
 
@@ -47,6 +50,11 @@ class ResultDataPostLoginLinkLogin:
                 parsers.ParserFor.make(SessionRestrictionData),
                 doc="The restrictions of this access token.",
             ),
+            rqa.RequiredArgument(
+                "expires_at",
+                rqa.RichValue.DateTime,
+                doc="When this token expires.",
+            ),
         ).use_readable_describe(True)
     )
 
@@ -55,6 +63,7 @@ class ResultDataPostLoginLinkLogin:
             "user": to_dict(self.user),
             "access_token": to_dict(self.access_token),
             "restrictions": to_dict(self.restrictions),
+            "expires_at": to_dict(self.expires_at),
         }
         return res
 
@@ -68,6 +77,7 @@ class ResultDataPostLoginLinkLogin:
             user=parsed.user,
             access_token=parsed.access_token,
             restrictions=parsed.restrictions,
+            expires_at=parsed.expires_at,
         )
         res.raw_data = d
         return res

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/models/result_data_post_user_login.py

@@ -3,6 +3,7 @@
 SPDX-License-Identifier: AGPL-3.0-only OR BSD-3-Clause-Clear
 """
 
+import datetime
 import typing as t
 from dataclasses import dataclass, field
 
@@ -24,6 +25,8 @@ class ResultDataPostUserLogin:
     access_token: "str"
     #: The restrictions of this access token.
     restrictions: "SessionRestrictionData"
+    #: When this token expires.
+    expires_at: "datetime.datetime"
 
     raw_data: t.Optional[t.Dict[str, t.Any]] = field(init=False, repr=False)
 
@@ -47,6 +50,11 @@ class ResultDataPostUserLogin:
                 parsers.ParserFor.make(SessionRestrictionData),
                 doc="The restrictions of this access token.",
             ),
+            rqa.RequiredArgument(
+                "expires_at",
+                rqa.RichValue.DateTime,
+                doc="When this token expires.",
+            ),
         ).use_readable_describe(True)
     )
 
@@ -55,6 +63,7 @@ class ResultDataPostUserLogin:
             "user": to_dict(self.user),
             "access_token": to_dict(self.access_token),
             "restrictions": to_dict(self.restrictions),
+            "expires_at": to_dict(self.expires_at),
         }
         return res
 
@@ -68,6 +77,7 @@ class ResultDataPostUserLogin:
             user=parsed.user,
             access_token=parsed.access_token,
             restrictions=parsed.restrictions,
+            expires_at=parsed.expires_at,
         )
         res.raw_data = d
         return res

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/models/result_data_post_user_register.py

@@ -3,6 +3,7 @@
 SPDX-License-Identifier: AGPL-3.0-only OR BSD-3-Clause-Clear
 """
 
+import datetime
 import typing as t
 from dataclasses import dataclass, field
 
@@ -24,6 +25,8 @@ class ResultDataPostUserRegister:
     access_token: "str"
     #: The restrictions of this access token.
     restrictions: "SessionRestrictionData"
+    #: When this token expires.
+    expires_at: "datetime.datetime"
 
     raw_data: t.Optional[t.Dict[str, t.Any]] = field(init=False, repr=False)
 
@@ -47,6 +50,11 @@ class ResultDataPostUserRegister:
                 parsers.ParserFor.make(SessionRestrictionData),
                 doc="The restrictions of this access token.",
             ),
+            rqa.RequiredArgument(
+                "expires_at",
+                rqa.RichValue.DateTime,
+                doc="When this token expires.",
+            ),
         ).use_readable_describe(True)
     )
 
@@ -55,6 +63,7 @@ class ResultDataPostUserRegister:
             "user": to_dict(self.user),
             "access_token": to_dict(self.access_token),
             "restrictions": to_dict(self.restrictions),
+            "expires_at": to_dict(self.expires_at),
         }
         return res
 
@@ -68,6 +77,7 @@ class ResultDataPostUserRegister:
             user=parsed.user,
             access_token=parsed.access_token,
             restrictions=parsed.restrictions,
+            expires_at=parsed.expires_at,
         )
         res.raw_data = d
         return res

{codegrade-16.1.66 → codegrade-16.1.68}/codegrade/models/site_setting_input.py

@@ -10,6 +10,12 @@ import cg_request_args as rqa
 
 from ..parsers import ParserFor, make_union
 from ..utils import to_dict
+from .access_token_modal_warning_time_setting import (
+    AccessTokenModalWarningTimeSetting,
+)
+from .access_token_toast_warning_time_setting import (
+    AccessTokenToastWarningTimeSetting,
+)
 from .ai_assistant_enabled_setting import AiAssistantEnabledSetting
 from .always_update_pii_with_lti_setting import AlwaysUpdatePiiWithLtiSetting
 from .analytics_enabled_setting import AnalyticsEnabledSetting
@@ -291,6 +297,9 @@ from .staged_assignment_importer_enabled_setting import (
     StagedAssignmentImporterEnabledSetting,
 )
 from .student_payment_enabled_setting import StudentPaymentEnabledSetting
+from .student_payment_main_option_setting import (
+    StudentPaymentMainOptionSetting,
+)
 from .student_view_enabled_setting import StudentViewEnabledSetting
 from .submissions_per_page_enabled_setting import (
     SubmissionsPerPageEnabledSetting,
@@ -340,6 +349,8 @@ SiteSettingInput = t.Union[
     MaxDynamoFileSizeSetting,
     MaxDocumentUpdateSizeSetting,
     JwtAccessTokenExpiresSetting,
+    AccessTokenToastWarningTimeSetting,
+    AccessTokenModalWarningTimeSetting,
     MaxLinesSetting,
     NotificationPollTimeSetting,
     ReleaseMessageMaxTimeSetting,
@@ -364,6 +375,7 @@ SiteSettingInput = t.Union[
     PeerFeedbackEnabledSetting,
     AtImageCachingEnabledSetting,
     StudentPaymentEnabledSetting,
+    StudentPaymentMainOptionSetting,
     EditorEnabledSetting,
     NewAutoTestEnabledSetting,
     ServerTimeCorrectionEnabledSetting,
@@ -477,6 +489,8 @@ SiteSettingInputParser = rqa.Lazy(
         ParserFor.make(MaxDynamoFileSizeSetting),
         ParserFor.make(MaxDocumentUpdateSizeSetting),
         ParserFor.make(JwtAccessTokenExpiresSetting),
+        ParserFor.make(AccessTokenToastWarningTimeSetting),
+        ParserFor.make(AccessTokenModalWarningTimeSetting),
         ParserFor.make(MaxLinesSetting),
         ParserFor.make(NotificationPollTimeSetting),
         ParserFor.make(ReleaseMessageMaxTimeSetting),
@@ -501,6 +515,7 @@ SiteSettingInputParser = rqa.Lazy(
         ParserFor.make(PeerFeedbackEnabledSetting),
         ParserFor.make(AtImageCachingEnabledSetting),
         ParserFor.make(StudentPaymentEnabledSetting),
+        ParserFor.make(StudentPaymentMainOptionSetting),
         ParserFor.make(EditorEnabledSetting),
         ParserFor.make(NewAutoTestEnabledSetting),
         ParserFor.make(ServerTimeCorrectionEnabledSetting),