Refactored the CAS user creation instances to utilize the same Peoplefinder code.

Author: kabel

app/controllers/AuthController.php

@@ -85,45 +85,41 @@ public function casAction()
 
                 Zend_Auth::getInstance()->getStorage()->write($userModel->getId());
 
+                //ensure remote data is fresh
+                $remoteData = $userModel->getRemoteData();
+                if (!empty($remoteData['email']) && $userModel['email'] != $remoteData['email']) {
+                    $userModel['email'] = $remoteData['email'];
+                    $userModel->save();
+                }
+                if (empty($userModel['info']) && !empty($remoteData['info'])) {
+                    $userModel['info'] = $remoteData['info'];
+                    $userModel->save();
+                }
+
                 if (empty($userModel['info']) || empty($userModel['email'])) {
                     return $this->_helper->redirector('profile', 'config', null, array(
                     	'view' => 'oldCAS'
                     ));
                 }
             } elseif (!Default_Model_Setting::get('lockout_cas')) {
                 $userModel = new Default_Model_User();
-                $pf = new UNL_Peoplefinder(new UNL_Peoplefinder_Driver_WebService_JSON());
-                /* @var $pf UNL_Peoplefinder_Driver_WebService_JSON */
-                $info = $email = '';
-                try {
-                    $pfResult = $pf->getUID($user);
-                    $info = (!empty($pfResult->eduPersonNickname)) ? $pfResult->eduPersonNickname->{0} . $pfResult->sn->{0} :  $pfResult->displayName->{0};
-                    if (isset($pfResult->mail)) {
-                        if (isset($pfResult->unlEmailAlias)) {
-                            $email = $pfResult->unlEmailAlias->{0} . '@unl.edu';
-                        } else {
-                            $email = $pfResult->mail->{0};
-                        }
-                    }
-                } catch (Exception $e) {
-                    //ignore peoplefinder exceptions
-                }
+                $remoteData = Default_Model_User::getRemoteUserData($user);
 
                 $userModel->setData(array(
                     'username' => $user,
                     'passwd' => '',
                     'login_type' => Default_Model_User::LOGIN_TYPE_CAS,
                     'level' => Default_Model_User::LEVEL_USER,
                     'status' => Default_Model_User::STATUS_ACTIVE,
-                    'info' => $info,
-                    'email' => $email
+                    'info' => $remoteData['info'],
+                    'email' => $remoteData['email']
                 ));
 
                 $userModel->save();
 
                 Zend_Auth::getInstance()->getStorage()->write($userModel->getId());
 
-                if (empty($userModel['email'])) {
+                if (empty($userModel['info']) || empty($userModel['email'])) {
                     return $this->_helper->redirector('profile', 'config', null, array(
                         'view' => 'newCAS'
                     ));

app/forms/User.php

@@ -57,18 +57,12 @@ public function handlePost($id)
                $data['passwd'] = md5($values['passwd_new']);
            } else {
                $data['passwd'] = '';
-
-               $pf = new UNL_Peoplefinder();
-               $pfResult = $pf->getUID($user);
-               if ($prResult) {
-                   $data['info'] = (!empty($pfResult->eduPersonNickname)) ? $pfResult->eduPersonNickname :  $pfResult->displayName;
-                   if (isset($pfResult->mail)) {
-                        if (isset($pfResult->unlEmailAlias)) {
-                            $data['email'] = $pfResult->unlEmailAlias . '@unl.edu';
-                        } else {
-                            $data['email'] = $pfResult->mail;
-                        }
-                    }
+               $remoteData = Default_Model_User::getRemoteUserData($data['username']);
+               if (empty($data['info'])) {
+                   $data['info'] = $remoteData['info'];
+               }
+               if (!empty($remoteData['email'])) {
+                   $data['email'] = $remoteData['email'];
                }
            }
 

app/models/User.php

@@ -257,6 +257,34 @@ public static function getLevelCounts($active = false)
         return $counts;
     }
 
+    public static function getRemoteUserData($uid)
+    {
+        $data = array(
+            'info' => '',
+            'email' => ''
+        );
+
+        //BEGIN UNL PEOPLEFINDER MODULE
+        $pf = new UNL_Peoplefinder(new UNL_Peoplefinder_Driver_WebService_JSON());
+        /* @var $pf UNL_Peoplefinder_Driver_WebService_JSON */
+        try {
+            $pfResult = $pf->getUID($uid);
+            $data['info'] = (!empty($pfResult->eduPersonNickname)) ? $pfResult->eduPersonNickname->{0} . $pfResult->sn->{0} :  $pfResult->displayName->{0};
+            if (isset($pfResult->mail)) {
+                if (isset($pfResult->unlEmailAlias)) {
+                    $data['email'] = $pfResult->unlEmailAlias->{0} . '@unl.edu';
+                } else {
+                    $data['email'] = $pfResult->mail->{0};
+                }
+            }
+        } catch (Exception $e) {
+            //ignore peoplefinder exceptions
+        }
+        //END PEOPLEFINDER MODULE
+
+        return $data;
+    }
+
     public function __construct()
     {
         parent::_init(self::$_resourceNameInit);
@@ -328,6 +356,11 @@ public function getGroupIds($onlyMembership = false)
         return $ids;
     }
 
+    public function getRemoteData()
+    {
+        return self::getRemoteUserData($this->getUsername());
+    }
+
     public function __toString()
     {
         return $this['username'];