Merge branch 'MDL-58898-master' of https://github.com/xow/moodle

[moodle.git] / auth / oauth2 / linkedlogins.php

diff --git a/auth/oauth2/linkedlogins.php b/auth/oauth2/linkedlogins.php
index d8f68f1..ff9a89f 100644 (file)
--- a/auth/oauth2/linkedlogins.php
+++ b/auth/oauth2/linkedlogins.php
@@ -58,8 +58,12 @@ if ($action == 'new') {
     $userinfo = $client->get_userinfo();
 
     if (!empty($userinfo)) {
     $userinfo = $client->get_userinfo();
 
     if (!empty($userinfo)) {

-        \auth_oauth2\api::link_login($userinfo, $issuer);
-        redirect($PAGE->url, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
+        try {
+            \auth_oauth2\api::link_login($userinfo, $issuer);
+            redirect($PAGE->url, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
+        } catch (Exception $e) {
+            redirect($PAGE->url, $e->getMessage(), null, \core\output\notification::NOTIFY_ERROR);
+        }

     } else {
         redirect($PAGE->url, get_string('notloggedin', 'auth_oauth2'), null, \core\output\notification::NOTIFY_ERROR);
     }
     } else {
         redirect($PAGE->url, get_string('notloggedin', 'auth_oauth2'), null, \core\output\notification::NOTIFY_ERROR);
     }