sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 5.0.13

Browse Source
This commit is contained in:
Neo committed 2025-12-19 19:04:57 -08:00
1 parent b89858b2ff
commit 5efe744c5f
1407 files changed
+69690 -30177
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

system/Login/Handler/Handler.php
+95 -4
View File
@@ -25,6 +25,7 @@ use IPS\Helpers\Form\Radio;
use IPS\Helpers\Form\Translatable;
use IPS\Helpers\Form\YesNo;
use IPS\Http\Url;
use IPS\IPS;
use IPS\Lang;
use IPS\Login;
use IPS\Login\Exception as LoginException;
@@ -33,6 +34,7 @@ use IPS\Login\Handler\Standard;
use IPS\Member;
use IPS\Member\Device;
use IPS\Node\Model;
use IPS\Output;
use IPS\Request;
use IPS\Settings;
use LogicException;
@@ -60,6 +62,22 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
*/
abstract class Handler extends Model
{
/**
* @brief [ActiveRecord] Caches
* @note Defined cache keys will be cleared automatically as needed
*/
protected array $caches = [ 'loginMethods' ];
/**
* Is this login handler supported? - Implemented like this for BC
*
* @return bool
*/
public static function isSupported(): bool
{
return TRUE;
}
/**
* Get all handler classes
*
@@ -84,7 +102,10 @@ abstract class Handler extends Model
foreach ( Application::allExtensions( 'core', 'LoginHandler', FALSE, 'core' ) as $key => $extension )
{
$return[] = $extension::class;
if( $extension::isSupported() )
{
$return[] = $extension::class;
}
}
return $return;
@@ -175,6 +196,21 @@ abstract class Handler extends Model
* @return int
*/
abstract public function type(): int;
/**
* Determine if a root can be added
*
* @return bool
*/
public static function canAddRoot(): bool
{
if ( IPS::canManageResources() )
{
return TRUE;
}
return parent::canAddRoot();
}
/**
* Can this handler process a login for a member?
@@ -196,6 +232,16 @@ abstract class Handler extends Model
{
return FALSE;
}
/**
* Can this handler sync profile photos?
*
* @return bool
*/
public function canSyncProfilePhoto() : bool
{
return false;
}
/**
* @brief Cached links
@@ -441,6 +487,19 @@ abstract class Handler extends Model
'linked' => TRUE,
) );
}
/**
* [ActiveRecord] Delete Record
*
* @return void
*/
public function delete(): void
{
parent::delete();
/* Delete login links for this handler */
Db::i()->delete( 'core_login_links', [ 'token_login_method=?', $this->_id ] );
}
/**
* Unlink Account
@@ -543,6 +602,11 @@ abstract class Handler extends Model
{
$return[] = 'email';
}
if( isset( $this->settings['update_photo_changes'] ) and $this->settings['update_photo_changes'] === 'force' )
{
$return[] = 'photo';
}
return $return;
}
@@ -775,6 +839,17 @@ abstract class Handler extends Model
/* Return */
return $obj;
}
/**
* [Node] Get whether or not this node is locked to current enabled/disabled status
*
* @note Return value NULL indicates the node cannot be enabled/disabled
* @return bool|null
*/
protected function get__locked(): ?bool
{
return !IPS::canManageResources();
}
/**
* Get settings
@@ -804,7 +879,7 @@ abstract class Handler extends Model
*/
public function canCopy(): bool
{
if ( !static::$allowMultiple )
if ( !static::$allowMultiple OR !IPS::canManageResources() )
{
return FALSE;
}
@@ -818,6 +893,10 @@ abstract class Handler extends Model
*/
public function canDelete(): bool
{
if( !IPS::canManageResources() )
{
return FALSE;
}
if ( parent::canDelete() )
{
return count( static::roots() ) > 1;
@@ -840,6 +919,14 @@ abstract class Handler extends Model
*/
public function form( Form &$form ) : void
{
/* No Editing for Managed */
if ( !IPS::canManageResources() )
{
$form->attributes = ['inert' => 'true'];
$form->actionButtons = [];
$form->addMessage( 'login_method_cannot_edit_managed', 'error' );
}
$form->addHeader('login_method_basic_settings');
$form->add( new Translatable( 'login_method_name', NULL, TRUE, array( 'app' => 'core', 'key' => ( $this->id ? 'login_method_' . $this->id : NULL ) ) ) );
if ( !( $this instanceof Standard ) ) {
@@ -870,8 +957,6 @@ abstract class Handler extends Model
) ) );
}
$form->add( new YesNo( 'login_front', $this->id ? $this->front : static::$enableAcpLoginByDefault, FALSE, array() ) );
foreach ( $this->acpForm() as $key => $field )
{
if ( is_string( $field ) )
@@ -909,6 +994,12 @@ abstract class Handler extends Model
*/
public function saveForm( array $values ): mixed
{
/* No Editing for Managed */
if( !IPS::canManageResources() )
{
Output::i()->error( 'login_method_cannot_edit_managed', '3S440/1', 403, '' );
}
if ( isset( static::$shareService ) and isset( $values[ 'share_autoshare_' . static::$shareService ] ) )
{
try
system/Login/Handler/OAuth1/OAuth1.php
+18 -1
View File
@@ -94,6 +94,23 @@ abstract class OAuth1 extends Handler
'optional' => 'login_update_changes_optional',
'disabled' => 'login_update_changes_no',
), 'disabled' => $emailChangesDisabled ), NULL, NULL, NULL, 'login_update_email_changes_inc_optional' );
/* If this handler supports profile photos, add options for that */
if( $this->canSyncProfilePhoto() )
{
$photoChangesDisabled = array();
if( $forcePhotoHandler = static::handlerHasForceSync( 'photo', $this ) )
{
$photoChangesDisabled[] = 'force';
Member::loggedIn()->language()->words['login_update_changes_yes_photo_desc'] = Member::loggedIn()->language()->addToStack( 'login_update_changes_yes_disabled', FALSE, array( 'sprintf' => $forcePhotoHandler->_title ) );
}
$return['update_photo_changes'] = new Radio( 'login_update_photo_changes', $this->settings['update_photo_changes'] ?? 'optional', FALSE, array( 'options' => array(
'force' => 'login_update_changes_yes_photo',
'optional' => 'login_update_changes_optional',
'disabled' => 'login_update_changes_no',
), 'disabled' => $photoChangesDisabled ), null, null, null, 'login_update_photo_changes_inc_optional' );
}
return $return;
}
@@ -468,7 +485,7 @@ abstract class OAuth1 extends Handler
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) )
if ( !( $link = $this->_link( $member ) ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}
system/Login/Handler/OAuth1/Twitter.php
+37 -10
View File
@@ -47,6 +47,16 @@ class Twitter extends OAuth1
{
return 'login_handler_Twitter';
}
/**
* Can this handler sync profile photos?
*
* @return bool
*/
public function canSyncProfilePhoto() : bool
{
return true;
}
/**
* ACP Settings Form
@@ -73,6 +83,15 @@ class Twitter extends OAuth1
'screen' => array( 'login_update_name_changes_inc_optional' ),
)
), NULL, NULL, NULL, 'login_real_name' ),
'real_photo' => new Radio( 'login_real_photo', $this->settings['real_photo'] ?? 1, false, array(
'options' => array(
1 => 'login_real_photo_twitter',
0 => 'login_real_photo_disabled'
),
'toggles' => array(
1 => array( 'login_update_photo_changes_inc_optional' )
)
) )
),
parent::acpForm(),
array()
@@ -240,7 +259,7 @@ class Twitter extends OAuth1
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) )
if ( !( $link = $this->_link( $member ) ) OR empty( $link['token_access_token'] ) )
{
throw new LoginException( "", LoginException::INTERNAL_ERROR );
}
@@ -260,16 +279,20 @@ class Twitter extends OAuth1
*/
public function userProfilePhoto( Member $member ): ?Url
{
if ( !( $link = $this->_link( $member ) ) )
if ( !( $link = $this->_link( $member ) ) OR empty( $link['token_access_token'] ) )
{
throw new LoginException( "", LoginException::INTERNAL_ERROR );
}
$userData = $this->_userData( $link['token_access_token'], $link['token_secret'] );
if ( !$userData['default_profile_image'] )
{
return Url::external( str_replace( '_normal', '', $userData['profile_image_url_https'] ?: $userData['profile_image_url'] ) );
}
if ( isset( $this->settings['real_photo'] ) and $this->settings['real_photo'] )
{
$userData = $this->_userData( $link['token_access_token'], $link['token_secret'] );
if ( !$userData['default_profile_image'] )
{
return Url::external( str_replace( '_normal', '', $userData['profile_image_url_https'] ?: $userData['profile_image_url'] ) );
}
}
return NULL;
}
@@ -335,8 +358,12 @@ class Twitter extends OAuth1
{
$return[] = 'name';
}
$return[] = 'photo';
if( isset( $this->settings['update_photo_changes'] ) and $this->settings['update_photo_changes'] == 'optional' and isset( $this->settings['real_photo'] ) and $this->settings['real_photo'] )
{
$return[] = 'photo';
}
$return[] = 'cover';
return $return;
system/Login/Handler/OAuth2/Custom.php
+3 -2
View File
@@ -174,6 +174,7 @@ class Custom extends OAuth2
$return['authorization_endpoint'] = (string) $return['authorization_endpoint'];
$return['token_endpoint'] = (string) $return['token_endpoint'];
$return['user_endpoint'] = (string) $return['user_endpoint'];
$return['oauth_authorization_endpoint'] = (string) $return['oauth_authorization_endpoint'];
return $return;
}
@@ -369,7 +370,7 @@ class Custom extends OAuth2
{
if ( isset( $this->settings['photo_field'] ) and $this->settings['photo_field'] )
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}
@@ -395,7 +396,7 @@ class Custom extends OAuth2
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}
system/Login/Handler/OAuth2/Facebook.php
+37 -11
View File
@@ -49,6 +49,16 @@ class Facebook extends OAuth2
{
return 'login_handler_Facebook';
}
/**
* Can this handler sync profile photos?
*
* @return bool
*/
public function canSyncProfilePhoto() : bool
{
return true;
}
/**
* ACP Settings Form
@@ -75,6 +85,15 @@ class Facebook extends OAuth2
1 => array( 'login_update_name_changes_inc_optional' ),
)
), NULL, NULL, NULL, 'login_real_name' ),
'real_photo' => new Radio( 'login_real_photo', $this->settings['real_photo'] ?? 1, false, array(
'options' => array(
1 => 'login_real_photo_facebook',
0 => 'login_real_photo_disabled'
),
'toggles' => array(
1 => array( 'login_update_photo_changes_inc_optional' )
)
) )
),
parent::acpForm(),
array()
@@ -310,17 +329,21 @@ class Facebook extends OAuth2
*/
public function userProfilePhoto( Member $member ): ?Url
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new LoginException( "", LoginException::INTERNAL_ERROR );
}
$photoVars = explode( ':', $member->group['g_photo_max_vars'] );
$response = $this->_authorizedRequest( "{$link['token_identifier']}/picture?width={$photoVars[1]}&redirect=false", $link['token_access_token'], NULL, 'get' );
if ( !$response['data']['is_silhouette'] and isset( $response['data']['url'] ) and $response['data']['url'] )
{
return Url::external( $response['data']['url'] );
}
if ( isset( $this->settings['real_photo'] ) and $this->settings['real_photo'] )
{
$photoVars = explode( ':', $member->group['g_photo_max_vars'] );
$response = $this->_authorizedRequest( "{$link['token_identifier']}/picture?width={$photoVars[1]}&redirect=false", $link['token_access_token'], NULL, 'get' );
if ( !$response['data']['is_silhouette'] and isset( $response['data']['url'] ) and $response['data']['url'] )
{
return Url::external( $response['data']['url'] );
}
}
return NULL;
}
@@ -336,7 +359,7 @@ class Facebook extends OAuth2
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new LoginException( "", LoginException::INTERNAL_ERROR );
}
@@ -365,8 +388,11 @@ class Facebook extends OAuth2
{
$return[] = 'name';
}
$return[] = 'photo';
if( isset( $this->settings['update_photo_changes'] ) and $this->settings['update_photo_changes'] == 'optional' and isset( $this->settings['real_photo'] ) and $this->settings['real_photo'] )
{
$return[] = 'photo';
}
return $return;
}
system/Login/Handler/OAuth2/Google.php
+37 -11
View File
@@ -49,6 +49,16 @@ class Google extends OAuth2
}
protected static bool $enableAcpLoginByDefault = FALSE;
/**
* Can this handler sync profile photos?
*
* @return bool
*/
public function canSyncProfilePhoto() : bool
{
return true;
}
/**
* ACP Settings Form
@@ -73,7 +83,16 @@ class Google extends OAuth2
'toggles' => array(
1 => array( 'login_update_name_changes_inc_optional' ),
)
), NULL, NULL, NULL, 'login_real_name' )
), NULL, NULL, NULL, 'login_real_name' ),
'real_photo' => new Radio( 'login_real_photo', $this->settings['real_photo'] ?? 1, false, array(
'options' => array(
1 => 'login_real_photo_google',
0 => 'login_real_photo_disabled'
),
'toggles' => array(
1 => array( 'login_update_photo_changes_inc_optional' )
)
) )
),
parent::acpForm()
);
@@ -280,16 +299,20 @@ class Google extends OAuth2
*/
public function userProfilePhoto( Member $member ): ?Url
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}
$userData = $this->_userData( $link['token_access_token'] );
if ( isset( $userData['picture'] ) and $userData['picture'] )
{
return Url::external( $userData['picture'] )->setQueryString( 'sz', NULL );
}
if ( isset( $this->settings['real_photo'] ) and $this->settings['real_photo'] )
{
$userData = $this->_userData( $link['token_access_token'] );
if ( isset( $userData['picture'] ) and $userData['picture'] )
{
return Url::external( $userData['picture'] )->setQueryString( 'sz', NULL );
}
}
return NULL;
}
@@ -305,7 +328,7 @@ class Google extends OAuth2
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}
@@ -356,8 +379,11 @@ class Google extends OAuth2
{
$return[] = 'name';
}
$return[] = 'photo';
if( isset( $this->settings['update_photo_changes'] ) and $this->settings['update_photo_changes'] == 'optional' and isset( $this->settings['real_photo'] ) and $this->settings['real_photo'] )
{
$return[] = 'photo';
}
return $return;
}
system/Login/Handler/OAuth2/Invision.php
+2 -2
View File
@@ -340,7 +340,7 @@ class Invision extends OAuth2
*/
public function userProfilePhoto( Member $member ): ?Url
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new LoginException( "", LoginException::INTERNAL_ERROR );
}
@@ -365,7 +365,7 @@ class Invision extends OAuth2
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new LoginException( "", LoginException::INTERNAL_ERROR );
}
system/Login/Handler/OAuth2/LinkedIn.php
+45 -20
View File
@@ -49,6 +49,16 @@ class LinkedIn extends OAuth2
{
return 'login_handler_Linkedin';
}
/**
* Can this handler sync profile photos?
*
* @return bool
*/
public function canSyncProfilePhoto() : bool
{
return true;
}
/**
* @brief Enable AdminCP logins by default
@@ -77,8 +87,17 @@ class LinkedIn extends OAuth2
'toggles' => array(
1 => array( 'login_update_name_changes_inc_optional' ),
)
), NULL, NULL, NULL, 'login_real_name'
) ), parent::acpForm() );
), NULL, NULL, NULL, 'login_real_name' ),
'real_photo' => new Radio( 'login_real_photo', $this->settings['real_photo'] ?? 1, false, array(
'options' => array(
1 => 'login_real_photo_linkedin',
0 => 'login_real_photo_disabled'
),
'toggles' => array(
1 => array( 'login_update_photo_changes_inc_optional' )
)
) )
), parent::acpForm() );
}
/**
@@ -272,7 +291,7 @@ class LinkedIn extends OAuth2
*/
public function userProfilePhoto( Member $member ): ?Url
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}
@@ -282,21 +301,25 @@ class LinkedIn extends OAuth2
return NULL;
}
$userData = $this->_userData( $link['token_access_token'] )['profilePicture']['displayImage~']['elements'];
if ( isset( $this->settings['real_photo'] ) and $this->settings['real_photo'] )
{
$userData = $this->_userData( $link['token_access_token'] )['profilePicture']['displayImage~']['elements'];
foreach( array_reverse( $userData ) as $_userData )
{
if ( isset( $_userData['identifiers'] ) )
{
foreach( $_userData['identifiers'] as $identifier )
{
if( isset( $identifier['identifier'] ) AND $identifier['identifier'] )
{
return Url::external( $identifier['identifier'] );
}
}
}
}
}
foreach( array_reverse( $userData ) as $_userData )
{
if ( isset( $_userData['identifiers'] ) )
{
foreach( $_userData['identifiers'] as $identifier )
{
if( isset( $identifier['identifier'] ) AND $identifier['identifier'] )
{
return Url::external( $identifier['identifier'] );
}
}
}
}
return NULL;
}
@@ -312,7 +335,7 @@ class LinkedIn extends OAuth2
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}
@@ -370,9 +393,11 @@ class LinkedIn extends OAuth2
{
$return[] = 'name';
}
$return[] = 'photo';
if( isset( $this->settings['update_photo_changes'] ) and $this->settings['update_photo_changes'] == 'optional' and isset( $this->settings['real_photo'] ) and $this->settings['real_photo'] )
{
$return[] = 'photo';
}
return $return;
}
system/Login/Handler/OAuth2/Microsoft.php
+1 -1
View File
@@ -236,7 +236,7 @@ class Microsoft extends OAuth2
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}
system/Login/Handler/OAuth2/OAuth2.php
+20 -3
View File
@@ -122,6 +122,23 @@ abstract class OAuth2 extends Handler
'optional' => 'login_update_changes_optional',
'disabled' => 'login_update_changes_no',
), 'disabled' => $emailChangesDisabled ), NULL, NULL, NULL, 'login_update_email_changes_inc_optional' );
/* If this handler supports profile photos, add options for that */
if( $this->canSyncProfilePhoto() )
{
$photoChangesDisabled = array();
if( $forcePhotoHandler = static::handlerHasForceSync( 'photo', $this ) )
{
$photoChangesDisabled[] = 'force';
Member::loggedIn()->language()->words['login_update_changes_yes_photo_desc'] = Member::loggedIn()->language()->addToStack( 'login_update_changes_yes_disabled', FALSE, array( 'sprintf' => $forcePhotoHandler->_title ) );
}
$return['update_photo_changes'] = new Radio( 'login_update_photo_changes', $this->settings['update_photo_changes'] ?? 'optional', FALSE, array( 'options' => array(
'force' => 'login_update_changes_yes_photo',
'optional' => 'login_update_changes_optional',
'disabled' => 'login_update_changes_no',
), 'disabled' => $photoChangesDisabled ), null, null, null, 'login_update_photo_changes_inc_optional' );
}
return array_merge( $return, parent::acpForm() );
}
@@ -538,7 +555,7 @@ abstract class OAuth2 extends Handler
{
try
{
$identifier = Db::i()->select( 'token_identifier', 'core_login_links', array( 'token_login_method=? AND token_member=?', $this->id, $exception->member->member_id ) )->first();
$identifier = Db::i()->select( 'token_identifier', 'core_login_links', [ 'token_login_method=? AND token_member=?', $this->id, $exception->member->member_id ], flags: Db::SELECT_FROM_WRITE_SERVER )->first();
if( $identifier != $userId )
{
@@ -786,7 +803,7 @@ abstract class OAuth2 extends Handler
*/
public function userId( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( 'generic_error', Exception::INTERNAL_ERROR );
}
@@ -806,7 +823,7 @@ abstract class OAuth2 extends Handler
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( 'generic_error', Exception::INTERNAL_ERROR );
}
system/Login/Handler/OAuth2/Wordpress.php
+2 -2
View File
@@ -312,7 +312,7 @@ class Wordpress extends OAuth2
*/
public function userProfilePhoto( Member $member ): ?Url
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}
@@ -342,7 +342,7 @@ class Wordpress extends OAuth2
*/
public function userProfileName( Member $member ): ?string
{
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) )
if ( !( $link = $this->_link( $member ) ) or ( $link['token_expires'] and $link['token_expires'] < time() ) OR empty( $link['token_access_token'] ) )
{
throw new Exception( "", Exception::INTERNAL_ERROR );
}