Merge pull request #449 from nextcloud/refactor/iaccount-serialization

Use JsonSerializable::jsonSerialize instead of a custom method

lib/Account.php

@@ -354,7 +354,7 @@ class Account implements IAccount {
 	 * @return array
 	 */
 	public function jsonSerialize() {
-		throw new Exception('Not implemented');
+		return $this->account->toJson();
 	}
 
 	/**
@@ -732,10 +732,6 @@ class Account implements IAccount {
 	}
 
 	/**
-	 * @return array
-	 */
-	public function getConfiguration() {
-		return $this->account->toJson();
 	}
 
 	/**

lib/Controller/AccountsController.php

@@ -117,7 +117,7 @@ class AccountsController extends Controller {
 
 		$json = [];
 		foreach ($mailAccounts as $mailAccount) {
-			$conf = $mailAccount->getConfiguration();
+			$conf = $mailAccount->jsonSerialize();
 			$conf['aliases'] = $this->aliasesService->findAll($conf['accountId'], $this->currentUserId);
 			$json[] = $conf;
 		}
@@ -134,7 +134,7 @@ class AccountsController extends Controller {
 		try {
 			$account = $this->accountService->find($this->currentUserId, $accountId);
 
-			return new JSONResponse($account->getConfiguration());
+			return new JSONResponse($account->jsonSerialize());
 		} catch (DoesNotExistException $e) {
 			return new JSONResponse([], 404);
 		}

lib/Controller/PageController.php

@@ -87,7 +87,7 @@ class PageController extends Controller {
 
 		$accountsJson = [];
 		foreach ($mailAccounts as $mailAccount) {
-			$conf = $mailAccount->getConfiguration();
+			$conf = $mailAccount->jsonSerialize();
 			$conf['aliases'] = $this->aliasesService->findAll($conf['accountId'], $this->currentUserId);
 			$accountsJson[] = $conf;
 		}

lib/Service/IAccount.php

@@ -25,11 +25,6 @@ use JsonSerializable;
 
 interface IAccount extends JsonSerializable {
 
-	/**
-	 * @return array
-	 */
-	public function getConfiguration();
-
 	/**
 	 * @param $folderId
 	 * @return IMailbox

lib/Service/UnifiedAccount.php

@@ -55,21 +55,12 @@ class UnifiedAccount implements IAccount {
 		$this->l10n = $l10n;
 	}
 
-	/**
-	 * @return array
-	 */
-	public function getConfiguration() {
-		return [
-			'accountId' => UnifiedAccount::ID,
-		];
-	}
-
 	/**
 	 * @return array
 	 */
 	public function jsonSerialize() {
 		return [
-			'id'             => UnifiedAccount::ID,
+			'accountId'             => UnifiedAccount::ID,
 			'email'          => '',
 			'folders'        => [$this->buildInbox()],
 			'specialFolders' => [],