bugfixing

ezpublishlegacy · Jun 29, 2015 · f6ddabc · f6ddabc
1 parent 20cfe88
commit f6ddabc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/Component/SyliusDefaultFunctionsOverride.php b/Component/SyliusDefaultFunctionsOverride.php
@@ -32,13 +32,15 @@
 class SyliusDefaultFunctionsOverride
 {
     private $container;
+    public $eZAPIRepository;
     private $entityManager;
     private $eventDispatcher;
     private $sylius = array();
 
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
+        $this->eZAPIRepository = $this->container->get('ezpublish.api.repository');
         $this->entityManager = $this->container->get('doctrine.orm.entity_manager');
         $this->eventDispatcher = $this->container->get('event_dispatcher');
         $this->sylius['CartProvider'] = $this->container->get('sylius.cart_provider');
@@ -123,8 +125,8 @@ public function checkoutOrder(OrderInterface $order, $userData)
         $this->entityManager->persist($order);
         $this->entityManager->flush();
 
-        $this->eventDispatcher->dispatch(SyliusCheckoutEvents::FINALIZE_COMPLETE, new GenericEvent($order));
-        $this->eventDispatcher->dispatch(SyliusOrderEvents::POST_CREATE, new GenericEvent($order));
+        #$this->eventDispatcher->dispatch(SyliusCheckoutEvents::FINALIZE_COMPLETE, new GenericEvent($order));
+        #$this->eventDispatcher->dispatch(SyliusOrderEvents::POST_CREATE, new GenericEvent($order));
 
         return $order;
     }
@@ -207,8 +209,7 @@ private function createNewProductAndVariant($contentId)
      */
     public function getEZObjectWithParent($contentId)
     {
-        $eZAPIRepository = $this->container->get('ezpublish.api.repository');
-        $contentCervice = $eZAPIRepository->getContentService();
+        $contentCervice = $this->eZAPIRepository->getContentService();
         $eZObjectArray = array('contentObject' => $contentCervice->loadContent($contentId));
         // Get the parent of eZ product
         $reverseRelations = $contentCervice->loadReverseRelations($eZObjectArray['contentObject']->versionInfo->contentInfo);
@@ -225,8 +226,7 @@ public function getEZObjectWithParent($contentId)
      */
     public function getEZObject($contentId)
     {
-        $eZAPIRepository = $this->container->get('ezpublish.api.repository');
-        $contentCervice = $eZAPIRepository->getContentService();
+        $contentCervice = $this->eZAPIRepository->getContentService();
         return $contentCervice->loadContent($contentId);
     }
 

diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
@@ -46,24 +46,21 @@ public function loadUserByCredentials($username, $password)
             // Get client data of the oauth client
             $client_id = $this->container->getParameter('oauth_client_id');
             $client_secret = $this->container->getParameter('oauth_client_secret');
-            $this->client->setBaseUrl('http://www.wuv-abo.de.example.com');
+            $base_url = $this->container->getParameter('oauth_baseurl');
+            $this->client->setBaseUrl($base_url);
             $cookieJar = $this->cookiePlugin->getCookieJar();
             // All requests
             $requestUrls = array(
                     'accessToken' => '/oauth/v2/token?client_id='.$client_id.'&client_secret='.$client_secret.'&grant_type=password&username='.$username.'&password='.$password,
-                    'authentication' => '/xrowapi/v1/auth?access_token=%s&grant_type=client_credentials',
+                    'authentication' => '/xrowapi/v1/auth?access_token=%s',
                     'user' => '/xrowapi/v1/user',
                     'account' => '/xrowapi/v1/account',
                     'subscriptions' => '/xrowapi/v1/subscriptions',
             );
             $oauthToken = $this->container->get('security.context')->getToken();
-            #$accessTokenString = $this->container->get('session')->get('athash');
-            #$accessToken = $this->container->get('fos_oauth_server.server')->verifyAccessToken($accessTokenString);
-            #die(var_dump($eventDispatcher));
             if ($oauthToken instanceof AnonymousToken) {
                 $accessTokenResponse = $this->client->get($requestUrls['accessToken'])->send();
                 $cookieJar->addCookiesFromResponse($accessTokenResponse);
-                #$eventDispatcher->dispatch(SyliusCartEvents::ITEM_ADD_INITIALIZE, $event);
                 $accessTokenJson = $accessTokenResponse->json();
                 if (isset($accessTokenJson['access_token'])) {
                     // Set authentication