build(pr: 1.0.0.4): publish alpha version v1.0.0.4

README.md

@@ -224,6 +224,11 @@ build number - Build Number
                 sample: 1.1.0.1 like (1.1-a.1)
               1 - beta
                 sample: 1.1.1.2 like (1.1-b.2)
+
+
+
+
+                %LocalAppData%\Microsoft\VSCommon\OnlineLicensing
               2 - release candidate
                 sample: 1.1.2.1 like (1.1-rc.1)
               3 - release
@@ -238,3 +243,4 @@ revision - git revision
 1.0.0.1
 1.0.0.2
 1.0.0.3
+1.0.0.4

src/O2NextGen-Prototypes.sln

@@ -99,6 +99,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "teambrain", "teambrain", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "a-discount", "a-discount", "{41ECEE68-B668-45CB-A3F0-DAC0BCF20D89}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.SmallTalk.SignalrHub", "Services\smalltalk\O2NextGen.SmallTalk.SignalrHub\O2NextGen.SmallTalk.SignalrHub.csproj", "{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -493,6 +495,18 @@ Global
 		{9D65077A-687A-433A-A280-45A70620ADC0}.Release|x64.Build.0 = Release|Any CPU
 		{9D65077A-687A-433A-A280-45A70620ADC0}.Release|x86.ActiveCfg = Release|Any CPU
 		{9D65077A-687A-433A-A280-45A70620ADC0}.Release|x86.Build.0 = Release|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Debug|x64.Build.0 = Debug|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Debug|x86.Build.0 = Debug|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Release|x64.ActiveCfg = Release|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Release|x64.Build.0 = Release|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Release|x86.ActiveCfg = Release|Any CPU
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -543,6 +557,7 @@ Global
 		{A50DA91B-BD5D-4640-80D8-46B1E55E76FD} = {574CE1BF-397E-4262-82AD-94FB1CE98DA2}
 		{4BAA467F-6F58-4C99-ACCF-88F2ADD398B8} = {574CE1BF-397E-4262-82AD-94FB1CE98DA2}
 		{41ECEE68-B668-45CB-A3F0-DAC0BCF20D89} = {574CE1BF-397E-4262-82AD-94FB1CE98DA2}
+		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429} = {0DB9F20A-FD40-4110-807E-AAEFEFCCD574}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5C9AF9F4-BF0A-486D-9F2E-17FE2F53F7E9}

src/Services/auth/O2NextGen.Auth.Web/Extensions/IdentityExtensions.cs

@@ -0,0 +1,38 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using O2NextGen.Auth.Web.Data;
+
+namespace O2NextGen.Auth.Web.Extensions
+{
+    public static class IdentityExtensions
+    {
+        public static IServiceCollection AddConfiguredIdentity(this IServiceCollection services,
+             IConfiguration configuration)
+        {
+            services.AddDbContext<AuthDbContext>(options =>
+                options.UseSqlServer(configuration["ConnectionString"]));
+
+            services
+
+                .AddIdentity<O2User, IdentityRole>(options =>
+                {
+                    options.Password.RequireDigit = false;
+                    //TODO: uncomment after some tests
+                    //options.Password.RequiredLength = 12; 
+                    options.Password.RequireLowercase = false;
+                    options.Password.RequireUppercase = false;
+                    options.Password.RequireNonAlphanumeric = false;
+                    options.User.RequireUniqueEmail = true;
+                    // options.SignIn.RequireConfirmedEmail = true;
+                })
+                .AddEntityFrameworkStores<AuthDbContext>()
+                .AddDefaultTokenProviders();
+
+            services.AddConfiguredIdentityServer(configuration);
+
+            return services;
+        }
+    }
+}

src/Services/auth/O2NextGen.Auth.Web/Extensions/IdentityServerExtensions.cs

