runtime enhancements (odata serialization & remove state from client …

…request)
hostnet · Jan 15, 2023 · 49756ff · 49756ff
1 parent 39cbda5
commit 49756ff
Show file tree

Hide file tree

Showing 50 changed files with 941 additions and 213 deletions.
diff --git a/src/Complex.php b/src/Complex.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Office365;
+
+namespace Office365;
+
+use Office365\Runtime\ClientValue;
+
+class Complex extends ClientValue
+{
+}
diff --git a/src/GraphServiceClient.php b/src/GraphServiceClient.php
@@ -39,6 +39,7 @@ public function __construct(callable $acquireToken)
     {
         $this->acquireTokenFunc = $acquireToken;
         $this->getPendingRequest()->beforeExecuteRequest(function (RequestOptions $request) {
+            $this->authenticateRequest($request);
             $this->prepareRequest($request);
         });
         parent::__construct();
@@ -50,8 +51,7 @@ public function __construct(callable $acquireToken)
     function getPendingRequest()
     {
         if(!$this->pendingRequest){
-            $format = new JsonFormat(ODataMetadataLevel::Verbose);
-            $this->pendingRequest = new ODataRequest($this,$format);
+            $this->pendingRequest = new ODataRequest(new JsonFormat(ODataMetadataLevel::Verbose));
         }
         return $this->pendingRequest;
     }

diff --git a/src/Outlook/EmailAddress.php b/src/Outlook/EmailAddress.php
@@ -5,8 +5,9 @@
  */
 namespace Office365\Outlook;
 
-use Office365\Runtime\ClientValue;
-class EmailAddress extends ClientValue
+use Office365\Complex;
+
+class EmailAddress extends Complex
 {
     /**
      * @param string $name

diff --git a/src/Outlook/ItemBody.php b/src/Outlook/ItemBody.php
@@ -5,8 +5,9 @@
  */
 namespace Office365\Outlook;
 
-use Office365\Runtime\ClientValue;
-class ItemBody extends ClientValue
+use Office365\Complex;
+
+class ItemBody extends Complex
 {
 
     function __construct($contentType=null,$content=null)

diff --git a/src/Outlook/Location.php b/src/Outlook/Location.php
@@ -5,8 +5,9 @@
  */
 namespace Office365\Outlook;
 
-use Office365\Runtime\ClientValue;
-class Location extends ClientValue
+use Office365\Complex;
+
+class Location extends Complex
 {
     /**
      * @var string

diff --git a/src/Outlook/PhysicalAddress.php b/src/Outlook/PhysicalAddress.php
@@ -5,8 +5,9 @@
  */
 namespace Office365\Outlook;
 
-use Office365\Runtime\ClientValue;
-class PhysicalAddress extends ClientValue
+use Office365\Complex;
+
+class PhysicalAddress extends Complex
 {
     /**
      * @var string

diff --git a/src/Outlook/Recipient.php b/src/Outlook/Recipient.php
@@ -5,8 +5,9 @@
  */
 namespace Office365\Outlook;
 
-use Office365\Runtime\ClientValue;
-class Recipient extends ClientValue
+use Office365\Complex;
+
+class Recipient extends Complex
 {
     function __construct(EmailAddress $emailAddress=null)
     {

diff --git a/src/Runtime/Actions/ClientAction.php b/src/Runtime/Actions/ClientAction.php
@@ -17,7 +17,7 @@ abstract class ClientAction
     /**
      * @param ClientRuntimeContext $context
      * @param ClientObject|null $bindingType
-     * @param ClientObject|ClientValue|ClientResult $returnType
+     * @param ClientObject|ClientValue|ClientResult|null $returnType
      */
     public function __construct($context, $bindingType,$returnType)
     {

diff --git a/src/Runtime/Actions/InvokeMethodQuery.php b/src/Runtime/Actions/InvokeMethodQuery.php
@@ -30,8 +30,7 @@ public function __construct($bindingType, $methodName=null, $methodParameters=nu
      */
     public function getPath(){
         if ($this->IsStatic) {
-            $request = $this->getContext()->getPendingRequest();
-            $entityTypeName = $request->normalizeTypeName($this->BindingType);
+            $entityTypeName = (string)$this->BindingType->getServerTypeInfo();
             $staticName = implode(".",[$entityTypeName, $this->MethodName]);
             return new ServiceOperationPath($staticName,$this->MethodParameters);
         }

diff --git a/src/Runtime/ClientRequest.php b/src/Runtime/ClientRequest.php
@@ -30,131 +30,63 @@ abstract class ClientRequest
      */
     protected $afterExecute;
 
-    /**
-     * @var ClientRuntimeContext
-     */
-    protected $context;
-
-
-    /**
-     * @var ClientAction[]
-     */
-    protected $queries = array();
 
-
-    /**
-     * @var ClientAction
-     */
-    protected $currentQuery = null;
-
-    /** @var Guid  */
+    /** @var Guid */
     protected $requestId;
 
     /** @var integer */
     protected $requestStatus;
 
 
-    /**
-     * ClientRequest constructor.
-     * @param ClientRuntimeContext $context
-     */
-    public function __construct(ClientRuntimeContext $context)
+    public function __construct()
     {
-        $this->context = $context;
         $this->beforeExecute = new EventHandler();
         $this->afterExecute = new EventHandler();
         $this->requestId = Guid::newGuid();
         $this->requestStatus = ClientRequestStatus::Active;
     }
 
 
-    /**
-     * @return ClientAction|null
-     */
-    protected function getNextQuery()
-    {
-        $qry = array_shift($this->queries);
-        $this->currentQuery = $qry;
-        return $qry;
-    }
-
-
-    /**
-     * @return ClientAction
-     */
-    public function getCurrentQuery(){
-        return $this->currentQuery;
-    }
-
-
-    /**
-     * Add query into request queue
-     * @param ClientAction $query
-     * @param bool $executeFirst
-     */
-    public function addQuery(ClientAction $query, $executeFirst=false)
-    {
-        if($executeFirst)
-            array_unshift($this->queries , $query);
-        else
-            $this->queries[] = $query;
-    }
-
-    /**
-     * @param ClientAction $query
-     * @param ClientObject|ClientResult $resultObject
-     */
-    public function addQueryAndResultObject(ClientAction $query, $resultObject = null)
-    {
-        $query->ReturnType = $resultObject;
-        $this->addQuery($query,false);
-    }
-
-
     /**
      * @param callable $event
      */
     public function beforeExecuteRequest(callable $event)
     {
-        $this->beforeExecute->addEvent($event,false);
+        $this->beforeExecute->addEvent($event, false);
     }
 
     /**
      * @param callable $event
      */
     public function beforeExecuteRequestOnce(callable $event)
     {
-        $this->beforeExecute->addEvent($event,true);
+        $this->beforeExecute->addEvent($event, true);
     }
 
     /**
      * @param callable $event
      * @param bool $once
      */
-    public function afterExecuteRequest(callable $event,$once=true)
+    public function afterExecuteRequest(callable $event, $once = true)
     {
-        $this->afterExecute->addEvent($event,$once);
+        $this->afterExecute->addEvent($event, $once);
     }
 
     /**
      * Submit a query
      * @throws Exception
      */
-    public function executeQuery()
+    public function executeQuery($query)
     {
-        while ($this->getNextQuery() !== null) {
-            try{
-                $request = $this->buildRequest();
-                $this->beforeExecute->triggerEvent(array($request));
-                $response = $this->executeQueryDirect($request);
-                $this->processResponse($response);
-                $this->afterExecute->triggerEvent(array($response));
-                $this->requestStatus = ClientRequestStatus::CompletedSuccess;
-            }
-            catch(Exception $e){
-                $this->requestStatus = ClientRequestStatus::CompletedException;
-                throw $e;
-            }
+        try {
+            $request = $this->buildRequest($query);
+            $response = $this->executeQueryDirect($request);
+            $this->processResponse($response, $query);
+            $this->afterExecute->triggerEvent(array($response));
+            $this->requestStatus = ClientRequestStatus::CompletedSuccess;
+        } catch (Exception $e) {
+            $this->requestStatus = ClientRequestStatus::CompletedException;
+            throw $e;
         }
     }
 
@@ -165,7 +97,7 @@ public function executeQuery()
      */
     public function executeQueryDirect(RequestOptions $request)
     {
-        $this->context->authenticateRequest($request);
+        $this->beforeExecute->triggerEvent(array($request));
         $response = Requests::execute($request);
         $this->validate($response);
         return $response;
@@ -174,31 +106,22 @@ public function executeQueryDirect(RequestOptions $request)
 
     /**
      * @param Response $response
+     * @param ClientAction $query
      */
-    public abstract function processResponse($response);
+    public abstract function processResponse($response, $query);
 
     /**
      * Build Request
+     * @param ClientAction $query
      * @return RequestOptions
      */
-    abstract public function buildRequest();
-
-
-    /**
-     * @return ClientAction[]
-     */
-    public function getActions(){
-        return $this->queries;
-    }
-
-    public function clearActions(){
-        $this->queries = array();
-    }
+    abstract public function buildRequest($query);
 
     /**
      * @return int
      */
-    public function getRequestStatus(){
+    public function getRequestStatus()
+    {
         return $this->requestStatus;
     }
 
@@ -211,7 +134,7 @@ public function getRequestStatus(){
     public function validate($response)
     {
         if ($response->getStatusCode() >= 400) {
-            throw new RequestException($response->getContent(),$response->getStatusCode());
+            throw new RequestException($response->getContent(), $response->getStatusCode());
         }
         return true;
     }