Merge pull request #1128 from pkuehnel/develop

Develop
pkuehnel · Feb 22, 2024 · d0baa36 · d0baa36
2 parents f3836f0 + 5686c8f
commit d0baa36
Show file tree

Hide file tree

Showing 22 changed files with 577 additions and 139 deletions.
diff --git a/Plugins.SmaEnergymeter/Plugins.SmaEnergymeter.csproj b/Plugins.SmaEnergymeter/Plugins.SmaEnergymeter.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageReference Include="Quartz" Version="3.8.0" />
+    <PackageReference Include="Quartz" Version="3.8.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />

diff --git a/Plugins.Solax/Plugins.Solax.csproj b/Plugins.Solax/Plugins.Solax.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />

diff --git a/README.md b/README.md
@@ -2,8 +2,7 @@
 
 [![Docker version](https://img.shields.io/docker/v/pkuehnel/teslasolarcharger/latest)](https://hub.docker.com/r/pkuehnel/teslasolarcharger)
 [![Docker size](https://img.shields.io/docker/image-size/pkuehnel/teslasolarcharger/latest)](https://hub.docker.com/r/pkuehnel/teslasolarcharger)
-[![Docker pulls new name](https://img.shields.io/docker/pulls/pkuehnel/teslasolarcharger)](https://hub.docker.com/r/pkuehnel/teslasolarcharger)
-[![Docker pulls old name](https://img.shields.io/docker/pulls/pkuehnel/smartteslaampsetter)](https://hub.docker.com/r/pkuehnel/smartteslaampsetter)
+[![Docker pulls](https://img.shields.io/docker/pulls/pkuehnel/teslasolarcharger)](https://hub.docker.com/r/pkuehnel/teslasolarcharger)
 [![](https://img.shields.io/badge/Donate-PayPal-ff69b4.svg)](https://www.paypal.com/donate/?hosted_button_id=S3CK8Q9KV3JUL)
 [![edgeRelease](https://github.com/pkuehnel/TeslaSolarCharger/actions/workflows/edgeRelease.yml/badge.svg)](https://github.com/pkuehnel/TeslaSolarCharger/actions/workflows/edgeRelease.yml)
 
@@ -175,8 +174,7 @@ volumes:
 
 [![Docker version](https://img.shields.io/docker/v/pkuehnel/teslasolarchargersmaplugin/latest)](https://hub.docker.com/r/pkuehnel/teslasolarchargersmaplugin)
 [![Docker size](https://img.shields.io/docker/image-size/pkuehnel/teslasolarchargersmaplugin/latest)](https://hub.docker.com/r/pkuehnel/teslasolarchargersmaplugin)
-[![Docker pulls new name](https://img.shields.io/docker/pulls/pkuehnel/teslasolarchargersmaplugin)](https://hub.docker.com/r/pkuehnel/teslasolarchargersmaplugin)
-[![Docker pulls old name](https://img.shields.io/docker/pulls/pkuehnel/smartteslaampsettersmaplugin)](https://hub.docker.com/r/pkuehnel/smartteslaampsettersmaplugin)
+[![Docker pulls](https://img.shields.io/docker/pulls/pkuehnel/teslasolarchargersmaplugin)](https://hub.docker.com/r/pkuehnel/teslasolarchargersmaplugin)
 
 The SMA plugin is used to access your EnergyMeter (or Sunny Home Manager 2.0) values.
 To use the plugin, add these lines to the bottom of your `docker-compose.yml`.
@@ -327,8 +325,7 @@ volumes:
 
 [![Docker version](https://img.shields.io/docker/v/pkuehnel/teslasolarchargersolaredgeplugin/latest)](https://hub.docker.com/r/pkuehnel/teslasolarchargersolaredgeplugin)
 [![Docker size](https://img.shields.io/docker/image-size/pkuehnel/teslasolarchargersolaredgeplugin/latest)](https://hub.docker.com/r/pkuehnel/teslasolarchargersolaredgeplugin)
-[![Docker pulls new name](https://img.shields.io/docker/pulls/pkuehnel/teslasolarchargersolaredgeplugin)](https://hub.docker.com/r/pkuehnel/teslasolarchargersolaredgeplugin)
-[![Docker pulls old name](https://img.shields.io/docker/pulls/pkuehnel/smartteslaampsettersolaredgeplugin)](https://hub.docker.com/r/pkuehnel/smartteslaampsettersolaredgeplugin)
+[![Docker pulls](https://img.shields.io/docker/pulls/pkuehnel/teslasolarchargersolaredgeplugin)](https://hub.docker.com/r/pkuehnel/teslasolarchargersolaredgeplugin)
 
 The SolarEdge Plugin uses the cloud API, which is limited to 300 which is reset after 15 minutes. When the limit is reached the solaredge API does not gather any new values. This results in TSC displaying 0 grid and home battery power until 15 minutes are over.
 

diff --git a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/TeslaToken.cs b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/TeslaToken.cs
@@ -9,6 +9,7 @@ public class TeslaToken
     public string AccessToken { get; set; }
     public string RefreshToken { get; set; }
     public string IdToken { get; set; }
+    public int UnauthorizedCounter { get; set; }
     public DateTime ExpiresAtUtc { get; set; }
     public TeslaFleetApiRegion Region { get; set; }
 }
diff --git a/TeslaSolarCharger.Model/Migrations/20240221111628_AddTokenUnauthorizedCounter.Designer.cs b/TeslaSolarCharger.Model/Migrations/20240221111628_AddTokenUnauthorizedCounter.Designer.cs
diff --git a/TeslaSolarCharger.Model/Migrations/20240221111628_AddTokenUnauthorizedCounter.cs b/TeslaSolarCharger.Model/Migrations/20240221111628_AddTokenUnauthorizedCounter.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TeslaSolarCharger.Model.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddTokenUnauthorizedCounter : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "UnauthorizedCounter",
+                table: "TeslaTokens",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "UnauthorizedCounter",
+                table: "TeslaTokens");
+        }
+    }
+}
diff --git a/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs b/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs
@@ -199,6 +199,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<int>("Region")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int>("UnauthorizedCounter")
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("Id");
 
                     b.ToTable("TeslaTokens");

diff --git a/TeslaSolarCharger.SharedBackend/Contracts/IConstants.cs b/TeslaSolarCharger.SharedBackend/Contracts/IConstants.cs
@@ -13,8 +13,10 @@ public interface IConstants
 
     string InstallationIdKey { get; }
     string FleetApiTokenRequested { get; }
-    string TokenRefreshUnauthorized { get; }
     string TokenMissingScopes { get; }
     string BackupZipBaseFileName { get; }
     string FleetApiProxyNeeded { get; }
+    TimeSpan MaxTokenRequestWaitTime { get; }
+    TimeSpan MinTokenRestLifetime { get; }
+    int MaxTokenUnauthorizedCount { get; }
 }
diff --git a/TeslaSolarCharger.SharedBackend/Values/Constants.cs b/TeslaSolarCharger.SharedBackend/Values/Constants.cs
@@ -16,4 +16,7 @@ public class Constants : IConstants
     public string TokenRefreshUnauthorized => "TokenRefreshUnauthorized";
     public string TokenMissingScopes => "TokenMissingScopes";
     public string FleetApiProxyNeeded => "FleetApiProxyNeeded";
+    public TimeSpan MaxTokenRequestWaitTime => TimeSpan.FromMinutes(5);
+    public TimeSpan MinTokenRestLifetime => TimeSpan.FromMinutes(2);
+    public int MaxTokenUnauthorizedCount => 5;
 }
diff --git a/TeslaSolarCharger.Tests/TeslaSolarCharger.Tests.csproj b/TeslaSolarCharger.Tests/TeslaSolarCharger.Tests.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
 	  <PackageReference Include="Autofac.Extras.FakeItEasy" Version="7.0.0" />
-	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
 	  <PackageReference Include="Autofac.Extras.Moq" Version="6.1.1" />
 	  <PackageReference Include="FluentAssertions" Version="6.12.0" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
@@ -18,8 +18,8 @@
 	  <PackageReference Include="Moq.EntityFrameworkCore" Version="8.0.1.2" />
 	  <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
 	  <PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
-	  <PackageReference Include="xunit" Version="2.6.6" />
-	  <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+	  <PackageReference Include="xunit" Version="2.7.0" />
+	  <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>