Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155

common/test/acceptance/pages/lms/login_and_register.py

@@ -232,7 +232,7 @@ class CombinedLoginAndRegisterPage(PageObject):
         Only the "Dummy" provider is used for bok choy because it is the only
         one that doesn't send traffic to external servers.
         """
-        self.q(css="button.{}-Dummy".format(self.current_form)).click()
+        self.q(css="button.{}-oa2-dummy".format(self.current_form)).click()
 
     def password_reset(self, email):
         """Navigates to, fills in, and submits the password reset form.

common/test/acceptance/tests/lms/test_account_settings.py

@@ -437,9 +437,10 @@ class AccountSettingsPageTest(AccountSettingsTestMixin, WebAppTest):
         Currently there is no way to test the whole authentication process
         because that would require accounts with the providers.
         """
-        for field_id, title, link_title in [
-            ['auth-facebook', 'Facebook', 'Link'],
-            ['auth-google', 'Google', 'Link'],
-        ]:
+        providers = (
+            ['auth-oa2-facebook', 'Facebook', 'Link'],
+            ['auth-oa2-google-oauth2', 'Google', 'Link'],
+        )
+        for field_id, title, link_title in providers:
             self.assertEqual(self.account_settings_page.title_for_field(field_id), title)
             self.assertEqual(self.account_settings_page.link_title_for_link_field(field_id), link_title)

common/test/acceptance/tests/lms/test_lms.py

@@ -166,7 +166,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest):
 
         # Now unlink the account (To test the account settings view and also to prevent cross-test side effects)
         account_settings = AccountSettingsPage(self.browser).visit()
-        field_id = "auth-dummy"
+        field_id = "auth-oa2-dummy"
         account_settings.wait_for_field(field_id)
         self.assertEqual("Unlink", account_settings.link_title_for_link_field(field_id))
         account_settings.click_on_link_in_link_field(field_id)
@@ -305,7 +305,7 @@ class RegisterFromCombinedPageTest(UniqueCourseTest):
 
         # Now unlink the account (To test the account settings view and also to prevent cross-test side effects)
         account_settings = AccountSettingsPage(self.browser).visit()
-        field_id = "auth-dummy"
+        field_id = "auth-oa2-dummy"
         account_settings.wait_for_field(field_id)
         self.assertEqual("Unlink", account_settings.link_title_for_link_field(field_id))
         account_settings.click_on_link_in_link_field(field_id)

common/test/db_fixtures/third_party_auth.json

@@ -0,0 +1,47 @@
+[
+  {
+    "pk": 1,
+    "model": "third_party_auth.oauth2providerconfig",
+    "fields": {
+      "enabled": true,
+      "change_date": "2001-02-03T04:05:06Z",
+      "changed_by": null,
+      "name": "Google",
+      "icon_class": "fa-google-plus",
+      "backend_name": "google-oauth2",
+      "key": "test",
+      "secret": "test",
+      "other_settings": "{}"
+    }
+  },
+  {
+    "pk": 2,
+    "model": "third_party_auth.oauth2providerconfig",
+    "fields": {
+      "enabled": true,
+      "change_date": "2001-02-03T04:05:06Z",
+      "changed_by": null,
+      "name": "Facebook",
+      "icon_class": "fa-facebook",
+      "backend_name": "facebook",
+      "key": "test",
+      "secret": "test",
+      "other_settings": "{}"
+    }
+  },
+  {
+    "pk": 3,
+    "model": "third_party_auth.oauth2providerconfig",
+    "fields": {
+      "enabled": true,
+      "change_date": "2001-02-03T04:05:06Z",
+      "changed_by": null,
+      "name": "Dummy",
+      "icon_class": "fa-sign-in",
+      "backend_name": "dummy",
+      "key": "",
+      "secret": "",
+      "other_settings": "{}"
+    }
+  }
+]