Merge 5322b35 into 3249226

typhonius · Jul 24, 2020 · d072f5c · d072f5c
2 parents 3249226 + 5322b35
commit d072f5c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/src/Response/IdeResponse.php b/src/Response/IdeResponse.php
@@ -12,6 +12,7 @@ class IdeResponse
     public $uuid;
     public $label;
     public $links;
+    public $owner;
 
     /**
      * IdeResponse constructor.
@@ -23,5 +24,6 @@ public function __construct($ide)
         $this->uuid = $ide->uuid;
         $this->label = $ide->label;
         $this->links = $ide->_links;
+        $this->owner = new MemberResponse($ide->_embedded->owner);
     }
 }
diff --git a/src/Response/MemberResponse.php b/src/Response/MemberResponse.php
@@ -28,7 +28,13 @@ public function __construct($member)
         $this->uuid = $member->uuid;
         $this->first_name = $member->first_name;
         $this->last_name = $member->last_name;
-        $this->mail = $member->mail;
+
+        if (property_exists($member, 'mail')) {
+          $this->mail = $member->mail;
+        }
+        elseif (property_exists($member, 'email')) {
+          $this->mail = $member->email;
+        }
         $this->picture_url = $member->picture_url;
         $this->username = $member->username;
 

diff --git a/tests/Endpoints/IdesTest.php b/tests/Endpoints/IdesTest.php
@@ -11,7 +11,8 @@ class IdesTest extends CloudApiTestCase
     public $properties = [
     'uuid',
     'label',
-    'links'
+    'links',
+    'owner',
     ];
 
     public function testGetAllIdes()

diff --git a/tests/Fixtures/Endpoints/Ides/getAllIdes.json b/tests/Fixtures/Endpoints/Ides/getAllIdes.json
@@ -29,8 +29,20 @@
                   "ide": {
                     "href": "https://215824ff-272a-4a8c-9027-df32ed1d68a9.ides.acquia.com"
                   }
+                },
+                "_embedded": {
+                  "owner": {
+                    "uuid": "10be1d3e-f2b4-4d34-855d-321df3938ffd",
+                    "first_name": "First",
+                    "last_name": "Last",
+                    "last_login_at": "2019-01-31T10:53:11-05:00",
+                    "created_at": "2016-08-14T17:38:59-04:00",
+                    "email": "user.name@example.com",
+                    "picture_url": "https://accounts.acquia.com/path/to/image.png",
+                    "username": "user.name"
+                  }
                 }
             }
         ]
     }
-}
+}
diff --git a/tests/Fixtures/Endpoints/Ides/getIde.json b/tests/Fixtures/Endpoints/Ides/getIde.json
@@ -16,6 +16,18 @@
       },
       "ide": {
         "href": "https://215824ff-272a-4a8c-9027-df32ed1d68a9.ides.acquia.com"
+      },
+      "_embedded": {
+        "owner": {
+          "uuid": "10be1d3e-f2b4-4d34-855d-321df3938ffd",
+          "first_name": "First",
+          "last_name": "Last",
+          "last_login_at": "2019-01-31T10:53:11-05:00",
+          "created_at": "2016-08-14T17:38:59-04:00",
+          "email": "user.name@example.com",
+          "picture_url": "https://accounts.acquia.com/path/to/image.png",
+          "username": "user.name"
+        }
       }
     }
-}
+}