15 changed files with 12 additions and 183 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,25 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/docs
-**/bin
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
--- a/Birdmap.API/Birdmap.API.csproj
+++ b/Birdmap.API/Birdmap.API.csproj
@ -8,9 +8,6 @@
    <SpaRoot>ClientApp\</SpaRoot>
    <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
    <AssemblyName>Birdmap.API</AssemblyName>
-    <UserSecretsId>a919c854-b332-49ee-8e38-96549f828836</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@ -34,7 +31,6 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
    <PackageReference Include="MQTTnet" Version="3.0.13" />
    <PackageReference Include="MQTTnet.AspNetCore" Version="3.0.13" />
    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
--- a/Birdmap.API/Dockerfile
+++ b/Birdmap.API/Dockerfile
@ -1,27 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
-WORKDIR /app
-RUN apt-get update && apt-get install -y curl
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt-get update && apt-get install -y nodejs
-
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-RUN apt-get update && apt-get install -y curl
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt-get update && apt-get install -y nodejs
-WORKDIR /src
-COPY ["Birdmap.API/Birdmap.API.csproj", "Birdmap.API/"]
-COPY ["Birdmap.BLL/Birdmap.BLL.csproj", "Birdmap.BLL/"]
-COPY ["Birdmap.Common/Birdmap.Common.csproj", "Birdmap.Common/"]
-COPY ["Birdmap.DAL/Birdmap.DAL.csproj", "Birdmap.DAL/"]
-RUN dotnet restore "Birdmap.API/Birdmap.API.csproj"
-COPY . .
-WORKDIR "/src/Birdmap.API"
-RUN dotnet build "Birdmap.API.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "Birdmap.API.csproj" -c Release -o /app/publish
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Birdmap.API.dll"]
--- a/Birdmap.API/Program.cs
+++ b/Birdmap.API/Program.cs
@ -1,6 +1,5 @@
 using Birdmap.DAL;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@ -40,10 +39,6 @@ namespace Birdmap.API

        public static IHostBuilder CreateHostBuilder(string[] args) =>
            Host.CreateDefaultBuilder(args)
-                .ConfigureAppConfiguration((hostingContext, config) =>
-                {
-                    config.AddEnvironmentVariables(prefix: "Birdmap_");
-                })
                .ConfigureWebHostDefaults(webBuilder =>
                {
                    webBuilder.UseStartup<Startup>();
@ -58,8 +53,8 @@ namespace Birdmap.API
        private static void SeedDatabase(IHost host)
        {
            using var scope = host.Services.CreateScope();
-
            var dbInitializer = scope.ServiceProvider.GetRequiredService<DbInitializer>();
+
            dbInitializer.Initialize();
        }
    }
--- a/Birdmap.API/Properties/launchSettings.json
+++ b/Birdmap.API/Properties/launchSettings.json
@ -1,11 +1,7 @@
-{
+{
  "iisSettings": {
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
-    "iis": {
-      "applicationUrl": "http://localhost/Birdmap.API",
-      "sslPort": 0
-    },
    "iisExpress": {
      "applicationUrl": "http://localhost:63288",
      "sslPort": 44331
@ -16,24 +12,16 @@
      "commandName": "IISExpress",
      "launchBrowser": true,
      "environmentVariables": {
-        "Birdmap_LocalDbConnectionString": "Data Source=DESKTOP-3600;Initial Catalog=birdmap2;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
    },
    "Birdmap": {
      "commandName": "Project",
      "launchBrowser": true,
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-      "publishAllPorts": true,
-      "useSSL": true
+      }
    }
  }
 }
--- a/Birdmap.API/Services/Mqtt/MqttClientService.cs
+++ b/Birdmap.API/Services/Mqtt/MqttClientService.cs
@ -117,7 +117,7 @@ namespace Birdmap.API.Services.Mqtt

        public async Task HandleDisconnectedAsync(MqttClientDisconnectedEventArgs eventArgs)
        {
-            _logger.LogDebug(eventArgs.Exception, $"Disconnected. Reason {eventArgs.ReasonCode}. Auth result: {eventArgs.AuthenticateResult}. Reconnecting...");
+            _logger.LogWarning(eventArgs.Exception, $"Disconnected. Reason {eventArgs.ReasonCode}. Auth result: {eventArgs.AuthenticateResult}. Reconnecting...");

            await Task.Delay(TimeSpan.FromSeconds(5));

@ -128,7 +128,7 @@ namespace Birdmap.API.Services.Mqtt
            }
            catch (Exception ex)
            {
-                _logger.LogDebug(ex, $"Reconnect failed...");
+                _logger.LogError(ex, $"Reconnect failed...");
            }
        }

--- a/Birdmap.API/appsettings.json
+++ b/Birdmap.API/appsettings.json
@ -6,19 +6,10 @@
      "Microsoft.Hosting.Lifetime": "Information"
    }
  },
