MDL-58220 oauth2: Remove extra step

Show create google/facebook/office365 buttons on the main page instead of hiding them behind a click.
moodle · Apr 3, 2017 · 818e789 · 818e789
1 parent 4a32445
commit 818e789
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/admin/tool/oauth2/issuers.php b/admin/tool/oauth2/issuers.php
@@ -66,7 +66,6 @@
 } else if ($action == 'edit') {
 
     if ($data = $mform->get_data()) {
-
         try {
             if (!empty($data->id)) {
                 core\oauth2\api::update_issuer($data);
@@ -89,28 +88,12 @@
     }
 } else if ($action == 'edittemplate') {
 
-    $type = optional_param('type', '', PARAM_ALPHA);
-    if (empty($type)) {
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading(get_string('createfromtemplate', 'tool_oauth2'));
-        echo '<p>' . get_string('createfromtemplatedesc', 'tool_oauth2') . '</p>';
-        $params = ['action' => 'edittemplate', 'type' => 'google', 'sesskey' => sesskey()];
-        $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
-        echo $renderer->single_button($addurl, get_string('createnewgoogleissuer', 'tool_oauth2'));
-        $params = ['action' => 'edittemplate', 'type' => 'microsoft', 'sesskey' => sesskey()];
-        $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
-        echo $renderer->single_button($addurl, get_string('createnewmicrosoftissuer', 'tool_oauth2'));
-        $params = ['action' => 'edittemplate', 'type' => 'facebook', 'sesskey' => sesskey()];
-        $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
-        echo $renderer->single_button($addurl, get_string('createnewfacebookissuer', 'tool_oauth2'));
-        echo $OUTPUT->footer();
-    } else {
-        require_sesskey();
-        $issuer = core\oauth2\api::create_standard_issuer($type);
-        $params = ['action' => 'edit', 'id' => $issuer->get('id')];
-        $editurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
-        redirect($editurl, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
-    }
+    $type = required_param('type', PARAM_ALPHA);
+    require_sesskey();
+    $issuer = core\oauth2\api::create_standard_issuer($type);
+    $params = ['action' => 'edit', 'id' => $issuer->get('id')];
+    $editurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
+    redirect($editurl, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
 } else if ($action == 'enable') {
 
     require_sesskey();
@@ -173,10 +156,17 @@
     $issuers = core\oauth2\api::get_all_issuers();
     echo $renderer->issuers_table($issuers);
 
+    $params = ['action' => 'edittemplate', 'type' => 'google', 'sesskey' => sesskey()];
+    $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
+    echo $renderer->single_button($addurl, get_string('createnewgoogleissuer', 'tool_oauth2'));
+    $params = ['action' => 'edittemplate', 'type' => 'microsoft', 'sesskey' => sesskey()];
+    $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
+    echo $renderer->single_button($addurl, get_string('createnewmicrosoftissuer', 'tool_oauth2'));
+    $params = ['action' => 'edittemplate', 'type' => 'facebook', 'sesskey' => sesskey()];
+    $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
+    echo $renderer->single_button($addurl, get_string('createnewfacebookissuer', 'tool_oauth2'));
     $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', ['action' => 'edit']);
     echo $renderer->single_button($addurl, get_string('createnewissuer', 'tool_oauth2'));
-    $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', ['action' => 'edittemplate']);
-    echo $renderer->single_button($addurl, get_string('createnewstandardissuer', 'tool_oauth2'));
     echo $OUTPUT->footer();
 
 }
diff --git a/admin/tool/oauth2/lang/en/tool_oauth2.php b/admin/tool/oauth2/lang/en/tool_oauth2.php
@@ -82,7 +82,6 @@
 $string['createnewgoogleissuer'] = 'Create new Google service';
 $string['createnewmicrosoftissuer'] = 'Create new Microsoft service';
 $string['createnewfacebookissuer'] = 'Create new Facebook service';
-$string['createnewstandardissuer'] = 'Create service from a template';
 $string['createnewendpoint'] = 'Create new endpoint for issuer "{$a}"';
 $string['createnewuserfieldmapping'] = 'Create new user field mapping for issuer "{$a}"';
 $string['deleteconfirm'] = 'Are you sure you want to delete the identity issuer "{$a}"? Any plugins relying on this issuer will stop working.';