Version 4.7.0

system/Api/Controller.php

@@ -56,12 +56,12 @@ abstract class _Controller
 	 * @brief	Name of the method we called
 	 */
 	public $methodCalled	 = NULL;
-	
+
 	/**
 	 * Constructor
 	 *
 	 * @param	\IPS\Api\Key	$apiKey			The API key being used to access, if applicable
-	 * @param	string			$accessToken	Access token for OAuth-authenticated requests
+	 * @param	array|null		$accessToken	Access token for OAuth-authenticated requests
 	 * @return	void
 	 */
 	public function __construct( \IPS\Api\Key $apiKey = NULL, $accessToken = NULL )

system/Api/DocumentationHelper.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * @brief		Documentation Helper
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
+ * @since		11 Nov 2021
+ */
+
+namespace IPS\Api;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * Documentation Helper
+ */
+abstract class _DocumentationHelper
+{
+
+	public static function getDescriptionForClass( $class )
+	{
+		if ( method_exists( $class, 'apiOutput') )
+		{
+			$reflection = new \ReflectionMethod( $class, 'apiOutput' );
+			$decoded = \IPS\Api\Controller::decodeDocblock( $reflection->getDocComment() );
+			return \IPS\Theme::i()->getTemplate('api','core')->referenceTable( $decoded['details']['apiresponse'] );
+		}
+
+		return \IPS\Theme::i()->getTemplate( 'global' )->block( '', \IPS\Member::loggedIn()->language()->addToStack( 'class_no_apioutput_method' ) );
+	}
+
+	/**
+	 * Get any additional classes referenced in the return types of this class
+	 *
+	 * @param	string	$class 		The classname
+	 * @param	bool	$exclude	If FALSE, will include this class itself in the return array
+	 * @return	array
+	 */
+	public static function getAdditionalClasses( $class, $exclude=FALSE )
+	{
+		if( !class_exists( $class ) or !method_exists( $class, 'apiOutput'))
+		{
+			return [];
+		}
+
+		$return = $exclude ? array() : array( $class => $class );
+		$reflection = new \ReflectionMethod( $class, 'apiOutput' );
+		$decoded = \IPS\Api\Controller::decodeDocblock( $reflection->getDocComment() );
+		foreach ( $decoded['details']['apiresponse'] as $response )
+		{
+			if ( mb_strpos( $response[0], '|' ) === FALSE AND !\in_array( $response[0], array( 'int', 'string', 'float', 'datetime', 'bool', 'object', 'array' ) ) )
+			{
+				if ( mb_substr( $response[0], 0, 1 ) == '[' )
+				{
+					if ( !\in_array( mb_substr( $response[0], 1, -1 ), $return ) and !\in_array( mb_substr( $response[0], 1, -1 ), array( 'int', 'string', 'float', 'datetime', 'bool', 'object', 'array' ) ) )
+					{
+						if( $returned = static::getAdditionalClasses( mb_substr( $response[0], 1, -1 ) ) )
+						{
+							$return = array_merge( $return, $returned );
+						}
+					}
+				}
+				elseif ( !\in_array( $response[0], $return ) )
+				{
+					if( $returned = static::getAdditionalClasses( $response[0] ) )
+					{
+						$return = array_merge( $return, $returned );
+					}
+				}
+			}
+		}
+		return $return;
+	}
+}

system/Api/OAuthClient.php

@@ -120,168 +120,163 @@ class _OAuthClient extends \IPS\Node\Model
 		$form->addTab('oauth_basic_settings');
 		$form->addHeader('oauth_basic_settings');
 		$form->add( new \IPS\Helpers\Form\Translatable( 'oauth_client_name', NULL, TRUE, array( 'app' => 'core', 'key' => ( $this->client_id ? "core_oauth_client_{$this->client_id}" : NULL ) ) ) );
