Reports namespace operations (along with improvements for deserializing resp payload)

Author: vgrem

src/Outlook/ItemBody.php

@@ -32,6 +32,6 @@ function __construct($contentType=null,$content=null)
     public function setProperty($name, $value)
     {
         $name = ucfirst($name);
-        parent::setProperty($name, $value);
+        return parent::setProperty($name, $value);
     }
 }

src/Reports/Report.php

@@ -13,6 +13,13 @@
  */
 class Report extends ClientValue
 {
+
+    public function setProperty($name, $value)
+    {
+        $this->Content = $value;
+        return $this;
+    }
+
     /**
      * @var string
      */

src/Reports/ReportRoot.php

@@ -7,35 +7,40 @@
 
 use Office365\Entity;
 use Office365\Runtime\Actions\InvokeMethodQuery;
-use Office365\Runtime\Actions\InvokePostMethodQuery;
 use Office365\Runtime\ClientResult;
 use Office365\Runtime\Http\RequestOptions;
 
 class ReportRoot extends Entity
 {
+
     /**
-     * Get details about users who have activated Microsoft 365.
+     * @param $name string
      * @return ClientResult
      */
-    function getOffice365ActivationsUserDetail(){
-        $qry = new InvokePostMethodQuery($this, "getOffice365ActivationsUserDetail");
+    private function addReportQuery($name){
+        $qry = new InvokeMethodQuery($this, $name);
+        $this->getContext()->getPendingRequest()->beforeExecuteRequestOnce(function (RequestOptions $request){
+            $request->FollowLocation = true;
+        });
         $reportResult = new ClientResult($this->getContext(),new Report());
         $this->getContext()->addQueryAndResultObject($qry, $reportResult);
         return $reportResult;
     }
 
+    /**
+     * Get details about users who have activated Microsoft 365.
+     * @return ClientResult
+     */
+    function getOffice365ActivationsUserDetail(){
+        return $this->addReportQuery("getOffice365ActivationsUserDetail");
+    }
+
     /**
      * Get the count of Microsoft 365 activations on desktops and devices.
      * @return ClientResult
      */
     function getOffice365ActivationCounts(){
-        $qry = new InvokeMethodQuery($this, "getOffice365ActivationCounts");
-        $this->getContext()->getPendingRequest()->beforeExecuteRequestOnce(function (RequestOptions $request){
-            $request->FollowLocation = true;
-        });
-        $reportResult = new ClientResult($this->getContext(),new Report());
-        $this->getContext()->addQueryAndResultObject($qry, $reportResult);
-        return $reportResult;
+        return $this->addReportQuery("getOffice365ActivationCounts");
     }
 
     /**
@@ -44,9 +49,6 @@ function getOffice365ActivationCounts(){
      * @return ClientResult
      */
     function getOffice365ActivationsUserCounts(){
-        $qry = new InvokePostMethodQuery($this, "getOffice365ActivationsUserCounts");
-        $reportResult = new ClientResult($this->getContext(),new Report());
-        $this->getContext()->addQueryAndResultObject($qry, $reportResult);
-        return $reportResult;
+        return $this->addReportQuery("getOffice365ActivationsUserCounts");
     }
 }

src/Runtime/Auth/AADTokenProvider.php

@@ -163,16 +163,6 @@ private function prepareTokenRequest($parameters)
      */
     private function normalizeToken($tokenValue)
     {
-        $tokenPayload = json_decode($tokenValue,true);
-        if (!is_null($tokenPayload)) {
-            if (isset($tokenPayload['id_token'])) {
-                $idToken = $tokenPayload['id_token'];
-                $idTokenPayload = base64_decode(
-                    explode('.', $idToken)[1]
-                );
-                $tokenPayload['id_token_info'] = json_decode($idTokenPayload, true);
-            }
-        }
-        return $tokenPayload;
+        return json_decode($tokenValue,true);
     }
 }

src/Runtime/ClientObjectCollection.php

@@ -6,7 +6,7 @@
 use Generator;
 use IteratorAggregate;
 use Office365\Runtime\Http\RequestOptions;
-use Office365\Runtime\OData\JsonLightFormat;
+use Office365\Runtime\OData\V3\JsonLightFormat;
 use Traversable;
 
 

src/Runtime/ClientValue.php

@@ -16,6 +16,7 @@ public function __construct()
     /**
      * @param string $name
      * @param mixed $value
+     * @return $this
      */
     function setProperty($name, $value)
     {
@@ -33,6 +34,7 @@ function setProperty($name, $value)
         }
         else
             $this->{$name} = $value;
+        return $this;
     }
 
     /**
@@ -61,12 +63,12 @@ public function getServerTypeName()
      */
     function toJson()
     {
-        $payload = array();
+        $json = array();
         foreach (get_object_vars($this) as $key => $val) {
             if (!is_null($val))
-                $payload[$key] = $val;
+                $json[$key] = $val;
         }
-        return $payload;
+        return $json;
     }
 
 }

src/Runtime/OData/ODataFormat.php

@@ -4,6 +4,8 @@
 namespace Office365\Runtime\OData;
 
 
+use Office365\Runtime\OData\V3\JsonLightFormat;
+
 abstract class ODataFormat
 {
 

src/Runtime/OData/ODataRequest.php

@@ -18,6 +18,7 @@
 use Office365\Runtime\Http\HttpMethod;
 use Office365\Runtime\Actions\InvokeMethodQuery;
 use Office365\Runtime\Actions\InvokePostMethodQuery;
+use Office365\Runtime\OData\V3\JsonLightFormat;
 use Office365\SharePoint\ClientContext;
 
 

src/Runtime/OData/JsonLightFormat.php src/Runtime/OData/V3/JsonLightFormat.phpsrc/Runtime/OData/JsonLightFormat.php renamed to src/Runtime/OData/V3/JsonLightFormat.php

@@ -1,7 +1,10 @@
 <?php
 
 
-namespace Office365\Runtime\OData;
+namespace Office365\Runtime\OData\V3;
+
+use Office365\Runtime\OData\ODataFormat;
+use Office365\Runtime\OData\ODataMetadataLevel;
 
 class JsonLightFormat extends ODataFormat
 {

src/SharePoint/ClientContext.php

@@ -11,10 +11,10 @@
 use Office365\Runtime\Actions\DeleteEntityQuery;
 use Office365\Runtime\Http\HttpMethod;
 use Office365\Runtime\OData\ODataRequest;
+use Office365\Runtime\OData\V3\JsonLightFormat;
 use Office365\Runtime\ResourcePath;
 use Office365\Runtime\Actions\UpdateEntityQuery;
 use Office365\Runtime\ClientRuntimeContext;
-use Office365\Runtime\OData\JsonLightFormat;
 use Office365\Runtime\OData\ODataMetadataLevel;
 use Office365\Runtime\Http\RequestOptions;