-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add proctorio redirect url #227
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
|
||
import logging | ||
from decimal import Decimal | ||
from urllib.parse import urljoin | ||
from urllib.parse import urljoin, urlparse | ||
|
||
from django.conf import settings | ||
from django.contrib.auth import login | ||
|
@@ -20,6 +20,7 @@ | |
from lti_consumer.lti_1p3.extensions.rest_framework.authentication import Lti1p3ApiAuthentication | ||
from lti_consumer.lti_1p3.extensions.rest_framework.permissions import LtiProctoringAcsPermissions | ||
from lti_consumer.models import LtiConfiguration | ||
from lti_consumer.utils import get_lti_api_base | ||
from rest_framework import status | ||
from rest_framework.decorators import api_view, authentication_classes, permission_classes | ||
from rest_framework.permissions import IsAuthenticated | ||
|
@@ -36,7 +37,6 @@ | |
from edx_exams.apps.core.exceptions import ExamIllegalStatusTransition | ||
from edx_exams.apps.core.models import AssessmentControlResult, User | ||
from edx_exams.apps.core.statuses import ExamAttemptStatus | ||
from edx_exams.apps.lti.utils import get_lti_root | ||
|
||
log = logging.getLogger(__name__) | ||
|
||
|
@@ -235,12 +235,12 @@ def start_proctoring(request, attempt_id): | |
lti_config = LtiConfiguration.objects.get(id=lti_config_id) | ||
|
||
proctoring_start_assessment_url = urljoin( | ||
get_lti_root(), | ||
get_lti_api_base(), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this helper function already existed in the lti library. Removed a 'duplicate' util from this service |
||
reverse('lti_consumer:lti_consumer.start_proctoring_assessment_endpoint') | ||
) | ||
|
||
assessment_control_url = urljoin( | ||
get_lti_root(), | ||
get_lti_api_base(), | ||
reverse('lti:acs', kwargs={'lti_config_id': lti_config_id}), | ||
) | ||
|
||
|
@@ -261,12 +261,13 @@ def start_proctoring(request, attempt_id): | |
proctoring_launch_data=proctoring_launch_data, | ||
context_id=exam.course_id, | ||
context_label=exam.content_id, | ||
custom_parameters={ | ||
# The protocol is intentionally stripped from this url, the proctoring tool | ||
# is appending https:// to anything we pass here. This is unavoidable at the moment. | ||
'custom_url': urlparse(get_lti_api_base()).netloc + reverse('browser_lock'), | ||
}, | ||
) | ||
|
||
# temporary addition for testing with Proctorio in stage | ||
if settings.LTI_CUSTOM_URL_CLAIM: # pragma: no cover | ||
launch_data.custom_parameters['custom_url'] = settings.LTI_CUSTOM_URL_CLAIM | ||
|
||
return redirect(get_lti_1p3_launch_start_url(launch_data)) | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the customization on this django view can eventually be removed. It was only needed when we didn't have a UI to test with. I didn't want to add all that to this PR tho