@@ -0,0 +1,160 @@
+using System.Collections.Generic;
+using System.Linq;
+using IdentityServer4;
+using IdentityServer4.Models;
+using IdentityServer4.Services;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using O2NextGen.Auth.Web.Data;
+using O2NextGen.Auth.Web.Services;
+
+namespace O2NextGen.Auth.Web.Extensions
+{
+    public static class IdentityServerExtensions
+    {
+        public static IServiceCollection AddConfiguredIdentityServer(this IServiceCollection services,
+           IConfiguration configuration)
+        {
+            var builder = services.AddIdentityServer(options =>
+            {
+                //    options.Events.RaiseErrorEvents = true;
+                //    options.Events.RaiseInformationEvents = true;
+                //    options.Events.RaiseFailureEvents = true;
+                //    options.Events.RaiseSuccessEvents = true;
+            })
+            // using in memory, but we could also get it, for example, from the database
+
+            .AddDeveloperSigningCredential()
+            .AddInMemoryPersistedGrants()
+            // access to data regarding the user's identity
+            .AddInMemoryIdentityResources(GetIdentityResources())
+            // APIs that may be accessed
+            .AddInMemoryApiResources(GetApis())
+            // client applications that may access users data and APIs on the user's behalf
+            .AddInMemoryClients(GetClients())
+            // configures IdentityServer integration with ASP.NET Core Identity
+            .AddAspNetIdentity<O2User>()
+
+            // to avoid bombarding the db with checks, make use of cache
+            //.AddInMemoryCaching();
+            // more about EF integration:
+            // - http://docs.identityserver.io/en/latest/quickstarts/7_entity_framework.html
+            // - http://docs.identityserver.io/en/latest/reference/ef.html?highlight=dbcontext
+
+            .Services.AddTransient<IProfileService, ProfileService>();
+            return services;
+        }
+
+        private static IEnumerable<IdentityResource> GetIdentityResources()
+        {
+            var profile = new IdentityResources.Profile();
+            profile.Required = true;
+            return new IdentityResource[]
+            {
+                new IdentityResources.OpenId(),
+                profile
+            };
+        }
+
+        // private static IEnumerable<ApiResource> GetApis()
+        // {
+        //     var apiResource = new ApiResource("smalltalkapi", "smalltalkapi");
+        //     apiResource.Scopes.First().Required = true;
+        //     return new[]
+        //     {
+        //         apiResource
+        //     };
+        // }
+        public static IEnumerable<ApiResource> GetApis() =>
+            new List<ApiResource>
+            {
+                new ApiResource("smalltalkapi", "SmallTalk API"),
+                new ApiResource("smalltalksignalr","SmallTalk SignalR")
+            };
+
+        private static IEnumerable<Client> GetClients()
+        {
+            return new[]
+            {
+                // React client
+                new Client
+                {
+                    ClientId = "smalltalk_client_reactjs",
+                    ClientName = "SmallTalk React App",
+
+                    AllowedGrantTypes = GrantTypes.Implicit,
+
+                    RequireClientSecret = false,
+
+                    RedirectUris =                 
+                    {"http://localhost:3003/signin-oidc",
+                    },
+
+
+                    AllowedScopes = new List<string>
+                    {
+                        IdentityServerConstants.StandardScopes.OpenId,
+                        IdentityServerConstants.StandardScopes.Profile,
+                        "smalltalkapi",
+                        "smalltalksignalr",
+                    },
+
+                    AllowAccessTokensViaBrowser = true,
+                    AlwaysIncludeUserClaimsInIdToken = true,
+                    RequireConsent = false
+                },
+                new Client
+                {
+                    ClientId = "smalltalkapi",
+                    ClientName = "Smalltalkapi Swagger UI",
+                    AllowedGrantTypes = GrantTypes.Implicit,
+                    AllowAccessTokensViaBrowser = true,
+
+                    RedirectUris = { $"http://localhost:5003/swagger/o2c.html" },
+                    PostLogoutRedirectUris = { $"http://localhost:5003/swagger/" },
+
+                     AllowedScopes = new List<string>
+                     {
+                        "smalltalkapi"
+                     }
+                },
+                new Client {
+                    ClientId = "o2business-wpf",
+
+                    AllowedGrantTypes = GrantTypes.Code,
+                    RequirePkce = true,
+                    RequireClientSecret = false,
+
+                    RedirectUris = { "http://localhost/sample-wpf-app" },
+                    AllowedCorsOrigins = { "http://localhost" },
+
+                    AllowedScopes = {
+                        IdentityServerConstants.StandardScopes.OpenId,
+                        IdentityServerConstants.StandardScopes.Profile,
+                    },
+
+                    AllowAccessTokensViaBrowser = true,
+                    RequireConsent = false,
+                },
+                new Client {
+                    ClientId = "xamarin",
+
+                    AllowedGrantTypes = GrantTypes.Code,
+                    RequirePkce = true,
+                    RequireClientSecret = false,
+
+                    RedirectUris = { "xamarinformsclients://callback" },
+
+                    AllowedScopes = {
+                        IdentityServerConstants.StandardScopes.OpenId,
+                        IdentityServerConstants.StandardScopes.Profile,
+                    },
+
+                    AllowAccessTokensViaBrowser = true,
+                    RequireConsent = false,
+                },
+
+            };
+        }
+    }
+}

src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj

@@ -10,6 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="IdentityServer4" Version="2.3.2" />
+    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
@@ -23,6 +25,7 @@
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.File" Version="2.2.0">
     </PackageReference>
+    <PackageReference Include="SkiaSharp.QrCode" Version="0.2.0" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Resources\Pages\Account\Register.en.resx">

src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs

@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
@@ -83,9 +84,10 @@ public async Task<IActionResult> OnPostAsync(string returnUrl = null)
                         pageHandler: null,
                         values: new { userId = user.Id, code = code },
                         protocol: Request.Scheme);
-
-                    await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
-                        $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+
+                    Console.WriteLine(HtmlEncoder.Default.Encode(callbackUrl));
+                    //await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
+                      //  $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
 
                     await _signInManager.SignInAsync(user, isPersistent: false);
 

src/Services/auth/O2NextGen.Auth.Web/Program.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using O2NextGen.Auth.Web.StartupHelpers;
 using Serilog;
 
 namespace O2NextGen.Auth.Web
@@ -20,6 +21,7 @@ public static async Task<int> Main(string[] args)
                 var host = CreateWebHostBuilder(args).Build();
                 Log.Information($"############### {AppName} ##############");
                 Log.Information("################# Starting Application #################");
+                await host.EnsureDbUpToDateAsync();
                 await host.RunAsync();
                 Log.Information($"============== {AppName} - state is started =====================");
                 return 0;

src/Services/auth/O2NextGen.Auth.Web/Properties/launchSettings.json

@@ -6,7 +6,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "https://localhost:10001;http://localhost:5001"
+      "applicationUrl": "http://localhost:5001"
     },
     "Docker": {
       "commandName": "Docker",