Version 4.7.13

oauth/authorize/index.php

@@ -280,6 +280,12 @@ class oAuthServerAuthorizationRequest
 		{
 			return TRUE;
 		}
+
+		/* If our account is incomplete (e.g. no name or no email), show that screen instead */
+		if( \IPS\Member::loggedIn()->member_id and !( \IPS\Member::loggedIn()->real_name and \IPS\Member::loggedIn()->email ) )
+		{
+			return TRUE;
+		}
 		
 		/* Have we gone through it already? */
 		if ( isset( \IPS\Request::i()->allow ) and \IPS\Login::compareHashes( (string) \IPS\Session::i()->csrfKey, (string) \IPS\Request::i()->csrfKey ) )
@@ -429,6 +435,12 @@ class oAuthServerAuthorizationRequest
 				\IPS\Dispatcher::i()->finish();	
 			}
 		}
+		/* If we're logged in but the account is incomplete (e.g. social registration with hitherto unset name/email), redirect to complete registration first */
+		elseif ( \IPS\Member::loggedIn()->member_id and !( \IPS\Member::loggedIn()->real_name and \IPS\Member::loggedIn()->email ) )
+		{
+			$url = \IPS\Http\Url::internal( 'oauth/authorize/', 'interface' );
+			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=system&controller=register&do=complete', 'front', 'register' )->addRef( $url )->setQueryString( 'oauth', 1 ) );
+		}
 
 		/* Still here? Show an authorization screen */
 		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'login', 'core', 'global' )->oauthAuthorize( $url, $this->client, $scopes );