Merge remote-tracking branch 'origin/master' into VIH-10554-Demo-Change

.gitignore

@@ -349,3 +349,4 @@ TESTS.xml
 Coverage/
 **/SpecFlow/userid
 .angular/
+.nx/

VideoWeb/VideoWeb.Common/Configuration/RedisConfiguration.cs

@@ -0,0 +1,7 @@
+namespace VideoWeb.Common.Configuration;
+
+public class RedisConfiguration
+{
+    public string Endpoint { get; set; }
+    public string Password { get; set; }
+}

VideoWeb/VideoWeb.Common/FeatureToggles.cs

@@ -0,0 +1,44 @@
+using System;
+using LaunchDarkly.Logging;
+using LaunchDarkly.Sdk;
+using LaunchDarkly.Sdk.Server;
+using LaunchDarkly.Sdk.Server.Interfaces;
+
+namespace VideoWeb.Common;
+
+public interface IFeatureToggles
+{
+    public bool Vodafone();
+}
+
+public class FeatureToggles : IFeatureToggles
+{
+    private readonly ILdClient _ldClient;
+    private readonly Context _context;
+    private const string LdUser = "vh-video-web";
+    private const string VodafoneToggleKey = "vodafone";
+
+    public FeatureToggles(string sdkKey, string environmentName)
+    {
+        var config = LaunchDarkly.Sdk.Server.Configuration.Builder(sdkKey)
+            .Logging(Components.Logging(Logs.ToWriter(Console.Out)).Level(LogLevel.Warn)).Build();
+        _context = Context.Builder(LdUser).Name(environmentName).Build();
+        _ldClient = new LdClient(config);
+    }
+
+    public bool Vodafone()
+    {
+        return GetBoolValueWithKey(VodafoneToggleKey);
+    }
+
+    private bool GetBoolValueWithKey(string key)
+    {
+        if (!_ldClient.Initialized)
+        {
+            throw new InvalidOperationException("LaunchDarkly client not initialized");
+        }
+
+        return _ldClient.BoolVariation(key, _context);
+    }
+}
+

VideoWeb/VideoWeb.Common/Security/HashGen/KinlyConfiguration.cs

@@ -1,18 +1,6 @@
 namespace VideoWeb.Common.Security.HashGen
 {
-    public class KinlyConfiguration
+    public class KinlyConfiguration : SupplierConfiguration
     {
-        public string CallbackSecret { get; set; }
-        public string Audience { get; set; }
-        public string Issuer { get; set; }
-        public string ApiSecret { get; set; }
-        public string SelfTestApiSecret { get; set; }
-        public int ExpiresInMinutes { get; set; }
-        public int HashExpiresInMinutes { get; set; }
-        public string JoinByPhoneFromDate { get; set; }
-        public string TurnServer { get; set; }
-        public string TurnServerUser { get; set; }
-        public string TurnServerCredential { get; set; }
-        public string HeartbeatUrlBase { get; set; }
     }
 }

VideoWeb/VideoWeb.Common/Security/HashGen/SupplierConfiguration.cs

@@ -0,0 +1,18 @@
+namespace VideoWeb.Common.Security.HashGen
+{
+    public abstract class SupplierConfiguration
+    {
+        public string CallbackSecret { get; set; }
+        public string Audience { get; set; }
+        public string Issuer { get; set; }
+        public string ApiSecret { get; set; }
+        public string SelfTestApiSecret { get; set; }
+        public int ExpiresInMinutes { get; set; }
+        public int HashExpiresInMinutes { get; set; }
+        public string JoinByPhoneFromDate { get; set; }
+        public string TurnServer { get; set; }
+        public string TurnServerUser { get; set; }
+        public string TurnServerCredential { get; set; }
+        public string HeartbeatUrlBase { get; set; }
+    }
+}

VideoWeb/VideoWeb.Common/Security/HashGen/VodafoneConfiguration.cs

@@ -0,0 +1,5 @@
+namespace VideoWeb.Common.Security.HashGen;
+
+public class VodafoneConfiguration : SupplierConfiguration
+{
+}

VideoWeb/VideoWeb.Common/Security/SupplierLocator.cs

