Merge branch 'MDL-57429-32-fix' of https://github.com/snake/moodle into MOODLE_32_STABLE

badges/backpack_form.php

@@ -101,6 +101,8 @@ class edit_backpack_form extends moodleform {
             $request = $bp->curl_request('user');
             if (isset($request->status) && $request->status == 'missing') {
                 $errors['email'] = get_string('error:nosuchuser', 'badges');
+            } else if (!isset($request->status) || $request->status !== 'okay') {
+                $errors['email'] = get_string('backpackconnectionunexpectedresult', 'badges');
             }
         }
         return $errors;

badges/backpackemailverify.php

@@ -43,11 +43,20 @@ if (!is_null($storedsecret)) {
         $data->email = $storedemail;
         $bp = new OpenBadgesBackpackHandler($data);
 
+        // Make sure we have all the required information before trying to save the connection.
+        $backpackuser = $bp->curl_request('user');
+        if (isset($backpackuser->status) && $backpackuser->status === 'okay' && isset($backpackuser->userId)) {
+            $backpackuid = $backpackuser->userId;
+        } else {
+            redirect(new moodle_url($redirect), get_string('backpackconnectionunexpectedresult', 'badges'),
+                null, \core\output\notification::NOTIFY_ERROR);
+        }
+
         $obj = new stdClass();
         $obj->userid = $USER->id;
         $obj->email = $data->email;
         $obj->backpackurl = $data->backpackurl;
-        $obj->backpackuid = $bp->curl_request('user')->userId;
+        $obj->backpackuid = $backpackuid;
         $obj->autosync = 0;
         $obj->password = '';
         $DB->insert_record('badge_backpack', $obj);

lang/en/badges.php

@@ -94,6 +94,7 @@ For more information about Persona visit <a href="https://login.persona.org/abou
 $string['backpackconnectioncancelattempt'] = 'Connect using a different email address';
 $string['backpackconnectionconnect'] = 'Connect to Backpack';
 $string['backpackconnectionresendemail'] = 'Resend verification email';
+$string['backpackconnectionunexpectedresult'] = 'There was a problem contacting the Backpack. Please try again.<br><br>If this problem persists, please contact your system administrator.';
 $string['backpackemailverificationpending'] = 'Verification pending';
 $string['backpackemailverifyemailbody'] = 'Hi,