From 2b09b2daa31ae02af5e13737a55129759bbaf06e Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 28 Feb 2017 10:35:51 +0800
Subject: [PATCH] MDL-58090 oauth2: Load and resave the DB files

Edit the DB files with XMLDB to detect/fix errors.

Part of MDL-58220
---
 lib/db/install.php |  2 --
 lib/db/install.xml | 10 +++++-----
 lib/db/upgrade.php |  4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/db/install.php b/lib/db/install.php
index 8a45a6aa4ff..f291828a1fa 100644
--- a/lib/db/install.php
+++ b/lib/db/install.php
@@ -321,6 +321,4 @@ function xmldb_main_install() {
     require_once($CFG->libdir . '/db/upgradelib.php');
     make_default_scale();
     make_competence_scale();
-
-    \core\oauth2\api::install_default_providers();
 }
diff --git a/lib/db/install.xml b/lib/db/install.xml
index 41d8b5a2763..29518ad8246 100755
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="lib/db" VERSION="20170224" COMMENT="XMLDB file for core Moodle tables"
+<XMLDB PATH="lib/db" VERSION="20170228" COMMENT="XMLDB file for core Moodle tables"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
@@ -3489,10 +3489,10 @@
         <FIELD NAME="baseurl" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="The base url to the issuer"/>
         <FIELD NAME="clientid" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="The client id used to connect to this oauth2 service."/>
         <FIELD NAME="clientsecret" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="The secret used to connect to this oauth2 service."/>
-        <FIELD NAME="loginscopes" TYPE="text" NOTNULL="true" DEFAULT="openid profile email" SEQUENCE="false" COMMENT="The scopes requested for a normal login attempt."/>
-        <FIELD NAME="loginscopesoffline" TYPE="text" NOTNULL="true" DEFAULT="openid profile email" SEQUENCE="false" COMMENT="The scopes requested for a login attempt to generate a refresh token."/>
-        <FIELD NAME="loginparams" TYPE="text" NOTNULL="true" DEFAULT="" SEQUENCE="false" COMMENT="Additional parameters sent for a login attempt."/>
-        <FIELD NAME="loginparamsoffline" TYPE="text" NOTNULL="true" DEFAULT="openid profile email" SEQUENCE="false" COMMENT="Additional parameters sent for a login attempt to generate a refresh token."/>
+        <FIELD NAME="loginscopes" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="The scopes requested for a normal login attempt."/>
+        <FIELD NAME="loginscopesoffline" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="The scopes requested for a login attempt to generate a refresh token."/>
+        <FIELD NAME="loginparams" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="Additional parameters sent for a login attempt."/>
+        <FIELD NAME="loginparamsoffline" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="Additional parameters sent for a login attempt to generate a refresh token."/>
         <FIELD NAME="scopessupported" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="The list of scopes this service supports."/>
         <FIELD NAME="showonloginpage" TYPE="int" LENGTH="2" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/>
         <FIELD NAME="sortorder" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" COMMENT="The defined sort order."/>
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 37f596d1aa4..06988419548 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2613,7 +2613,7 @@ function xmldb_main_upgrade($oldversion) {
 
     if ($oldversion < 2017032400.21) {
 
-         // Define table oauth2_issuer to be created.
+        // Define table oauth2_issuer to be created.
         $table = new xmldb_table('oauth2_issuer');
 
         // Adding fields to table oauth2_issuer.
@@ -2702,7 +2702,7 @@ function xmldb_main_upgrade($oldversion) {
 
     if ($oldversion < 2017033100.01) {
 
-         // Define table oauth2_user_field_mapping to be created.
+        // Define table oauth2_user_field_mapping to be created.
         $table = new xmldb_table('oauth2_user_field_mapping');
 
         // Adding fields to table oauth2_user_field_mapping.