From 8660e9a16852f91471ef87216fdba263850541d8 Mon Sep 17 00:00:00 2001
From: Mikhail Golenkov <mikhailgolenkov@catalyst-au.net>
Date: Thu, 1 Apr 2021 13:35:51 +1100
Subject: [PATCH] MDL-71254 oauth2: Redirect to the login page in case of error

---
 admin/oauth2callback.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/oauth2callback.php b/admin/oauth2callback.php
index 709e28ce99b..c0b5572faca 100644
--- a/admin/oauth2callback.php
+++ b/admin/oauth2callback.php
@@ -34,11 +34,12 @@ $error = optional_param('error', '', PARAM_RAW);
 if ($error) {
     $message = optional_param('error_description', '', PARAM_RAW);
     if ($message) {
-        print_error($message);
+        $SESSION->loginerrormsg = $message;
+        redirect(new moodle_url(get_login_url()));
     } else {
-        print_error($error);
+        $SESSION->loginerrormsg = $error;
+        redirect(new moodle_url(get_login_url()));
     }
-    die();
 }
 
 // The authorization code generated by the authorization server.
@@ -53,5 +54,6 @@ if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
     $redirecturl->param('oauth2code', $code);
     redirect($redirecturl);
 } else {
-    print_error('invalidsesskey');
+    $SESSION->loginerrormsg = get_string('invalidsesskey', 'error');
+    redirect(new moodle_url(get_login_url()));
 }