add missing providers

Author: paule96

KK.AspNetCore.EasyAuthAuthentication.code-workspace

@@ -26,5 +26,9 @@
 			"path": "./"
 		}
 	],
-	"settings": {}
+	"settings": {
+		"cSpell.words": [
+			"authentification"
+		]
+	}
 }

samples/KK.AspNetCore.EasyAuthAuthentication.Samples.Web/KK.AspNetCore.EasyAuthAuthentication.Samples.Web.csproj

@@ -10,6 +10,7 @@
 
     <!-- Set this to true if you enable server-side prerendering -->
     <BuildServerSideRenderer>false</BuildServerSideRenderer>
+    <UserSecretsId>795deb04-f3bb-4d51-a58e-9d84a7b987fd</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

samples/KK.AspNetCore.EasyAuthAuthentication.Samples.Web/appsettings.json

@@ -15,7 +15,23 @@
         "Enabled": true
       },
       {
-        "ProviderName": "EasyAuthWithHeaderService",
+        "ProviderName": "EasyAuthAzureAdService",
+        "Enabled": true
+      },
+      {
+        "ProviderName": "EasyAuthMicrosoftService",
+        "Enabled": true
+      },
+      {
+        "ProviderName": "EasyAuthFacebookService",
+        "Enabled": true
+      },
+      {
+        "ProviderName": "EasyAuthTwitterService",
+        "Enabled": true
+      },
+      {
+        "ProviderName": "EasyAuthGoogleService",
         "Enabled": true
       }
     ]

src/KK.AspNetCore.EasyAuthAuthentication/Models/ProviderOptions.cs

@@ -27,7 +27,7 @@ public ProviderOptions(string providerName)
         public ProviderOptions(string providerName, string nameClaimType)
         {
             this.ProviderName = providerName;
-            this.NameClaimType = nameClaimType;            
+            this.NameClaimType = nameClaimType;
         }
 
         /// <summary>
