Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22375 from edx/azarembok/notes-devstack-fixes

Browse Source 
Updates notes client name and API url for compatiblity with devstack.
This commit is contained in:
Alan Zarembok
2019-11-21 11:50:21 -05:00
committed by GitHub
parent 052f853ec1 38491776f0
commit efd225ce8e
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/djangoapps/edxnotes/helpers.py
View File

@@ -34,8 +34,7 @@ from xmodule.modulestore.django import modulestore
from xmodule.modulestore.exceptions import ItemNotFoundError
log = logging.getLogger(__name__)
# OAuth2 Client name for edxnotes
CLIENT_NAME = "edx-notes"
DEFAULT_PAGE = 1
DEFAULT_PAGE_SIZE = 25
@@ -56,10 +55,10 @@ def get_edxnotes_id_token(user):
Returns generated ID Token for edxnotes.
"""
try:
notes_application = Application.objects.get(name=CLIENT_NAME)
notes_application = Application.objects.get(name=settings.EDXNOTES_CLIENT_NAME)
except Application.DoesNotExist:
raise ImproperlyConfigured(
u'OAuth2 Client with name [{}] does not exist.'.format(CLIENT_NAME)
u'OAuth2 Client with name [{}] does not exist.'.format(settings.EDXNOTES_CLIENT_NAME)
)
return create_jwt_for_user(
user, secret=notes_application.client_secret, aud=notes_application.client_id

1
lms/envs/common.py
View File

@@ -1369,6 +1369,7 @@ PAYMENT_REPORT_GENERATOR_GROUP = 'shoppingcart_report_access'
# Configure the LMS to use our stub EdxNotes implementation
EDXNOTES_PUBLIC_API = 'http://localhost:18120/api/v1'
EDXNOTES_INTERNAL_API = 'http://localhost:18120/api/v1'
EDXNOTES_CLIENT_NAME = "edx-notes"
EDXNOTES_CONNECT_TIMEOUT = 0.5 # time in seconds
EDXNOTES_READ_TIMEOUT = 1.5 # time in seconds

3
lms/envs/devstack.py
View File

@@ -290,3 +290,6 @@ if os.path.isfile(join(dirname(abspath(__file__)), 'private.py')):
MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE)
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
EDXNOTES_INTERNAL_API = 'http://edx.devstack.edxnotesapi:18120/api/v1'
EDXNOTES_CLIENT_NAME = 'edx_notes_api-backend-service'

1
lms/envs/production.py
View File

@@ -874,6 +874,7 @@ PROFILE_IMAGE_SIZES_MAP = ENV_TOKENS.get(
EDXNOTES_PUBLIC_API = ENV_TOKENS.get('EDXNOTES_PUBLIC_API', EDXNOTES_PUBLIC_API)
EDXNOTES_INTERNAL_API = ENV_TOKENS.get('EDXNOTES_INTERNAL_API', EDXNOTES_INTERNAL_API)
EDXNOTES_CLIENT_NAME = ENV_TOKENS.get('EDXNOTES_CLIENT_NAME', EDXNOTES_CLIENT_NAME)
EDXNOTES_CONNECT_TIMEOUT = ENV_TOKENS.get('EDXNOTES_CONNECT_TIMEOUT', EDXNOTES_CONNECT_TIMEOUT)
EDXNOTES_READ_TIMEOUT = ENV_TOKENS.get('EDXNOTES_READ_TIMEOUT', EDXNOTES_READ_TIMEOUT)