Merge pull request #1774 from pkuehnel/fix/preventCallingFleetAPIOnNo…

…nLicensedCars fix(TeslaFleetApiService): Only allow vehicle request via Fleet API on non licensed cars
pkuehnel · Jan 25, 2025 · 31fdc1c · 31fdc1c
2 parents 0cefbe8 + af06279
commit 31fdc1c
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs b/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs
@@ -937,15 +937,12 @@ await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(Send
             }
         }
 
-        if (fleetApiRequest.BleCompatible && (!await backendApiService.IsFleetApiLicensed(car.Vin, true)))
+        if (fleetApiRequest.RequestUrl != VehicleRequest.RequestUrl && (!await backendApiService.IsFleetApiLicensed(car.Vin, true)))
         {
-            if (!car.UseBle)
-            {
-                await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Fleet API not licensed for car {car.Vin}",
-                    "Can not send Fleet API commands to car as Fleet API is not licensed",
-                    issueKeys.FleetApiNotLicensed, car.Vin, null).ConfigureAwait(false);
-            }
-
+            await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Fleet API not licensed for car {car.Vin}",
+                "Can not send Fleet API commands to car as Fleet API is not licensed",
+                issueKeys.FleetApiNotLicensed, car.Vin, null).ConfigureAwait(false);
+
             logger.LogError("Can not send Fleet API commands to car {vin} as car is not licensed", car.Vin);
             return null;
         }