fix for user create

.gitignore

@@ -333,3 +333,5 @@ ASALocalRun/
 /Clients/MQTTClient/.vscode
 /IoTSharp/ClientApp.rar
 /IoTSharp/ClientApp/package-lock.json
+/IoTSharp/healthchecksdb
+/IoTSharp/healthchecksdb-shm

IoTSharp.Edge.ModBus/IoTSharp.Edge.ModBus.csproj

@@ -36,8 +36,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\IoTSharp.EdgeSdk.MQTT\IoTSharp.EdgeSdk.MQTT.csproj" />
-    <ProjectReference Include="..\IoTSharp.Extensions.AspNetCore\IoTSharp.Extensions.AspNetCore.csproj" />
-    <ProjectReference Include="..\IoTSharp.Extensions\IoTSharp.Extensions.csproj" />
   </ItemGroup>
 
   <ItemGroup>

IoTSharp.Edges.sln

@@ -22,10 +22,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTSharp.EdgeSdk.MQTT", "Io
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTSharp.Edge.ModBus", "IoTSharp.Edge.ModBus\IoTSharp.Edge.ModBus.csproj", "{9267A0CE-ECBC-41E4-AD83-927117FD625E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTSharp.Extensions", "IoTSharp.Extensions\IoTSharp.Extensions.csproj", "{551E62E3-51DA-4C1D-8DBB-7346A29EE817}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTSharp.Extensions.AspNetCore", "IoTSharp.Extensions.AspNetCore\IoTSharp.Extensions.AspNetCore.csproj", "{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -146,46 +142,6 @@ Global
 		{9267A0CE-ECBC-41E4-AD83-927117FD625E}.Release|x64.Build.0 = Release|Any CPU
 		{9267A0CE-ECBC-41E4-AD83-927117FD625E}.Release|x86.ActiveCfg = Release|Any CPU
 		{9267A0CE-ECBC-41E4-AD83-927117FD625E}.Release|x86.Build.0 = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|ARM.Build.0 = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|x64.Build.0 = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Debug|x86.Build.0 = Debug|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|Any CPU.Build.0 = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|ARM.ActiveCfg = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|ARM.Build.0 = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|ARM64.Build.0 = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|x64.ActiveCfg = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|x64.Build.0 = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|x86.ActiveCfg = Release|Any CPU
-		{551E62E3-51DA-4C1D-8DBB-7346A29EE817}.Release|x86.Build.0 = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|ARM.Build.0 = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|x64.Build.0 = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Debug|x86.Build.0 = Debug|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|ARM.ActiveCfg = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|ARM.Build.0 = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|ARM64.Build.0 = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|x64.ActiveCfg = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|x64.Build.0 = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC80DA58-F40E-4B3C-8271-A25F65FEB0CB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

IoTSharp.Releases/GithubRelease.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IoTSharp.Releases
-{
-    public class GithubRelease
-    {
-        public string url { get; set; }
-        public string html_url { get; set; }
-        public string assets_url { get; set; }
-        public string upload_url { get; set; }
-        public string tarball_url { get; set; }
-        public string zipball_url { get; set; }
-        public string id { get; set; }
-        public string tag_name { get; set; }
-        public string name { get; set; }
-        public string body { get; set; }
-
-        public ICollection<GithubReleaseAsset> assets { get; set; }
-
-    }
-
-    public class GithubReleaseAsset
-    {
-        public string url { get; set; }
-        public string browser_download_url { get; set; }
-        public string id { get; set; }
-        public string name { get; set; }
-        public string label { get; set; }
-        public string state { get; set; }
-        public string content_type { get; set; }
-        public long size { get; set; }
-        public int download_count { get; set; }
-    }
-}

IoTSharp.Releases/IoTSharp.Releases.csproj

-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net46</TargetFrameworks>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Description></Description>
-    <PackageProjectUrl>https://github.com/maikebing/GithubReleasesDownloader</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/maikebing/GithubReleasesDownloader</RepositoryUrl>
-    <Authors>mwhitis;IoTSharp;maikebing</Authors>
-    <Company>mwhitis;IoTSharp;maikebing</Company>
-    <PackageTags>Github;Releases;Downloader;IoTSharp</PackageTags>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-  </ItemGroup>
-
-</Project>

IoTSharp.Releases/LinkHeaderParser.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IoTSharp.Releases
-{
-    public class LinkHeaderParser
-    {
-/*
-          <https://api.github.com/search/code?q=addClass+user%3Amozilla&page=2>; rel="next",
-          <https://api.github.com/search/code?q=addClass+user%3Amozilla&page=34>; rel="last"
-*/
-
-        public string GetNextPageFromHeader(string headerText)
-        {
-            if (string.IsNullOrWhiteSpace(headerText))
-            {
-                return string.Empty;
-            }
-
-            var links = headerText.Split(',');
-
-            foreach (var link in links.Where(link => link.Contains("rel=\"next\"")))
-            {
-                return link.Split(';')[0].Replace("<","").Replace(">","").Trim();
-            }
-
-            return string.Empty;
-        }
-    }
-}

IoTSharp.Releases/ReleaseDownloader.cs

-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Mime;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace IoTSharp.Releases
-{
-    public class ReleaseDownloader
-    {
-        private readonly string _baseUri;
-
-        private readonly string _accessToken;
-
-        private readonly string _userAgent;
-
-        private readonly string _releaseUri;
-
-        private string _user;
-        private string _repo;
-        private string _token;
-
-
-        public ReleaseDownloader(string _url, string accessToken)
-        {
-            var uri = new Uri(_url);
-            _baseUri = $"{ GetBaseUri(uri)}/repos/{GetUserFromUri(uri)}/{GetRepoFromUri(uri)}";
-            _accessToken = accessToken;
-            _userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3829.0 Safari/537.36 Edg/77.0.197.1"; ;
-            _releaseUri = GetReleaseUri();
-        }
-
-        private static string GetUserFromUri(Uri uri)
-        {
-            return !uri.LocalPath.Contains("/") ? string.Empty : uri.Segments[1].TrimEnd('/');
-        }
-
-        private static string GetRepoFromUri(Uri uri)
-        {
-            return !uri.LocalPath.Contains("/") ? string.Empty : uri.Segments[2].TrimEnd('/');
-        }
-
-        private static string GetBaseUri(Uri uri)
-        {
-            return uri.Host.Equals("github.com", StringComparison.OrdinalIgnoreCase) ? "https://api.github.com" : $"{uri.Scheme}://{uri.Host}/api/v3";
-        }
-
-
-        public ICollection<GithubRelease> GetDataForAllReleases()
-        {
-            var requestingUri = GetAccessTokenUri(_releaseUri);
-            return DownloadReleases(requestingUri);
-        }
-
-        public ICollection<GithubRelease> DownloadReleases(string requestingUri)
-        {
-
-            Console.WriteLine("Requesting: {0}", requestingUri);
-            var request = (HttpWebRequest)WebRequest.Create(new Uri(requestingUri));
-            request.UserAgent = _userAgent;
-
-            var response = request.GetResponse();
-            Console.WriteLine(((HttpWebResponse)response).StatusDescription);
-            // Get the stream containing content returned by the server.
-
-            var responseFromServer = ReadResponseFromServer(response);
-
-            var releases = JsonConvert.DeserializeObject<List<GithubRelease>>(responseFromServer);
-
-            var parser = new LinkHeaderParser();
-
-            var linkHeader = response.Headers["Link"];
-
-            var nextUrl = parser.GetNextPageFromHeader(linkHeader);
-
-            if (!string.IsNullOrEmpty(nextUrl))
-            {
-                releases.AddRange(DownloadReleases(nextUrl));
-            }
-
-            // Clean up the streams and the response.
-            response.Close();
-            return releases;
-        }
-
-        private string GetReleaseUri()
-        {
-            var releaseUri = $"{_baseUri}/releases";
-            return releaseUri;
-        }
-
-        private static string ReadResponseFromServer(WebResponse response)
-        {
-            using (var dataStream = response.GetResponseStream())
-            {
-                // Open the stream using a StreamReader for easy access.
-                using (var reader = new StreamReader(dataStream))
-                {
-                    // Read the content.
-                    return reader.ReadToEnd();
-                }
-            }
-        }
-
-        private string GetAssetsUriForId(string id)
-        {
-            var assetUri = $"{_releaseUri}/assets/{id}";
-            return assetUri;
-        }
-
-        private string GetAccessTokenUri(string uri)
-        {
-            return _accessToken == string.Empty ? uri : uri += $"?access_token={_accessToken}";
-        }
-
-        public bool DownloadAsset(string id, string path)
-        {
-            WebResponse response = GetAssetResponse(id);
-            GetBinaryResponseFromResponse(path,response);
-            return true;
-        }
-        public bool DownloadAsset(string id, out byte[] assetdata)
-        {
-            WebResponse response = GetAssetResponse(id);
-            assetdata = GetBinaryResponseFromResponse(response);
-            return true;
-        }
-
-        private WebResponse GetAssetResponse(string id)
-        {
-            var assetUri = GetAccessTokenUri(GetAssetsUriForId(id));
-
-            var request = (HttpWebRequest)WebRequest.Create(new Uri(assetUri));
-            request.Accept = "application/octet-stream";
-            request.UserAgent = "mwhitis";
-
-            var response = request.GetResponse();
-            return response;
-        }
-
-        private static byte[] GetBinaryResponseFromResponse( WebResponse response)
-        {
-            byte[] result = null;
-            long received = 0;
-            byte[] buffer = new byte[1024];
-            using (var ms = new  MemoryStream() )
-            {
-                using (var input = response.GetResponseStream())
-                {
-                    int size = input.Read(buffer, 0, buffer.Length);
-                    while (size > 0)
-                    {
-                        ms.Write(buffer, 0, size);
-                        received += size;
-
-                        size = input.Read(buffer, 0, buffer.Length);
-                    }
-                }
-
-                result = ms.ToArray();
-            }
-            return result;
-        }
-        private static void GetBinaryResponseFromResponse(string path, WebResponse response)
-        {
-            System.IO.File.WriteAllBytes(path, GetBinaryResponseFromResponse(response));
-        }
-    }
-}

IoTSharp/Data/ApplicationDBInitializer.cs

@@ -93,6 +93,10 @@ namespace IoTSharp.Data
                     await _signInManager.UserManager.AddToRoleAsync(user, nameof(UserRole.SystemAdmin));
                     
                 }
+                else
+                {
+                    throw new Exception(string.Join(',', result.Errors.ToList().Select(ie => $"code={ie.Code},msg={ie.Description}")));
+                }
             }
             var rship = new Relationship
             {

IoTSharp/Dockerfile

@@ -2,7 +2,7 @@
 
 FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
 WORKDIR /app
-EXPOSE 80
+EXPOSE 2927
 
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
 WORKDIR /src

IoTSharp/IoTSharp.csproj

@@ -83,6 +83,7 @@
     <None Remove="Migrations\**" />
     <Content Remove="appsettings.Production.json" />
     <None Remove="healthchecksdb" />
+    <None Remove="healthchecksdb-shm" />
     <None Include="..\docs\images\200x200.png">
       <Pack>True</Pack>
       <PackagePath></PackagePath>

IoTSharp/appsettings.Development.json

@@ -7,7 +7,7 @@
     }
   },
   "ConnectionStrings": {
-    "IoTSharp": "Server=localhost;Database=IoTSharp;Username=postgres;Password=future;"
+    "IoTSharp": "Server=host.docker.internal;Database=IoTSharp;Username=postgres;Password=future;"
   },
   "JwtKey": "kissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissme",
   "JwtExpireHours": 24,