Moved communication with GitHub to webtrees-common library

Author: Jefferson49

composer.json

@@ -11,8 +11,8 @@
     ],
     "require": {
         "bahuma/oauth2-nextcloud": "=2.0.0",
-        "jefferson49/oauth2-kanidm": ">=1.1.0",
-        "jefferson49/webtrees-common": ">=1.2.8",
+        "jefferson49/oauth2-kanidm": ">=1.1.1",
+        "jefferson49/webtrees-common": ">=1.2.12",
         "league/oauth2-client": "=2.8.1",
         "league/oauth2-github": "=3.1.1",
         "league/oauth2-google": "=4.0.1",

composer.lock

@@ -36,7 +36,6 @@
 namespace Jefferson49\Webtrees\Module\OAuth2Client;
 
 use Fig\Http\Message\RequestMethodInterface;
-use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Localization\Translation;
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\FlashMessages;
@@ -64,21 +63,19 @@
 use Fisharebest\Webtrees\Validator;
 use Fisharebest\Webtrees\Tree;
 use Fisharebest\Webtrees\View;
+use Jefferson49\Webtrees\Exceptions\GithubCommunicationError;
 use Jefferson49\Webtrees\Helpers\Functions;
+use Jefferson49\Webtrees\Helpers\GithubService;
 use Jefferson49\Webtrees\Internationalization\MoreI18N;
 use Jefferson49\Webtrees\Log\CustomModuleLogInterface;
 use Jefferson49\Webtrees\Module\OAuth2Client\Factories\AuthorizationProviderFactory;
 use Jefferson49\Webtrees\Module\OAuth2Client\LoginWithAuthorizationProviderAction;
 use Jefferson49\Webtrees\Module\OAuth2Client\RequestHandlers\RegisterWithProviderAction;
-use GuzzleHttp\Client;
 use Illuminate\Support\Collection;
-use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use RuntimeException;
 
-use function substr;
-
 
 class OAuth2Client extends AbstractModule implements
 	ModuleCustomInterface, 
@@ -105,13 +102,9 @@ class OAuth2Client extends AbstractModule implements
 	public const REDIRECT_ROUTE = '/OAuth2Client';
 	public const REGISTER_PROVIDER_ROUTE = '/register-with-provider-action{/tree}';
 
-	//Github repository
+	//Github
 	public const GITHUB_REPO = 'Jefferson49/webtrees-oauth2-client';
 
-	//Github API URL to get the information about the latest releases
-	public const GITHUB_API_LATEST_VERSION = 'https://api.github.com/repos/'. self::GITHUB_REPO . '/releases/latest';
-	public const GITHUB_API_TAG_NAME_PREFIX = '"tag_name":"v';
-
 	//Author of custom module
 	public const CUSTOM_AUTHOR = 'Markus Hemprich';
 
@@ -292,43 +285,18 @@ public function customModuleVersion(): string
      */
     public function customModuleLatestVersion(): string
     {
-        // No update URL provided.
-        if (self::GITHUB_API_LATEST_VERSION === '') {
-            return $this->customModuleVersion();
-        }
         return Registry::cache()->file()->remember(
             $this->name() . '-latest-version',
             function (): string {
-                try {
-                    $client = new Client(
-                        [
-                        'timeout' => 3,
-                        ]
-                    );
-
-                    $response = $client->get(self::GITHUB_API_LATEST_VERSION);
 
-                    if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
-                        $content = $response->getBody()->getContents();
-                        preg_match_all('/' . self::GITHUB_API_TAG_NAME_PREFIX . '\d+\.\d+\.\d+/', $content, $matches, PREG_OFFSET_CAPTURE);
-
-						if(!empty($matches[0]))
-						{
-							$version = $matches[0][0][0];
-							$version = substr($version, strlen(self::GITHUB_API_TAG_NAME_PREFIX));	
-						}
-						else
-						{
-							$version = $this->customModuleVersion();
-						}
-
-                        return $version;
-                    }
-                } catch (GuzzleException $ex) {
-                    // Can't connect to the server?
+                try {
+                    //Get latest release from GitHub
+                    return GithubService::getLatestReleaseTag(self::GITHUB_REPO);
+                }
+                catch (GithubCommunicationError $ex) {
+                    // Can't connect to GitHub?
+                    return $this->customModuleVersion();
                 }
-
-                return $this->customModuleVersion();
             },
             86400
         );