Merge pull request #31 from CyberfusionNL/1.86

Version 1.86.0

Author: dvdheiden

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 this package and not the cluster API. See the changelog of the [cluster API](https://cluster-api.cyberfusion.nl/redoc#section/Changelog) 
 for detailed information.
 
+## [1.86.0]
+
+### Added
+
+- CMS theme install endpoint.
+- CMS user credentials update endpoint.
+
 ## [1.85.1]
 
 ### Fixed

README.md

@@ -2,7 +2,7 @@
 
 Client for the [Cyberfusion Cluster API](https://cluster-api.cyberfusion.nl/).
 
-This client was built for and tested on the **1.162** version of the API.
+This client was built for and tested on the **1.164** version of the API.
 
 ## Support
 

src/Client.php

@@ -20,7 +20,7 @@ class Client implements ClientContract
 {
     private const CONNECT_TIMEOUT = 60;
     private const TIMEOUT = 180;
-    private const VERSION = '1.85.1';
+    private const VERSION = '1.86.0';
     private const USER_AGENT = 'cyberfusion-cluster-api-client/' . self::VERSION;
 
     private Configuration $configuration;

src/Endpoints/Cmses.php

@@ -7,6 +7,7 @@
 use Cyberfusion\ClusterApi\Models\CmsConfigurationConstant;
 use Cyberfusion\ClusterApi\Models\CmsInstallation;
 use Cyberfusion\ClusterApi\Models\CmsOption;
+use Cyberfusion\ClusterApi\Models\CmsUserCredentials;
 use Cyberfusion\ClusterApi\Models\TaskCollection;
 use Cyberfusion\ClusterApi\Request;
 use Cyberfusion\ClusterApi\Response;
@@ -405,4 +406,131 @@ public function regenerateSalts(int $id): Response
             'cms' => $cms,
         ]);
     }
+
+    /**
+     * @param int $id
+     * @param string $name
+     * @param string|null $version
+     * @return Response
+     * @throws RequestException
+     */
+    public function installThemeFromRepository(int $id, string $name, string $version = null): Response
+    {
+        $request = (new Request())
+            ->setMethod(Request::METHOD_POST)
+            ->setUrl(sprintf('cmses/%d/themes', $id))
+            ->setBody([
+                'name' => $name,
+                'version' => $version,
+            ]);
+
+        $response = $this
+            ->client
+            ->request($request);
+        if (!$response->isSuccess()) {
+            return $response;
+        }
+
+        // Retrieve the CMS again, so we log affected clusters and can return the CMS object
+        $retrieveResponse = $this->get($id);
+        if (!$retrieveResponse->isSuccess()) {
+            return $retrieveResponse;
+        }
+
+        $cms = $retrieveResponse->getData('cms');
+
+        // Log which cluster is affected by this change
+        $this
+            ->client
+            ->addAffectedCluster($cms->getClusterId());
+
+        return $response->setData([
+            'cms' => $cms,
+        ]);
+    }
+
+    /**
+     * @param int $id
+     * @param string $url
+     * @return Response
+     * @throws RequestException
+     */
+    public function installThemeFromUrl(int $id, string $url): Response
+    {
+        $request = (new Request())
+            ->setMethod(Request::METHOD_POST)
+            ->setUrl(sprintf('cmses/%d/themes', $id))
+            ->setBody([
+                'url' => $url,
+            ]);
+
+        $response = $this
+            ->client
+            ->request($request);
+        if (!$response->isSuccess()) {
+            return $response;
+        }
+
+        // Retrieve the CMS again, so we log affected clusters and can return the CMS object
+        $retrieveResponse = $this->get($id);
+        if (!$retrieveResponse->isSuccess()) {
+            return $retrieveResponse;
+        }
+
+        $cms = $retrieveResponse->getData('cms');
+
+        // Log which cluster is affected by this change
+        $this
+            ->client
+            ->addAffectedCluster($cms->getClusterId());
+
+        return $response->setData([
+            'cms' => $cms,
+        ]);
+    }
+
+    /**
+     * @param int $id
+     * @param int $userId
+     * @param CmsUserCredentials $cmsUserCredentials
+     * @return Response
+     * @throws RequestException
+     */
+    public function updateUserCredentials(int $id, int $userId, CmsUserCredentials $cmsUserCredentials): Response
+    {
+        $this->validateRequired($cmsUserCredentials, 'update', [
+            'password',
+        ]);
+
+        $request = (new Request())
+            ->setMethod(Request::METHOD_PATCH)
+            ->setUrl(sprintf('cmses/%d/users/%d/credentials', $id, $userId))
+            ->setBody($this->filterFields($cmsUserCredentials->toArray(), [
+                'password',
+            ]));
+
+        $response = $this
+            ->client
+            ->request($request);
+        if (!$response->isSuccess()) {
+            return $response;
+        }
+
+        // Retrieve the CMS again, so we log affected clusters and can return the CMS object
+        $retrieveResponse = $this->get($id);
+        if (!$retrieveResponse->isSuccess()) {
+            return $retrieveResponse;
+        }
+
+        $cms = $retrieveResponse->getData('cms');
+
+        // Log which cluster is affected by this change
+        $this
+            ->client
+            ->addAffectedCluster($cms->getClusterId());
+
+        return $response->setData([
+            'cms' => $cms,
+        ]);
+    }
 }

src/Models/CmsUserCredentials.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Cyberfusion\ClusterApi\Models;
+
+use Cyberfusion\ClusterApi\Contracts\Model;
+use Cyberfusion\ClusterApi\Support\Arr;
+use Cyberfusion\ClusterApi\Support\Validator;
+
+class CmsUserCredentials extends ClusterModel implements Model
+{
+    private string $password;
+
+    public function getPassword(): string
+    {
+        return $this->password;
+    }
+
+    public function setPassword(string $password): self
+    {
+        Validator::value($password)
+            ->minLength(24)
+            ->maxLength(255)
+            ->pattern('^[ -~]+$')
+            ->validate();
+
+        $this->password = $password;
+
+        return $this;
+    }
+
+    public function fromArray(array $data): self
+    {
+        return $this
+            ->setPassword(Arr::get($data, 'password'));
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'password' => $this->getPassword(),
+        ];
+    }
+}