Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-04 15:07:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate RainLoop Webmail to use Facebook Graph API instead of FQL

Browse source
This commit is contained in:
RainLoop Team 2014-07-04 00:11:47 +04:00
parent 9fcaf00875
commit d0dbb26548
120 changed files with 18817 additions and 1746 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1188,6 +1188,7 @@ class Actions
$aResult['TwitterConsumerKey'] = (string) $oConfig->Get('social', 'twitter_consumer_key', '');
$aResult['TwitterConsumerSecret'] = (string) $oConfig->Get('social', 'twitter_consumer_secret', '');
$aResult['AllowDropboxSocial'] = (bool) $oConfig->Get('social', 'dropbox_enable', false);
$aResult['DropboxApiKey'] = (string) $oConfig->Get('social', 'dropbox_api_key', '');
@ -1205,6 +1206,14 @@ class Actions
$aResult['Capa'] = $this->Capa(true);
}
$aResult['SupportedFacebookSocial'] = (bool) \version_compare(PHP_VERSION, '5.4.0', '>=');
if (!$aResult['SupportedFacebookSocial'])
{
$aResult['AllowFacebookSocial'] = false;
$aResult['FacebookAppID'] = '';
$aResult['FacebookAppSecret'] = '';
}
$aResult['ProjectHash'] = \md5($aResult['AccountHash'].APP_VERSION.$this->Plugins()->Hash());
$sLanguage = $oConfig->Get('webmail', 'language', 'en');
@ -6995,7 +7004,7 @@ class Actions
'FileName' => (0 === \strlen($sSubject) ? 'message-'.$mResult['Uid'] : \MailSo\Base\Utils::ClearXss($sSubject)).'.eml'
));
// Flags
$aFlags = $mResponse->FlagsLowerCase();

127
rainloop/v/0.0.0/app/libraries/RainLoop/Common/RainLoopFacebookRedirectLoginHelper.php Normal file
View file

@ -0,0 +1,127 @@
<?php
namespace RainLoop\Common;
class RainLoopFacebookRedirectLoginHelper extends \Facebook\FacebookRedirectLoginHelper
{
/**
* @var string
*/
private $rlAppId;
/**
* @var string
*/
private $rlUserHash;
/**
* @var mixed
*/
private $rlAccount;
/**
* @var mixed
*/
private $rlStorageProvaider;
public function __construct($redirectUrl, $appId = null, $appSecret = null)
{
parent::__construct($redirectUrl, $appId, $appSecret);
$this->rlAppId = '';
$this->rlUserHash = '';
$this->rlAccount = null;
$this->rlStorageProvaider = null;
}
/**
* @return string
*/
public function GetRLAppId()
{
return $this->rlAppId;
}
public function initRainLoopData($config)
{
if (!empty($config['rlAppId']))
{
$this->rlAppId = $config['rlAppId'];
}
if (!empty($config['rlStorageProvaider']))
{
$this->rlStorageProvaider = $config['rlStorageProvaider'];
}
if (!empty($config['rlAccount']))
{
$this->rlAccount = $config['rlAccount'];
}
if (!empty($config['rlUserHash']))
{
$this->rlUserHash = (string) $config['rlUserHash'];
}
if (!class_exists('\\RainLoop\\Providers\\Storage\\Enumerations\\StorageType') || '' === $this->rlUserHash)
{
$this->rlStorageProvaider = null;
}
}
/**
* Stores a state string in session storage for CSRF protection.
* Developers should subclass and override this method if they want to store
* this state in a different location.
*
* @param string $state
*
* @throws FacebookSDKException
*/
protected function storeState($state)
{
if ($this->rlStorageProvaider)
{
$this->rlStorageProvaider->Put(
$this->rlAccount ? $this->rlAccount : null,
$this->rlAccount ? \RainLoop\Providers\Storage\Enumerations\StorageType::USER :
\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
$this->generateSessionVariableName(), $state);
}
}
/**
* Loads a state string from session storage for CSRF validation. May return
* null if no object exists. Developers should subclass and override this
* method if they want to load the state from a different location.
*
* @return string|null
*
* @throws FacebookSDKException
*/
protected function loadState()
{
if ($this->rlStorageProvaider)
{
$state = $this->rlStorageProvaider->Get(
$this->rlAccount ? $this->rlAccount : null,
$this->rlAccount ? \RainLoop\Providers\Storage\Enumerations\StorageType::USER :
\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
$this->generateSessionVariableName(), false);
if (false !== $state)
{
$this->state = $state;
return $this->state;
}
}
return null;
}
private function generateSessionVariableName()
{
return implode('/', array('Fackebook', \md5($this->rlUserHash), 'Storage'));
}
}

196
rainloop/v/0.0.0/app/libraries/RainLoop/Social.php
View file

