Upgrade

Classes/Flowpack/OAuth2/Client/Eel/AuthorizationHelper.php

@@ -0,0 +1,33 @@
+<?php
+namespace Flowpack\OAuth2\Client\Eel;
+
+use Neos\Eel\ProtectedContextAwareInterface;
+use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Flow\Annotations as Flow;
+use Flowpack\OAuth2\Client\UriBuilder;
+
+class AuthorizationHelper implements ProtectedContextAwareInterface {
+    /**
+     * @Flow\Inject
+     * @var UriBuilder
+     */
+    protected $oauthUriBuilder;
+
+	/**
+	 * @param string $providerName
+	 * @return string
+	 */
+	public function getAuthorizationUri(string $providerName) {
+		return $this->oauthUriBuilder->getAuthorizationUri($providerName);
+	}
+
+	/**
+	 * All methods are considered safe
+	 *
+	 * @param string $methodName
+	 * @return boolean
+	 */
+	public function allowsCallOfMethod($methodName) {
+		return true;
+	}
+}

Classes/Flowpack/OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php

@@ -12,10 +12,10 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Exception as OAuth2Exception;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Request;
-use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\Utility\Arrays;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Request;
+use Neos\Flow\Http\Uri;
+use Neos\Utility\Arrays;
 
 /**
  */
@@ -24,7 +24,7 @@ abstract class AbstractHttpTokenEndpoint implements TokenEndpointInterface
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Http\Client\CurlEngine
+     * @var \Neos\Flow\Http\Client\CurlEngine
      */
     protected $requestEngine;
 

Classes/Flowpack/OAuth2/Client/Endpoint/FacebookTokenEndpoint.php

@@ -12,10 +12,10 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Exception as OAuth2Exception;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Request;
-use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\Log\SecurityLoggerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Request;
+use Neos\Flow\Http\Uri;
+use Neos\Flow\Log\SecurityLoggerInterface;
 
 /**
  * @Flow\Scope("singleton")

Classes/Flowpack/OAuth2/Client/Endpoint/GoogleTokenEndpoint.php

@@ -12,10 +12,10 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Exception as OAuth2Exception;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Request;
-use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\Log\SecurityLoggerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Request;
+use Neos\Flow\Http\Uri;
+use Neos\Flow\Log\SecurityLoggerInterface;
 
 /**
  * @Flow\Scope("singleton")

Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php

@@ -11,9 +11,9 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Configuration\ConfigurationManager;
-use TYPO3\Flow\Object\ObjectManagerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 
 /**
  * @Flow\Scope("singleton")
@@ -40,7 +40,7 @@ class Resolver
      */
     public function getTokenEndpointForProvider($providerName)
     {
-        $tokenEndpointClassName = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, sprintf('TYPO3.Flow.security.authentication.providers.%s.providerOptions.tokenEndpointClassName', $providerName));
+        $tokenEndpointClassName = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, sprintf('Neos.Flow.security.authentication.providers.%s.providerOptions.tokenEndpointClassName', $providerName));
         if ($tokenEndpointClassName === null) {
             throw new \InvalidArgumentException(sprintf('In Settings.yaml, there was no "tokenEndpointClassName" option given for the provider "%s".', $providerName), 1383743372);
         }

Classes/Flowpack/OAuth2/Client/Endpoint/TokenEndpointInterface.php

@@ -11,7 +11,7 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  */

Classes/Flowpack/OAuth2/Client/Exception.php

@@ -13,6 +13,6 @@
 
 /**
  */
-class Exception extends \TYPO3\Flow\Exception
+class Exception extends \Neos\Flow\Exception
 {
 }

Classes/Flowpack/OAuth2/Client/Exception/InvalidPartyDataException.php

@@ -12,7 +12,7 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Exception;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  *

Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php

@@ -12,12 +12,12 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Security\Authentication\TokenInterface;
-use TYPO3\Flow\Security\Account;
-use TYPO3\Flow\Security\Policy\PolicyService;
-use TYPO3\Flow\Validation\ValidatorResolver;
-use TYPO3\Party\Domain\Repository\PartyRepository;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Security\Authentication\TokenInterface;
+use Neos\Flow\Security\Account;
+use Neos\Flow\Security\Policy\PolicyService;
+use Neos\Flow\Validation\ValidatorResolver;
+use Neos\Party\Domain\Repository\PartyRepository;
 
 /**
  */
