Merge pull request #478 from karlomikus/develop

Feature release

Author: karlomikus

CHANGELOG.md

@@ -1,3 +1,19 @@
+# v5.3.0
+## New
+- Added PocketId as a SSO provider
+```
+# Setup via:
+POCKETID_BASE_URL=
+POCKETID_CLIENT_ID=
+POCKETID_CLIENT_SECRET=
+POCKETID_REDIRECT_URI=
+```
+- Added import support for `cocktailexplorer.co`
+
+# v5.2.5
+## Fixes
+- Fixed menu item having wrong thumb path
+
 # v5.2.4
 ## Fixes
 - Fixed wrong thumbnail URL getting synced into search engine

app/Providers/AppServiceProvider.php

@@ -39,6 +39,7 @@ public function boot()
             $event->extendSocialite('authentik', \SocialiteProviders\Authentik\Provider::class);
             $event->extendSocialite('authelia', \SocialiteProviders\Authelia\Provider::class);
             $event->extendSocialite('keycloak', \SocialiteProviders\Keycloak\Provider::class);
+            $event->extendSocialite('pocketid', \Kami\Cocktail\Services\Auth\PocketIdProvider::class);
         });
 
         if (DB::getDriverName() === 'sqlite') {

app/Scraper/Manager.php

@@ -30,6 +30,7 @@ final class Manager
         \Kami\Cocktail\Scraper\Sites\MakeMeACocktail::class,
         \Kami\Cocktail\Scraper\Sites\KindredCocktails::class,
         \Kami\Cocktail\Scraper\Sites\CraftedPour::class,
+        \Kami\Cocktail\Scraper\Sites\CocktailExplorer::class,
     ];
 
     public function __construct(private readonly string $url)

app/Scraper/Sites/CocktailExplorer.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kami\Cocktail\Scraper\Sites;
+
+use Kami\RecipeUtils\AmountValue;
+use Kami\RecipeUtils\RecipeIngredient;
+use Symfony\Component\DomCrawler\Crawler;
+
+class CocktailExplorer extends DefaultScraper
+{
+    public static function getSupportedUrls(): array
+    {
+        return [
+            'https://www.cocktailexplorer.co',
+        ];
+    }
+
+    public function ingredients(): array
+    {
+        $result = $this->crawler->filter('.video__recipe__ingredients li')->each(function (Crawler $node): RecipeIngredient {
+            $amount = $node->filter('.video__recipe__ingredient__quantity')->attr('data-ingredient-amount');
+            $unit = $node->filter('.video__recipe__ingredient__quantity')->attr('data-ingredient-unit');
+            $ingredient = $node->filter('strong')->text();
+
+            return new RecipeIngredient(
+                name: $ingredient,
+                amount: AmountValue::fromString($amount),
+                units: $unit,
+                source: $node->text(),
+            );
+        });
+
+        return $result;
+    }
+}

app/Services/Auth/OauthProvider.php

@@ -18,6 +18,7 @@ enum OauthProvider: string
     case Authentik = 'authentik';
     case Authelia = 'authelia';
     case Keycloak = 'keycloak';
+    case PocketId = 'pocketid';
 
     public function getPrettyName(): string
     {
@@ -28,6 +29,7 @@ public function getPrettyName(): string
             self::Authentik => 'Authentik',
             self::Authelia => 'Authelia',
             self::Keycloak => 'Keycloak',
+            self::PocketId => 'PocketId',
         };
     }
 }

app/Services/Auth/PocketIdExtendSocialite.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kami\Cocktail\Services\Auth;
+
+use Laravel\Socialite\Contracts\Provider;
+use SocialiteProviders\Manager\SocialiteWasCalled;
+
+class PocketIdExtendSocialite
+{
+    public function handle(SocialiteWasCalled $socialiteWasCalled): void
+    {
+        $socialiteWasCalled->extendSocialite('pocketid', Provider::class);
+    }
+}

app/Services/Auth/PocketIdProvider.php

@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kami\Cocktail\Services\Auth;
+
+use Illuminate\Support\Arr;
+use GuzzleHttp\RequestOptions;
+use SocialiteProviders\Manager\OAuth2\User;
+use SocialiteProviders\Manager\OAuth2\AbstractProvider;
+
+class PocketIdProvider extends AbstractProvider
+{
+    public const IDENTIFIER = 'POCKETID';
+
+    /**
+     * @var array<string>
+     */
+    protected $scopes = ['openid profile email'];
+
+    /**
+     * @return array<string>
+     */
+    public static function additionalConfigKeys(): array
+    {
+        return ['base_url'];
+    }
+
+    protected function getBaseUrl(): string
+    {
+        return rtrim($this->getConfig('base_url'), '/');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthUrl($state)
+    {
+        return $this->buildAuthUrlFromBase($this->getBaseUrl() . '/authorize', $state);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getTokenUrl()
+    {
+        return $this->getBaseUrl() . '/api/oidc/token';
+    }
+
+    /**
+     * @return array<mixed>
+     */
+    protected function getUserByToken($token): array
+    {
+        $response = $this->getHttpClient()->get($this->getBaseUrl() . '/api/oidc/userinfo', [
+            RequestOptions::HEADERS => [
+                'Authorization' => 'Bearer '.$token,
+            ],
+        ]);
+
+        return json_decode((string) $response->getBody(), true);
+    }
+
+    /**
+     * @param array<mixed> $user
+     */
+    protected function mapUserToObject(array $user): User
+    {
+        return (new User())->setRaw($user)->map([
+            'id' => Arr::get($user, 'sub'),
+            'nickname' => Arr::get($user, 'preferred_username'),
+            'name' => Arr::get($user, 'name'),
+            'email' => Arr::get($user, 'email'),
+        ]);
+    }
+}

config/services.php

@@ -70,4 +70,11 @@
         'base_url' => env('KEYCLOAK_BASE_URL'),
         'realms' => env('KEYCLOAK_REALM'),
     ],
+
+    'pocketid' => [
+        'base_url' => env('POCKETID_BASE_URL'),
+        'client_id' => env('POCKETID_CLIENT_ID'),
+        'client_secret' => env('POCKETID_CLIENT_SECRET'),
+        'redirect' => env('POCKETID_REDIRECT_URI')
+    ],
 ];