Added Managed Identity support for Redis authentication

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Console/Microsoft.UnifiedRedisPlatform.ManagementConsole.csproj

@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../../sdk/Core/Microsoft.UnifiedRedisPlatform.Core.csproj" />
+    <ProjectReference Include="..\..\..\sdk\Core\Microsoft.UnifiedRedisPlatform.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Console/Program.cs

@@ -20,6 +20,7 @@ class Program
         private static string _appName;
         private static string _appSecret;
         private static string _location;
+        private static string _managedIdentityClientId;
         private static UnifiedConnectionMultiplexer _mux;
         private static IUnifiedDatabase _database;
         private static int _mode = AdvancedMode;
@@ -105,6 +106,7 @@ static void Main(string[] args)
                         AppName = _appName,
                         AppSecret = _appSecret,
                         Region = _location,
+                        ManagedIdentityClientId = _managedIdentityClientId,
                         ConnectionRetryProtocol = connectionTimeout > 0 && connectionMaxRetry > 0 ? new RetryProtocol()
                         {
                             TimeoutInMs = connectionTimeout > 0 ? connectionTimeout : RetryProtocol.GetDefaultConnectionProtocol().TimeoutInMs,
@@ -135,7 +137,7 @@ static void Main(string[] args)
 
             if (_mux == null)
             {
-                _mux = UnifiedConnectionMultiplexer.Connect(_clusterName, _appName, _appSecret, preferredLocation: _location) as UnifiedConnectionMultiplexer;
+                _mux = UnifiedConnectionMultiplexer.Connect(_clusterName, _appName, _appSecret, managedIdentityClientId: _managedIdentityClientId, preferredLocation: _location) as UnifiedConnectionMultiplexer;
             }
 
             _database = _mux.GetDatabase() as IUnifiedDatabase;
@@ -219,6 +221,7 @@ private static void SetupDefaultAppDetails()
             _appName = _configuration["AppName"];
             _appSecret = _configuration["AppSecret"];
             _location = _configuration["AppLocation"];
+            _managedIdentityClientId = _configuration["ManagedIdentityClientId"];
 
             Console.WriteLine("Default configurations received.");
         }
@@ -238,6 +241,9 @@ private static void SetAppDetails()
 
             Console.Write("Region: ");
             _location = Console.ReadLine();
+
+            Console.Write("Managed Identity Client ID (leave empty for local debugging): ");
+            _managedIdentityClientId = Console.ReadLine();
         }
 
         private static void ShowOperations()
@@ -322,7 +328,9 @@ private static void ShowAllKeys()
                 if (choice.KeyChar.ToString().ToLower() == "e")
                     return;
 
+#pragma warning disable CS0618 // Perf issues are acceptable in Management Console
                 var keys = AsyncMode ? _mux.GetKeysAsync().Result : _mux.GetKeys();
+#pragma warning restore CS0618
                 if (!keys.Any())
                     Console.WriteLine("No keys found in cache");
                 else
@@ -387,10 +395,12 @@ private static void Flush()
                 if (choice.KeyChar.ToString().ToLower() == "e")
                     return;
 
+#pragma warning disable CS0618 // Perf issues are acceptable in Management Console
                 if (AsyncMode)
                     _mux.FlushAsync().Wait();
                 else
                     _mux.FlushAsync();
+#pragma warning restore CS0618
 
                 Console.WriteLine("Cache flushed");
             }
@@ -415,10 +425,12 @@ private static void FlushSecondary()
                 if (choice.KeyChar.ToString().ToLower() == "e")
                     return;
 
+#pragma warning disable CS0618 // Perf issues are acceptable in Management Console
                 if (AsyncMode)
                     _mux.FlushSecondaryAsync().Wait();
                 else
                     _mux.FlushSecondary();
+#pragma warning restore CS0618
 
                 Console.WriteLine("Cache flushed");
             }

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Console/appsettings.json