-		if ( $type !== 'mobile' )
-		{
-			$form->add( new \IPS\Helpers\Form\Radio( 'oauth_client_type', $type, TRUE, array(
-				'options'	=> array(
-					'invision'		=> 'client_type_invision',
-					'wordpress'		=> 'client_type_wordpress',
-					'confidential'	=> 'client_type_confidential',
-					'public'		=> 'client_type_public',
-				),
-				'toggles'	=> array(
-					'invision'		=> array( 'oauth_grant_types_invision', 'oauth_invision_endpoint' ),
-					'wordpress'		=> array( 'oauth_wordpress_endpoint' ),
-					'confidential'	=> array( 'oauth_grant_types_confidential', 'oauth_redirect_uris', 'oauth_choose_scopes', 'oauth_header_oauth_access_tokens', 'oauth_access_token_length', 'oauth_tab_oauth_scopes' ),
-					'public'		=> array( 'oauth_grant_types_public', 'oauth_redirect_uris', 'oauth_choose_scopes', 'oauth_header_oauth_access_tokens', 'oauth_access_token_length', 'oauth_tab_oauth_scopes' ),
-				)
-			) ) );
-			$form->add( new \IPS\Helpers\Form\Radio( 'oauth_invision_grant_type', $this->client_id ? $this->grant_types : 'authorization_code', NULL, array(
-				'options'	=> array(
-					'authorization_code'	=> 'invision_grant_type_server_authorization_code',
-					'password'				=> 'invision_grant_type_server_password',
-				),
-			), NULL, NULL, NULL, 'oauth_grant_types_invision' ) );
-			$confidentialGrant = new \IPS\Helpers\Form\CheckboxSet( 'oauth_grant_types_confidential', $this->client_id ? explode( ',', $this->grant_types ) : array( 'authorization_code' ), NULL, array(
-				'options'	=> array(
-					'authorization_code'	=> 'grant_type_authorization_code',
-					'implicit'				=> 'grant_type_implicit',
-					'password'				=> 'grant_type_password',
-					'client_credentials'	=> 'grant_type_client_credentials'
-				),
-				'toggles'	=> array(
-					'authorization_code'	=> array( 'oauth_pkce', 'oauth_use_refresh_tokens' )
-				)
-			), function( $val ) {
-				if ( !$val and \IPS\Request::i()->oauth_client_type === 'confidential' ) {
-					throw new \DomainException('form_required');
-				}
-			}, NULL, NULL, 'oauth_grant_types_confidential' );
-			$confidentialGrant->label = \IPS\Member::loggedIn()->language()->addToStack('oauth_grant_types');
-			$form->add( $confidentialGrant );
-			$publicGrant = new \IPS\Helpers\Form\CheckboxSet( 'oauth_grant_types_public', $this->client_id ? explode( ',', $this->grant_types ) : array( 'implicit' ), NULL, array(
-				'options'	=> array(
-					'authorization_code'	=> 'grant_type_authorization_code',
-					'implicit'				=> 'grant_type_implicit',
-					'password'				=> 'grant_type_password',
-				),
-				'toggles'	=> array(
-					'authorization_code'	=> array( 'oauth_pkce', 'oauth_use_refresh_tokens' )
-				)
-			), function( $val ) {
-				if ( !$val and \IPS\Request::i()->oauth_client_type === 'public' ) {
-					throw new \DomainException('form_required');
-				}
-			}, NULL, NULL, 'oauth_grant_types_public' );
-			$publicGrant->label = \IPS\Member::loggedIn()->language()->addToStack('oauth_grant_types');
-			$form->add( $publicGrant );
-			$redirectUris = json_decode( $this->redirect_uris, TRUE );
-			$form->add( new \IPS\Helpers\Form\Url( 'oauth_invision_endpoint', isset( $redirectUris[0] ) ? preg_replace( '#/oauth/callback/$#i', '/', $redirectUris[0] ) : NULL, NULL, array( 'placeholder' => 'https://othercommunity.example.com/', 'allowedProtocols' => NULL ), function( $val ) {
-				if ( !$val and \IPS\Request::i()->oauth_client_type == 'invision' ) {
+
+		$form->add( new \IPS\Helpers\Form\Radio( 'oauth_client_type', $type, TRUE, array(
+			'options'	=> array(
+				'invision'		=> 'client_type_invision',
+				'wordpress'		=> 'client_type_wordpress',
+				'confidential'	=> 'client_type_confidential',
+				'public'		=> 'client_type_public',
+			),
+			'toggles'	=> array(
+				'invision'		=> array( 'oauth_grant_types_invision', 'oauth_invision_endpoint' ),
+				'wordpress'		=> array( 'oauth_wordpress_endpoint' ),
+				'confidential'	=> array( 'oauth_grant_types_confidential', 'oauth_redirect_uris', 'oauth_choose_scopes', 'oauth_header_oauth_access_tokens', 'oauth_access_token_length', 'oauth_tab_oauth_scopes' ),
+				'public'		=> array( 'oauth_grant_types_public', 'oauth_redirect_uris', 'oauth_choose_scopes', 'oauth_header_oauth_access_tokens', 'oauth_access_token_length', 'oauth_tab_oauth_scopes' ),
+			)
+		) ) );
+		$form->add( new \IPS\Helpers\Form\Radio( 'oauth_invision_grant_type', $this->client_id ? $this->grant_types : 'authorization_code', NULL, array(
+			'options'	=> array(
+				'authorization_code'	=> 'invision_grant_type_server_authorization_code',
+				'password'				=> 'invision_grant_type_server_password',
+			),
+		), NULL, NULL, NULL, 'oauth_grant_types_invision' ) );
+		$confidentialGrant = new \IPS\Helpers\Form\CheckboxSet( 'oauth_grant_types_confidential', $this->client_id ? explode( ',', $this->grant_types ) : array( 'authorization_code' ), NULL, array(
+			'options'	=> array(
+				'authorization_code'	=> 'grant_type_authorization_code',
+				'implicit'				=> 'grant_type_implicit',
+				'password'				=> 'grant_type_password',
+				'client_credentials'	=> 'grant_type_client_credentials'
+			),
+			'toggles'	=> array(
+				'authorization_code'	=> array( 'oauth_pkce', 'oauth_use_refresh_tokens' )
+			)
+		), function( $val ) {
+			if ( !$val and \IPS\Request::i()->oauth_client_type === 'confidential' ) {
+				throw new \DomainException('form_required');
+			}
+		}, NULL, NULL, 'oauth_grant_types_confidential' );
+		$confidentialGrant->label = \IPS\Member::loggedIn()->language()->addToStack('oauth_grant_types');
+		$form->add( $confidentialGrant );
+		$publicGrant = new \IPS\Helpers\Form\CheckboxSet( 'oauth_grant_types_public', $this->client_id ? explode( ',', $this->grant_types ) : array( 'implicit' ), NULL, array(
+			'options'	=> array(
+				'authorization_code'	=> 'grant_type_authorization_code',
+				'implicit'				=> 'grant_type_implicit',
+				'password'				=> 'grant_type_password',
+			),
+			'toggles'	=> array(
+				'authorization_code'	=> array( 'oauth_pkce', 'oauth_use_refresh_tokens' )
+			)
+		), function( $val ) {
+			if ( !$val and \IPS\Request::i()->oauth_client_type === 'public' ) {
+				throw new \DomainException('form_required');
+			}
+		}, NULL, NULL, 'oauth_grant_types_public' );
+		$publicGrant->label = \IPS\Member::loggedIn()->language()->addToStack('oauth_grant_types');
+		$form->add( $publicGrant );
+		$redirectUris = json_decode( $this->redirect_uris, TRUE );
+		$form->add( new \IPS\Helpers\Form\Url( 'oauth_invision_endpoint', isset( $redirectUris[0] ) ? preg_replace( '#/oauth/callback/$#i', '/', $redirectUris[0] ) : NULL, NULL, array( 'placeholder' => 'https://othercommunity.example.com/', 'allowedProtocols' => NULL ), function( $val ) {
+			if ( !$val and \IPS\Request::i()->oauth_client_type == 'invision' ) {
+				throw new \DomainException('form_required');
+			}
+			if ( $val and $val instanceof \IPS\Http\Url and $val->data[ \IPS\Http\Url::COMPONENT_FRAGMENT ] ) {
+				throw new \DomainException('oauth_redirect_uris_no_fragment');
+			}
+			if ( $val and rtrim( (string) $val, '/' ) === rtrim( \IPS\Settings::i()->base_url, '/' ) ) {
+				throw new \DomainException('oauth_invision_endpoint_internal');
+			}
+		}, NULL, NULL, 'oauth_invision_endpoint' ) );
+		$form->add( new \IPS\Helpers\Form\Url( 'oauth_wordpress_endpoint', isset( $redirectUris[0] ) ? $redirectUris[0] : NULL, NULL, array( 'placeholder' => 'https://wordpress.example.com/', 'allowedProtocols' => NULL ), function( $val ) {
+			if ( !$val and \IPS\Request::i()->oauth_client_type == 'wordpress' ) {
+				throw new \DomainException('form_required');
+			}
+			if ( $val and $val instanceof \IPS\Http\Url and $val->data[ \IPS\Http\Url::COMPONENT_FRAGMENT ] ) {
+				throw new \DomainException('oauth_redirect_uris_no_fragment');
+			}
+		}, NULL, NULL, 'oauth_wordpress_endpoint' ) );
+		$form->add( new \IPS\Helpers\Form\Radio( 'oauth_pkce', $this->pkce ?: 'none', FALSE, array( 'options' => array( 'S256' => 'oauth_pkce_256', 'plain' => 'oauth_pkce_plain', 'none' => 'oauth_pkce_none' ) ), NULL, NULL, NULL, 'oauth_pkce' ) );
+		$form->add( new \IPS\Helpers\Form\Stack( 'oauth_redirect_uris', $redirectUris, NULL, array( 'stackFieldType' => 'Url', 'placeholder' => 'https://www.example.com/redirect_uri', 'allowedProtocols' => NULL ), function( $val ) {
+			if ( !\in_array( \IPS\Request::i()->oauth_client_type, array('invision', 'wordpress') ) ) {
+				$chosenGrantTypes = \IPS\Request::i()->oauth_client_type === 'public' ? \IPS\Request::i()->oauth_grant_types_public : \IPS\Request::i()->oauth_grant_types_confidential;
+				if ( !$val and ( isset( $chosenGrantTypes['authorization_code'] ) or isset( $chosenGrantTypes['implicit'] ) ) ) {
 					throw new \DomainException('form_required');
 				}
 				if ( $val and $val instanceof \IPS\Http\Url and $val->data[ \IPS\Http\Url::COMPONENT_FRAGMENT ] ) {
 					throw new \DomainException('oauth_redirect_uris_no_fragment');
 				}
-				if ( $val and rtrim( (string) $val, '/' ) === rtrim( \IPS\Settings::i()->base_url, '/' ) ) {
-					throw new \DomainException('oauth_invision_endpoint_internal');
-				}
-			}, NULL, NULL, 'oauth_invision_endpoint' ) );
-			$form->add( new \IPS\Helpers\Form\Url( 'oauth_wordpress_endpoint', isset( $redirectUris[0] ) ? $redirectUris[0] : NULL, NULL, array( 'placeholder' => 'https://wordpress.example.com/', 'allowedProtocols' => NULL ), function( $val ) {
-				if ( !$val and \IPS\Request::i()->oauth_client_type == 'wordpress' ) {
-					throw new \DomainException('form_required');
-				}
-				if ( $val and $val instanceof \IPS\Http\Url and $val->data[ \IPS\Http\Url::COMPONENT_FRAGMENT ] ) {
-					throw new \DomainException('oauth_redirect_uris_no_fragment');
-				}
-			}, NULL, NULL, 'oauth_wordpress_endpoint' ) );
-			$form->add( new \IPS\Helpers\Form\Radio( 'oauth_pkce', $this->pkce ?: 'none', FALSE, array( 'options' => array( 'S256' => 'oauth_pkce_256', 'plain' => 'oauth_pkce_plain', 'none' => 'oauth_pkce_none' ) ), NULL, NULL, NULL, 'oauth_pkce' ) );
-			$form->add( new \IPS\Helpers\Form\Stack( 'oauth_redirect_uris', $redirectUris, NULL, array( 'stackFieldType' => 'Url', 'placeholder' => 'https://www.example.com/redirect_uri', 'allowedProtocols' => NULL ), function( $val ) {
-				if ( !\in_array( \IPS\Request::i()->oauth_client_type, array('invision', 'wordpress') ) ) {
-					$chosenGrantTypes = \IPS\Request::i()->oauth_client_type === 'public' ? \IPS\Request::i()->oauth_grant_types_public : \IPS\Request::i()->oauth_grant_types_confidential;
-					if ( !$val and ( isset( $chosenGrantTypes['authorization_code'] ) or isset( $chosenGrantTypes['implicit'] ) ) ) {
-						throw new \DomainException('form_required');
-					}
-					if ( $val and $val instanceof \IPS\Http\Url and $val->data[ \IPS\Http\Url::COMPONENT_FRAGMENT ] ) {
-						throw new \DomainException('oauth_redirect_uris_no_fragment');
-					}
-				}
-			}, NULL, NULL, 'oauth_redirect_uris' ) );
-		}
+			}
+		}, NULL, NULL, 'oauth_redirect_uris' ) );
 		
 		$form->addHeader('oauth_authorization_screen');
 		$form->add( new \IPS\Helpers\Form\Radio( 'oauth_prompt', $this->prompt, FALSE, array( 'options' => array( 'none' => 'oauth_prompt_none', 'automatic' => 'oauth_prompt_automatic', 'reauthorize' => 'oauth_prompt_reauthorize', 'login' => 'oauth_prompt_login' ) ) ) );
-		if ( $type !== 'mobile' )
-		{
-			$form->add( new \IPS\Helpers\Form\YesNo( 'oauth_choose_scopes', $this->choose_scopes, FALSE, array(), NULL, NULL, NULL, 'oauth_choose_scopes' ) );
-		}
+
+		$form->add( new \IPS\Helpers\Form\YesNo( 'oauth_choose_scopes', $this->choose_scopes, FALSE, array(), NULL, NULL, NULL, 'oauth_choose_scopes' ) );
+
 		$form->add( new \IPS\Helpers\Form\YesNo( 'oauth_ucp', $this->ucp, FALSE ) );
-		if ( $type !== 'mobile' )
+
+		$form->addHeader('oauth_access_tokens');
+		$form->add( new \IPS\Helpers\Form\Interval( 'oauth_access_token_length', $this->access_token_length, NULL, array( 'valueAs' => \IPS\Helpers\Form\Interval::HOURS, 'unlimited' => 0, 'unlimitedLang' => 'forever' ), NULL, NULL, NULL, 'oauth_access_token_length' ) );
+		$form->add( new \IPS\Helpers\Form\YesNo( 'oauth_use_refresh_tokens', $this->use_refresh_tokens, NULL, array( 'togglesOn' => array( 'oauth_refresh_token_length' ) ), NULL, NULL, NULL, 'oauth_use_refresh_tokens' ) );
+		$form->add( new \IPS\Helpers\Form\Interval( 'oauth_refresh_token_length', $this->refresh_token_length, NULL, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'forever' ), NULL, NULL, NULL, 'oauth_refresh_token_length' ) );
+
+		$form->addTab('oauth_scopes');
+		$form->addMessage('oauth_scopes_blurb');
+		$matrix = new \IPS\Helpers\Form\Matrix;
+		$matrix->classes[] = 'cApiPermissionsMatrix';
+		$matrix->langPrefix = 'oauth_scope_';
+		$matrix->columns = array(
+			'name'	=> function( $key, $value, $data )
+			{
+				return new \IPS\Helpers\Form\Custom( $key, $value, FALSE, array(
+					'getHtml'	=> function( $field )
+					{
+						return \IPS\Theme::i()->getTemplate( 'api' )->oauthScopeField( $field->name, $field->value );
+					}
+				) );
+			},
+			'endpoints'	=> function( $key, $value, $data )
+			{
+				return new \IPS\Helpers\Form\Custom( $key, $value ?: array(), FALSE, array(
+					'getHtml'	=> function( $field )
+					{
+						$endpoints = \IPS\Api\Controller::getAllEndpoints();
+						foreach ( $endpoints as $key => $endpoint )
+						{
+							$pieces = explode('/', $key);
+							$endpointTree[ $pieces[0] ][ $pieces[1] ][ $key ] = $endpoint;
+						}
+
+						return \IPS\Theme::i()->getTemplate( 'api' )->permissionsFieldHtml( $endpointTree, $field->name, $field->value );
+					}
+				) );
+			}
+		);
+		if ( !$this->client_id )
 		{
-			$form->addHeader('oauth_access_tokens');
-			$form->add( new \IPS\Helpers\Form\Interval( 'oauth_access_token_length', $this->access_token_length, NULL, array( 'valueAs' => \IPS\Helpers\Form\Interval::HOURS, 'unlimited' => 0, 'unlimitedLang' => 'forever' ), NULL, NULL, NULL, 'oauth_access_token_length' ) );
-			$form->add( new \IPS\Helpers\Form\YesNo( 'oauth_use_refresh_tokens', $this->use_refresh_tokens, NULL, array( 'togglesOn' => array( 'oauth_refresh_token_length' ) ), NULL, NULL, NULL, 'oauth_use_refresh_tokens' ) );
-			$form->add( new \IPS\Helpers\Form\Interval( 'oauth_refresh_token_length', $this->refresh_token_length, NULL, array( 'valueAs' => \IPS\Helpers\Form\Interval::DAYS, 'unlimited' => 0, 'unlimitedLang' => 'forever' ), NULL, NULL, NULL, 'oauth_refresh_token_length' ) );
-			
-			$form->addTab('oauth_scopes');
-			$form->addMessage('oauth_scopes_blurb');
-			$matrix = new \IPS\Helpers\Form\Matrix;
-			$matrix->classes[] = 'cApiPermissionsMatrix';
-			$matrix->langPrefix = 'oauth_scope_';
-			$matrix->columns = array(
-				'name'	=> function( $key, $value, $data )
-				{
-					return new \IPS\Helpers\Form\Custom( $key, $value, FALSE, array(
-						'getHtml'	=> function( $field )
-						{
-							return \IPS\Theme::i()->getTemplate( 'api' )->oauthScopeField( $field->name, $field->value );
-						}
-					) );
-				},
-				'endpoints'	=> function( $key, $value, $data )
-				{
-					return new \IPS\Helpers\Form\Custom( $key, $value ?: array(), FALSE, array(
-						'getHtml'	=> function( $field )
-						{
-							$endpoints = \IPS\Api\Controller::getAllEndpoints();
-							foreach ( $endpoints as $key => $endpoint )
-							{
-								$pieces = explode('/', $key);
-								$endpointTree[ $pieces[0] ][ $pieces[1] ][ $key ] = $endpoint;
-							}
-			
-							return \IPS\Theme::i()->getTemplate( 'api' )->permissionsFieldHtml( $endpointTree, $field->name, $field->value );
-						}
-					) );
-				}
+			$matrix->rows[] = array(
+				'name'		=> array( 'key' => 'profile', 'desc' => \IPS\Member::loggedIn()->language()->get('oauth_default_scope_profile') ),
+				'endpoints'	=> array(
+					'core/me/GETindex'	=> array( 'access' => TRUE, 'log' => FALSE ),
+				)
+			);
+			$matrix->rows[] = array(
+				'name'		=> array( 'key' => 'email', 'desc' => \IPS\Member::loggedIn()->language()->get('oauth_default_scope_email') ),
+				'endpoints'	=> array(
+					'core/me/GETitem'	=> array( 'access' => TRUE, 'log' => FALSE ),
+				)
 			);
-			if ( !$this->client_id )
-			{
-				$matrix->rows[] = array(
-					'name'		=> array( 'key' => 'profile', 'desc' => \IPS\Member::loggedIn()->language()->get('oauth_default_scope_profile') ),
-					'endpoints'	=> array(
-						'core/me/GETindex'	=> array( 'access' => TRUE, 'log' => FALSE ),
-					)
-				);
-				$matrix->rows[] = array(
-					'name'		=> array( 'key' => 'email', 'desc' => \IPS\Member::loggedIn()->language()->get('oauth_default_scope_email') ),
-					'endpoints'	=> array(
-						'core/me/GETitem'	=> array( 'access' => TRUE, 'log' => FALSE ),
-					)
-				);
-			}
-			elseif ( $this->scopes and $scopes = json_decode( $this->scopes, TRUE ) )
-			{
-				foreach ( $scopes as $key => $data )
-				{
-					$matrix->rows[] = array(
-						'name'		=> array( 'key' => $key, 'desc' => $data['description'] ),
-						'endpoints'	=> $data['endpoints']
-					);
-				}
-			}
-			$form->addMatrix( 'scopes', $matrix );
 		}
+		elseif ( $this->scopes and $scopes = json_decode( $this->scopes, TRUE ) )
+		{
+			foreach ( $scopes as $key => $data )
+			{
+				$matrix->rows[] = array(
+					'name'		=> array( 'key' => $key, 'desc' => $data['description'] ),
+					'endpoints'	=> $data['endpoints']
+				);
+			}
+		}
+		$form->addMatrix( 'scopes', $matrix );
 	}
 	
 	/**
@@ -299,20 +294,8 @@ class _OAuthClient extends \IPS\Node\Model
 	{
 		/* Normalise the settings */
 		$originalClientType = isset( $values['oauth_client_type'] ) ? $values['oauth_client_type'] : $this->type;
