Version 4.7.6

system/Login/Handler/OAuth2/Custom.php

@@ -444,7 +444,7 @@ class _Custom extends \IPS\Login\Handler\OAuth2
 			}
 
 			/* Check for any errors */
-			if ( static::getValueFromArray( $response, $this->settings['uid_field'] ) === NULL )
+			if ( $response === NULL OR static::getValueFromArray( $response, $this->settings['uid_field'] ) === NULL )
 			{
 				\IPS\Log::log( print_r( $response, TRUE ), 'oauth_custom' );
 				throw new \IPS\Login\Exception( 'generic_error', \IPS\Login\Exception::INTERNAL_ERROR );

system/Login/Handler/OAuth2/Google.php

@@ -374,7 +374,16 @@ class _Google extends \IPS\Login\Handler\OAuth2
 				
 			if ( isset( $response['error'] ) )
 			{
-				throw new \IPS\Login\Exception( $response['error']['errors'][0]['message'], \IPS\Login\Exception::INTERNAL_ERROR );
+				if ( isset( $response['error_description'] ) )
+				{
+					throw new \IPS\Login\Exception( $response['error_description'], \IPS\Login\Exception::INTERNAL_ERROR );
+				}
+				// Keeping this for backwards compatibility..
+				else if( isset( $response['error']['errors'][0]['message'] ) )
+				{
+					throw new \IPS\Login\Exception( $response['error']['errors'][0]['message'], \IPS\Login\Exception::INTERNAL_ERROR );
+				}
+
 			}
 			
 			$this->_cachedUserData[ $accessToken ] = $response;

system/Login/Handler/OAuth2/OAuth2.php

@@ -73,6 +73,7 @@ abstract class _OAuth2 extends \IPS\Login\Handler
 			'options' => array(
 				'always'		=> 'login_handler_show_in_ucp_always',
 				'loggedin'		=> 'login_handler_show_in_ucp_loggedin',
+				'disabled'		=> 'login_handler_show_in_ucp_disabled'
 			),
 		) );