WebSVN – Moodle – Diff – /auth/oauth2/classes/api.php

      * List linked logins
+     *
      * Requires auth/oauth2:managelinkedlogins capability at the user context.
+     *
      * @param int $userid (defaults to $USER->id)
-     * @return boolean
+     * @return linked_login[]
      */
     public static function get_linked_logins($userid = false) {
         global $USER;
     /**
      * See if there is a match for this username and issuer in the linked_login table.
+     *
      * @param string $username as returned from an oauth client.
      * @param \core\oauth2\issuer $issuer
-     * @return stdClass User record if found.
+     * @return linked_login|false record if found and user exists, false otherwise.
      */
     public static function match_username_to_user($username, $issuer) {
         $params = [
             'issuerid' => $issuer->get('id'),
             'username' => $username
+     *
      * @param array $userinfo as returned from an oauth client.
      * @param \core\oauth2\issuer $issuer
      * @param int $userid (defaults to $USER->id)
      * @param bool $skippermissions During signup we need to set this before the user is setup for capability checks.
-     * @return bool
+     * @return linked_login
      */
     public static function link_login($userinfo, $issuer, $userid = false, $skippermissions = false) {
         global $USER;
         $site = get_site();
         $supportuser = \core_user::get_support_user();
         $user = get_complete_user_data('id', $userid);
+        $data = new stdClass();
+        $placeholders = \core_user::get_name_placeholders($user);
-        $data = new stdClass();
+        foreach ($placeholders as $field => $value) {
+            $data->{$field} = $value;
         $data->fullname = fullname($user);
         $data->sitename  = format_string($site->fullname);
         $data->admin     = generate_email_signoff();
         $data->issuername = format_string($issuer->get('name'));
             return false;
+        }
         $expires = $login->get('confirmtokenexpires');
         if (time() > $expires) {
             $login->delete();
-            return;
+            return false;
+        }
         $login->set('confirmtokenexpires', 0);
         $login->set('confirmtoken', '');
         $login->update();
         return true;
     /**
      * Create an account with a linked login that is already confirmed.
+     *
      * @param array $userinfo as returned from an oauth client.
      * @param \core\oauth2\issuer $issuer
-     * @return bool
+     * @return stdClass
      */
     public static function create_new_confirmed_account($userinfo, $issuer) {
         global $CFG, $DB;
         require_once($CFG->dirroot.'/user/profile/lib.php');
         require_once($CFG->dirroot.'/user/lib.php');
      * Send an email with a link to confirm creating this account.
+     *
      * @param array $userinfo as returned from an oauth client.
      * @param \core\oauth2\issuer $issuer
      * @param int $userid (defaults to $USER->id)
-     * @return bool
+     * @return stdClass
      */
     public static function send_confirm_account_email($userinfo, $issuer) {
         global $CFG, $DB;
         require_once($CFG->dirroot.'/user/profile/lib.php');
         require_once($CFG->dirroot.'/user/lib.php');
         $site = get_site();
         $supportuser = \core_user::get_support_user();
         $user = get_complete_user_data('id', $user->id);
+        $data = new stdClass();
+        $placeholders = \core_user::get_name_placeholders($user);
-        $data = new stdClass();
+        foreach ($placeholders as $field => $value) {
+            $data->{$field} = $value;
         $data->fullname = fullname($user);
         $data->sitename  = format_string($site->fullname);
         $data->admin     = generate_email_signoff();
         email_to_user($user, $supportuser, $subject, $message, $messagehtml);
         return $user;
+    }
     /**
-     * Delete linked login
+     * Delete a users own linked login
+     *
      * Requires auth/oauth2:managelinkedlogins capability at the user context.
+     *
-     * @param int $linkedloginid
-     * @return boolean
+     * @param int $linkedloginid
      */
-    public static function delete_linked_login($linkedloginid) {
-        $login = new linked_login($linkedloginid);
+    public static function delete_linked_login($linkedloginid) {
-        $userid = $login->get('userid');
+        global $USER;
         if (\core\session\manager::is_loggedinas()) {
+            throw new moodle_exception('notwhileloggedinas', 'auth_oauth2');
+        }
+        $login = linked_login::get_record([
+            'id' => $linkedloginid,
+            'userid' => $USER->id,
-            throw new moodle_exception('notwhileloggedinas', 'auth_oauth2');
+            'confirmtoken' => '',
         ], MUST_EXIST);
-        $context = context_user::instance($userid);
+        $context = context_user::instance($login->get('userid'));
     /**
      * Create a new user & update the profile fields
+     *
      * @param array $userinfo
      * @param object $user
-     * @return object
+     * @return stdClass
      */
     private static function save_user(array $userinfo, object $user): object {
         // Map supplied issuer user info to Moodle user fields.
         $userfieldmapping = new \core\oauth2\user_field_mapping();
         $userfieldlist = $userfieldmapping->get_internalfields();

Proyectos de Subversion Moodle

(root)/auth/oauth2/classes/api.php – Rev 1 → 1441