Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions provision-sanctions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ docker exec -t sanctions.app bash -c "echo 'from django.contrib.auth import get_

# Provision IDA User in LMS
echo -e "${GREEN}Provisioning ${name}_worker in LMS...${NC}"
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user ${name}_worker ${name}_worker@example.com --staff --superuser"
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack manage_user ${name}_worker ${name}_worker@example.com --staff --superuser"

# Create the DOT applications - one for single sign-on and one for backend service IDA-to-IDA authentication.
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_dot_application --grant-type authorization-code --skip-authorization --redirect-uris 'http://localhost:${port}/complete/edx-oauth2/' --client-id '${name}-sso-key' --client-secret '${name}-sso-secret' --scopes 'user_id' ${name}-sso ${name}_worker"
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_dot_application --grant-type client-credentials --client-id '${name}-backend-service-key' --client-secret '${name}-backend-service-secret' ${name}-backend-service ${name}_worker"
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack create_dot_application --grant-type authorization-code --skip-authorization --redirect-uris 'http://localhost:${port}/complete/edx-oauth2/' --client-id '${name}-sso-key' --client-secret '${name}-sso-secret' --scopes 'user_id' ${name}-sso ${name}_worker"
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack create_dot_application --grant-type client-credentials --client-id '${name}-backend-service-key' --client-secret '${name}-backend-service-secret' ${name}-backend-service ${name}_worker"

# Restart enterprise.catalog app and worker containers
docker-compose restart app
4 changes: 2 additions & 2 deletions sanctions/apps/api/v1/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from unittest import mock

from django.db.utils import OperationalError
from requests.exceptions import HTTPError
from requests.exceptions import RequestException
from rest_framework.reverse import reverse

from sanctions.apps.sanctions.models import SanctionsCheckFailure
Expand Down Expand Up @@ -36,7 +36,7 @@ def test_sdn_check_missing_args_returns_400(self):
@mock.patch('sanctions.apps.api.v1.views.checkSDNFallback')
@mock.patch('sanctions.apps.api_client.sdn_client.SDNClient.search')
def test_sdn_check_search_fails_uses_fallback(self, mock_search, mock_fallback):
mock_search.side_effect = [HTTPError]
mock_search.side_effect = [RequestException]
mock_fallback.return_value = 0
self.set_jwt_cookie(self.user.id)
response = self.client.post(
Expand Down
6 changes: 3 additions & 3 deletions sanctions/apps/api/v1/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.conf import settings
from django.http import JsonResponse
from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
from requests.exceptions import HTTPError, Timeout
from requests.exceptions import RequestException
from rest_framework import permissions, views

from sanctions.apps.api_client.sdn_client import SDNClient
Expand Down Expand Up @@ -61,8 +61,8 @@ def post(self, request):
lms_user_id
)
sdn_check_response = sdn_check.search(lms_user_id, full_name, city, country)
except (HTTPError, Timeout) as e:
logger.info(
except RequestException as e:
logger.error(
'SDNCheckView: SDN API call received an error: %s.'
' Calling sanctions checkSDNFallback function for user %s.',
str(e),
Expand Down
2 changes: 2 additions & 0 deletions sanctions/settings/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

DEBUG = True

ALLOWED_HOSTS = ['*']

# CACHE CONFIGURATION
# See: https://docs.djangoproject.com/en/dev/ref/settings/#caches
CACHES = {
Expand Down
Loading