@@ -26,19 +26,19 @@ abstract class AbstractFlow implements FlowInterface
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\Context
+     * @var \Neos\Flow\Security\Context
      */
     protected $securityContext;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Persistence\PersistenceManagerInterface
+     * @var \Neos\Flow\Persistence\PersistenceManagerInterface
      */
     protected $persistenceManager;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\AccountRepository
+     * @var \Neos\Flow\Security\AccountRepository
      */
     protected $accountRepository;
 

Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php

@@ -13,12 +13,12 @@
 
 use Flowpack\OAuth2\Client\Exception\InvalidPartyDataException;
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Party\Domain\Model\ElectronicAddress;
-use TYPO3\Party\Domain\Model\Person;
-use TYPO3\Party\Domain\Model\PersonName;
-use TYPO3\Party\Domain\Repository\PartyRepository;
-use TYPO3\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Annotations as Flow;
+use Neos\Party\Domain\Model\ElectronicAddress;
+use Neos\Party\Domain\Model\Person;
+use Neos\Party\Domain\Model\PersonName;
+use Neos\Party\Domain\Repository\PartyRepository;
+use Neos\Flow\Configuration\ConfigurationManager;
 
 /**
  */
@@ -59,15 +59,14 @@ public function createPartyAndAttachToAccountFor(AbstractClientToken $token)
         $party->addElectronicAddress($electronicAddress);
         $party->setPrimaryElectronicAddress($electronicAddress);
 
-        $partyValidator = $this->validatorResolver->getBaseValidatorConjunction('TYPO3\Party\Domain\Model\Person');
+        $partyValidator = $this->validatorResolver->getBaseValidatorConjunction('Neos\Party\Domain\Model\Person');
         $validationResult = $partyValidator->validate($party);
         if ($validationResult->hasErrors()) {
             throw new InvalidPartyDataException('The created party does not satisfy the requirements', 1384266207);
         }
 
         $account = $token->getAccount();
         $account->setParty($party);
-        $this->accountRepository->update($account);
         $this->partyRepository->add($party);
 
         $this->persistenceManager->persistAll();
@@ -106,7 +105,7 @@ protected function initializeUserData(AbstractClientToken $token)
     protected function buildFacebookQuery()
     {
         $query = '/me';
-        $this->authenticationServicesFields = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'TYPO3.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.fields');
+        $this->authenticationServicesFields = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.fields');
         $fields = implode(',', $this->authenticationServicesFields);
 
         $query = $query . '?fields=' . $fields;

Classes/Flowpack/OAuth2/Client/Flow/FlowInterface.php

@@ -12,9 +12,9 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Security\Account;
-use TYPO3\Flow\Security\Authentication\TokenInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Security\Account;
+use Neos\Flow\Security\Authentication\TokenInterface;
 
 /**
  */
@@ -27,7 +27,7 @@ interface FlowInterface
     public function getChargedAuthenticatedTokenHavingNoPartyAttached();
 
     /**
-     * @param \TYPO3\Flow\Security\Authentication\TokenInterface|\Flowpack\OAuth2\Client\Token\AbstractClientToken $token
+     * @param \Neos\Flow\Security\Authentication\TokenInterface|\Flowpack\OAuth2\Client\Token\AbstractClientToken $token
      * @return TokenInterface
      */
     public function getTokenOfForeignAccountOf(AbstractClientToken $token);

Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php

@@ -13,10 +13,10 @@
 
 use Flowpack\OAuth2\Client\Exception\InvalidPartyDataException;
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Party\Domain\Model\ElectronicAddress;
-use TYPO3\Party\Domain\Model\Person;
-use TYPO3\Party\Domain\Model\PersonName;
+use Neos\Flow\Annotations as Flow;
+use Neos\Party\Domain\Model\ElectronicAddress;
+use Neos\Party\Domain\Model\Person;
+use Neos\Party\Domain\Model\PersonName;
 
 /**
  */
@@ -51,15 +51,14 @@ public function createPartyAndAttachToAccountFor(AbstractClientToken $token)
         $party->addElectronicAddress($electronicAddress);
         $party->setPrimaryElectronicAddress($electronicAddress);
 