@@ -1,6 +1,7 @@
-{
+{
   "ClusterName": "PS-PreProd-01",
   "AppName": "FXP-Service-SIT",
   "AppSecret": "",
-  "AppLocation": "eastus"
+  "AppLocation": "eastus",
+  "ManagedIdentityClientId": ""
 }

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Core/Domain/Commands/FlushKeysCommand.cs

@@ -6,7 +6,7 @@ namespace Microsoft.UnifiedRedisPlatform.Manager.Domain.Commands
 {
     public class FlushKeysCommand : Command<KeysResult>
     {
-        public override string DisplayName => "Flush Application Command";
+        public override string DisplayName => "Flush Keys Command";
 
         private readonly string _id;
         public override string Id => _id;
@@ -16,7 +16,7 @@ public class FlushKeysCommand : Command<KeysResult>
         public string SearchText { get; set; }
         public bool DeleteSecondary { get; set; }
 
-        public FlushKeysCommand(string cluster, string application, string searchText, bool deleteSecondary = false)
+        public FlushKeysCommand(string cluster, string application, string searchText, bool deleteSecondary)
         {
             _id = Guid.NewGuid().ToString();
             Cluster = cluster;
@@ -25,20 +25,24 @@ public FlushKeysCommand(string cluster, string application, string searchText, b
             DeleteSecondary = deleteSecondary;
         }
 
-        public FlushKeysCommand(string cluster, string application)
-            : this(cluster, application, null)
+        public FlushKeysCommand(string cluster, string application, string searchText)
+            : this(cluster, application, searchText, false)
         { }
 
         public override bool Validate(out string ValidationErrorMessage)
         {
             ValidationErrorMessage = null;
-
             if (string.IsNullOrWhiteSpace(Cluster))
-                ValidationErrorMessage += "Cluster name cannot be empty.";
+            {
+                ValidationErrorMessage = "Cluster is not provided";
+                return false;
+            }
             if (string.IsNullOrWhiteSpace(Application))
-                ValidationErrorMessage += "Application name cannot be empty.";
-
-            return string.IsNullOrWhiteSpace(ValidationErrorMessage);
+            {
+                ValidationErrorMessage = "Application is not provided";
+                return false;
+            }
+            return true;
         }
     }
 }

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Core/Domain/Commands/Handlers/CreateKeyCommandHandler.cs

@@ -5,7 +5,6 @@
 using AppInsights.EnterpriseTelemetry.Context;
 using Microsoft.UnifiedPlatform.Service.Common.Configuration;
 using Microsoft.UnifiedPlatform.Service.Common.Authentication;
-using AppInsights.EnterpriseTelemetry;
 
 namespace Microsoft.UnifiedRedisPlatform.Manager.Domain.Commands.Handlers
 {

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Core/Domain/Microsoft.UnifiedRedisPlatform.Manager.Domain.csproj

@@ -1,14 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CQRS.Mediatr.Lite" Version="1.0.0" />
+    <PackageReference Include="Microsoft.CQRS" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\sdk\Core\Microsoft.UnifiedRedisPlatform.Core.csproj" />
     <ProjectReference Include="..\..\..\..\service\Microsoft.UnifiedRedisPlatform.Service\SharedKernel\Common\Microsoft.UnifiedPlatform.Service.Common.csproj" />
   </ItemGroup>
 

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Core/Domain/Queries/GetKeyQuery.cs

@@ -1,16 +1,14 @@
-using Microsoft.CQRS;
+using System;
+using Microsoft.CQRS;
 using Microsoft.UnifiedPlatform.Service.Common.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Microsoft.UnifiedRedisPlatform.Manager.Domain.Queries
 {
     public class GetKeyQuery : Query<UnifiedRedisKey>
     {
         public override string DisplayName => "Get Key Query";
 
-        private string _id;
+        private readonly string _id;
         public override string Id => _id;
 
         public string Cluster { get; set; }
@@ -28,15 +26,22 @@ public GetKeyQuery(string cluster, string application, string key)
         public override bool Validate(out string ValidationErrorMessage)
         {
             ValidationErrorMessage = null;
-
             if (string.IsNullOrWhiteSpace(Cluster))
-                ValidationErrorMessage += "Cluster name cannot be empty.";
+            {
+                ValidationErrorMessage = "Cluster is not provided";
+                return false;
+            }
             if (string.IsNullOrWhiteSpace(Application))
-                ValidationErrorMessage += "Application name cannot be empty.";
+            {
+                ValidationErrorMessage = "Application is not provided";
+                return false;
+            }
             if (string.IsNullOrWhiteSpace(Key))
-                ValidationErrorMessage += "Key cannot be empty";
-
-            return string.IsNullOrWhiteSpace(ValidationErrorMessage);
+            {
+                ValidationErrorMessage = "Key is not provided";
+                return false;
+            }
+            return true;
         }
     }
 }

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Core/Domain/UnifiedConnectionMultiplexerFactory.cs

@@ -9,9 +9,16 @@ public interface IUnifiedConnectionMultiplexerFactory
 
     public class UnifiedConnectionMultiplexerFactory : IUnifiedConnectionMultiplexerFactory
     {
+        private readonly string _managedIdentityClientId;
+
+        public UnifiedConnectionMultiplexerFactory(string managedIdentityClientId = null)
+        {
+            _managedIdentityClientId = managedIdentityClientId;
+        }
+
         public IUnifiedConnectionMultiplexer Create(string clusterName, string applicationName, string appSecret)
         {
-            return UnifiedConnectionMultiplexer.Connect(clusterName, applicationName, appSecret) as IUnifiedConnectionMultiplexer;
+            return UnifiedConnectionMultiplexer.Connect(clusterName, applicationName, appSecret, managedIdentityClientId: _managedIdentityClientId) as IUnifiedConnectionMultiplexer;
         }
     }
 }

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Microsoft.UnifiedRedisPlatform.Manager.sln

@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.UnifiedPlatform.S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.UnifiedPlatform.Service.Common", "..\..\service\Microsoft.UnifiedRedisPlatform.Service\SharedKernel\Common\Microsoft.UnifiedPlatform.Service.Common.csproj", "{0C33A24D-5FE5-4566-9104-0F43E67FA798}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.UnifiedRedisPlatform.Core", "..\..\sdk\Microsoft.UnifiedRedisPlatform.SDK\Core\Microsoft.UnifiedRedisPlatform.Core.csproj", "{C45F1E14-800A-47C6-8E6D-3FB82A3AA743}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.UnifiedRedisPlatform.Core", "..\..\sdk\Core\Microsoft.UnifiedRedisPlatform.Core.csproj", "{C45F1E14-800A-47C6-8E6D-3FB82A3AA743}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.UnifiedPlatform.Storage", "..\..\service\Microsoft.UnifiedRedisPlatform.Service\Infrastructure\Storage\Microsoft.UnifiedPlatform.Storage.csproj", "{57DE9E2F-18B7-41F7-9435-FD9A0A446E05}"
 EndProject

src/manager/Microsoft.UnifiedRedisPlatform.Manager/NuGet.Config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="PS-GCM-FieldExperiencePlatform" value="https://pkgs.dev.azure.com/MicrosoftIT/OneITVSO/_packaging/PS-GCM-FieldExperiencePlatform/nuget/v3/index.json" />
+    <add key="nuget.org-fallback" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <packageRestore>
+    <add key="enabled" value="True" />
+    <add key="automatic" value="True" />
+  </packageRestore>
+  <activePackageSource>
+    <add key="All" value="(Aggregate source)" />
+  </activePackageSource>
+</configuration>

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Web/API/Dependency/DependencyResolver.cs

@@ -247,9 +247,14 @@ protected virtual void RegisterAuthenticators(ContainerBuilder builder)
 
         protected virtual void RegisterRequestHandlerResolver(ContainerBuilder builder)
         {
-            builder.RegisterType<UnifiedConnectionMultiplexerFactory>()
-                .As<IUnifiedConnectionMultiplexerFactory>()
-                .SingleInstance();
+            builder.Register(ctx =>
+            {
+                var config = ctx.Resolve<IConfiguration>();
+                var managedIdentityClientId = config["ManagedIdentityClientId"];
+                return new UnifiedConnectionMultiplexerFactory(managedIdentityClientId);
+            })
+            .As<IUnifiedConnectionMultiplexerFactory>()
+            .SingleInstance();
 
             builder.Register(ctx =>
             {

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Web/API/Microsoft.UnifiedRedisPlatform.Manager.API.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ApplicationInsightsResourceId>/subscriptions/05a315f7-744f-4692-b9dd-1aed7c6cee64/resourcegroups/RG-FieldExperiencePlatform-Dev-01/providers/microsoft.insights/components/aifxpdev</ApplicationInsightsResourceId>
   </PropertyGroup>
 
@@ -10,13 +10,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.32" />
-    <PackageReference Include="Microsoft.FXP.Telemetry.Web.Extension" Version="1.0.0-beta.1" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
+    <PackageReference Include="Microsoft.CQRS" Version="1.1.0" />
+    <PackageReference Include="AppInsights.EnterpriseTelemetry" Version="1.0.2" />
+    <PackageReference Include="AppInsights.EnterpriseTelemetry.AspNetCore.Extension" Version="1.0.3" />
     <PackageReference Include="Microsoft.Graph" Version="3.4.0" />
     <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.4" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.73.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.9.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.9.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Web/API/Program.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Web/API/Properties/launchSettings.json

@@ -1,4 +1,4 @@
-{
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Web/API/Startup.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Autofac;
 using System.IO;
 using System.Reflection;
@@ -71,7 +71,7 @@ protected virtual void AddAuthentication(IServiceCollection services)
 
         protected virtual void AddTelemetry(IServiceCollection services, IConfiguration configuration)
         {
-            services.AddEnterpriseLogger(configuration);
+            services.AddEnterpriseTelemetry(configuration);
             services.AddSingleton<IGlobalExceptionHandler, UnauthorizedUserExceptionHandler>();
             services.AddSingleton<IGlobalExceptionHandler, GenericExceptionHandler>();
         }

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Web/API/appsettings.Development.json

@@ -1,4 +1,4 @@
-{
+{
   "Logging": {
     "LogLevel": {
       "Default": "Information",

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Web/API/appsettings.json

@@ -1,4 +1,4 @@
-{
+{
   "Logging": {
     "LogLevel": {
       "Default": "Information",
@@ -60,5 +60,6 @@
     "ConfigurationTable": "UnifiedRedisPlatform",
     "BackoffInterval": 1000,
     "MaxAttempt": 10
-  }
+  },
+  "ManagedIdentityClientId": "ddcbb4aa-01a9-46aa-8c11-03e1b789d9cd"
 }

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Web/App/Data/WeatherForecast.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Microsoft.UnifiedRedisPlatform.Manager.App.Data
 {

src/manager/Microsoft.UnifiedRedisPlatform.Manager/Web/App/Data/WeatherForecastService.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.Linq;
 using System.Net.Http;