@ -210,35 +210,23 @@ class Social
$oFacebook = $this->FacebookConnector($oAccount ? $oAccount : null);
if ($oAccount && $oFacebook)
{
$oUser = $oFacebook->getUser();
if ($oUser)
$oSettings = $this->oActions->SettingsProvider()->Load($oAccount);
$sEncodedeData = $oSettings->GetConf('FacebookAccessToken', '');
if (!empty($sEncodedeData))
{
$mData = false;
try
{
$aData = $oFacebook->api(array(
'method' => 'fql.query',
'query' => 'SELECT uid FROM user WHERE uid = me()'
));
$mData = isset($aData[0], $aData[0]['uid']) ? $aData[0]['uid'] : false;
}
catch (\Exception $oException)
{
$this->oActions->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
}
if (false !== $mData && 0 < \strlen($mData))
$aData = \RainLoop\Utils::DecodeKeyValues($sEncodedeData);
if (is_array($aData) && isset($aData['id']))
{
$this->oActions->StorageProvider()->Clear(null,
\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
$this->FacebookUserLoginStorageKey($oFacebook, $mData));
$this->FacebookUserLoginStorageKey($oFacebook, $aData['id'])
);
}
}
$oFacebook->UserLogout();
$oSettings = $this->oActions->SettingsProvider()->Load($oAccount);
$oSettings->SetConf('FacebookAccessToken', '');
$oSettings->SetConf('FacebookSocialName', '');
return $this->oActions->SettingsProvider()->Save($oAccount, $oSettings);
@ -429,60 +417,41 @@ class Social
$sSocialName = '';
$mData = false;
$sUserData = '';
$aUserData = false;
$bLogin = false;
$iErrorCode = \RainLoop\Notifications::UnknownError;
$sRedirectUrl = $this->oHttp->GetFullUrl().'?SocialFacebook';
if (0 < strlen($this->oActions->GetSpecAuthToken()))
{
$sRedirectUrl .= '&rlah='.$this->oActions->GetSpecAuthToken();
}
else if ($this->oHttp->HasQuery('rlah'))
if (0 === \strlen($this->oActions->GetSpecAuthToken()) && $this->oHttp->HasQuery('rlah'))
{
$this->oActions->SetSpecAuthToken($this->oHttp->GetQuery('rlah', ''));
$sRedirectUrl .= '&rlah='.$this->oActions->GetSpecAuthToken();
}
try
$oAccount = $this->oActions->GetAccount();
$oFacebook = $this->FacebookConnector($oAccount);
if ($oFacebook)
{
$oAccount = $this->oActions->GetAccount();
$oFacebook = $this->FacebookConnector($oAccount ? $oAccount : null);
if ($oFacebook)
try
{
if ($oAccount)
$oSession = $oFacebook->getSessionFromRedirect();
if (!$oSession && !$this->oHttp->HasQuery('state'))
{
$oUser = $oFacebook->getUser();
if (!$oUser && !$this->oHttp->HasQuery('state'))
$sLoginUrl = $oFacebook->getLoginUrl().'&display=popup';
}
else if ($oSession)
{
$oRequest = new \Facebook\FacebookRequest($oSession, 'GET', '/me');
$oResponse = $oRequest->execute();
$oGraphObject = $oResponse->getGraphObject();
$mData = $oGraphObject->getProperty('id');
$sSocialName = $oGraphObject->getProperty('name');
if ($oAccount)
{
$sLoginUrl = $oFacebook->getLoginUrl(array(
'display' => 'popup',
'redirect_uri' => $sRedirectUrl
));
}
else
{
try
{
$aData = $oFacebook->api(array(
'method' => 'fql.query',
'query' => 'SELECT uid, name, username FROM user WHERE uid = me()'
));
$mData = isset($aData[0], $aData[0]['uid']) ? $aData[0]['uid'] : false;
$sSocialName = !empty($aData[0]['name']) ? $aData[0]['name'] : '';
$sSocialName .= !empty($aData[0]['username']) ? ' ('.$aData[0]['username'].')' : '';
$sSocialName = \trim($sSocialName);
}
catch (\FacebookApiException $oException)
{
$this->oActions->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
}
if (false !== $mData && 0 < \strlen($mData))
if ($mData && 0 < \strlen($mData))
{
$aUserData = array(
'Email' => $oAccount->Email(),
@ -491,6 +460,9 @@ class Social
$oSettings = $this->oActions->SettingsProvider()->Load($oAccount);
$oSettings->SetConf('FacebookSocialName', $sSocialName);
$oSettings->SetConf('FacebookAccessToken', \RainLoop\Utils::EncodeKeyValues(array('id' => $mData)));
$this->oActions->SettingsProvider()->Save($oAccount, $oSettings);
$this->oActions->StorageProvider()->Put(null,
@ -501,28 +473,11 @@ class Social
$iErrorCode = 0;
}
}
}
else
{
$bLogin = true;
$oUser = $oFacebook->getUser();
if ($oUser)
else
{
try
{
$aData = $oFacebook->api(array(
'method' => 'fql.query',
'query' => 'SELECT uid FROM user WHERE uid = me()'
));
$bLogin = true;
$mData = isset($aData[0], $aData[0]['uid']) ? $aData[0]['uid'] : false;
}
catch (\FacebookApiException $oException)
{
}
if (false !== $mData && 0 < \strlen($mData))
if ($mData && 0 < \strlen($mData))
{
$sUserData = $this->oActions->StorageProvider()->Get(null,
\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
@ -550,19 +505,12 @@ class Social
$iErrorCode = \RainLoop\Notifications::SocialFacebookLoginAccessDisable;
}
}
else
{
$sLoginUrl = $oFacebook->getLoginUrl(array(
'display' => 'popup',
'redirect_uri' => $sRedirectUrl
));
}
}
}
}
catch (\Exception $oException)
{
$this->oActions->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
catch (\Exception $oException)
{
$this->oActions->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
}
}
if ($sLoginUrl)
@ -571,7 +519,9 @@ class Social
}
else
{
$this->oHttp->ServerNoCache();
@\header('Content-Type: text/html; charset=utf-8');
$sCallBackType = $bLogin ? '_login' : '';
$sConnectionFunc = 'rl_'.\md5(\RainLoop\Utils::GetConnectionToken()).'_facebook'.$sCallBackType.'_service';
$sResult = '<script type="text/javascript" data-cfasync="false">opener && opener.'.$sConnectionFunc.' && opener.'.
@ -852,42 +802,48 @@ class Social
/**
* @param \RainLoop\Account|null $oAccount = null
*
* @return \Facebook|null
* @return \RainLoop\Common\RainLoopFacebookRedirectLoginHelper|null
*/
public function FacebookConnector($oAccount = null)
{
$oFacebook = false;
$oConfig = $this->oActions->Config();
if ($oConfig->Get('social', 'fb_enable', false) &&
'' !== \trim($oConfig->Get('social', 'fb_app_id', '')) &&
$sAppID = \trim($oConfig->Get('social', 'fb_app_id', ''));
if (\version_compare(PHP_VERSION, '5.4.0', '>=') &&
$oConfig->Get('social', 'fb_enable', false) && '' !== $sAppID &&
'' !== \trim($oConfig->Get('social', 'fb_app_secret', '')))
{
include_once APP_VERSION_ROOT_PATH.'app/libraries/facebook/facebook.php';
\Facebook\FacebookSession::setDefaultApplication($sAppID,
\trim($oConfig->Get('social', 'fb_app_secret', '')));
if (isset(\RainLoopFacebook::$CURL_OPTS) && \is_array(\RainLoopFacebook::$CURL_OPTS))
$sRedirectUrl = $this->oHttp->GetFullUrl().'?SocialFacebook';
if (0 < \strlen($this->oActions->GetSpecAuthToken()))
{
$sProxy = $this->oActions->Config()->Get('labs', 'curl_proxy', '');
if (0 < \strlen($sProxy))
{
\RainLoopFacebook::$CURL_OPTS[CURLOPT_PROXY] = $sProxy;
$sProxyAuth = $this->oActions->Config()->Get('labs', 'curl_proxy_auth', '');
if (0 < \strlen($sProxyAuth))
{
\RainLoopFacebook::$CURL_OPTS[CURLOPT_PROXYUSERPWD] = $sProxyAuth;
}
}
$sRedirectUrl .= '&rlah='.$this->oActions->GetSpecAuthToken();
}
else if ($this->oHttp->HasQuery('rlah'))
{
$this->oActions->SetSpecAuthToken($this->oHttp->GetQuery('rlah', ''));
$sRedirectUrl .= '&rlah='.$this->oActions->GetSpecAuthToken();
}
$oFacebook = new \RainLoopFacebook(array(
'rlAccount' => $oAccount,
'rlUserHash' => \RainLoop\Utils::GetConnectionToken(),
'rlStorageProvaider' => $this->oActions->StorageProvider(),
'appId' => \trim($oConfig->Get('social', 'fb_app_id', '')),
'secret' => \trim($oConfig->Get('social', 'fb_app_secret', '')),
'fileUpload' => false,
'cookie' => true
));
try
{
$oAccount = $this->oActions->GetAccount();
$oFacebook = new \RainLoop\Common\RainLoopFacebookRedirectLoginHelper($sRedirectUrl);
$oFacebook->initRainLoopData(array(
'rlAppId' => $sAppID,
'rlAccount' => $oAccount,
'rlUserHash' => \RainLoop\Utils::GetConnectionToken(),
'rlStorageProvaider' => $this->oActions->StorageProvider()
));
}
catch (\Exception $oException)
{
$this->oActions->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
}
}
return false === $oFacebook ? null : $oFacebook;
@ -906,7 +862,7 @@ class Social
*/
public function FacebookUserLoginStorageKey($oFacebook, $sFacebookUserId)
{
return \implode('_', array('facebook', \md5($oFacebook->getAppId()), $sFacebookUserId, APP_SALT));
return \implode('_', array('facebookNew', \md5($oFacebook->GetRLAppId()), $sFacebookUserId, APP_SALT));
}
/**