refactor: 更改为 ITOTPService 服务

Author: ArgoZhang

src/components/BootstrapBlazor.Authenticator/Extensions/OTPExtensions.cs

@@ -15,7 +15,7 @@ internal static class OTPExtensions
 
     public static OtpNet.OtpType ToType(this OTPType type) => type switch
     {
-        OTPType.Hotp => OtpNet.OtpType.Hotp,
+        OTPType.HOTP => OtpNet.OtpType.Hotp,
         _ => OtpNet.OtpType.Totp
     };
 }

src/components/BootstrapBlazor.Authenticator/Extensions/ServiceCollectionExtension.cs

@@ -4,7 +4,6 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Options;
 
 namespace BootstrapBlazor.Components;
 
@@ -22,7 +21,7 @@ public static class ServiceCollectionExtension
     public static IServiceCollection AddBootstrapBlazorAuthenticator(this IServiceCollection services, Action<
     AuthenticatorOptions>? configOptions = null)
     {
-        services.TryAddSingleton<IAuthenticatorService, DefaultAuthenticatorServices>();
+        services.TryAddSingleton<ITOTPService, DefaultTOTPServices>();
         services.AddOptionsMonitor<AuthenticatorOptions>();
         services.Configure<AuthenticatorOptions>(options =>
         {

src/components/BootstrapBlazor.Authenticator/Services/DefaultAuthenticatorServices.cs

@@ -0,0 +1,73 @@
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+using Microsoft.Extensions.Options;
+using OtpNet;
+
+namespace BootstrapBlazor.Components;
+
+class DefaultTOTPServices(IOptionsMonitor<AuthenticatorOptions> optionsMonitor) : ITOTPService
+{
+    public TOTPInstanceBase? TOTPInstance { get; private set; }
+
+    public string GenerateOtpUri(AuthenticatorOptions? options = null)
+    {
+        options ??= optionsMonitor.CurrentValue;
+        var type = options.Type.ToType();
+        var mode = options.Algorithm.ToMode();
+        var uri = new OtpUri(type, options.SecretKey, options.UserName, options.IssuerName, mode, options.Digits, options.Period, options.Counter);
+        return uri.ToString();
+    }
+
+    public string Compute(string secretKey, DateTime? timestamp = null)
+    {
+        var instance = new Totp(Base32Encoding.ToBytes(secretKey));
+        TOTPInstance = new DefaultTOTPInstance(instance);
+        return timestamp == null ? instance.ComputeTotp() : instance.ComputeTotp(timestamp.Value);
+    }
+
+    public int GetRemainingSeconds(DateTime? timestamp = null)
+    {
+        if (TOTPInstance != null)
+        {
+            return timestamp == null ? TOTPInstance.GetRemainingSeconds() : TOTPInstance.GetRemainingSeconds(timestamp.Value);
+        }
+        var instance = new Totp(Base32Encoding.ToBytes("OMM2LVLFX6QJHMYI"));
+        return timestamp == null ? instance.RemainingSeconds() : instance.RemainingSeconds(timestamp.Value);
+    }
+
+    public string GenerateSecretKey(int length = 20)
+    {
+        var secretKey = KeyGeneration.GenerateRandomKey(length);
+        return Base32Encoding.ToString(secretKey);
+    }
+
+    public byte[] GetSecretKeyBytes(string input)
+    {
+        return Base32Encoding.ToBytes(input);
+    }
+
+    public bool Verify(string code, DateTime? timestamp = null)
+    {
+        if (TOTPInstance != null)
+        {
+            return timestamp == null ? TOTPInstance.Verify(code) : TOTPInstance.Verify(code, timestamp.Value);
+        }
+        var instance = new Totp(Base32Encoding.ToBytes("OMM2LVLFX6QJHMYI"));
+        return timestamp == null ? instance.VerifyTotp(code, out _) : instance.VerifyTotp(timestamp.Value, code, out _);
+    }
+}
+
+class DefaultTOTPInstance(Totp instance) : TOTPInstanceBase
+{
+    public override int GetRemainingSeconds(DateTime? timestamp = null)
+    {
+        return timestamp == null ? instance.RemainingSeconds() : instance.RemainingSeconds(timestamp.Value);
+    }
+
+    public override bool Verify(string code, DateTime? timestamp = null)
+    {
+        return timestamp == null ? instance.VerifyTotp(code, out _) : instance.VerifyTotp(timestamp.Value, code, out _);
+    }
+}