@@ -0,0 +1,42 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using VideoWeb.Common.Security.HashGen;
+using VideoWeb.Common.Security.Tokens.Base;
+using VideoWeb.Common.Security.Tokens.Kinly;
+using VideoWeb.Common.Security.Tokens.Vodafone;
+
+namespace VideoWeb.Common.Security;
+
+public interface ISupplierLocator
+{
+    IJwtTokenProvider GetTokenProvider();
+    IOptions<SupplierConfiguration> GetSupplierConfiguration();
+}
+
+public class SupplierLocator : ISupplierLocator
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IOptions<KinlyConfiguration> _kinlyConfigOptions;
+    private readonly IOptions<VodafoneConfiguration> _vodafoneConfigOptions;
+    private readonly IFeatureToggles _featureToggles;
+
+    public SupplierLocator(IServiceProvider serviceProvider,
+        IFeatureToggles featureToggles,
+        IOptions<KinlyConfiguration> kinlyConfigOptions,
+        IOptions<VodafoneConfiguration> vodafoneConfigOptions)
+    {
+        _serviceProvider = serviceProvider;
+        _featureToggles = featureToggles;
+        _kinlyConfigOptions = kinlyConfigOptions;
+        _vodafoneConfigOptions = vodafoneConfigOptions;
+    }
+
+    public IJwtTokenProvider GetTokenProvider() => _featureToggles.Vodafone()
+        ? _serviceProvider.GetService<IVodafoneJwtTokenProvider>()
+        : _serviceProvider.GetService<IKinlyJwtTokenProvider>();
+
+    public IOptions<SupplierConfiguration> GetSupplierConfiguration() =>
+        _featureToggles.Vodafone() ? _vodafoneConfigOptions : _kinlyConfigOptions;
+
+}

VideoWeb/VideoWeb.Common/Security/BaseServiceTokenHandler.cs → VideoWeb/VideoWeb.Common/Security/Tokens/Base/BaseServiceTokenHandler.cs

@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Options;
 using VideoWeb.Common.Configuration;
 
