Merge pull request #28859 from nextcloud/backport/28822/stable21

[stable21] Add email addresses to contacts menu

core/src/OC/contactsmenu/contact.handlebars

@@ -6,6 +6,7 @@
 <div class="body">
 	<div class="full-name">{{contact.fullName}}</div>
 	<div class="last-message">{{contact.lastMessage}}</div>
+	<div class="email-address">{{contact.emailAddresses}}</div>
 </div>
 {{#if contact.topAction}}
 <a class="top-action" href="{{contact.topAction.hyperlink}}" title="{{contact.topAction.title}}">

lib/private/Contacts/ContactsMenu/Entry.php

@@ -162,6 +162,7 @@ class Entry implements IEntry {
 			'topAction' => $topAction,
 			'actions' => $otherActions,
 			'lastMessage' => '',
+			'emailAddresses' => $this->getEMailAddresses(),
 		];
 	}
 }

tests/lib/Contacts/ContactsMenu/EntryTest.php

@@ -96,16 +96,18 @@ class EntryTest extends TestCase {
 
 	public function testJsonSerialize() {
 		$expectedJson = [
-			'id' => 123,
+			'id' => '123',
 			'fullName' => 'Guadalupe Frisbey',
 			'topAction' => null,
 			'actions' => [],
 			'lastMessage' => '',
 			'avatar' => null,
+			'emailAddresses' => ['user@example.com']
 		];
 
 		$this->entry->setId(123);
 		$this->entry->setFullName('Guadalupe Frisbey');
+		$this->entry->addEMailAddress('user@example.com');
 		$json = $this->entry->jsonSerialize();
 
 		$this->assertEquals($expectedJson, $json);