-  "Kestrel": {
-    "Certificates": {
-      "Default": {
-        "Password": "certpass123",
-        "Path": "C:\\Users\\Ricsi\\AppData\\Roaming\\ASP.NET\\Https\\aspnetapp.pfx"
-      }
-    }
-  },
  "AllowedHosts": "*",
  "Secret": "7vj.3KW.hYE!}4u6",
  // "LocalDbConnectionString": "Data Source=DESKTOP-3600\\SQLEXPRESS;Initial Catalog=birdmap;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-  "LocalDbConnectionString": "Data Source=DESKTOP-3600;Initial Catalog=birdmap2;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-  //"LocalDbConnectionString": "Data Source=db;Initial Catalog=birdmap;User=sa;Password=RPSsql12345",
+  "LocalDbConnectionString": "Data Source=DESKTOP-3600;Initial Catalog=birdmap;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "Defaults": {
    "Services": {
      "Local Database": "https://localhost:44331/health",
@ -38,7 +29,6 @@
    ]
  },
  "UseDummyServices": true,
-  "ServicesBaseUrl": "https://birb.k8s.kmlabz.com/",
  "Mqtt": {
    "BrokerHostSettings": {
      "Host": "localhost",
--- a/Birdmap.BLL/Services/LiveDeviceService.cs
+++ b/Birdmap.BLL/Services/LiveDeviceService.cs
@ -23,9 +23,8 @@ namespace Birdmap.BLL.Services
        private System.Net.Http.HttpClient _httpClient;
        private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;

-        public LiveDummyService(string baseUrl, System.Net.Http.HttpClient httpClient)
+        public LiveDummyService(System.Net.Http.HttpClient httpClient)
        {
-            _baseUrl = baseUrl;
            _httpClient = httpClient;
            _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
        }
--- a/Birdmap.BLL/Services/LiveInputService.cs
+++ b/Birdmap.BLL/Services/LiveInputService.cs
@ -23,9 +23,8 @@ namespace Birdmap.BLL.Services
        private System.Net.Http.HttpClient _httpClient;
        private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;

-        public LiveInputService(string baseUrl, System.Net.Http.HttpClient httpClient)
+        public LiveInputService(System.Net.Http.HttpClient httpClient)
        {
-            _baseUrl = baseUrl;
            _httpClient = httpClient;
            _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
        }
--- a/Birdmap.BLL/Startup.cs
+++ b/Birdmap.BLL/Startup.cs
@ -2,7 +2,6 @@
 using Birdmap.BLL.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System.Net.Http;

 namespace Birdmap.BLL
 {
@ -21,20 +20,8 @@ namespace Birdmap.BLL
            }
            else
            {
-                var baseUrl = configuration.GetValue<string>("ServicesBaseUrl");
-
-                services.AddTransient<IInputService, LiveInputService>(serviceProvider =>
-                {
-                    var httpClient = serviceProvider.GetService<HttpClient>();
-                    var service = new LiveInputService(baseUrl, httpClient);
-                    return service;
-                });
-                services.AddTransient<IDeviceService, LiveDummyService>(serviceProvider =>
-                {
-                    var httpClient = serviceProvider.GetService<HttpClient>();
-                    var service = new LiveDummyService(baseUrl, httpClient);
-                    return service;
-                });
+                services.AddTransient<IInputService, LiveInputService>();
+                services.AddTransient<IDeviceService, LiveDummyService>();
            }

            return services;
--- a/Birdmap.DAL/DbInitializer.cs
+++ b/Birdmap.DAL/DbInitializer.cs
@ -22,17 +22,10 @@ namespace Birdmap.DAL

        public void Initialize()
        {
-            EnsureCreated();
            AddDefaultUsers();
            AddDefaultServices();
        }

-        private void EnsureCreated()
-        {
-            _logger.LogInformation("Ensuring database is created...");
-            _context.Database.EnsureCreated();
-        }
-
        private void AddDefaultServices()
        {
            _logger.LogInformation("Removing previously added default services...");
--- a/Birdmap.sln
+++ b/Birdmap.sln
@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Birdmap.Common", "Birdmap.C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.TestApp.WinForm", "MQTTnet.TestApp.WinForm\MQTTnet.TestApp.WinForm.csproj", "{E1707FE7-4A65-42AC-B71C-6CC1A55FC42A}"
 EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{9443433B-1D13-41F0-B345-B36ACD15EF81}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -41,10 +39,6 @@ Global
 		{E1707FE7-4A65-42AC-B71C-6CC1A55FC42A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E1707FE7-4A65-42AC-B71C-6CC1A55FC42A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1707FE7-4A65-42AC-B71C-6CC1A55FC42A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9443433B-1D13-41F0-B345-B36ACD15EF81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9443433B-1D13-41F0-B345-B36ACD15EF81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9443433B-1D13-41F0-B345-B36ACD15EF81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9443433B-1D13-41F0-B345-B36ACD15EF81}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/MQTTnet.TestApp.WinForm/Retained.json
+++ b/MQTTnet.TestApp.WinForm/Retained.json
@ -1 +0,0 @@
-[{"Topic":"devices/output","Payload":"eyJ0YWciOiIxN2NmOGI4Mi1lZDQ4LTQ4MDctOTI3MS0xZDlmMGY5ZDViMWYiLCJwcm9iYWJpbGl0eSI6MC43MjA0MzAyMzAxMjU5ODUyfQ==","QualityOfServiceLevel":1,"Retain":true,"UserProperties":null,"ContentType":null,"ResponseTopic":null,"PayloadFormatIndicator":null,"MessageExpiryInterval":null,"TopicAlias":null,"CorrelationData":null,"SubscriptionIdentifiers":null}]
--- a/docker-compose.dcproj
+++ b/docker-compose.dcproj
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk">
-  <PropertyGroup Label="Globals">
-    <ProjectVersion>2.1</ProjectVersion>
-    <DockerTargetOS>Linux</DockerTargetOS>
-    <ProjectGuid>9443433b-1d13-41f0-b345-b36acd15ef81</ProjectGuid>
-    <DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
-    <DockerServiceUrl>{Scheme}://localhost:{ServicePort}</DockerServiceUrl>
-    <DockerServiceName>birdmap.api</DockerServiceName>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="docker-compose.yml" />
-    <None Include=".dockerignore" />
-  </ItemGroup>
-</Project>
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,44 +0,0 @@
-version: '3.4'
-
-services:
-    db:
-        image: "mcr.microsoft.com/mssql/server:2019-latest"
-        environment:
-          - ACCEPT_EULA=Y
-          - SA_PASSWORD=RPSsql12345
-
-    birdmap.api:
-        image: ${DOCKER_REGISTRY-}birdmapapi
-        ports:
-            - "8000:80"
-            - "8001:443"
-        volumes:
-            - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
-            - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro
-        build:
-          context: .
-          dockerfile: Birdmap.API/Dockerfile
-        depends_on:
-            - db
-        environment:
-            - ASPNETCORE_ENVIRONMENT=Docker
-            - ASPNETCORE_URLS=https://+;http://+
-            - ASPNETCORE_HTTPS_PORT=8001
-            - Birdmap_Kestrel__Certificates__Default__Password=certpass123
-            - Birdmap_Kestrel__Certificates__Default__Path=/root/.aspnet/https/aspnetapp.pfx
-            - Birdmap_LocalDbConnectionString=Data Source=db;Initial Catalog=birdmap;User=sa;Password=RPSsql12345
-            - Birdmap_Defaults__Users__0__Name=admin
-            - Birdmap_Defaults__Users__0__Password=pass
-            - Birdmap_Defaults__Users__0__Role=Admin
-            - Birdmap_Defaults__Users__1__Name=user
-            - Birdmap_Defaults__Users__1__Password=pass
-            - Birdmap_Defaults__Users__1__Role=User
-            - Birdmap_Defaults__Services__Local-Database=https://localhost/health
-            - Birdmap_UseDummyServices=true
-            - Birdmap_ServicesBaseUrl=https://birb.k8s.kmlabz.com/
-            - Birdmap_Mqtt__BrokerHostSettings__Host=localhost
-            - Birdmap_Mqtt__BrokerHostSettings__Port=1883
-            - Birdmap_Mqtt__ClientSettings__Id=ASP.NET Core client
-            - Birdmap_Mqtt__ClientSettings__Username=username
-            - Birdmap_Mqtt__ClientSettings__Password=password
-            - Birdmap_Mqtt__ClientSettings__Topic=devices/output
				`@ -1 +0,0 @@`
				`[{"Topic":"devices/output","Payload":"eyJ0YWciOiIxN2NmOGI4Mi1lZDQ4LTQ4MDctOTI3MS0xZDlmMGY5ZDViMWYiLCJwcm9iYWJpbGl0eSI6MC43MjA0MzAyMzAxMjU5ODUyfQ==","QualityOfServiceLevel":1,"Retain":true,"UserProperties":null,"ContentType":null,"ResponseTopic":null,"PayloadFormatIndicator":null,"MessageExpiryInterval":null,"TopicAlias":null,"CorrelationData":null,"SubscriptionIdentifiers":null}]`