-namespace VideoWeb.Common.Security
+namespace VideoWeb.Common.Security.Tokens.Base
 {
     public abstract class BaseServiceTokenHandler : DelegatingHandler
     {

VideoWeb/VideoWeb.Common/Security/Tokens/Base/IJwtTokenProvider.cs

@@ -0,0 +1,7 @@
+namespace VideoWeb.Common.Security.Tokens.Base;
+
+public interface IJwtTokenProvider
+{
+    string GenerateTokenForCallbackEndpoint(string claims, int expiresInMinutes);
+    string GenerateToken(string claims, int expiresInMinutes);
+}

VideoWeb/VideoWeb.Common/Security/Tokens/Base/JwtTokenProvider.cs

@@ -0,0 +1,46 @@
+using System;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using Microsoft.IdentityModel.Tokens;
+using VideoWeb.Common.Security.HashGen;
+
+namespace VideoWeb.Common.Security.Tokens.Base;
+
+public abstract class JwtTokenProvider : IJwtTokenProvider
+{
+    private readonly SupplierConfiguration _supplierConfiguration;
+
+    protected JwtTokenProvider(SupplierConfiguration supplierConfiguration)
+    {
+        _supplierConfiguration = supplierConfiguration;
+    }
+
+    public string GenerateTokenForCallbackEndpoint(string claims, int expiresInMinutes)
+    {
+        var key = Convert.FromBase64String(_supplierConfiguration.CallbackSecret);
+        return BuildToken(claims, expiresInMinutes, key);
+    }
+
+    public string GenerateToken(string claims, int expiresInMinutes)
+    {
+        var key = Convert.FromBase64String(_supplierConfiguration.ApiSecret);
+        return BuildToken(claims, expiresInMinutes, key);
+    }
+
+    private string BuildToken(string claims, int expiresInMinutes, byte[] key)
+    {
+        var securityKey = new SymmetricSecurityKey(key);
+        var descriptor = new SecurityTokenDescriptor
+        {
+            Subject = new ClaimsIdentity(new[] {new Claim(ClaimTypes.Name, claims)}),
+            NotBefore = DateTime.UtcNow.AddMinutes(-1),
+            Issuer = _supplierConfiguration.Issuer,
+            Expires = DateTime.UtcNow.AddMinutes(expiresInMinutes + 1),
+            SigningCredentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha512)
+        };
+
+        var handler = new JwtSecurityTokenHandler();
+        var token = handler.CreateJwtSecurityToken(descriptor);
+        return handler.WriteToken(token);
+    }
+}

VideoWeb/VideoWeb.Common/Security/BookingsApiTokenHandler.cs → VideoWeb/VideoWeb.Common/Security/Tokens/BookingsApiTokenHandler.cs

@@ -1,8 +1,9 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
 using VideoWeb.Common.Configuration;
+using VideoWeb.Common.Security.Tokens.Base;
 
-namespace VideoWeb.Common.Security
+namespace VideoWeb.Common.Security.Tokens
 {
     public class BookingsApiTokenHandler : BaseServiceTokenHandler
     {
@@ -16,4 +17,4 @@ public BookingsApiTokenHandler(IOptions<AzureAdConfiguration> azureAdConfigurati
         protected override string TokenCacheKey => "BookingsApiServiceToken";
         protected override string ClientResource => HearingServicesConfiguration.BookingsApiResourceId;
     }
-}
+}

VideoWeb/VideoWeb.Common/Security/Tokens/Kinly/IKinlyJwtTokenProvider.cs

@@ -0,0 +1,7 @@
+using VideoWeb.Common.Security.Tokens.Base;
+
+namespace VideoWeb.Common.Security.Tokens.Kinly;
+
+public interface IKinlyJwtTokenProvider : IJwtTokenProvider
+{
+}

VideoWeb/VideoWeb.Common/Security/Tokens/Kinly/KinlyJwtTokenProvider.cs

@@ -0,0 +1,12 @@
+using VideoWeb.Common.Security.HashGen;
+using VideoWeb.Common.Security.Tokens.Base;
+
+namespace VideoWeb.Common.Security.Tokens.Kinly;
+
+public class KinlyJwtTokenProvider : JwtTokenProvider, IKinlyJwtTokenProvider
+{
+    public KinlyJwtTokenProvider(KinlyConfiguration supplierConfiguration) : base(supplierConfiguration)
+    {
+    }
+}
+

VideoWeb/VideoWeb.Common/Security/TokenProvider.cs → VideoWeb/VideoWeb.Common/Security/Tokens/TokenProvider.cs

@@ -4,7 +4,7 @@
 using Microsoft.Identity.Client;
 using VideoWeb.Common.Configuration;
 
-namespace VideoWeb.Common.Security
+namespace VideoWeb.Common.Security.Tokens
 {
     public interface ITokenProvider
     {

VideoWeb/VideoWeb.Common/Security/UserApiTokenHandler.cs → VideoWeb/VideoWeb.Common/Security/Tokens/UserApiTokenHandler.cs

@@ -1,8 +1,9 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
 using VideoWeb.Common.Configuration;
+using VideoWeb.Common.Security.Tokens.Base;
 
-namespace VideoWeb.Common.Security
+namespace VideoWeb.Common.Security.Tokens
 {
     public class UserApiTokenHandler : BaseServiceTokenHandler
     {
@@ -16,4 +17,4 @@ public UserApiTokenHandler(IOptions<AzureAdConfiguration> azureAdConfiguration,
         protected override string TokenCacheKey => "UserApiServiceToken";
         protected override string ClientResource => HearingServicesConfiguration.UserApiResourceId;
     }
-}
+}

VideoWeb/VideoWeb.Common/Security/VideoApiTokenHandler.cs → VideoWeb/VideoWeb.Common/Security/Tokens/VideoApiTokenHandler.cs

@@ -1,8 +1,9 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
 using VideoWeb.Common.Configuration;
+using VideoWeb.Common.Security.Tokens.Base;
 
-namespace VideoWeb.Common.Security
+namespace VideoWeb.Common.Security.Tokens
 {
     public class VideoApiTokenHandler : BaseServiceTokenHandler
     {
@@ -16,4 +17,4 @@ public VideoApiTokenHandler(IOptions<AzureAdConfiguration> azureAdConfiguration,
         protected override string TokenCacheKey => "VideoApiServiceToken";
         protected override string ClientResource => HearingServicesConfiguration.VideoApiResourceId;
     }
-}
+}

VideoWeb/VideoWeb.Common/Security/Tokens/Vodafone/IVodafoneJwtTokenProvider.cs

@@ -0,0 +1,7 @@
+using VideoWeb.Common.Security.Tokens.Base;
+
+namespace VideoWeb.Common.Security.Tokens.Vodafone;
+
+public interface IVodafoneJwtTokenProvider : IJwtTokenProvider
+{
+}

VideoWeb/VideoWeb.Common/Security/Tokens/Vodafone/VodafoneJwtTokenProvider.cs

@@ -0,0 +1,12 @@
+using VideoWeb.Common.Security.HashGen;
+using VideoWeb.Common.Security.Tokens.Base;
+
+namespace VideoWeb.Common.Security.Tokens.Vodafone;
+
+public class VodafoneJwtTokenProvider : JwtTokenProvider, IVodafoneJwtTokenProvider
+{
+    public VodafoneJwtTokenProvider(VodafoneConfiguration vodafoneConfiguration) : base(vodafoneConfiguration)
+    {
+    }
+}
+

VideoWeb/VideoWeb.Common/VideoWeb.Common.csproj

@@ -7,7 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BookingsApi.Client" Version="1.51.12" />
+    <PackageReference Include="BookingsApi.Client" Version="2.0.4" />
+    <PackageReference Include="LaunchDarkly.ServerSdk" Version="7.0.0" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.16.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.16.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />