Changeset 1204

Timestamp:

07/18/10 12:46:27 (3 years ago)

Author:

d0nut

Message:

added openid page and openid button template

Location:

openid

Files:

• files/lib/data/openid/OpenID.class.php (modified) (3 diffs)
• files/lib/page/OpenIDPage.class.php (modified) (4 diffs)
• files/lib/system/event/listener/UserLoginOpenIDListener.class.php (modified) (3 diffs)
• package.xml (modified) (2 diffs)
• templates/openidLogin.tpl (modified) (1 diff)

openid/files/lib/data/openid/OpenID.class.php

@@ -252 +252 @@
                         $user = $this->registerUser($me);
 
-                        // update avatar
-                        $this->updateAvatar('https://graph.openid.com/'.$me['id'].'/picture', $user);
-
                         // either user is new, oder just got a link, but add a openid link
                         $this->addOpenIDUser($me, $user);
@@ -261 +258 @@
                 if($user) {
 
+                        die('login temporary disabled');
                         // UserLoginForm should not write cookie, since interfaces only support unhashed password
                         $this->eventObj->useCookies = 0;
@@ -390 +388 @@
                 return $availableLanguages;
         }
-
-        /**
-         * downloads openid image and saves as avatar
-         *
-         * @param       string          $avatarURL
-         * @param       User            $user
-         * @return      boolean
-         */
-        protected function updateAvatar($avatarURL, $user) {
-                // existing avatar? skip openid download
-                if ($user->avatarID || empty($avatarURL)) {
-                        return false;
-                }
-
-                try {
-                        $tmpName = FileUtil::downloadFileFromHttp($avatarURL, 'avatar');
-                }
-                catch (SystemException $e) {
-
-                        // skip, download is not that important
-                        return false;
-                }
-
-                $avatarID = AvatarEditor::create($tmpName, $avatarURL, 'avatarURL', $user->userID);
-
-                // update user
-                $sql = "UPDATE  wcf".WCF_N."_user
-                        SET     avatarID = ".$avatarID."
-                        WHERE   userID = ".$user->userID;
-                return WCF::getDB()->sendQuery($sql);
-        }
 }

openid/files/lib/page/OpenIDPage.class.php

@@ -2 +2 @@
 // wcf imports
 require_once(WCF_DIR.'lib/page/AbstractPage.class.php');
+require_once(WCF_DIR.'lib/data/openid/OpenID.class.php');
 
 /**
- * 
+ * handles authentication and user registration
  * 
  * @author      Torben Brodt
@@ -13 +14 @@
 class OpenIDPage extends AbstractPage {
 
+        protected $identifier;
         
         /**
@@ -20 +22 @@
                 parent::readParameters();
                 
-                
+                $this->identifier = isset($_GET['identifier']) ? $_GET['identifier'] : null;
         }
         
@@ -29 +31 @@
                 parent::readData();
                 
+                $openid = new OpenID();
+                
+                if($this->identifier) {
+                        $openid->tryAuthentication($this->identifier);
+                } else {
+                        $openid->finishAuthentication();
+                }
         }
         

openid/files/lib/system/event/listener/UserLoginOpenIDListener.class.php

@@ -7 +7 @@
  * 
  * @author      Torben Brodt
- * @url         http://trac.easy-coding.de/trac/wcf/wiki/openid
  * @license     GNU General Public License <http://opensource.org/licenses/gpl-3.0.html>
+ * @package     de.easy-coding.wcf.openid
  */
 class UserLoginOpenIDListener implements EventListener {
@@ -32 +32 @@
                         return;
                 }
+                
+                // TODO: remove DEBUG
+                if(!isset($_GET['openid'])) {
+                        return;
+                }
 
                 $this->eventObj = $eventObj;
@@ -47 +52 @@
 
                 WCF::getTPL()->assign(array(
-                        'openID' => OpenID::getReturnTo(),
+                        'openid_url' => OpenID::getReturnTo(),
                 ));
 

openid/package.xml

@@ -6 +6 @@
                 <packagedescription language="de"><![CDATA[Dieses Plugin verbindet openid mit dem WCF. So ist z.B. ein Direktlogin via openid möglich.]]></packagedescription>
                 <packagedescription><![CDATA[This enables all users to login with their openid account.]]></packagedescription>
-                <version>1.0.0 RC 1</version>
+                <version>1.0.0 Beta 1</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -31 +31 @@
                 <languages languagecode="en">en.xml</languages>
         </instructions>
-        <instructions type="update" fromversion="1.1.3">
+        <instructions type="update" fromversion="1.0.0">
                 <files>files.tar</files>
-                <templates>templates.tar</templates>
-                <sql>update.sql</sql>
-                
-                <options>options.xml</options>
-                <eventlistener>eventlistener.xml</eventlistener>
-                <languages languagecode="de">de.xml</languages>
-                <languages languagecode="en">en.xml</languages>
         </instructions>
 </package>

openid/templates/openidLogin.tpl

@@ -1 +1 @@
 <div class="formElement">
         <div class="formField">
-                <div id="fb-root"></div>
-                <script type="text/javascript">
-                window.fbAsyncInit = function() {
-                        FB.init({
-                                appId   : '{FACEBOOK_APPID}',
-                                session : {$session|json_encode}, // don't refetch the session when PHP already has it
-                                status  : true, // check login status
-                                cookie  : true, // enable cookies to allow the server to access the session
-                                xfbml   : true // parse XFBML
-                        });
+                <form method="get" action="{$openid_url}">
+                        <script type="text/javascript">
+                        function openid(elem, msg) {
+                                var x = prompt(msg);
+                                if(x) {
+                                        elem.href = elem.href.replace(/\\1/, x);
+                                        return true;
+                                }
+        
+                                return false;
+                        }
+                        </script>
+        
+                        Sie können sich mit ihrem existieren Account bestimmter Anbieter bei uns authentifizieren.<br/>
+                        Das ganze funktioniert ÃŒber die s.g. OpenID Schnittstelle - es werden keine Zugangsdaten ausgetauscht.<br/>
 
-                        // whenever the user logs in, we refresh the page
-                        FB.Event.subscribe('auth.login', function() {
-                                window.location.reload();
-                        });
-                };
+                        <a href="{$openid_url}&identifier=https://www.google.com/accounts/o8/id">Google</a>
+                        <a href="{$openid_url}&identifier=http://yahoo.com/">Yahoo</a>
+                        <a href="{$openid_url}&identifier=http://openid.aol.com/\1" onclick="return openid(this)">AOL</a>
+                        <a href="{$openid_url}&identifier=http://\1.myopenid.com/" onclick="return openid(this)">myOpenID</a>
 
-                (function() {
-                        var e = document.createElement('script');
-                        e.src = document.location.protocol + '//connect.facebook.net/en_US/all.js';
-                        e.async = true;
-                        document.getElementById('fb-root').appendChild(e);
-                }());
-                </script>
-
-                <a href="{$loginUrl}"><img src="http://static.ak.fbcdn.net/rsrc.php/zB6N8/hash/4li2k73z.gif"></a>
+                        <p>... oder geben Sie ihre OpenID manuell ein:<br/>
+                        <input type="text" name="identifier" class="openid" value="https://www.google.com/accounts/o8/id" /></p>
+                        <p>
+                                <input type="submit" value="Weiter &raquo;" />
+                        </p>
+                </form>
         </div>
 </div>