--- a/server/src/app/Libraries/Handle/HandleClient.php Fri Apr 22 11:20:17 2016 +0200
+++ b/server/src/app/Libraries/Handle/HandleClient.php Sun Apr 24 22:38:10 2016 +0200
@@ -42,7 +42,7 @@
public function close() {
$this->deleteSession();
- $this->freeResources();
+ $this->freeResources();
}
private function getBaseUrl() {
@@ -60,7 +60,7 @@
private function getPrivateKeyRes() {
if(is_null($this->privateKeyRes)) {
$this->privateKeyRes = openssl_pkey_get_private($this->privateKeyOrCert, $this->pkpass);
- }
+ }
return $this->privateKeyRes;
}
@@ -93,7 +93,7 @@
}
$rsa->loadKey($keyContent);
$rsa->setSignatureMode(RSA::SIGNATURE_PKCS1);
-
+
return $rsa->sign($str);
}
@@ -236,17 +236,20 @@
$total = (int)$paginateJson['totalCount'];
$results = $paginateJson['handles'];
-
+
return new LengthAwarePaginator($results, $total, $perPage, $page, [
'path' => Paginator::resolveCurrentPath(),
'pageName' => $pageName,
]);
-
+
}
public function deleteHandle($handle) {
$this->initSession();
-
+
+ if($handle === $this->adminId) {
+ throw new \Exception("HandleClient: can not delete admin handle");
+ }
$delUrl = $this->getBaseUrl()."handles/$handle";
$delRes = $this->httpClient->delete($delUrl, $this->guzzleOptions);