Merge pull request #486 from karlomikus/develop

Minor release

Author: karlomikus

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v5.4.0
+## New
+- Added Zitadel as SSO provider
+- ABV now gets recalculated when method dilution percentage changes
+
+## Fixes
+- Fix materialized path migration failing in certain cases
+
 # v5.3.0
 ## New
 - Added PocketId as a SSO provider

app/Http/Controllers/CocktailMethodController.php

@@ -9,6 +9,7 @@
 use OpenApi\Attributes as OAT;
 use Illuminate\Http\JsonResponse;
 use Kami\Cocktail\OpenAPI as BAO;
+use Illuminate\Support\Facades\Log;
 use Kami\Cocktail\Models\CocktailMethod;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Kami\Cocktail\Http\Requests\CocktailMethodRequest;
@@ -105,11 +106,24 @@ public function update(CocktailMethodRequest $request, int $id): JsonResource
             abort(403);
         }
 
+        $originalDilutionPercentage = $method->dilution_percentage;
+
         $method->name = $request->input('name');
         $method->dilution_percentage = (int) $request->input('dilution_percentage');
         $method->updated_at = now();
         $method->save();
 
+        if ($originalDilutionPercentage !== $method->dilution_percentage) {
+            Log::info('Updating ABV for cocktails using method ID: ' . $method->id);
+            $cocktailsToUpdateAbv = $method->cocktails()->get();
+
+            foreach ($cocktailsToUpdateAbv as $cocktail) {
+                $calculatedAbv = $cocktail->getABV();
+                $cocktail->abv = $calculatedAbv;
+                $cocktail->save();
+            }
+        }
+
         return new CocktailMethodResource($method);
     }
 

app/Providers/AppServiceProvider.php

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

app/Services/Auth/OauthProvider.php

@@ -19,6 +19,7 @@ enum OauthProvider: string
     case Authelia = 'authelia';
     case Keycloak = 'keycloak';
     case PocketId = 'pocketid';
+    case Zitadel = 'zitadel';
 
     public function getPrettyName(): string
     {
@@ -30,6 +31,7 @@ public function getPrettyName(): string
             self::Authelia => 'Authelia',
             self::Keycloak => 'Keycloak',
             self::PocketId => 'PocketId',
+            self::Zitadel => 'Zitadel',
         };
     }
 }

composer.json

@@ -24,6 +24,7 @@
         "socialiteproviders/authelia": "^4.0",
         "socialiteproviders/authentik": "^5.2",
         "socialiteproviders/keycloak": "^5.3",
+        "socialiteproviders/zitadel": "^4.1",
         "spatie/array-to-xml": "^3.1",
         "spatie/laravel-query-builder": "^6.0",
         "spatie/laravel-sluggable": "^3.4",