-		if ( $this->type === 'mobile' )
-		{
-			$values['oauth_client_type'] = 'mobile';
-			
-			foreach ( static::mobileAppValues() as $k => $v )
-			{
-				$values["oauth_{$k}"] = $v;
-			}
-			
-			$values['oauth_grant_types_public'] = $values['oauth_grant_types'];
-			$values['scopes'] = $values['oauth_scopes'];
-			$values['oauth_pkce'] = 'S256';
-		}
-		elseif ( $values['oauth_client_type'] === 'invision' )
+
+		if ( $values['oauth_client_type'] === 'invision' )
 		{
 			$values['oauth_client_type'] = 'confidential';
 			$values['oauth_grant_types_confidential'] = array( $values['oauth_invision_grant_type'] );
@@ -450,27 +433,6 @@ class _OAuthClient extends \IPS\Node\Model
 		return FALSE;
 	}
 	
-	/**
-	 * [Node] Does the currently logged in user have permission to delete this node?
-	 *
-	 * @return	bool
-	 */
-	public function canDelete()
-	{
-		return $this->type !== 'mobile'; // Admin can deregister community which will in turn delete the client
-	}
-	
-	/**
-	 * [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()
-	{
-		return $this->type === 'mobile';
-	}
-	
 	/**
 	 * [Node] Get buttons to display in tree
 	 * Example code explains return value
@@ -780,31 +742,4 @@ class _OAuthClient extends \IPS\Node\Model
 		
 		return parent::delete();
 	}
-	
-	/**
-	 * Get special values for mobile app
-	 *
-	 * @return	void
-	 */
-	final public static function mobileAppValues()
-	{
-		$redirect_uris = [ \IPS\APP_MULTICOMMUNITY_SCHEMA . '://auth' ];
-		if ( \IPS\Settings::i()->mobile_app_redirect_scheme )
-		{
-			$redirect_uris[] = \IPS\Settings::i()->mobile_app_redirect_scheme . '://auth';
-		}
-		
-		return array(
-			'grant_types'			=> array('authorization_code'),
-			'redirect_uris'			=> $redirect_uris,
-			'access_token_length'	=> 168,
-			'use_refresh_tokens'	=> TRUE,
-			'refresh_token_length'	=> NULL,
-			'scopes'				=> array(),
-			'choose_scopes'			=> FALSE,
-			'type'					=> 'mobile',
-			'graphql'				=> TRUE
-		);
-	}
-
 }

