Login action, profileLink and indexAction in IndexController refactored.

mzeena · Feb 23, 2011 · 15c8760 · 15c8760
1 parent 8120d8a
commit 15c8760
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 50 deletions.
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
@@ -1,18 +1,23 @@
 <?php
 
-class IndexController extends Zend_Controller_Action
-{
+class IndexController extends Zend_Controller_Action {
 
-    public function init()
-    {
+    public function init() {
         /* Initialize action controller here */
     }
 
-    public function indexAction()
-    {
-        // action body
-    }
+    public function indexAction() {
+
+        $auth = Zend_Auth::getInstance();
+
+        if ($auth->hasIdentity()) {
+            $this->view->identity = $auth->getIdentity();
+        } else {
+            $this->view->identity = null;
+        }
 
 
+    }
+
 }
 
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
@@ -50,9 +50,20 @@ public function loginAction() {
             } else if ('https://www.facebook.com' == $openid_identifier) {
                 $adapter = $this->_getFacebookAdapter();
             } else {
-                // for openid fetch only email
-                $toFetch = array("email" => true,'firstname'=> true);
-                $adapter = $this->_getOpenIdAdapter($openid_identifier, $toFetch );
+                // for openid
+                $adapter = $this->_getOpenIdAdapter($openid_identifier);
+
+                // specify what to grab from the provider and what extension to use
+                // for this purpose
+                $toFetch = array('email' => true);
+                // for google and yahoo use AtributeExchange Extension
+                if ('https://www.google.com/accounts/o8/id' == $openid_identifier || 'http://me.yahoo.com/' == $openid_identifier) {
+                    $ext = $this->_getOpenIdExt('ax', $toFetch);
+                } else {
+                    $ext = $this->_getOpenIdExt('sreg', $toFetch);
+                }
+
+                $adapter->setExtensions($ext);
             }
 
             // here a user is redirect to the provider for loging
@@ -71,22 +82,45 @@ public function loginAction() {
                 // for twitter
                 $adapter = $this->_getTwitterAdapter()->setQueryData($_GET);
             } else {
-                // for openid
-                $adapter = $this->_getOpenIdAdapter();
+                // for openid                
+                $adapter = $this->_getOpenIdAdapter(null);
+
+                // specify what to grab from the provider and what extension to use
+                // for this purpose
+                $ext = null;
+                $toFetch = array('email' => true);
+                // for google and yahoo use AtributeExchange Extension
+                if (isset($_GET['openid_ns_ext1']) || isset($_GET['openid_ns_ax'])) {
+                    $ext = $this->_getOpenIdExt('ax', $toFetch);
+                } else if (isset($_GET['openid_ns_sreg'])) {
+                    $ext = $this->_getOpenIdExt('sreg', $toFetch);
+                }
+                if ($ext) {
+                    $ext->parseResponse($_GET);
+                    $adapter->setExtensions($ext);
+                }
             }
 
             $result = $auth->authenticate($adapter);
 
-            var_dump($result->getMessages());
-            var_dump($result->getIdentity());
-            var_dump($_GET);
-            // var_dump($ext->getProperties());
-            return;
+//            var_dump($result->getMessages());
+//            var_dump($ext->getProperties());
+//
+//            var_dump($result->getIdentity());
+//           var_dump($_GET);
+////            // var_dump($ext->getProperties());
+//           return;
 
 
             if ($result->isValid()) {
+                $toStore = array('identity' => $auth->getIdentity());
+
+                if ($ext) {
+                    $toStore['properties'] = $ext->getProperties();
+                }
+                $auth->getStorage()->write($toStore);
+
                 $this->_helper->FlashMessenger('Successful OpenID authentication');
-                $auth->getStorage()->write($this->getRequest()->getParams());
                 return $this->_redirect('/index/index');
             } else {
                 $this->_helper->FlashMessenger('Failed authentication');
@@ -99,6 +133,8 @@ public function loginAction() {
     public function logoutAction() {
         $auth = Zend_Auth::getInstance();
         $auth->clearIdentity();
+        $this->_helper->FlashMessenger('You were logged out');
+        return $this->_redirect('/index/index');
     }
 
     /**
@@ -125,25 +161,30 @@ protected function _getTwitterAdapter() {
      * Get Zend_Auth_Adapter_OpenId adapter
      *
      * @param string $openid_identifier
-     * @param array $propertiesToRequest
      * @return Zend_Auth_Adapter_OpenId
      */
-    protected function _getOpenIdAdapter($openid_identifier = null, array $propertiesToRequest = array()) {
-
-        $adapter = new Zend_Auth_Adapter_OpenId($openid_identifier);
+    protected function _getOpenIdAdapter($openid_identifier = null) {
+        return new Zend_Auth_Adapter_OpenId($openid_identifier);
+    }
 
-        if (!empty($propertiesToRequest)) {
+    /**
+     * Get Zend_OpenId_Extension. Sreg or Ax. 
+     * 
+     * @param string $extType Possible values: 'sreg' or 'ax'
+     * @param array $propertiesToRequest
+     * @return Zend_OpenId_Extension|null
+     */
+    protected function _getOpenIdExt($extType, array $propertiesToRequest) {
 
-            if ('https://www.google.com/accounts/o8/id' == $openid_identifier || 'http://me.yahoo.com/' == $openid_identifier) {
-                $ext = new My_OpenId_Extension_AttributeExchange($propertiesToRequest);
-            } else {
-                $ext = new Zend_OpenId_Extension_Sreg($propertiesToRequest);
-            }
+        $ext = null;
 
-            $adapter->setExtensions($ext);
+        if ('ax' == $extType) {
+            $ext = new My_OpenId_Extension_AttributeExchange($propertiesToRequest);
+        } elseif ('sreg' == $extType) {
+            $ext = new Zend_OpenId_Extension_Sreg($propertiesToRequest);
         }
 
-        return $adapter;
+        return $ext;
     }
 
 }

diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
@@ -17,7 +17,7 @@
     <body>
         <div>
             <h1>OpenID with Zend Framework</h1>
-            <a href="<?php echo $this->baseUrl();?>">Home</a>
+            <a href="<?php echo $this->baseUrl();?>">Home</a> | <?php echo $this->profileLink(); ?>
             <h2 style="color:green"><?php echo $this->flashMessenger(); ?></h2>
 
 

diff --git a/application/openid/extension/AttributeExchange.php b/application/openid/extension/AttributeExchange.php
@@ -115,7 +115,7 @@ public function getProperties()
 
 	private function splitParams($params)
 	{
-		$final = array();
+		$final = array();        
 
 		// Loop the parameters
 		foreach ($params as $identifier => $value)
@@ -255,6 +255,7 @@ public function prepareResponse(&$params)
     public function parseResponse($params)
     {
     	$params = $this->splitParams($params);
+
     	$ax = null;
 
     	// Get the data name space
@@ -274,6 +275,8 @@ public function parseResponse($params)
     		}
     	}
 
+
+
     	// Check if the data was found
     	if ($ax == null)
     		return false;
@@ -282,6 +285,8 @@ public function parseResponse($params)
     	if (isset($ax['mode']) && $ax['mode'] != 'fetch_response')
     		return false;
 
+
+
     	// Get the attributes
     	foreach ($ax['value'] as $attr => $value)
     	{

diff --git a/application/views/helpers/ProfileLink.php b/application/views/helpers/ProfileLink.php
@@ -29,18 +29,9 @@ public function profileLink()  {
 
         $html = '<a href="'.$baseUrl.'/user/login"> Login </a>';
 
-        if ($auth->hasIdentity()) {
-
-            $identity = $auth->getIdentity();
-
-            $html = "You identity:" . $identity['openid_identity'] . '<br />' ;
-            var_dump($identity);
-           // $html .= 'Returned from the openID provider:' . var_export($identity) . '<br />';
-            $html .= '<a href="'.$baseUrl.'/user/logout"> Logout </a>';
-            return $html;
-        }
-
-
+        if ($auth->hasIdentity()) {          
+            $html = '<a href="'.$baseUrl.'/user/logout"> Logout </a>';
+        }        
 
         return $html;
     }

diff --git a/application/views/scripts/index/index.phtml b/application/views/scripts/index/index.phtml
@@ -1,5 +1,22 @@
 <div>
 
-   <?php echo $this->profileLink();?>
+    <?php if ($this->identity): ?>
+
+    <h2>You are logged</h2>
+        You identity:
+        <pre>
+        <?php echo $this->identity['identity']; ?>
+    </pre>
+    <?php if (isset($this->identity['properties'])): ?>
+            Data fetched:
+            <pre>
+        <?php echo var_export($this->identity['properties'], true); ?>
+        </pre>
+    <?php endif; ?>
+
+    <?php else: ?>
+            <h2>You are not logged</h2>
+    <?php endif; ?>
+
 
 </div>
diff --git a/library/Zend/OpenId/Consumer.php b/library/Zend/OpenId/Consumer.php
@@ -861,16 +861,16 @@ protected function _checkId($immediate, $id, $returnTo=null, $root=null, $extens
             if ($server == 'https://www.google.com/accounts/o8/ud') {
                 $params['openid.identity'] = 'http://specs.openid.net/auth/2.0/identifier_select';
                 $params['openid.claimed_id'] = 'http://specs.openid.net/auth/2.0/identifier_select';
+                $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0';
+                $params['openid.ax.mode'] = 'fetch_request';                
                 $params['openid.ns.pape'] = 'http://specs.openid.net/extensions/pape/1.0';
-                $params['openid.pape.preferred_auth_policies'] = '';
             }
 
             if ($server == 'http://www.myopenid.com/server') {
                 $params['openid.ns.sreg'] = 'http://openid.net/extensions/sreg/1.1';
                 $params['openid.ns.pape'] = 'http://specs.openid.net/extensions/pape/1.0';
                 $params['openid.pape.preferred_auth_policies'] = '';
-            }            
-
+            }
         }
 
         if (isset($handle)) {

diff --git a/library/Zend/OpenId/Extension.php b/library/Zend/OpenId/Extension.php
@@ -41,11 +41,12 @@ abstract class Zend_OpenId_Extension
      */
     static public function forAll($extensions, $func, &$params)
     {
+
         if ($extensions !== null) {
             if (is_array($extensions)) {
                 foreach ($extensions as $ext) {
                     if ($ext instanceof Zend_OpenId_Extension) {
-                        if (!$ext->$func($params)) {
+                        if (!$ext->$func($params)) {                             
                             return false;
                         }
                     } else {