-        $partyValidator = $this->validatorResolver->getBaseValidatorConjunction('TYPO3\Party\Domain\Model\Person');
+        $partyValidator = $this->validatorResolver->getBaseValidatorConjunction('Neos\Party\Domain\Model\Person');
         $validationResult = $partyValidator->validate($party);
         if ($validationResult->hasErrors()) {
             throw new InvalidPartyDataException('The created party does not satisfy the requirements', 1384266207);
         }
 
         $account = $token->getAccount();
         $account->setParty($party);
-        $this->accountRepository->update($account);
         $this->partyRepository->add($party);
 
         $this->persistenceManager->persistAll();

Classes/Flowpack/OAuth2/Client/Provider/AbstractClientProvider.php

@@ -11,8 +11,8 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Security\Authentication\Provider\AbstractProvider;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Security\Authentication\Provider\AbstractProvider;
 
 /**
  */

Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php

@@ -12,12 +12,12 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Log\SecurityLoggerInterface;
-use TYPO3\Flow\Security\Account;
-use TYPO3\Flow\Security\Authentication\TokenInterface;
-use TYPO3\Flow\Security\Exception\UnsupportedAuthenticationTokenException;
-use TYPO3\Flow\Security\Policy\PolicyService;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Log\SecurityLoggerInterface;
+use Neos\Flow\Security\Account;
+use Neos\Flow\Security\Authentication\TokenInterface;
+use Neos\Flow\Security\Exception\UnsupportedAuthenticationTokenException;
+use Neos\Flow\Security\Policy\PolicyService;
 
 /**
  */
@@ -38,13 +38,7 @@ class FacebookProvider extends AbstractClientProvider
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\AccountRepository
-     */
-    protected $accountRepository;
-
-    /**
-     * @Flow\Inject
-     * @var \TYPO3\Flow\Security\Context
+     * @var \Neos\Flow\Security\Context
      */
     protected $securityContext;
 
@@ -62,15 +56,15 @@ class FacebookProvider extends AbstractClientProvider
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Persistence\PersistenceManagerInterface
+     * @var \Neos\Flow\Persistence\PersistenceManagerInterface
      */
     protected $persistenceManager;
 
     /**
      * Tries to authenticate the given token. Sets isAuthenticated to TRUE if authentication succeeded.
      *
      * @param TokenInterface $authenticationToken The token to be authenticated
-     * @throws \TYPO3\Flow\Security\Exception\UnsupportedAuthenticationTokenException
+     * @throws \Neos\Flow\Security\Exception\UnsupportedAuthenticationTokenException
      * @return void
      */
     public function authenticate(TokenInterface $authenticationToken)
@@ -102,14 +96,10 @@ public function authenticate(TokenInterface $authenticationToken)
         // From here, we surely know the user is considered authenticated against the remote service,
         // yet to check if there is an immanent account present.
         $authenticationToken->setAuthenticationStatus(TokenInterface::AUTHENTICATION_SUCCESSFUL);
-        /** @var $account \TYPO3\Flow\Security\Account */
+        /** @var $account \Neos\Flow\Security\Account */
         $account = null;
         $isNewCreatedAccount = false;
         $providerName = $this->name;
-        $accountRepository = $this->accountRepository;
-        $this->securityContext->withoutAuthorizationChecks(function () use ($tokenInformation, $providerName, $accountRepository, &$account) {
-            $account = $accountRepository->findByAccountIdentifierAndAuthenticationProviderName($tokenInformation['user_id'], $providerName);
-        });
 
         if ($account === null) {
             $account = new Account();
@@ -124,7 +114,6 @@ public function authenticate(TokenInterface $authenticationToken)
                 $roles[] = $this->policyService->getRole($roleIdentifier);
             }
             $account->setRoles($roles);
-            $this->accountRepository->add($account);
         }
         $authenticationToken->setAccount($account);
 
@@ -133,9 +122,6 @@ public function authenticate(TokenInterface $authenticationToken)
         $account->setCredentialsSource($longLivedToken['access_token']);
         $account->authenticationAttempted(TokenInterface::AUTHENTICATION_SUCCESSFUL);
 
-        $this->accountRepository->update($account);
-        $this->persistenceManager->persistAll();
-
         // Only if defined a Party for the account is created
         if ($this->options['partyCreation'] && $isNewCreatedAccount) {
             $this->facebookFlow->createPartyAndAttachToAccountFor($authenticationToken);