system/Api/PaginatedResponse.php

@@ -83,7 +83,7 @@ class _PaginatedResponse extends Response
 	/**
 	 * Data to output
 	 *
-	 * @return	string
+	 * @return	array
 	 */
 	public function getOutput()
 	{

system/Api/Webhook.php

@@ -20,7 +20,7 @@ if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 /**
  * Webhook
  */
-class _Webhook extends \IPS\Patterns\ActiveRecord
+class _Webhook extends \IPS\Node\Model
 {
 	/**
 	 * @brief	[ActiveRecord] Multiton Store
@@ -42,9 +42,103 @@ class _Webhook extends \IPS\Patterns\ActiveRecord
 	 * @note	Defined cache keys will be cleared automatically as needed
 	 */
 	protected $caches = array('webhooks');
-	
+
 	/**
-	 * Fire all webhooks for given event
+	 * @brief	[Node] Node Title
+	 */
+	public static $nodeTitle = 'api_webhooks';
+
+	/**
+	 * @brief	[Node] ACP Restrictions
+	 * @code
+	array(
+	'app'		=> 'core',				// The application key which holds the restrictrions
+	'module'	=> 'foo',				// The module key which holds the restrictions
+	'map'		=> array(				// [Optional] The key for each restriction - can alternatively use "prefix"
+	'add'			=> 'foo_add',
+	'edit'			=> 'foo_edit',
+	'permissions'	=> 'foo_perms',
+	'delete'		=> 'foo_delete'
+	),
+	'all'		=> 'foo_manage',		// [Optional] The key to use for any restriction not provided in the map (only needed if not providing all 4)
+	'prefix'	=> 'foo_',				// [Optional] Rather than specifying each  key in the map, you can specify a prefix, and it will automatically look for restrictions with the key "[prefix]_add/edit/permissions/delete"
+	 * @endcode
+	 */
+	protected static $restrictions = array(
+		'app'		=> 'core',
+		'module'	=> 'applications',
+		'prefix' 	=> 'api_',
+	);
+
+	/**
+	 * Set Default Values
+	 *
+	 * @return	void
+	 */
+	public function setDefaultValues()
+	{
+		$this->_data['filters'] = '{}';
+		$this->_data['url'] = '';
+		$this->_data['events'] = '';
+	}
+
+	/**
+	 * [Node] Add/Edit Form
+	 *
+	 * @param	\IPS\Helpers\Form	$form	The form
+	 * @return	void
+	 */
+	public function form( &$form )
+	{
+		$form->add( new \IPS\Helpers\Form\Url( 'url', $this->url ?? "", TRUE ) );
+		$events = [];
+
+		foreach ( \IPS\Api\Webhook::getAvailableWebhooks() as $app => $hooks )
+		{
+			if( \count( $hooks ))
+			{
+				foreach( $hooks as $hook => $params)
+				{
+					$events[$hook] = "webhook_". $hook ;
+				}
+			}
+		}
+
+		$form->add( new \IPS\core\Form\WebhookSelector('webhook_events', $this->events ?? [], TRUE , [ 'options' => $events] ) );
+	}
+
+	/**
+	 * [Node] Format form values from add/edit form for save
+	 *
+	 * @param	array	$values	Values from the form
+	 * @return	array
+	 */
+	public function formatFormValues( $values )
+	{
+		$values['events'] = $values['webhook_events'];
+		unset( $values['webhook_events'] );
+
+
+		return $values;
+	}
+
+	public function get__title()
+	{
+		return (string) $this->url;
+	}
+
+	/**
+	 * [Node] Get Node Description
+	 *
+	 * @return	string|null
+	 */
+	protected function get__description()
+	{
+		return \IPS\Theme::i()->getTemplate( 'api', 'core' )->webhookDesc( $this );
+	}
+
+	/**
+	 * This method will log the webhook to be fired, it's going to be fired via a task!
 	 *
 	 * @param	string	$event		The event key
 	 * @param	mixed	$data		Data
@@ -52,14 +146,7 @@ class _Webhook extends \IPS\Patterns\ActiveRecord
 	 * @return	void
 	 */
 	public static function fire( $event, $data = NULL, $filters = array() )
-	{		
-		/* Normalise data */
-		if ( \is_object( $data ) and method_exists( $data, 'apiOutput' ) )
-		{
-			$data = $data->apiOutput();
-		}
-		$data = $data ? json_encode( $data ) : NULL;
-						
+	{
 		/* Get our webhooks from cache */
 		if ( !isset( \IPS\Data\Store::i()->webhooks ) )
 		{
@@ -87,6 +174,28 @@ class _Webhook extends \IPS\Patterns\ActiveRecord
 		$enable = FALSE;
 		if ( isset( \IPS\Data\Store::i()->webhooks[ $event ] ) )
 		{
+			/* Normalise data */
+			if ( \is_object( $data ) and method_exists( $data, 'apiOutput' ) )
+			{
+				$data = $data->apiOutput();
+			}
+			else if ( \is_array( $data ) )
+			{
+				foreach ( $data as $key => &$item )
+				{
+					/* Normalise data */
+					if ( \is_object( $item ) and method_exists( $item, 'apiOutput' ) )
+					{
+						$item = $item->apiOutput();
+					}
+				}
+			}
+
+			/* We need to replace and langstring hashes ( like node names) */
+			\IPS\Member::loggedIn()->language()->parseOutputForDisplay( $data );
+
+			$data = $data ? json_encode( $data ) : NULL;
+			
 			/* Loop through each one... */
 			foreach ( \IPS\Data\Store::i()->webhooks[ $event ] as $id => $webhook )
 			{					
@@ -168,31 +277,30 @@ class _Webhook extends \IPS\Patterns\ActiveRecord
 	/**
 	 * Set Events
 	 *
-	 * @param	array	$events	List of events
+	 * @param	string|array	$events	List of events
 	 * @return	void
 	 */
-	public function set_events( array $events )
+	public function set_events( $events )
 	{
+		if( !\is_array( $events ) )
+		{
+			$events = [$events];
+		}
 		$this->_data['events'] = implode( ',', $events );
 	}
 	
 	/**
 	 * Get URL
 	 *
-	 * @return	array
+	 * @return
 	 */
 	public function get_url()
 	{
-		if ( $this->_url === NULL )
-		{
-			$this->_url = new \IPS\Http\Url( $this->_data['url'] );
-		}
-		
-		return $this->_url;
+		return $this->_data['url'] ? new \IPS\Http\Url( $this->_data['url'] ) : '';
 	}
 	
 	/**
-	 * Set Events
+	 * Set Url
 	 *
 	 * @param	\IPS\Http\Url	$url		The URL
 	 * @return	void
@@ -227,12 +335,13 @@ class _Webhook extends \IPS\Patterns\ActiveRecord
 	/**
 	 * Get output for API
 	 *
+	 * @param	\IPS\Member|NULL	$authorizedMember	The member making the API request or NULL for API Key / client_credentials
 	 * @return	array
 	 * @apiresponse		int		id		ID number
-	 * @apiresponse		array	events	List of events to subscribe to
+	 * @apiresponse		array	events	List of events this hook is subscribed to
 	 * @apiresponse		string	url		URL to send webhook to
 	 */
-	public function apiOutput()
+	public function apiOutput( \IPS\Member $authorizedMember = NULL )
 	{
 		return array(
 			'id'		=> $this->id,
@@ -240,4 +349,42 @@ class _Webhook extends \IPS\Patterns\ActiveRecord
 			'url'		=> (string) $this->url
 		);
 	}
-}
+
+	public static function getAvailableWebhooks()
+	{
+		$hooks = [];
+		foreach ( \IPS\Application::applications() as $app )
+		{
+			if( $app->enabled )
+			{
+				$hooks[$app->directory] = $app->getWebhooks();
+			}
+		}
+
+		return $hooks;
+	}
+
+	/**
+	 * Search
+	 *
+	 * @param	string		$column	Column to search
+	 * @param	string		$query	Search query
+	 * @param	string|null	$order	Column to order by
+	 * @param	mixed		$where	Where clause
+	 * @return	array
+	 */
+	public static function search( $column, $query, $order=NULL, $where=array() )
+	{
+		if ( $column === '_title' )
+		{
+			$column	= 'url';
+		}
+
+		if( $order == '_title' )
+		{
+			$order	= 'url';
+		}
+
+		return parent::search( $column, $query, $order, $where );
+	}
+}