Version 5.0.13
This commit is contained in:
1 parent
b89858b2ff
commit
5efe744c5f
1407 files changed
+69690
-30177
No files matched your search
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user