nextcloud /
server
@@ -38,110 +38,110 @@ |
||
| 38 | 38 | * @package OCA\LookupServerConnector |
| 39 | 39 | */ |
| 40 | 40 | class UpdateLookupServer { |
| 41 | - /** @var AccountManager */ |
|
| 42 | - private $accountManager; |
|
| 43 | - /** @var IConfig */ |
|
| 44 | - private $config; |
|
| 45 | - /** @var ISecureRandom */ |
|
| 46 | - private $secureRandom; |
|
| 47 | - /** @var IClientService */ |
|
| 48 | - private $clientService; |
|
| 49 | - /** @var Manager */ |
|
| 50 | - private $keyManager; |
|
| 51 | - /** @var Signer */ |
|
| 52 | - private $signer; |
|
| 53 | - /** @var IJobList */ |
|
| 54 | - private $jobList; |
|
| 55 | - /** @var string URL point to lookup server */ |
|
| 56 | - private $lookupServer = 'https://lookup.nextcloud.com/users'; |
|
| 41 | + /** @var AccountManager */ |
|
| 42 | + private $accountManager; |
|
| 43 | + /** @var IConfig */ |
|
| 44 | + private $config; |
|
| 45 | + /** @var ISecureRandom */ |
|
| 46 | + private $secureRandom; |
|
| 47 | + /** @var IClientService */ |
|
| 48 | + private $clientService; |
|
| 49 | + /** @var Manager */ |
|
| 50 | + private $keyManager; |
|
| 51 | + /** @var Signer */ |
|
| 52 | + private $signer; |
|
| 53 | + /** @var IJobList */ |
|
| 54 | + private $jobList; |
|
| 55 | + /** @var string URL point to lookup server */ |
|
| 56 | + private $lookupServer = 'https://lookup.nextcloud.com/users'; |
|
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * @param AccountManager $accountManager |
|
| 60 | - * @param IConfig $config |
|
| 61 | - * @param ISecureRandom $secureRandom |
|
| 62 | - * @param IClientService $clientService |
|
| 63 | - * @param Manager $manager |
|
| 64 | - * @param Signer $signer |
|
| 65 | - * @param IJobList $jobList |
|
| 66 | - */ |
|
| 67 | - public function __construct(AccountManager $accountManager, |
|
| 68 | - IConfig $config, |
|
| 69 | - ISecureRandom $secureRandom, |
|
| 70 | - IClientService $clientService, |
|
| 71 | - Manager $manager, |
|
| 72 | - Signer $signer, |
|
| 73 | - IJobList $jobList) { |
|
| 74 | - $this->accountManager = $accountManager; |
|
| 75 | - $this->config = $config; |
|
| 76 | - $this->secureRandom = $secureRandom; |
|
| 77 | - $this->clientService = $clientService; |
|
| 78 | - $this->keyManager = $manager; |
|
| 79 | - $this->signer = $signer; |
|
| 80 | - $this->jobList = $jobList; |
|
| 81 | - } |
|
| 58 | + /** |
|
| 59 | + * @param AccountManager $accountManager |
|
| 60 | + * @param IConfig $config |
|
| 61 | + * @param ISecureRandom $secureRandom |
|
| 62 | + * @param IClientService $clientService |
|
| 63 | + * @param Manager $manager |
|
| 64 | + * @param Signer $signer |
|
| 65 | + * @param IJobList $jobList |
|
| 66 | + */ |
|
| 67 | + public function __construct(AccountManager $accountManager, |
|
| 68 | + IConfig $config, |
|
| 69 | + ISecureRandom $secureRandom, |
|
| 70 | + IClientService $clientService, |
|
| 71 | + Manager $manager, |
|
| 72 | + Signer $signer, |
|
| 73 | + IJobList $jobList) { |
|
| 74 | + $this->accountManager = $accountManager; |
|
| 75 | + $this->config = $config; |
|
| 76 | + $this->secureRandom = $secureRandom; |
|
| 77 | + $this->clientService = $clientService; |
|
| 78 | + $this->keyManager = $manager; |
|
| 79 | + $this->signer = $signer; |
|
| 80 | + $this->jobList = $jobList; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * @param IUser $user |
|
| 85 | - */ |
|
| 86 | - public function userUpdated(IUser $user) { |
|
| 87 | - $userData = $this->accountManager->getUser($user); |
|
| 88 | - $publicData = []; |
|
| 83 | + /** |
|
| 84 | + * @param IUser $user |
|
| 85 | + */ |
|
| 86 | + public function userUpdated(IUser $user) { |
|
| 87 | + $userData = $this->accountManager->getUser($user); |
|
| 88 | + $publicData = []; |
|
| 89 | 89 | |
| 90 | - foreach ($userData as $key => $data) { |
|
| 91 | - if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) { |
|
| 92 | - $publicData[$key] = $data; |
|
| 93 | - } |
|
| 94 | - } |
|
| 90 | + foreach ($userData as $key => $data) { |
|
| 91 | + if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) { |
|
| 92 | + $publicData[$key] = $data; |
|
| 93 | + } |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - $this->sendToLookupServer($user, $publicData); |
|
| 97 | - } |
|
| 96 | + $this->sendToLookupServer($user, $publicData); |
|
| 97 | + } |
|
| 98 | 98 | |
| 99 | - /** |
|
| 100 | - * send public user data to the lookup server |
|
| 101 | - * |
|
| 102 | - * @param IUser $user |
|
| 103 | - * @param array $publicData |
|
| 104 | - */ |
|
| 105 | - protected function sendToLookupServer(IUser $user, array $publicData) { |
|
| 99 | + /** |
|
| 100 | + * send public user data to the lookup server |
|
| 101 | + * |
|
| 102 | + * @param IUser $user |
|
| 103 | + * @param array $publicData |
|
| 104 | + */ |
|
| 105 | + protected function sendToLookupServer(IUser $user, array $publicData) { |
|
| 106 | 106 | |
| 107 | - $dataArray = ['federationId' => $user->getCloudId()]; |
|
| 107 | + $dataArray = ['federationId' => $user->getCloudId()]; |
|
| 108 | 108 | |
| 109 | - if (!empty($publicData)) { |
|
| 110 | - $dataArray['name'] = isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : ''; |
|
| 111 | - $dataArray['email'] = isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : ''; |
|
| 112 | - $dataArray['address'] = isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : ''; |
|
| 113 | - $dataArray['website'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : ''; |
|
| 114 | - $dataArray['twitter'] = isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : ''; |
|
| 115 | - $dataArray['phone'] = isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : ''; |
|
| 116 | - } |
|
| 109 | + if (!empty($publicData)) { |
|
| 110 | + $dataArray['name'] = isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : ''; |
|
| 111 | + $dataArray['email'] = isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : ''; |
|
| 112 | + $dataArray['address'] = isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : ''; |
|
| 113 | + $dataArray['website'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : ''; |
|
| 114 | + $dataArray['twitter'] = isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : ''; |
|
| 115 | + $dataArray['phone'] = isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : ''; |
|
| 116 | + } |
|
| 117 | 117 | |
| 118 | - $dataArray = $this->signer->sign('lookupserver', $dataArray, $user); |
|
| 119 | - $httpClient = $this->clientService->newClient(); |
|
| 120 | - try { |
|
| 121 | - if (empty($publicData)) { |
|
| 122 | - $httpClient->delete($this->lookupServer, |
|
| 123 | - [ |
|
| 124 | - 'body' => json_encode($dataArray), |
|
| 125 | - 'timeout' => 10, |
|
| 126 | - 'connect_timeout' => 3, |
|
| 127 | - ] |
|
| 128 | - ); |
|
| 129 | - } else { |
|
| 130 | - $httpClient->post($this->lookupServer, |
|
| 131 | - [ |
|
| 132 | - 'body' => json_encode($dataArray), |
|
| 133 | - 'timeout' => 10, |
|
| 134 | - 'connect_timeout' => 3, |
|
| 135 | - ] |
|
| 136 | - ); |
|
| 137 | - } |
|
| 138 | - } catch (\Exception $e) { |
|
| 139 | - $this->jobList->add(RetryJob::class, |
|
| 140 | - [ |
|
| 141 | - 'dataArray' => $dataArray, |
|
| 142 | - 'retryNo' => 0, |
|
| 143 | - ] |
|
| 144 | - ); |
|
| 145 | - } |
|
| 146 | - } |
|
| 118 | + $dataArray = $this->signer->sign('lookupserver', $dataArray, $user); |
|
| 119 | + $httpClient = $this->clientService->newClient(); |
|
| 120 | + try { |
|
| 121 | + if (empty($publicData)) { |
|
| 122 | + $httpClient->delete($this->lookupServer, |
|
| 123 | + [ |
|
| 124 | + 'body' => json_encode($dataArray), |
|
| 125 | + 'timeout' => 10, |
|
| 126 | + 'connect_timeout' => 3, |
|
| 127 | + ] |
|
| 128 | + ); |
|
| 129 | + } else { |
|
| 130 | + $httpClient->post($this->lookupServer, |
|
| 131 | + [ |
|
| 132 | + 'body' => json_encode($dataArray), |
|
| 133 | + 'timeout' => 10, |
|
| 134 | + 'connect_timeout' => 3, |
|
| 135 | + ] |
|
| 136 | + ); |
|
| 137 | + } |
|
| 138 | + } catch (\Exception $e) { |
|
| 139 | + $this->jobList->add(RetryJob::class, |
|
| 140 | + [ |
|
| 141 | + 'dataArray' => $dataArray, |
|
| 142 | + 'retryNo' => 0, |
|
| 143 | + ] |
|
| 144 | + ); |
|
| 145 | + } |
|
| 146 | + } |
|
| 147 | 147 | } |
