chore: added smappee api

docker-compose.yml

@@ -131,6 +131,25 @@ services:
 # Only enable if external services present
 #     ports:
 #       - 4317:4317 # OTLP gRPC receiver
+  smappee-api:
+    build:
+      context: ./smappee-api
+    labels:
+      - traefik.http.routers.smappeeapi.rule=Host(`smappee.pladijs`)
+      - traefik.http.services.smappeeapi.loadbalancer.server.port=8080
+    environment:
+      ASPNETCORE_ENVIRONMENT: Production
+    env_file:
+      - environment-variables/local.env
+      - environment-variables/production.env
+    restart: unless-stopped
+  smappee-api:
+    build: ./smappee-api
+    env_file:
+      - .env.smappee
+    labels:
+      - traefik.http.routers.smappee.rule=Host(`smappee.pladijs`)
+      - traefik.http.services.smappee.loadbalancer.server.port=8080
   energy-management:
     build:
       context: ./energy-management

smappee-api/Dockerfile

@@ -0,0 +1,17 @@
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
+WORKDIR /src
+
+COPY smappee-api.csproj ./
+RUN dotnet restore
+
+COPY . .
+RUN dotnet publish -c Release -o /app
+
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
+WORKDIR /app
+COPY --from=build /app .
+
+ENV ASPNETCORE_URLS=http://+:8080
+EXPOSE 8080
+
+ENTRYPOINT ["dotnet", "smappee-api.dll"]

smappee-api/Program.cs

@@ -31,12 +31,11 @@ app.MapPost(
 
 app.MapPost(
         "/disable",
-        () =>
+        async (IChargerService chargerService) =>
-            async (IChargerService chargerService) =>
+        {
-            {
+            await chargerService.ExecuteRequest(ChargerRequests.Disable);
-                await chargerService.ExecuteRequest(ChargerRequests.Disable);
+            return;
-                return;
+        }
-            }
     )
     .WithName("Disable");
 

smappee-api/appsettings.Development.json

@@ -3,6 +3,9 @@
     "LogLevel": {
       "Default": "Information",
       "Microsoft.AspNetCore": "Information"
+    },
+    "Console": {
+      "FormatterName": "json"
     }
   },
   "CHARGER": {
@@ -17,8 +20,11 @@
   "HttpClientLogging": {
     "LogRequestStart": false,
     "LogBody": true,
+    "LogContentHeaders": true,
     "BodySizeLimit": 32768,
     "BodyReadTimeout": "00:00:01",
+    "RequestBodyContentTypes": [ "application/json", "application/x-www-form-urlencoded" ],
+    "ResponseBodyContentTypes": [ "application/json" ],
     "RequestHeadersDataClasses": {
       "User-Agent": "None",
       "Content-Type": "None"
@@ -26,7 +32,6 @@
     "ResponseHeadersDataClasses": {
       "Content-Type": "None"
     },
-    "RequestPathLoggingMode": "Formatted",
+    "RequestPathParameterRedactionMode": "None"
-    "RequestPathParameterRedactionMode": "Strict"
   }
 }

smappee-api/docker-compose.yml

@@ -0,0 +1,7 @@
+services:
+  smappee-api:
+    build: .
+    ports:
+      - "5057:8080"
+    env_file:
+      - .env

smappee-api/services/SmappeeChargerService.cs

@@ -33,11 +33,11 @@ internal class SmappeeChargerService : IChargerService
         var response = request switch
         {
             ChargerRequests.Enable => await httpClient.PutAsJsonAsync<SmappeeRequestBody>(
-                $"/dev/v3/chargingstations/${options.ChargingStation}/connectors/{options.Connector}/mode",
+                $"/dev/v3/chargingstations/{options.ChargingStation}/connectors/{options.Connector}/mode",
                 new SmappeeRequestBody("NORMAL", new Limit("AMPERE", 6))
             ),
             ChargerRequests.Disable => await httpClient.PutAsJsonAsync(
-                "/dev/v3/chargingstations",
+                $"/dev/v3/chargingstations/{options.ChargingStation}/connectors/{options.Connector}/mode",
                 new SmappeeRequestBody("PAUSED", null)
             ),
             _ => throw new NotImplementedException(),

smappee-api/services/SmappeeTokenService.cs

@@ -39,14 +39,17 @@ internal class SmappeeTokenService : IBearerTokenService
         var httpClient = httpClientFactory.CreateClient("smappeeTokenService");
         httpClient.BaseAddress = options.Url;
 
-        var result = await httpClient.PostAsJsonAsync<TokenRequestBody>(
+        var result = await httpClient.PostAsync(
             "/dev/v3/oauth2/token",
-            new TokenRequestBody(
+            new FormUrlEncodedContent(
-                "password",
+                new Dictionary<string, string>
-                options.ClientId,
+                {
-                options.ClientSecret,
+                    ["grant_type"] = "password",
-                options.UserName,
+                    ["client_id"] = options.ClientId,
-                options.Password
+                    ["client_secret"] = options.ClientSecret,
+                    ["username"] = options.UserName,
+                    ["password"] = options.Password,
+                }
             )
         );
         result.EnsureSuccessStatusCode();
@@ -59,14 +62,6 @@ internal class SmappeeTokenService : IBearerTokenService
         );
     }
 
-    record TokenRequestBody(
-        string grant_type,
-        string client_id,
-        string client_secret,
-        string username,
-        string password
-    );
-
     record TokenResponse(string access_token, int expires_in);
 
     record TokenData(string Token, DateTime Expiration);