Skip to content

E
edx-platform
Commit 88fef8b2 by J. Cliff Dyer
Options

Use renamed edx_oauth2_provider throughout. 

MA-1998 Install and configure django_oauth_toolkit to coexist with
existing oauth libraries.
parent 88d0461b
Showing with 30 additions and 29 deletions
cms/djangoapps/contentstore/views/tests/test_programs.py
...@@ -5,7 +5,7 @@ from django.conf import settings ...@@ -5,7 +5,7 @@ from django.conf import settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
import httpretty import httpretty
import mock import mock
from oauth2_provider.tests.factories import ClientFactory from edx_oauth2_provider.tests.factories import ClientFactory
from provider.constants import CONFIDENTIAL from provider.constants import CONFIDENTIAL
from openedx.core.djangoapps.programs.models import ProgramsApiConfig from openedx.core.djangoapps.programs.models import ProgramsApiConfig
......
cms/envs/common.py
...@@ -867,7 +867,7 @@ INSTALLED_APPS = ( ...@@ -867,7 +867,7 @@ INSTALLED_APPS = (
# OAuth2 Provider # OAuth2 Provider
'provider', 'provider',
'provider.oauth2', 'provider.oauth2',
'oauth2_provider', 'edx_oauth2_provider',
# These are apps that aren't strictly needed by Studio, but are imported by # These are apps that aren't strictly needed by Studio, but are imported by
# other apps that are. Django 1.8 wants to have imported models supported # other apps that are. Django 1.8 wants to have imported models supported
......
common/djangoapps/auth_exchange/forms.py
...@@ -3,7 +3,7 @@ Forms to support third-party to first-party OAuth 2.0 access token exchange ...@@ -3,7 +3,7 @@ Forms to support third-party to first-party OAuth 2.0 access token exchange
""" """
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.forms import CharField from django.forms import CharField
from oauth2_provider.constants import SCOPE_NAMES from edx_oauth2_provider.constants import SCOPE_NAMES
import provider.constants import provider.constants
from provider.forms import OAuthForm, OAuthValidationError from provider.forms import OAuthForm, OAuthValidationError
from provider.oauth2.forms import ScopeChoiceField, ScopeMixin from provider.oauth2.forms import ScopeChoiceField, ScopeMixin
......
common/test/db_cache/bok_choy_data_default.json
This source diff could not be displayed because it is too large. You can view the blob instead.
common/test/db_cache/bok_choy_migrations_data_default.sql
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
LOCK TABLES `django_migrations` WRITE; LOCK TABLES `django_migrations` WRITE;
/*!40000 ALTER TABLE `django_migrations` DISABLE KEYS */; /*!40000 ALTER TABLE `django_migrations` DISABLE KEYS */;
INSERT INTO `django_migrations` VALUES (1,'contenttypes','0001_initial','2016-02-29 17:58:04.910265'),(2,'auth','0001_initial','2016-02-29 17:58:05.155297'),(3,'admin','0001_initial','2016-02-29 17:58:05.261098'),(4,'assessment','0001_initial','2016-02-29 17:58:08.458980'),(5,'assessment','0002_staffworkflow','2016-02-29 17:58:08.659081'),(6,'contenttypes','0002_remove_content_type_name','2016-02-29 17:58:08.818265'),(7,'auth','0002_alter_permission_name_max_length','2016-02-29 17:58:08.855835'),(8,'auth','0003_alter_user_email_max_length','2016-02-29 17:58:08.894682'),(9,'auth','0004_alter_user_username_opts','2016-02-29 17:58:08.918567'),(10,'auth','0005_alter_user_last_login_null','2016-02-29 17:58:08.971615'),(11,'auth','0006_require_contenttypes_0002','2016-02-29 17:58:08.976069'),(12,'bookmarks','0001_initial','2016-02-29 17:58:09.243246'),(13,'branding','0001_initial','2016-02-29 17:58:09.364920'),(14,'bulk_email','0001_initial','2016-02-29 17:58:09.630882'),(15,'bulk_email','0002_data__load_course_email_template','2016-02-29 17:58:09.715512'),(16,'instructor_task','0001_initial','2016-02-29 17:58:09.872596'),(17,'certificates','0001_initial','2016-02-29 17:58:10.722743'),(18,'certificates','0002_data__certificatehtmlviewconfiguration_data','2016-02-29 17:58:10.736641'),(19,'certificates','0003_data__default_modes','2016-02-29 17:58:10.775334'),(20,'certificates','0004_certificategenerationhistory','2016-02-29 17:58:10.911498'),(21,'certificates','0005_auto_20151208_0801','2016-02-29 17:58:11.002303'),(22,'certificates','0006_certificatetemplateasset_asset_slug','2016-02-29 17:58:11.050549'),(23,'certificates','0007_certificateinvalidation','2016-02-29 17:58:11.166297'),(24,'commerce','0001_data__add_ecommerce_service_user','2016-02-29 17:58:11.198023'),(25,'commerce','0002_commerceconfiguration','2016-02-29 17:58:11.291907'),(26,'contentserver','0001_initial','2016-02-29 17:58:11.375676'),(27,'cors_csrf','0001_initial','2016-02-29 17:58:11.462189'),(28,'course_action_state','0001_initial','2016-02-29 17:58:11.783744'),(29,'course_groups','0001_initial','2016-02-29 17:58:12.790006'),(30,'course_modes','0001_initial','2016-02-29 17:58:12.902796'),(31,'course_modes','0002_coursemode_expiration_datetime_is_explicit','2016-02-29 17:58:12.957209'),(32,'course_modes','0003_auto_20151113_1443','2016-02-29 17:58:12.979234'),(33,'course_modes','0004_auto_20151113_1457','2016-02-29 17:58:13.095320'),(34,'course_modes','0005_auto_20151217_0958','2016-02-29 17:58:13.116644'),(35,'course_modes','0006_auto_20160208_1407','2016-02-29 17:58:13.208193'),(36,'course_overviews','0001_initial','2016-02-29 17:58:13.283088'),(37,'course_overviews','0002_add_course_catalog_fields','2016-02-29 17:58:13.499090'),(38,'course_overviews','0003_courseoverviewgeneratedhistory','2016-02-29 17:58:13.525866'),(39,'course_overviews','0004_courseoverview_org','2016-02-29 17:58:13.567577'),(40,'course_overviews','0005_delete_courseoverviewgeneratedhistory','2016-02-29 17:58:13.585458'),(41,'course_overviews','0006_courseoverviewimageset','2016-02-29 17:58:13.636894'),(42,'course_overviews','0007_courseoverviewimageconfig','2016-02-29 17:58:13.764616'),(43,'course_overviews','0008_remove_courseoverview_facebook_url','2016-02-29 17:58:13.815867'),(44,'course_overviews','0009_readd_facebook_url','2016-02-29 17:58:13.872971'),(45,'course_structures','0001_initial','2016-02-29 17:58:13.899706'),(46,'courseware','0001_initial','2016-02-29 17:58:16.765503'),(47,'coursewarehistoryextended','0001_initial','2016-02-29 17:58:16.912454'),(48,'credentials','0001_initial','2016-02-29 17:58:17.072454'),(49,'credit','0001_initial','2016-02-29 17:58:18.478297'),(50,'dark_lang','0001_initial','2016-02-29 17:58:18.635638'),(51,'dark_lang','0002_data__enable_on_install','2016-02-29 17:58:18.654315'),(52,'default','0001_initial','2016-02-29 17:58:19.121037'),(53,'default','0002_add_related_name','2016-02-29 17:58:19.287646'),(54,'default','0003_alter_email_max_length','2016-02-29 17:58:19.355367'),(55,'django_comment_common','0001_initial','2016-02-29 17:58:19.826406'),(56,'django_notify','0001_initial','2016-02-29 17:58:20.691115'),(57,'django_openid_auth','0001_initial','2016-02-29 17:58:20.948196'),(58,'edx_proctoring','0001_initial','2016-02-29 17:58:25.028310'),(59,'edx_proctoring','0002_proctoredexamstudentattempt_is_status_acknowledged','2016-02-29 17:58:25.270722'),(60,'edx_proctoring','0003_auto_20160101_0525','2016-02-29 17:58:25.651659'),(61,'edx_proctoring','0004_auto_20160201_0523','2016-02-29 17:58:25.881209'),(62,'edxval','0001_initial','2016-02-29 17:58:26.490038'),(63,'edxval','0002_data__default_profiles','2016-02-29 17:58:26.519947'),(64,'embargo','0001_initial','2016-02-29 17:58:27.388295'),(65,'embargo','0002_data__add_countries','2016-02-29 17:58:27.716022'),(66,'external_auth','0001_initial','2016-02-29 17:58:28.339793'),(67,'lms_xblock','0001_initial','2016-02-29 17:58:28.600358'),(68,'sites','0001_initial','2016-02-29 17:58:28.639305'),(69,'microsite_configuration','0001_initial','2016-02-29 17:58:30.470563'),(70,'microsite_configuration','0002_auto_20160202_0228','2016-02-29 17:58:31.089884'),(71,'milestones','0001_initial','2016-02-29 17:58:32.206321'),(72,'milestones','0002_data__seed_relationship_types','2016-02-29 17:58:32.242905'),(73,'milestones','0003_coursecontentmilestone_requirements','2016-02-29 17:58:33.317573'),(74,'milestones','0004_auto_20151221_1445','2016-02-29 17:58:33.593210'),(75,'mobile_api','0001_initial','2016-02-29 17:58:33.849089'),(76,'notes','0001_initial','2016-02-29 17:58:34.185220'),(77,'oauth2','0001_initial','2016-02-29 17:58:35.892898'),(78,'oauth2_provider','0001_initial','2016-02-29 17:58:36.227236'),(79,'oauth_provider','0001_initial','2016-02-29 17:58:37.052991'),(80,'organizations','0001_initial','2016-02-29 17:58:37.290331'),(81,'programs','0001_initial','2016-02-29 17:58:37.667708'),(82,'programs','0002_programsapiconfig_cache_ttl','2016-02-29 17:58:38.067119'),(83,'programs','0003_auto_20151120_1613','2016-02-29 17:58:39.752602'),(84,'programs','0004_programsapiconfig_enable_certification','2016-02-29 17:58:40.179508'),(85,'programs','0005_programsapiconfig_max_retries','2016-02-29 17:58:40.596412'),(86,'rss_proxy','0001_initial','2016-02-29 17:58:40.641620'),(87,'self_paced','0001_initial','2016-02-29 17:58:41.078194'),(88,'sessions','0001_initial','2016-02-29 17:58:41.133704'),(89,'student','0001_initial','2016-02-29 17:58:53.980867'),(90,'shoppingcart','0001_initial','2016-02-29 17:59:06.233175'),(91,'shoppingcart','0002_auto_20151208_1034','2016-02-29 17:59:07.059000'),(92,'shoppingcart','0003_auto_20151217_0958','2016-02-29 17:59:07.907660'),(93,'splash','0001_initial','2016-02-29 17:59:08.351083'),(94,'static_replace','0001_initial','2016-02-29 17:59:08.818049'),(95,'static_replace','0002_assetexcludedextensionsconfig','2016-02-29 17:59:09.319193'),(96,'status','0001_initial','2016-02-29 17:59:10.500113'),(97,'student','0002_auto_20151208_1034','2016-02-29 17:59:11.650009'),(98,'submissions','0001_initial','2016-02-29 17:59:12.491480'),(99,'submissions','0002_auto_20151119_0913','2016-02-29 17:59:12.683289'),(100,'submissions','0003_submission_status','2016-02-29 17:59:12.811034'),(101,'survey','0001_initial','2016-02-29 17:59:13.767659'),(102,'teams','0001_initial','2016-02-29 17:59:16.603866'),(103,'third_party_auth','0001_initial','2016-02-29 17:59:19.924001'),(104,'track','0001_initial','2016-02-29 17:59:19.974203'),(105,'user_api','0001_initial','2016-02-29 17:59:24.197607'),(106,'util','0001_initial','2016-02-29 17:59:24.978364'),(107,'util','0002_data__default_rate_limit_config','2016-02-29 17:59:25.017205'),(108,'verify_student','0001_initial','2016-02-29 17:59:33.329519'),(109,'verify_student','0002_auto_20151124_1024','2016-02-29 17:59:34.238392'),(110,'verify_student','0003_auto_20151113_1443','2016-02-29 17:59:35.001393'),(111,'wiki','0001_initial','2016-02-29 17:59:56.418517'),(112,'wiki','0002_remove_article_subscription','2016-02-29 17:59:56.476734'),(113,'workflow','0001_initial','2016-02-29 17:59:56.760505'),(114,'xblock_django','0001_initial','2016-02-29 17:59:57.572216'),(115,'xblock_django','0002_auto_20160204_0809','2016-02-29 17:59:58.380438'),(116,'contentstore','0001_initial','2016-02-29 18:00:19.534458'),(117,'course_creators','0001_initial','2016-02-29 18:00:19.597219'),(118,'xblock_config','0001_initial','2016-02-29 18:00:19.855097'); INSERT INTO `django_migrations` VALUES (1,'contenttypes','0001_initial','2016-03-07 21:30:14.182305'),(2,'auth','0001_initial','2016-03-07 21:30:14.485815'),(3,'admin','0001_initial','2016-03-07 21:30:14.565850'),(4,'assessment','0001_initial','2016-03-07 21:30:17.817617'),(5,'assessment','0002_staffworkflow','2016-03-07 21:30:18.084033'),(6,'contenttypes','0002_remove_content_type_name','2016-03-07 21:30:18.233041'),(7,'auth','0002_alter_permission_name_max_length','2016-03-07 21:30:18.276671'),(8,'auth','0003_alter_user_email_max_length','2016-03-07 21:30:18.326002'),(9,'auth','0004_alter_user_username_opts','2016-03-07 21:30:18.353157'),(10,'auth','0005_alter_user_last_login_null','2016-03-07 21:30:18.414606'),(11,'auth','0006_require_contenttypes_0002','2016-03-07 21:30:18.418705'),(12,'bookmarks','0001_initial','2016-03-07 21:30:18.701043'),(13,'branding','0001_initial','2016-03-07 21:30:18.829558'),(14,'bulk_email','0001_initial','2016-03-07 21:30:19.115081'),(15,'bulk_email','0002_data__load_course_email_template','2016-03-07 21:30:19.155468'),(16,'instructor_task','0001_initial','2016-03-07 21:30:19.341905'),(17,'certificates','0001_initial','2016-03-07 21:30:20.197566'),(18,'certificates','0002_data__certificatehtmlviewconfiguration_data','2016-03-07 21:30:20.220202'),(19,'certificates','0003_data__default_modes','2016-03-07 21:30:20.258243'),(20,'certificates','0004_certificategenerationhistory','2016-03-07 21:30:20.390214'),(21,'certificates','0005_auto_20151208_0801','2016-03-07 21:30:20.497751'),(22,'certificates','0006_certificatetemplateasset_asset_slug','2016-03-07 21:30:20.541391'),(23,'certificates','0007_certificateinvalidation','2016-03-07 21:30:20.642449'),(24,'commerce','0001_data__add_ecommerce_service_user','2016-03-07 21:30:20.668836'),(25,'commerce','0002_commerceconfiguration','2016-03-07 21:30:20.764499'),(26,'contentserver','0001_initial','2016-03-07 21:30:20.858120'),(27,'cors_csrf','0001_initial','2016-03-07 21:30:20.948472'),(28,'course_action_state','0001_initial','2016-03-07 21:30:22.206899'),(29,'course_groups','0001_initial','2016-03-07 21:30:23.049803'),(30,'course_modes','0001_initial','2016-03-07 21:30:23.168870'),(31,'course_modes','0002_coursemode_expiration_datetime_is_explicit','2016-03-07 21:30:23.216519'),(32,'course_modes','0003_auto_20151113_1443','2016-03-07 21:30:23.240339'),(33,'course_modes','0004_auto_20151113_1457','2016-03-07 21:30:23.342111'),(34,'course_modes','0005_auto_20151217_0958','2016-03-07 21:30:23.361769'),(35,'course_modes','0006_auto_20160208_1407','2016-03-07 21:30:23.436155'),(36,'course_overviews','0001_initial','2016-03-07 21:30:23.508236'),(37,'course_overviews','0002_add_course_catalog_fields','2016-03-07 21:30:23.733762'),(38,'course_overviews','0003_courseoverviewgeneratedhistory','2016-03-07 21:30:23.761257'),(39,'course_overviews','0004_courseoverview_org','2016-03-07 21:30:23.810614'),(40,'course_overviews','0005_delete_courseoverviewgeneratedhistory','2016-03-07 21:30:23.835739'),(41,'course_overviews','0006_courseoverviewimageset','2016-03-07 21:30:23.888381'),(42,'course_overviews','0007_courseoverviewimageconfig','2016-03-07 21:30:23.983401'),(43,'course_overviews','0008_remove_courseoverview_facebook_url','2016-03-07 21:30:23.999461'),(44,'course_overviews','0009_readd_facebook_url','2016-03-07 21:30:24.004728'),(45,'course_structures','0001_initial','2016-03-07 21:30:24.040777'),(46,'courseware','0001_initial','2016-03-07 21:30:25.940851'),(47,'coursewarehistoryextended','0001_initial','2016-03-07 21:30:26.040072'),(48,'coursewarehistoryextended','0002_force_studentmodule_index','2016-03-07 21:30:26.130654'),(49,'credentials','0001_initial','2016-03-07 21:30:26.264799'),(50,'credit','0001_initial','2016-03-07 21:30:27.649602'),(51,'dark_lang','0001_initial','2016-03-07 21:30:27.805328'),(52,'dark_lang','0002_data__enable_on_install','2016-03-07 21:30:27.826148'),(53,'default','0001_initial','2016-03-07 21:30:28.315042'),(54,'default','0002_add_related_name','2016-03-07 21:30:28.498168'),(55,'default','0003_alter_email_max_length','2016-03-07 21:30:28.548248'),(56,'django_comment_common','0001_initial','2016-03-07 21:30:29.000655'),(57,'django_notify','0001_initial','2016-03-07 21:30:29.868315'),(58,'django_openid_auth','0001_initial','2016-03-07 21:30:30.132929'),(59,'oauth2','0001_initial','2016-03-07 21:30:32.085445'),(60,'edx_oauth2_provider','0001_initial','2016-03-07 21:30:32.271384'),(61,'edx_proctoring','0001_initial','2016-03-07 21:30:35.489095'),(62,'edx_proctoring','0002_proctoredexamstudentattempt_is_status_acknowledged','2016-03-07 21:30:35.811830'),(63,'edx_proctoring','0003_auto_20160101_0525','2016-03-07 21:30:36.318967'),(64,'edx_proctoring','0004_auto_20160201_0523','2016-03-07 21:30:36.594639'),(65,'edxval','0001_initial','2016-03-07 21:30:37.250149'),(66,'edxval','0002_data__default_profiles','2016-03-07 21:30:37.292234'),(67,'embargo','0001_initial','2016-03-07 21:30:38.318664'),(68,'embargo','0002_data__add_countries','2016-03-07 21:30:38.670470'),(69,'external_auth','0001_initial','2016-03-07 21:30:40.309901'),(70,'lms_xblock','0001_initial','2016-03-07 21:30:40.530640'),(71,'sites','0001_initial','2016-03-07 21:30:40.570456'),(72,'microsite_configuration','0001_initial','2016-03-07 21:30:42.065940'),(73,'microsite_configuration','0002_auto_20160202_0228','2016-03-07 21:30:42.510084'),(74,'milestones','0001_initial','2016-03-07 21:30:43.515278'),(75,'milestones','0002_data__seed_relationship_types','2016-03-07 21:30:43.549236'),(76,'milestones','0003_coursecontentmilestone_requirements','2016-03-07 21:30:43.637530'),(77,'milestones','0004_auto_20151221_1445','2016-03-07 21:30:43.934637'),(78,'mobile_api','0001_initial','2016-03-07 21:30:44.232529'),(79,'notes','0001_initial','2016-03-07 21:30:44.623792'),(80,'oauth_provider','0001_initial','2016-03-07 21:30:45.424401'),(81,'organizations','0001_initial','2016-03-07 21:30:45.647395'),(82,'programs','0001_initial','2016-03-07 21:30:46.009532'),(83,'programs','0002_programsapiconfig_cache_ttl','2016-03-07 21:30:46.380846'),(84,'programs','0003_auto_20151120_1613','2016-03-07 21:30:48.590249'),(85,'programs','0004_programsapiconfig_enable_certification','2016-03-07 21:30:48.865268'),(86,'programs','0005_programsapiconfig_max_retries','2016-03-07 21:30:49.120259'),(87,'rss_proxy','0001_initial','2016-03-07 21:30:49.167846'),(88,'self_paced','0001_initial','2016-03-07 21:30:49.436334'),(89,'sessions','0001_initial','2016-03-07 21:30:49.500776'),(90,'student','0001_initial','2016-03-07 21:31:00.590300'),(91,'shoppingcart','0001_initial','2016-03-07 21:31:11.285831'),(92,'shoppingcart','0002_auto_20151208_1034','2016-03-07 21:31:12.264731'),(93,'shoppingcart','0003_auto_20151217_0958','2016-03-07 21:31:13.226615'),(94,'splash','0001_initial','2016-03-07 21:31:13.813727'),(95,'static_replace','0001_initial','2016-03-07 21:31:14.416875'),(96,'static_replace','0002_assetexcludedextensionsconfig','2016-03-07 21:31:14.985262'),(97,'status','0001_initial','2016-03-07 21:31:16.225967'),(98,'student','0002_auto_20151208_1034','2016-03-07 21:31:18.224130'),(99,'submissions','0001_initial','2016-03-07 21:31:19.010824'),(100,'submissions','0002_auto_20151119_0913','2016-03-07 21:31:19.189219'),(101,'submissions','0003_submission_status','2016-03-07 21:31:19.281079'),(102,'survey','0001_initial','2016-03-07 21:31:19.931263'),(103,'teams','0001_initial','2016-03-07 21:31:21.332348'),(104,'third_party_auth','0001_initial','2016-03-07 21:31:23.645023'),(105,'track','0001_initial','2016-03-07 21:31:23.694019'),(106,'user_api','0001_initial','2016-03-07 21:31:27.559462'),(107,'util','0001_initial','2016-03-07 21:31:28.021488'),(108,'util','0002_data__default_rate_limit_config','2016-03-07 21:31:28.071141'),(109,'verify_student','0001_initial','2016-03-07 21:31:34.927463'),(110,'verify_student','0002_auto_20151124_1024','2016-03-07 21:31:36.838984'),(111,'verify_student','0003_auto_20151113_1443','2016-03-07 21:31:37.274647'),(112,'wiki','0001_initial','2016-03-07 21:31:55.194872'),(113,'wiki','0002_remove_article_subscription','2016-03-07 21:31:55.245251'),(114,'workflow','0001_initial','2016-03-07 21:31:55.566223'),(115,'xblock_django','0001_initial','2016-03-07 21:31:56.357737'),(116,'xblock_django','0002_auto_20160204_0809','2016-03-07 21:31:58.039094'),(117,'contentstore','0001_initial','2016-03-07 21:32:17.147931'),(118,'course_creators','0001_initial','2016-03-07 21:32:17.219370'),(119,'xblock_config','0001_initial','2016-03-07 21:32:17.426982');
/*!40000 ALTER TABLE `django_migrations` ENABLE KEYS */; /*!40000 ALTER TABLE `django_migrations` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
...@@ -34,4 +34,4 @@ UNLOCK TABLES; ...@@ -34,4 +34,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2016-02-29 18:00:23 -- Dump completed on 2016-03-07 21:32:22
common/test/db_cache/bok_choy_migrations_data_student_module_history.sql
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
LOCK TABLES `django_migrations` WRITE; LOCK TABLES `django_migrations` WRITE;
/*!40000 ALTER TABLE `django_migrations` DISABLE KEYS */; /*!40000 ALTER TABLE `django_migrations` DISABLE KEYS */;
INSERT INTO `django_migrations` VALUES (1,'contenttypes','0001_initial','2016-02-29 18:01:39.511327'),(2,'auth','0001_initial','2016-02-29 18:01:39.547129'),(3,'admin','0001_initial','2016-02-29 18:01:39.568351'),(4,'assessment','0001_initial','2016-02-29 18:01:40.149754'),(5,'assessment','0002_staffworkflow','2016-02-29 18:01:40.160082'),(6,'contenttypes','0002_remove_content_type_name','2016-02-29 18:01:40.231907'),(7,'auth','0002_alter_permission_name_max_length','2016-02-29 18:01:40.251926'),(8,'auth','0003_alter_user_email_max_length','2016-02-29 18:01:40.276419'),(9,'auth','0004_alter_user_username_opts','2016-02-29 18:01:40.297224'),(10,'auth','0005_alter_user_last_login_null','2016-02-29 18:01:40.317098'),(11,'auth','0006_require_contenttypes_0002','2016-02-29 18:01:40.319374'),(12,'bookmarks','0001_initial','2016-02-29 18:01:40.396366'),(13,'branding','0001_initial','2016-02-29 18:01:40.453783'),(14,'bulk_email','0001_initial','2016-02-29 18:01:40.565081'),(15,'bulk_email','0002_data__load_course_email_template','2016-02-29 18:01:40.574000'),(16,'instructor_task','0001_initial','2016-02-29 18:01:40.613011'),(17,'certificates','0001_initial','2016-02-29 18:01:40.980762'),(18,'certificates','0002_data__certificatehtmlviewconfiguration_data','2016-02-29 18:01:40.991190'),(19,'certificates','0003_data__default_modes','2016-02-29 18:01:41.003742'),(20,'certificates','0004_certificategenerationhistory','2016-02-29 18:01:41.061308'),(21,'certificates','0005_auto_20151208_0801','2016-02-29 18:01:41.113837'),(22,'certificates','0006_certificatetemplateasset_asset_slug','2016-02-29 18:01:41.131141'),(23,'certificates','0007_certificateinvalidation','2016-02-29 18:01:41.189247'),(24,'commerce','0001_data__add_ecommerce_service_user','2016-02-29 18:01:41.200385'),(25,'commerce','0002_commerceconfiguration','2016-02-29 18:01:41.260287'),(26,'contentserver','0001_initial','2016-02-29 18:01:41.323580'),(27,'cors_csrf','0001_initial','2016-02-29 18:01:41.388714'),(28,'course_action_state','0001_initial','2016-02-29 18:01:41.514544'),(29,'course_groups','0001_initial','2016-02-29 18:01:42.036647'),(30,'course_modes','0001_initial','2016-02-29 18:01:42.068946'),(31,'course_modes','0002_coursemode_expiration_datetime_is_explicit','2016-02-29 18:01:42.084746'),(32,'course_modes','0003_auto_20151113_1443','2016-02-29 18:01:42.100516'),(33,'course_modes','0004_auto_20151113_1457','2016-02-29 18:01:42.187139'),(34,'course_modes','0005_auto_20151217_0958','2016-02-29 18:01:42.205556'),(35,'course_modes','0006_auto_20160208_1407','2016-02-29 18:01:42.289731'),(36,'course_overviews','0001_initial','2016-02-29 18:01:42.319879'),(37,'course_overviews','0002_add_course_catalog_fields','2016-02-29 18:01:42.402948'),(38,'course_overviews','0003_courseoverviewgeneratedhistory','2016-02-29 18:01:42.417563'),(39,'course_overviews','0004_courseoverview_org','2016-02-29 18:01:42.435373'),(40,'course_overviews','0005_delete_courseoverviewgeneratedhistory','2016-02-29 18:01:42.448847'),(41,'course_overviews','0006_courseoverviewimageset','2016-02-29 18:01:42.472337'),(42,'course_overviews','0007_courseoverviewimageconfig','2016-02-29 18:01:42.561497'),(43,'course_overviews','0008_remove_courseoverview_facebook_url','2016-02-29 18:01:42.582078'),(44,'course_overviews','0009_readd_facebook_url','2016-02-29 18:01:42.608691'),(45,'course_structures','0001_initial','2016-02-29 18:01:42.625296'),(46,'courseware','0001_initial','2016-02-29 18:01:44.499738'),(47,'coursewarehistoryextended','0001_initial','2016-02-29 18:01:44.691094'),(48,'credentials','0001_initial','2016-02-29 18:01:44.788912'),(49,'credit','0001_initial','2016-02-29 18:01:45.621214'),(50,'dark_lang','0001_initial','2016-02-29 18:01:45.752882'),(51,'dark_lang','0002_data__enable_on_install','2016-02-29 18:01:45.765638'),(52,'default','0001_initial','2016-02-29 18:01:46.107319'),(53,'default','0002_add_related_name','2016-02-29 18:01:46.247368'),(54,'default','0003_alter_email_max_length','2016-02-29 18:01:46.265241'),(55,'django_comment_common','0001_initial','2016-02-29 18:01:46.569556'),(56,'django_notify','0001_initial','2016-02-29 18:01:47.200935'),(57,'django_openid_auth','0001_initial','2016-02-29 18:01:47.399851'),(58,'edx_proctoring','0001_initial','2016-02-29 18:01:50.659784'),(59,'edx_proctoring','0002_proctoredexamstudentattempt_is_status_acknowledged','2016-02-29 18:01:50.845795'),(60,'edx_proctoring','0003_auto_20160101_0525','2016-02-29 18:01:51.213992'),(61,'edx_proctoring','0004_auto_20160201_0523','2016-02-29 18:01:51.397904'),(62,'edxval','0001_initial','2016-02-29 18:01:51.631665'),(63,'edxval','0002_data__default_profiles','2016-02-29 18:01:51.651781'),(64,'embargo','0001_initial','2016-02-29 18:01:52.230500'),(65,'embargo','0002_data__add_countries','2016-02-29 18:01:52.401900'),(66,'external_auth','0001_initial','2016-02-29 18:01:52.851531'),(67,'lms_xblock','0001_initial','2016-02-29 18:01:53.081369'),(68,'sites','0001_initial','2016-02-29 18:01:53.104608'),(69,'microsite_configuration','0001_initial','2016-02-29 18:01:54.497782'),(70,'microsite_configuration','0002_auto_20160202_0228','2016-02-29 18:01:55.048275'),(71,'milestones','0001_initial','2016-02-29 18:01:55.459781'),(72,'milestones','0002_data__seed_relationship_types','2016-02-29 18:01:55.481439'),(73,'milestones','0003_coursecontentmilestone_requirements','2016-02-29 18:01:55.522487'),(74,'milestones','0004_auto_20151221_1445','2016-02-29 18:01:55.688330'),(75,'mobile_api','0001_initial','2016-02-29 18:01:56.844055'),(76,'notes','0001_initial','2016-02-29 18:01:57.066857'),(77,'oauth2','0001_initial','2016-02-29 18:01:58.412080'),(78,'oauth2_provider','0001_initial','2016-02-29 18:01:58.699157'),(79,'oauth_provider','0001_initial','2016-02-29 18:01:59.448662'),(80,'organizations','0001_initial','2016-02-29 18:01:59.538595'),(81,'programs','0001_initial','2016-02-29 18:01:59.922304'),(82,'programs','0002_programsapiconfig_cache_ttl','2016-02-29 18:02:00.317781'),(83,'programs','0003_auto_20151120_1613','2016-02-29 18:02:01.977886'),(84,'programs','0004_programsapiconfig_enable_certification','2016-02-29 18:02:02.413721'),(85,'programs','0005_programsapiconfig_max_retries','2016-02-29 18:02:02.799700'),(86,'rss_proxy','0001_initial','2016-02-29 18:02:02.828648'),(87,'self_paced','0001_initial','2016-02-29 18:02:03.260889'),(88,'sessions','0001_initial','2016-02-29 18:02:03.285722'),(89,'student','0001_initial','2016-02-29 18:02:14.964735'),(90,'shoppingcart','0001_initial','2016-02-29 18:02:26.167709'),(91,'shoppingcart','0002_auto_20151208_1034','2016-02-29 18:02:26.959607'),(92,'shoppingcart','0003_auto_20151217_0958','2016-02-29 18:02:27.772373'),(93,'splash','0001_initial','2016-02-29 18:02:28.180056'),(94,'static_replace','0001_initial','2016-02-29 18:02:28.600901'),(95,'static_replace','0002_assetexcludedextensionsconfig','2016-02-29 18:02:29.072670'),(96,'status','0001_initial','2016-02-29 18:02:30.149381'),(97,'student','0002_auto_20151208_1034','2016-02-29 18:02:31.383085'),(98,'submissions','0001_initial','2016-02-29 18:02:31.704655'),(99,'submissions','0002_auto_20151119_0913','2016-02-29 18:02:31.818741'),(100,'submissions','0003_submission_status','2016-02-29 18:02:31.875924'),(101,'survey','0001_initial','2016-02-29 18:02:32.613867'),(102,'teams','0001_initial','2016-02-29 18:02:35.208964'),(103,'third_party_auth','0001_initial','2016-02-29 18:02:38.385039'),(104,'track','0001_initial','2016-02-29 18:02:38.420093'),(105,'user_api','0001_initial','2016-02-29 18:02:42.631297'),(106,'util','0001_initial','2016-02-29 18:02:43.444988'),(107,'util','0002_data__default_rate_limit_config','2016-02-29 18:02:43.472520'),(108,'verify_student','0001_initial','2016-02-29 18:02:51.517974'),(109,'verify_student','0002_auto_20151124_1024','2016-02-29 18:02:52.305832'),(110,'verify_student','0003_auto_20151113_1443','2016-02-29 18:02:53.133517'),(111,'wiki','0001_initial','2016-02-29 18:03:14.972792'),(112,'wiki','0002_remove_article_subscription','2016-02-29 18:03:15.007100'),(113,'workflow','0001_initial','2016-02-29 18:03:15.147297'),(114,'xblock_django','0001_initial','2016-02-29 18:03:15.981916'),(115,'xblock_django','0002_auto_20160204_0809','2016-02-29 18:03:16.844433'),(116,'contentstore','0001_initial','2016-02-29 18:03:37.119213'),(117,'course_creators','0001_initial','2016-02-29 18:03:37.149132'),(118,'xblock_config','0001_initial','2016-02-29 18:03:37.381904'); INSERT INTO `django_migrations` VALUES (1,'contenttypes','0001_initial','2016-03-07 21:33:26.033148'),(2,'auth','0001_initial','2016-03-07 21:33:26.071794'),(3,'admin','0001_initial','2016-03-07 21:33:26.094726'),(4,'assessment','0001_initial','2016-03-07 21:33:26.734334'),(5,'assessment','0002_staffworkflow','2016-03-07 21:33:26.748174'),(6,'contenttypes','0002_remove_content_type_name','2016-03-07 21:33:26.822178'),(7,'auth','0002_alter_permission_name_max_length','2016-03-07 21:33:26.846501'),(8,'auth','0003_alter_user_email_max_length','2016-03-07 21:33:26.870855'),(9,'auth','0004_alter_user_username_opts','2016-03-07 21:33:26.895281'),(10,'auth','0005_alter_user_last_login_null','2016-03-07 21:33:26.919048'),(11,'auth','0006_require_contenttypes_0002','2016-03-07 21:33:26.922595'),(12,'bookmarks','0001_initial','2016-03-07 21:33:27.008343'),(13,'branding','0001_initial','2016-03-07 21:33:27.065792'),(14,'bulk_email','0001_initial','2016-03-07 21:33:27.189432'),(15,'bulk_email','0002_data__load_course_email_template','2016-03-07 21:33:27.197917'),(16,'instructor_task','0001_initial','2016-03-07 21:33:27.245184'),(17,'certificates','0001_initial','2016-03-07 21:33:27.641690'),(18,'certificates','0002_data__certificatehtmlviewconfiguration_data','2016-03-07 21:33:27.656293'),(19,'certificates','0003_data__default_modes','2016-03-07 21:33:27.667624'),(20,'certificates','0004_certificategenerationhistory','2016-03-07 21:33:27.737402'),(21,'certificates','0005_auto_20151208_0801','2016-03-07 21:33:27.794978'),(22,'certificates','0006_certificatetemplateasset_asset_slug','2016-03-07 21:33:27.808778'),(23,'certificates','0007_certificateinvalidation','2016-03-07 21:33:27.865273'),(24,'commerce','0001_data__add_ecommerce_service_user','2016-03-07 21:33:27.875925'),(25,'commerce','0002_commerceconfiguration','2016-03-07 21:33:27.937252'),(26,'contentserver','0001_initial','2016-03-07 21:33:28.010793'),(27,'cors_csrf','0001_initial','2016-03-07 21:33:28.072393'),(28,'course_action_state','0001_initial','2016-03-07 21:33:29.150991'),(29,'course_groups','0001_initial','2016-03-07 21:33:29.653738'),(30,'course_modes','0001_initial','2016-03-07 21:33:29.692413'),(31,'course_modes','0002_coursemode_expiration_datetime_is_explicit','2016-03-07 21:33:29.707909'),(32,'course_modes','0003_auto_20151113_1443','2016-03-07 21:33:29.723139'),(33,'course_modes','0004_auto_20151113_1457','2016-03-07 21:33:29.802913'),(34,'course_modes','0005_auto_20151217_0958','2016-03-07 21:33:29.819395'),(35,'course_modes','0006_auto_20160208_1407','2016-03-07 21:33:29.901786'),(36,'course_overviews','0001_initial','2016-03-07 21:33:29.932173'),(37,'course_overviews','0002_add_course_catalog_fields','2016-03-07 21:33:30.019436'),(38,'course_overviews','0003_courseoverviewgeneratedhistory','2016-03-07 21:33:30.035991'),(39,'course_overviews','0004_courseoverview_org','2016-03-07 21:33:30.055999'),(40,'course_overviews','0005_delete_courseoverviewgeneratedhistory','2016-03-07 21:33:30.069417'),(41,'course_overviews','0006_courseoverviewimageset','2016-03-07 21:33:30.092113'),(42,'course_overviews','0007_courseoverviewimageconfig','2016-03-07 21:33:30.174080'),(43,'course_overviews','0008_remove_courseoverview_facebook_url','2016-03-07 21:33:30.176656'),(44,'course_overviews','0009_readd_facebook_url','2016-03-07 21:33:30.178836'),(45,'course_structures','0001_initial','2016-03-07 21:33:30.194595'),(46,'courseware','0001_initial','2016-03-07 21:33:31.078692'),(47,'coursewarehistoryextended','0001_initial','2016-03-07 21:33:31.241565'),(48,'coursewarehistoryextended','0002_force_studentmodule_index','2016-03-07 21:33:31.349328'),(49,'credentials','0001_initial','2016-03-07 21:33:31.439568'),(50,'credit','0001_initial','2016-03-07 21:33:32.158562'),(51,'dark_lang','0001_initial','2016-03-07 21:33:32.272553'),(52,'dark_lang','0002_data__enable_on_install','2016-03-07 21:33:32.292147'),(53,'default','0001_initial','2016-03-07 21:33:32.618496'),(54,'default','0002_add_related_name','2016-03-07 21:33:32.747109'),(55,'default','0003_alter_email_max_length','2016-03-07 21:33:32.764118'),(56,'django_comment_common','0001_initial','2016-03-07 21:33:33.045633'),(57,'django_notify','0001_initial','2016-03-07 21:33:33.683870'),(58,'django_openid_auth','0001_initial','2016-03-07 21:33:33.887994'),(59,'oauth2','0001_initial','2016-03-07 21:33:35.518104'),(60,'edx_oauth2_provider','0001_initial','2016-03-07 21:33:35.661195'),(61,'edx_proctoring','0001_initial','2016-03-07 21:33:37.901502'),(62,'edx_proctoring','0002_proctoredexamstudentattempt_is_status_acknowledged','2016-03-07 21:33:38.137829'),(63,'edx_proctoring','0003_auto_20160101_0525','2016-03-07 21:33:38.644618'),(64,'edx_proctoring','0004_auto_20160201_0523','2016-03-07 21:33:38.906016'),(65,'edxval','0001_initial','2016-03-07 21:33:39.155791'),(66,'edxval','0002_data__default_profiles','2016-03-07 21:33:39.181773'),(67,'embargo','0001_initial','2016-03-07 21:33:39.959843'),(68,'embargo','0002_data__add_countries','2016-03-07 21:33:40.149397'),(69,'external_auth','0001_initial','2016-03-07 21:33:40.725785'),(70,'lms_xblock','0001_initial','2016-03-07 21:33:41.882266'),(71,'sites','0001_initial','2016-03-07 21:33:41.904159'),(72,'microsite_configuration','0001_initial','2016-03-07 21:33:42.952132'),(73,'microsite_configuration','0002_auto_20160202_0228','2016-03-07 21:33:43.359419'),(74,'milestones','0001_initial','2016-03-07 21:33:43.716203'),(75,'milestones','0002_data__seed_relationship_types','2016-03-07 21:33:43.739942'),(76,'milestones','0003_coursecontentmilestone_requirements','2016-03-07 21:33:43.772194'),(77,'milestones','0004_auto_20151221_1445','2016-03-07 21:33:43.907278'),(78,'mobile_api','0001_initial','2016-03-07 21:33:44.150482'),(79,'notes','0001_initial','2016-03-07 21:33:44.414752'),(80,'oauth_provider','0001_initial','2016-03-07 21:33:45.032852'),(81,'organizations','0001_initial','2016-03-07 21:33:45.111393'),(82,'programs','0001_initial','2016-03-07 21:33:45.427919'),(83,'programs','0002_programsapiconfig_cache_ttl','2016-03-07 21:33:45.727136'),(84,'programs','0003_auto_20151120_1613','2016-03-07 21:33:47.072788'),(85,'programs','0004_programsapiconfig_enable_certification','2016-03-07 21:33:48.327058'),(86,'programs','0005_programsapiconfig_max_retries','2016-03-07 21:33:48.536151'),(87,'rss_proxy','0001_initial','2016-03-07 21:33:48.571928'),(88,'self_paced','0001_initial','2016-03-07 21:33:48.799690'),(89,'sessions','0001_initial','2016-03-07 21:33:48.831344'),(90,'student','0001_initial','2016-03-07 21:33:58.200378'),(91,'shoppingcart','0001_initial','2016-03-07 21:34:07.068222'),(92,'shoppingcart','0002_auto_20151208_1034','2016-03-07 21:34:07.860305'),(93,'shoppingcart','0003_auto_20151217_0958','2016-03-07 21:34:08.746587'),(94,'splash','0001_initial','2016-03-07 21:34:09.212391'),(95,'static_replace','0001_initial','2016-03-07 21:34:09.728084'),(96,'static_replace','0002_assetexcludedextensionsconfig','2016-03-07 21:34:10.232762'),(97,'status','0001_initial','2016-03-07 21:34:11.353387'),(98,'student','0002_auto_20151208_1034','2016-03-07 21:34:12.427561'),(99,'submissions','0001_initial','2016-03-07 21:34:13.762704'),(100,'submissions','0002_auto_20151119_0913','2016-03-07 21:34:13.860261'),(101,'submissions','0003_submission_status','2016-03-07 21:34:13.899844'),(102,'survey','0001_initial','2016-03-07 21:34:14.322540'),(103,'teams','0001_initial','2016-03-07 21:34:15.395533'),(104,'third_party_auth','0001_initial','2016-03-07 21:34:17.484168'),(105,'track','0001_initial','2016-03-07 21:34:17.515995'),(106,'user_api','0001_initial','2016-03-07 21:34:21.513361'),(107,'util','0001_initial','2016-03-07 21:34:21.885445'),(108,'util','0002_data__default_rate_limit_config','2016-03-07 21:34:21.920632'),(109,'verify_student','0001_initial','2016-03-07 21:34:27.215973'),(110,'verify_student','0002_auto_20151124_1024','2016-03-07 21:34:27.909387'),(111,'verify_student','0003_auto_20151113_1443','2016-03-07 21:34:28.606460'),(112,'wiki','0001_initial','2016-03-07 21:34:45.492292'),(113,'wiki','0002_remove_article_subscription','2016-03-07 21:34:45.529216'),(114,'workflow','0001_initial','2016-03-07 21:34:45.651613'),(115,'xblock_django','0001_initial','2016-03-07 21:34:46.297434'),(116,'xblock_django','0002_auto_20160204_0809','2016-03-07 21:34:46.988209'),(117,'contentstore','0001_initial','2016-03-07 21:35:04.702755'),(118,'course_creators','0001_initial','2016-03-07 21:35:04.729239'),(119,'xblock_config','0001_initial','2016-03-07 21:35:04.908173');
/*!40000 ALTER TABLE `django_migrations` ENABLE KEYS */; /*!40000 ALTER TABLE `django_migrations` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
...@@ -34,4 +34,4 @@ UNLOCK TABLES; ...@@ -34,4 +34,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2016-02-29 18:03:40 -- Dump completed on 2016-03-07 21:35:08
common/test/db_cache/bok_choy_schema_default.sql
...@@ -1143,6 +1143,7 @@ CREATE TABLE `course_overviews_courseoverview` ( ...@@ -1143,6 +1143,7 @@ CREATE TABLE `course_overviews_courseoverview` (
`end` datetime(6) DEFAULT NULL, `end` datetime(6) DEFAULT NULL,
`advertised_start` longtext, `advertised_start` longtext,
`course_image_url` longtext NOT NULL, `course_image_url` longtext NOT NULL,
`facebook_url` longtext,
`social_sharing_url` longtext, `social_sharing_url` longtext,
`end_of_course_survey_url` longtext, `end_of_course_survey_url` longtext,
`certificates_display_behavior` longtext, `certificates_display_behavior` longtext,
...@@ -1167,7 +1168,6 @@ CREATE TABLE `course_overviews_courseoverview` ( ...@@ -1167,7 +1168,6 @@ CREATE TABLE `course_overviews_courseoverview` (
`effort` longtext, `effort` longtext,
`short_description` longtext, `short_description` longtext,
`org` longtext NOT NULL, `org` longtext NOT NULL,
`facebook_url` longtext,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
...@@ -1658,7 +1658,7 @@ CREATE TABLE `django_migrations` ( ...@@ -1658,7 +1658,7 @@ CREATE TABLE `django_migrations` (
`name` varchar(255) NOT NULL, `name` varchar(255) NOT NULL,
`applied` datetime(6) NOT NULL, `applied` datetime(6) NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=119 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=120 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `django_openid_auth_association`; DROP TABLE IF EXISTS `django_openid_auth_association`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
......
common/test/db_cache/bok_choy_schema_student_module_history.sql
...@@ -22,7 +22,8 @@ CREATE TABLE `coursewarehistoryextended_studentmodulehistoryextended` ( ...@@ -22,7 +22,8 @@ CREATE TABLE `coursewarehistoryextended_studentmodulehistoryextended` (
`student_module_id` int(11) NOT NULL, `student_module_id` int(11) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `coursewarehistoryextended_studentmodulehistoryextended_2af72f10` (`version`), KEY `coursewarehistoryextended_studentmodulehistoryextended_2af72f10` (`version`),
KEY `coursewarehistoryextended_studentmodulehistoryextended_e2fa5388` (`created`) KEY `coursewarehistoryextended_studentmodulehistoryextended_e2fa5388` (`created`),
KEY `coursewarehistoryextended_student_module_id_61b23a7a1dd27fe4_idx` (`student_module_id`)
) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `django_migrations`; DROP TABLE IF EXISTS `django_migrations`;
...@@ -34,7 +35,7 @@ CREATE TABLE `django_migrations` ( ...@@ -34,7 +35,7 @@ CREATE TABLE `django_migrations` (
`name` varchar(255) NOT NULL, `name` varchar(255) NOT NULL,
`applied` datetime(6) NOT NULL, `applied` datetime(6) NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=119 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=120 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
......
lms/djangoapps/course_structure_api/v0/tests.py
...@@ -9,7 +9,7 @@ from mock import patch, Mock ...@@ -9,7 +9,7 @@ from mock import patch, Mock
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from oauth2_provider.tests.factories import AccessTokenFactory, ClientFactory from edx_oauth2_provider.tests.factories import AccessTokenFactory, ClientFactory
from opaque_keys.edx.locator import CourseLocator from opaque_keys.edx.locator import CourseLocator
from xmodule.error_module import ErrorDescriptor from xmodule.error_module import ErrorDescriptor
from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore import ModuleStoreEnum
......
lms/djangoapps/edxnotes/tests.py
...@@ -20,7 +20,7 @@ from django.core.urlresolvers import reverse ...@@ -20,7 +20,7 @@ from django.core.urlresolvers import reverse
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.test.client import RequestFactory from django.test.client import RequestFactory
from django.test.utils import override_settings from django.test.utils import override_settings
from oauth2_provider.tests.factories import ClientFactory from edx_oauth2_provider.tests.factories import ClientFactory
from provider.oauth2.models import Client from provider.oauth2.models import Client
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
......
lms/djangoapps/oauth2_handler/handlers.py
...@@ -115,7 +115,7 @@ class CourseAccessHandler(object): ...@@ -115,7 +115,7 @@ class CourseAccessHandler(object):
For a description of the function naming and arguments, see: For a description of the function naming and arguments, see:
`oauth2_provider/oidc/handlers.py` `edx_oauth2_provider/oidc/handlers.py`
""" """
......
lms/djangoapps/oauth2_handler/tests.py
...@@ -14,7 +14,7 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase ...@@ -14,7 +14,7 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
# Will also run default tests for IDTokens and UserInfo # Will also run default tests for IDTokens and UserInfo
from oauth2_provider.tests import IDTokenTestCase, UserInfoTestCase from edx_oauth2_provider.tests import IDTokenTestCase, UserInfoTestCase
class BaseTestMixin(ModuleStoreTestCase): class BaseTestMixin(ModuleStoreTestCase):
......
lms/envs/common.py
...@@ -440,16 +440,16 @@ OAUTH_OIDC_ISSUER = 'https:/example.com/oauth2' ...@@ -440,16 +440,16 @@ OAUTH_OIDC_ISSUER = 'https:/example.com/oauth2'
# OpenID Connect claim handlers # OpenID Connect claim handlers
OAUTH_OIDC_ID_TOKEN_HANDLERS = ( OAUTH_OIDC_ID_TOKEN_HANDLERS = (
'oauth2_provider.oidc.handlers.BasicIDTokenHandler', 'edx_oauth2_provider.oidc.handlers.BasicIDTokenHandler',
'oauth2_provider.oidc.handlers.ProfileHandler', 'edx_oauth2_provider.oidc.handlers.ProfileHandler',
'oauth2_provider.oidc.handlers.EmailHandler', 'edx_oauth2_provider.oidc.handlers.EmailHandler',
'oauth2_handler.IDTokenHandler' 'oauth2_handler.IDTokenHandler'
) )
OAUTH_OIDC_USERINFO_HANDLERS = ( OAUTH_OIDC_USERINFO_HANDLERS = (
'oauth2_provider.oidc.handlers.BasicUserInfoHandler', 'edx_oauth2_provider.oidc.handlers.BasicUserInfoHandler',
'oauth2_provider.oidc.handlers.ProfileHandler', 'edx_oauth2_provider.oidc.handlers.ProfileHandler',
'oauth2_provider.oidc.handlers.EmailHandler', 'edx_oauth2_provider.oidc.handlers.EmailHandler',
'oauth2_handler.UserInfoHandler' 'oauth2_handler.UserInfoHandler'
) )
...@@ -1837,7 +1837,7 @@ INSTALLED_APPS = ( ...@@ -1837,7 +1837,7 @@ INSTALLED_APPS = (
# OAuth2 Provider # OAuth2 Provider
'provider', 'provider',
'provider.oauth2', 'provider.oauth2',
'oauth2_provider', 'edx_oauth2_provider',
'third_party_auth', 'third_party_auth',
......
lms/urls.py
...@@ -820,7 +820,7 @@ if settings.FEATURES.get('AUTH_USE_OPENID_PROVIDER'): ...@@ -820,7 +820,7 @@ if settings.FEATURES.get('AUTH_USE_OPENID_PROVIDER'):
if settings.FEATURES.get('ENABLE_OAUTH2_PROVIDER'): if settings.FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
urlpatterns += ( urlpatterns += (
url(r'^oauth2/', include('oauth2_provider.urls', namespace='oauth2')), url(r'^oauth2/', include('edx_oauth2_provider.urls', namespace='oauth2')),
) )
......
openedx/core/djangoapps/credentials/tests/test_utils.py
...@@ -6,7 +6,7 @@ from django.core.cache import cache ...@@ -6,7 +6,7 @@ from django.core.cache import cache
from django.test import TestCase from django.test import TestCase
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import httpretty import httpretty
from oauth2_provider.tests.factories import ClientFactory from edx_oauth2_provider.tests.factories import ClientFactory
from provider.constants import CONFIDENTIAL from provider.constants import CONFIDENTIAL
from openedx.core.djangoapps.credentials.tests.mixins import CredentialsApiConfigMixin, CredentialsDataMixin from openedx.core.djangoapps.credentials.tests.mixins import CredentialsApiConfigMixin, CredentialsDataMixin
......
openedx/core/djangoapps/credit/tests/test_views.py
...@@ -15,7 +15,7 @@ from django.conf import settings ...@@ -15,7 +15,7 @@ from django.conf import settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.test import TestCase, Client from django.test import TestCase, Client
from django.test.utils import override_settings from django.test.utils import override_settings
from oauth2_provider.tests.factories import AccessTokenFactory, ClientFactory from edx_oauth2_provider.tests.factories import AccessTokenFactory, ClientFactory
from opaque_keys.edx.keys import CourseKey from opaque_keys.edx.keys import CourseKey
import pytz import pytz
......
openedx/core/djangoapps/programs/tasks/v1/tests/test_tasks.py
...@@ -13,7 +13,7 @@ from django.conf import settings ...@@ -13,7 +13,7 @@ from django.conf import settings
from django.test import override_settings, TestCase from django.test import override_settings, TestCase
from edx_rest_api_client.client import EdxRestApiClient from edx_rest_api_client.client import EdxRestApiClient
from oauth2_provider.tests.factories import ClientFactory from edx_oauth2_provider.tests.factories import ClientFactory
from openedx.core.djangoapps.credentials.tests.mixins import CredentialsApiConfigMixin from openedx.core.djangoapps.credentials.tests.mixins import CredentialsApiConfigMixin
from openedx.core.djangoapps.programs.tests.mixins import ProgramsApiConfigMixin from openedx.core.djangoapps.programs.tests.mixins import ProgramsApiConfigMixin
from openedx.core.djangoapps.programs.tasks.v1 import tasks from openedx.core.djangoapps.programs.tasks.v1 import tasks
......
openedx/core/djangoapps/programs/tests/test_utils.py
...@@ -7,7 +7,7 @@ from django.test import TestCase ...@@ -7,7 +7,7 @@ from django.test import TestCase
import httpretty import httpretty
import mock import mock
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from oauth2_provider.tests.factories import ClientFactory from edx_oauth2_provider.tests.factories import ClientFactory
from provider.constants import CONFIDENTIAL from provider.constants import CONFIDENTIAL
from openedx.core.djangoapps.credentials.tests.mixins import CredentialsApiConfigMixin from openedx.core.djangoapps.credentials.tests.mixins import CredentialsApiConfigMixin
......
openedx/core/lib/tests/test_edx_api_utils.py
...@@ -7,7 +7,7 @@ from django.test import TestCase ...@@ -7,7 +7,7 @@ from django.test import TestCase
import httpretty import httpretty
import mock import mock
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from oauth2_provider.tests.factories import ClientFactory from edx_oauth2_provider.tests.factories import ClientFactory
from provider.constants import CONFIDENTIAL from provider.constants import CONFIDENTIAL
from testfixtures import LogCapture from testfixtures import LogCapture
......
openedx/core/lib/tests/test_token_utils.py
...@@ -10,7 +10,7 @@ from django.test.utils import override_settings ...@@ -10,7 +10,7 @@ from django.test.utils import override_settings
import freezegun import freezegun
import jwt import jwt
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from oauth2_provider.tests.factories import ClientFactory from edx_oauth2_provider.tests.factories import ClientFactory
from provider.constants import CONFIDENTIAL from provider.constants import CONFIDENTIAL
from openedx.core.lib.token_utils import get_id_token from openedx.core.lib.token_utils import get_id_token
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment