Update Skill template

Author: VictorGrycuk

templates/csharp/Skill/Skill/Services/BotServices.cs

@@ -36,7 +36,7 @@ public BotServices(BotSettings settings, IBotTelemetryClient client)
  luisOptions = new LuisRecognizerOptionsV3(dispatchApp)
  {
  TelemetryClient = telemetryClient,
- LogPersonalInformation = true,
+ LogPersonalInformation = settings.LogPersonalData,
  };
  set.DispatchService = new LuisRecognizer(luisOptions);
  }
@@ -49,7 +49,7 @@ public BotServices(BotSettings settings, IBotTelemetryClient client)
  luisOptions = new LuisRecognizerOptionsV3(luisApp)
  {
  TelemetryClient = telemetryClient,
- LogPersonalInformation = true,
+ LogPersonalInformation = settings.LogPersonalData,
  };
  set.LuisServices.Add(model.Id, new LuisRecognizer(luisOptions));
  }

templates/csharp/Skill/Skill/Services/BotSettings.cs

@@ -7,5 +7,6 @@ namespace $safeprojectname$.Services
 {
  public class BotSettings : BotSettingsBase
  {
+ public bool LogPersonalData { get; set; }
  }
 }

templates/csharp/Skill/Skill/SkillProjectTemplate.vstemplate

@@ -31,9 +31,6 @@
  <Folder Name="Adapters" TargetFolderName="Adapters">
  <ProjectItem ReplaceParameters="true" TargetFileName="DefaultAdapter.cs">DefaultAdapter.cs</ProjectItem>
  </Folder>
- <Folder Name="Authentication" TargetFolderName="Authentication">
- <ProjectItem ReplaceParameters="true" TargetFileName="AllowedCallersClaimsValidator.cs">AllowedCallersClaimsValidator.cs</ProjectItem>
- </Folder>
  <Folder Name="Bots" TargetFolderName="Bots">
  <ProjectItem ReplaceParameters="true" TargetFileName="DefaultActivityHandler.cs">DefaultActivityHandler.cs</ProjectItem>
  </Folder>

templates/csharp/Skill/Skill/Startup.cs

@@ -62,7 +62,10 @@ public void ConfigureServices(IServiceCollection services)
  });
 
  // Load settings
- var settings = new BotSettings();
+ var settings = new BotSettings()
+ {
+ LogPersonalData = Configuration.GetSection("logPersonalInfo")?.Value.ToLower() == "true"
+ };
  Configuration.Bind(settings);
  services.AddSingleton(settings);
  services.AddSingleton<BotSettingsBase>(settings);
@@ -85,8 +88,14 @@ public void ConfigureServices(IServiceCollection services)
  services.AddSingleton<ITelemetryInitializer, OperationCorrelationTelemetryInitializer>();
  services.AddSingleton<ITelemetryInitializer, TelemetryBotIdInitializer>();
  services.AddSingleton<TelemetryInitializerMiddleware>();
- services.AddSingleton<TelemetryLoggerMiddleware>();
-
+ if (settings.LogPersonalData)
+ {
+ services.AddSingleton<TelemetryLoggerMiddleware>(s => new TelemetryLoggerMiddleware(s.GetService<IBotTelemetryClient>(), true));
+ }
+ else
+ {
+ services.AddSingleton<TelemetryLoggerMiddleware>();
+ }
  // Configure bot services
  services.AddSingleton<BotServices>();
 

templates/csharp/Skill/Skill/appsettings.json

@@ -17,5 +17,6 @@
  "containerId": "botstate-collection",
  "databaseId": "botstate-db"
  },
- "properties": {}
+ "properties": {},
+ "logPersonalInfo": true
 }