@@ -41,20 +41,20 @@ public ProviderOptions(string providerName, string nameClaimType, string roleNam
         {
             this.ProviderName = providerName;
             this.NameClaimType = nameClaimType;
-            this.RoleClaimType  = roleNameClaimType;
+            this.RoleClaimType = roleNameClaimType;
         }
 
         /// <summary>
         /// The <c>ClaimType</c> for the Idendity User.
         /// </summary>
         /// <value>The Claim Type to use for the User. Default is <c>ClaimType</c> of the auth provider.</value>
-        public string NameClaimType { get; set; } = ClaimTypes.Name;
+        public string NameClaimType { get; set; } = string.Empty;
 
         /// <summary>
         /// The <c>ClaimType</c> for the Idendity Role.
         /// </summary>
         /// <value>The Claim Type to use for the Roles. Default is <c>ClaimType</c> of the auth provider.</value>
-        public string RoleClaimType { get; set; } = ClaimTypes.Role;
+        public string RoleClaimType { get; set; } = string.Empty;
 
         /// <summary>
         /// The provider name for this options object.
@@ -71,7 +71,7 @@ public ProviderOptions(string providerName, string nameClaimType, string roleNam
         /// </summary>
         /// <param name="options">The provider options model with the new options.</param>
         public void ChangeModel(ProviderOptions? options)
-        {            
+        {
             if (options == null)
             {
                 return;

src/KK.AspNetCore.EasyAuthAuthentication/Services/EasyAuthAzureAdService.cs

@@ -0,0 +1,34 @@
+namespace KK.AspNetCore.EasyAuthAuthentication.Services
+{
+    using System.Security.Claims;
+    using KK.AspNetCore.EasyAuthAuthentication.Interfaces;
+    using KK.AspNetCore.EasyAuthAuthentication.Models;
+    using Microsoft.AspNetCore.Authentication;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.Logging;
+
+    public class EasyAuthAzureAdService: EasyAuthWithHeaderService<EasyAuthAzureAdService>, IEasyAuthAuthentificationService
+    {
+        private readonly ILogger<EasyAuthAzureAdService> logger;
+
+        public EasyAuthAzureAdService(ILogger<EasyAuthAzureAdService> logger) : base(logger)
+        {
+            this.logger = logger;
+            this.defaultOptions = new ProviderOptions(typeof(EasyAuthAzureAdService).Name, "name", ClaimTypes.Role);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context)
+        {
+            this.logger.LogInformation("Try authentification with azure ad account.");
+            return base.AuthUser(context);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context, ProviderOptions options)
+        {
+            this.logger.LogInformation("Try authentification with azure ad account.");
+            return base.AuthUser(context, options);
+        }
+
+        public new bool CanHandleAuthentification(HttpContext httpContext) => base.CanHandleAuthentification(httpContext) && httpContext.Request.Headers[PrincipalIdpHeaderName] == "aad" && IsHeaderSet(httpContext.Request.Headers, AuthTokenHeaderNames.AADIdToken);
+    }
+}

src/KK.AspNetCore.EasyAuthAuthentication/Services/EasyAuthFacebookService.cs

@@ -0,0 +1,32 @@
+namespace KK.AspNetCore.EasyAuthAuthentication.Services
+{
+    using System.Security.Claims;
+    using KK.AspNetCore.EasyAuthAuthentication.Interfaces;
+    using KK.AspNetCore.EasyAuthAuthentication.Models;
+    using Microsoft.AspNetCore.Authentication;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.Logging;
+
+    public class EasyAuthFacebookService : EasyAuthWithHeaderService<EasyAuthFacebookService>, IEasyAuthAuthentificationService
+    {
+        private readonly ILogger<EasyAuthFacebookService> logger;
+        public EasyAuthFacebookService(ILogger<EasyAuthFacebookService> logger) : base(logger){
+            this.logger = logger;
+            this.defaultOptions = new ProviderOptions(typeof(EasyAuthFacebookService).Name, "name", ClaimTypes.Role);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context)
+        {
+            this.logger.LogInformation("Try authentification with facebook account.");
+            return base.AuthUser(context);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context, ProviderOptions options)
+        {
+            this.logger.LogInformation("Try authentification with facebook account.");
+            return base.AuthUser(context, options);
+        }
+
+        public new bool CanHandleAuthentification(HttpContext httpContext) => base.CanHandleAuthentification(httpContext) && httpContext.Request.Headers[PrincipalIdpHeaderName] == "facebook" && IsHeaderSet(httpContext.Request.Headers, AuthTokenHeaderNames.FacebookAccessToken);
+    }
+}

src/KK.AspNetCore.EasyAuthAuthentication/Services/EasyAuthGoogleService.cs

@@ -0,0 +1,33 @@
+namespace KK.AspNetCore.EasyAuthAuthentication.Services
+{
+    using System.Security.Claims;
+    using KK.AspNetCore.EasyAuthAuthentication.Interfaces;
+    using KK.AspNetCore.EasyAuthAuthentication.Models;
+    using Microsoft.AspNetCore.Authentication;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.Logging;
+
+    public class EasyAuthGoogleService : EasyAuthWithHeaderService<EasyAuthGoogleService>, IEasyAuthAuthentificationService
+    {
+        private readonly ILogger<EasyAuthGoogleService> logger;
+        public EasyAuthGoogleService(ILogger<EasyAuthGoogleService> logger) : base(logger)
+        {
+            this.logger = logger;
+            this.defaultOptions = new ProviderOptions(typeof(EasyAuthGoogleService).Name, "name", ClaimTypes.Role);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context)
+        {
+            this.logger.LogInformation("Try authentification with google account.");
+            return base.AuthUser(context);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context, ProviderOptions options)
+        {
+            this.logger.LogInformation("Try authentification with google account.");
+            return base.AuthUser(context, options);
+        }
+
+        public new bool CanHandleAuthentification(HttpContext httpContext) => base.CanHandleAuthentification(httpContext) && httpContext.Request.Headers[PrincipalIdpHeaderName] == "google" && IsHeaderSet(httpContext.Request.Headers, AuthTokenHeaderNames.GoogleIdToken);
+    }
+}

src/KK.AspNetCore.EasyAuthAuthentication/Services/EasyAuthMicrosoftService.cs

@@ -0,0 +1,34 @@
+namespace KK.AspNetCore.EasyAuthAuthentication.Services
+{
+    using System.Security.Claims;
+    using KK.AspNetCore.EasyAuthAuthentication.Interfaces;
+    using KK.AspNetCore.EasyAuthAuthentication.Models;
+    using Microsoft.AspNetCore.Authentication;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.Logging;
+
+    public class EasyAuthMicrosoftService : EasyAuthWithHeaderService<EasyAuthMicrosoftService>, IEasyAuthAuthentificationService
+    {
+        private readonly ILogger<EasyAuthMicrosoftService> logger;
+
+        public EasyAuthMicrosoftService(ILogger<EasyAuthMicrosoftService> logger) : base(logger)
+        {
+            this.logger = logger;
+            this.defaultOptions = new ProviderOptions(typeof(EasyAuthMicrosoftService).Name, "name", ClaimTypes.Role);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context)
+        {
+            this.logger.LogInformation("Try authentification with microsoft account.");
+            return base.AuthUser(context);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context, ProviderOptions options)
+        {
+            this.logger.LogInformation("Try authentification with microsoft account.");
+            return base.AuthUser(context, options);
+        }
+
+        public new bool CanHandleAuthentification(HttpContext httpContext) => base.CanHandleAuthentification(httpContext) && httpContext.Request.Headers[PrincipalIdpHeaderName] == "microsoftaccount" && IsHeaderSet(httpContext.Request.Headers, AuthTokenHeaderNames.MicrosoftAccessToken);
+    }
+}

src/KK.AspNetCore.EasyAuthAuthentication/Services/EasyAuthTwitterService.cs

@@ -0,0 +1,34 @@
+namespace KK.AspNetCore.EasyAuthAuthentication.Services
+{
+    using System.Security.Claims;
+    using KK.AspNetCore.EasyAuthAuthentication.Interfaces;
+    using KK.AspNetCore.EasyAuthAuthentication.Models;
+    using Microsoft.AspNetCore.Authentication;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.Logging;
+
+    public class EasyAuthTwitterService : EasyAuthWithHeaderService<EasyAuthTwitterService>, IEasyAuthAuthentificationService
+    {
+        private readonly ILogger<EasyAuthTwitterService> logger;
+
+        public EasyAuthTwitterService(ILogger<EasyAuthTwitterService> logger) : base(logger)
+        {
+            this.logger = logger;
+            this.defaultOptions = new ProviderOptions(typeof(EasyAuthTwitterService).Name, "name", ClaimTypes.Role);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context)
+        {
+            this.logger.LogInformation("Try authentification with twitter account.");
+            return base.AuthUser(context);
+        }
+
+        public new AuthenticateResult AuthUser(HttpContext context, ProviderOptions options)
+        {
+            this.logger.LogInformation("Try authentification with twitter account.");
+            return base.AuthUser(context, options);
+        }
+
+        public new bool CanHandleAuthentification(HttpContext httpContext) => base.CanHandleAuthentification(httpContext) && httpContext.Request.Headers[PrincipalIdpHeaderName] == "twitter" && IsHeaderSet(httpContext.Request.Headers, AuthTokenHeaderNames.TwitterAccessToken);
+    }
+}

src/KK.AspNetCore.EasyAuthAuthentication/Services/EasyAuthWithHeaderService.cs

@@ -15,35 +15,39 @@ namespace KK.AspNetCore.EasyAuthAuthentication.Services
     /// <summary>
     /// A service that can be used to authentificat a user principal in the <see cref="EasyAuthAuthenticationHandler"/>.
     /// </summary>
-    public class EasyAuthWithHeaderService : IEasyAuthAuthentificationService
+    public abstract class EasyAuthWithHeaderService<T> : IEasyAuthAuthentificationService where T : IEasyAuthAuthentificationService
     {
         private const string PrincipalObjectHeader = "X-MS-CLIENT-PRINCIPAL";
-        private const string PrincipalIdpHeaderName = "X-MS-CLIENT-PRINCIPAL-IDP";
+        protected const string PrincipalIdpHeaderName = "X-MS-CLIENT-PRINCIPAL-IDP";
 
         private static readonly Func<ClaimsPrincipal, bool> IsContextUserNotAuthenticated =
             user => user == null || user.Identity == null || user.Identity.IsAuthenticated == false;
 
-        private static readonly Func<IHeaderDictionary, string, bool> IsHeaderSet =
+        protected static readonly Func<IHeaderDictionary, string, bool> IsHeaderSet =
             (headers, headerName) => !string.IsNullOrEmpty(headers[headerName].ToString());
 
-        private readonly ProviderOptions defaultOptions = new ProviderOptions(typeof(EasyAuthWithHeaderService).Name, ClaimTypes.Email, ClaimTypes.Role);
+#pragma warning disable IDE1006 // Naming Styles rule is broken
+        protected ProviderOptions defaultOptions = new ProviderOptions(typeof(T).Name, ClaimTypes.Email, ClaimTypes.Role);
+#pragma warning restore IDE1006 // Naming Styles
+
+
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EasyAuthWithHeaderService"/> class.
         /// </summary>
         /// <param name="logger">The logger for this service.</param>
         public EasyAuthWithHeaderService(
-            ILogger<EasyAuthWithHeaderService> logger) => this.Logger = logger;
+            ILogger<EasyAuthWithHeaderService<T>> logger) => this.Logger = logger;
 
-        private ILogger Logger { get; }
+        protected ILogger Logger { get; }
 
         /// <inheritdoc/>
         public bool CanHandleAuthentification(HttpContext httpContext)
         {
             var headers = httpContext.Request.Headers;
             var user = httpContext.User;
-            return IsContextUserNotAuthenticated(user) &&
-                IsHeaderSet(headers, AuthTokenHeaderNames.AADIdToken);
+            return IsContextUserNotAuthenticated(user);
+                
         }
 
         /// <summary>