Merge pull request #14 from brunohbrito/dev

bugs fix for google oauth

Author: brunobritodev

.gitignore

@@ -247,4 +247,7 @@ ModelManifest.xml
 # Sphinx
 *.opt
 docs/_build
-docs/.vscode
+docs/.vscode
+
+# Log files
+**/*log*.txt

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Eduardo Pires
+Copyright (c) 2018 Bruno Brito
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/Backend/Jp.Infra.CrossCutting.IdentityServer/Configuration/SigninCredentialExtension.cs

@@ -25,7 +25,7 @@ public static class SigninCredentialExtension
 
         private const string FileName = nameof(FileName);
         private const string FilePassword = nameof(FilePassword);
-        private const string KeyStoreIssuer = nameof(KeyStoreIssuer);
+        private const string CertificateThumbprint = nameof(CertificateThumbprint);
 
         public static IIdentityServerBuilder AddSigninCredentialFromConfig(
             this IIdentityServerBuilder builder, IConfigurationSection options, ILogger logger, IHostingEnvironment env)
@@ -74,14 +74,18 @@ private static void AddCertificateFromEnvironment(IIdentityServerBuilder builder
         private static void AddCertificateFromStore(IIdentityServerBuilder builder,
             IConfigurationSection options, ILogger logger)
         {
-            var keyIssuer = options.GetValue<string>(KeyStoreIssuer);
+            var keyIssuer = options.GetValue<string>(CertificateThumbprint);
             logger.LogInformation($"SigninCredentialExtension adding key from store by {keyIssuer}");
 
-            X509Store store = new X509Store(StoreName.My, StoreLocation.LocalMachine);
+            X509Store store = new X509Store(StoreName.My, StoreLocation.CurrentUser);
             store.Open(OpenFlags.ReadOnly);
 
-            var certificates = store.Certificates.Find(X509FindType.FindByIssuerName, keyIssuer, true);
-
+            var certificates = store.Certificates.Find(X509FindType.FindByThumbprint, keyIssuer, false);
+            logger.LogInformation($"Certificates on store: {store.Certificates.Count}");
+            foreach (var storeCertificate in store.Certificates)
+            {
+                logger.LogInformation($"{storeCertificate.Thumbprint} - {storeCertificate.IssuerName.Name}");
+            }
             if (certificates.Count > 0)
                 builder.AddSigningCredential(certificates[0]);
             else

src/Backend/Jp.UserManagement/Program.cs

@@ -21,7 +21,7 @@ public static void Main(string[] args)
                 .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
                 .Enrich.FromLogContext()
                 .WriteTo.ApplicationInsights(TelemetryConfiguration.Active, TelemetryConverter.Traces)
-                .WriteTo.File(@"jpProject_sso_log.txt")
+                .WriteTo.File(@"jpProject_sso_log-.txt", rollingInterval: RollingInterval.Day, retainedFileCountLimit: 5)
                 .WriteTo.Console()
                 .CreateLogger();
 

src/Frontend/Jp.UI.SSO/Configuration/SigninCredentialExtension.cs

@@ -27,9 +27,8 @@ public static IServiceCollection AddAuth(this IServiceCollection services,
                     {
                         OnCreatingTicket = context =>
                         {
-                            var identity = (ClaimsIdentity)context.Principal.Identity;
-                            var profileImg = context.User["image"].Value<string>("url");
-                            identity.AddClaim(new Claim(JwtClaimTypes.Picture, profileImg));
+                            if (context.User.ContainsKey("image"))
+                                context.Identity.AddClaim(new Claim(JwtClaimTypes.Picture, context.User.GetValue("image").SelectToken("url").ToString()));
                             return Task.CompletedTask;
                         }
                     };
@@ -48,9 +47,8 @@ public static IServiceCollection AddAuth(this IServiceCollection services,
                         {
                             OnCreatingTicket = context =>
                             {
-                                var identity = (ClaimsIdentity)context.Principal.Identity;
-                                var profileImg = context.User["picture"]["data"].Value<string>("url");
-                                identity.AddClaim(new Claim(JwtClaimTypes.Picture, profileImg));
+                                if (context.User.ContainsKey("picture"))
+                                    context.Identity.AddClaim(new Claim(JwtClaimTypes.Picture, context.User.GetValue("picture").SelectToken("data").SelectToken("url").ToString()));
                                 return Task.CompletedTask;
                             }
                         };

src/Frontend/Jp.UI.SSO/Configuration/SocialIntegrationConfig.cs

@@ -24,7 +24,7 @@ public static void Main(string[] args)
                 .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
                 .Enrich.FromLogContext()
                 .WriteTo.ApplicationInsights(TelemetryConfiguration.Active, TelemetryConverter.Traces)
-                .WriteTo.File(@"jpProject_sso_log.txt")
+                .WriteTo.File(@"jpProject_sso_log-.txt", rollingInterval: RollingInterval.Day, retainedFileCountLimit: 5)
                 .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Literate)
                 .CreateLogger();
 

src/Frontend/Jp.UI.SSO/Program.cs

@@ -9,6 +9,7 @@
     },
     "CertificateOptions": {
         "Type": "Temporary",
+        "KeyStoreIssuer": null,
         "FileName": "jpproject.pfx",
         "FilePassword": ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
     },