Merge branch 'w45_MDL-42602_m26_userloginevent' of https://github.com…

…/skodak/moodle
wfuedu · Nov 6, 2013 · 7fd16ca · 7fd16ca
2 parents fe48481 + 93b3aaf
commit 7fd16ca
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/auth/ldap/tests/plugin_test.php b/auth/ldap/tests/plugin_test.php
@@ -246,12 +246,8 @@ public function test_ldap_user_loggedin_event() {
 
         $this->resetAfterTest();
 
-        $this->setAdminUser();
-
-        $user = clone($USER);
-
-        // The USER variable no longer stores the password hash, so set it here.
-        $user->password = 'password';
+        $this->assertFalse(isloggedin());
+        $user = $DB->get_record('user', array('username'=>'admin'));
 
         // Note: we are just going to trigger the function that calls the event,
         // not actually perform a LDAP login, for the sake of sanity.
@@ -271,23 +267,6 @@ public function test_ldap_user_loggedin_event() {
         $events = $sink->get_events();
         $sink->close();
 
-        // Unset the password now.
-        unset($user->password);
-
-        // Get the user from the DB and set the expected variables.
-        $dbuser = $DB->get_record('user', array('id' => $user->id), '*', MUST_EXIST);
-        $user->firstaccess = (int) $dbuser->firstaccess;
-        $user->lastaccess = (int) $dbuser->lastaccess;
-        $user->currentlogin = (int) $dbuser->currentlogin;
-        $user->sesskey = sesskey();
-        $user->lastcourseaccess = array();
-        $user->currentcourseaccess = array();
-        $user->groupmember = array();
-        $user->profile = array();
-        $user->preference = array(
-            '_lastloaded' => time()
-        );
-
         // Check that the event is valid.
         $this->assertCount(2, $events);
         $event = $events[0];
@@ -297,7 +276,6 @@ public function test_ldap_user_loggedin_event() {
         $this->assertEquals('user', $event->objecttable);
         $this->assertEquals('2', $event->objectid);
         $this->assertEquals(context_system::instance()->id, $event->contextid);
-        $this->assertEquals($user, $event->get_record_snapshot('user', 2));
         $expectedlog = array(SITEID, 'user', 'login', 'view.php?id=' . $USER->id . '&course=' . SITEID, $user->id,
             0, $user->id);
         $this->assertEventLegacyLogData($expectedlog, $event);

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -4450,7 +4450,6 @@ function complete_user_login($user) {
             'other' => array('username' => $USER->username),
         )
     );
-    $event->add_record_snapshot('user', $user);
     $event->trigger();
 
     if (isguestuser()) {

diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php
@@ -2446,14 +2446,17 @@ public function test_order_in_string() {
     }
 
     public function test_complete_user_login() {
-        global $USER;
+        global $USER, $DB;
 
         $this->resetAfterTest();
         $user = $this->getDataGenerator()->create_user();
         $this->setUser(0);
 
         $sink = $this->redirectEvents();
-        @complete_user_login($user); // Hide session header errors.
+        $loginuser = clone($user);
+        $this->setCurrentTimeStart();
+        @complete_user_login($loginuser); // Hide session header errors.
+        $this->assertSame($loginuser, $USER);
         $this->assertEquals($user->id, $USER->id);
         $events = $sink->get_events();
         $sink->close();
@@ -2466,7 +2469,21 @@ public function test_complete_user_login() {
         $this->assertEquals('user', $event->objecttable);
         $this->assertEquals($user->id, $event->objectid);
         $this->assertEquals(context_system::instance()->id, $event->contextid);
-        $this->assertEquals($user, $event->get_record_snapshot('user', $user->id));
+
+        $user = $DB->get_record('user', array('id'=>$user->id));
+
+        $this->assertTimeCurrent($user->firstaccess);
+        $this->assertTimeCurrent($user->lastaccess);
+        $this->assertTimeCurrent($user->timemodified);
+
+        $this->assertTimeCurrent($USER->firstaccess);
+        $this->assertTimeCurrent($USER->lastaccess);
+        $this->assertTimeCurrent($USER->timemodified);
+        $this->assertTimeCurrent($USER->currentlogin);
+        $this->assertSame(sesskey(), $USER->sesskey);
+        $this->assertTimeCurrent($USER->preference['_lastloaded']);
+        $this->assertObjectNotHasAttribute('password', $USER);
+        $this->assertObjectNotHasAttribute('description', $USER);
     }
 
     /**