[ODS-6330] Fix identified CodeQL issues (#1000)

Author: simpat-jesus

Application/EdFi.Ods.SandboxAdmin.Services/EdFi.Ods.SandboxAdmin.Services.csproj

@@ -1,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
-
   <ItemGroup>
 	  <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.0" />
 	  <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
@@ -18,10 +15,9 @@
 	  <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
 	  <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
 	  <PackageReference Include="Npgsql" Version="8.0.2" />
-      <PackageReference Include="Quartz.AspNetCore" Version="3.5.0" />
-      <PackageReference Include="Quartz.Serialization.Json" Version="3.5.0" />	  
+    <PackageReference Include="Quartz.AspNetCore" Version="3.5.0" />
+    <PackageReference Include="Quartz.Serialization.Json" Version="3.5.0" />	  
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\Ed-Fi-ODS\Application\EdFi.Ods.Sandbox\EdFi.Ods.Sandbox.csproj" />
   </ItemGroup>

Application/EdFi.Ods.SandboxAdmin.Services/EmailService.cs

@@ -3,8 +3,6 @@
 // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
 // See the LICENSE and NOTICES files in the project root for more information.
 
-using System;
-using System.IO;
 using System.Net;
 using System.Net.Mail;
 using System.Text;
@@ -31,15 +29,14 @@ public void SendConfirmationEmail(string emailAddress, string secret)
             var messageBuilder = new StringBuilder();
 
             messageBuilder.AppendLine(
-                @"An account has been created for email address '" + emailAddress +
-                "' in Sandbox Admin.");
+                $"An account has been created for email address '{emailAddress}' in Sandbox Admin.");
 
             messageBuilder.AppendLine();
             messageBuilder.AppendLine(@"Please follow this link to set your password:");
             messageBuilder.AppendLine();
             messageBuilder.AppendLine(_routeService.GetRouteForActivation(emailAddress, secret));
 
-            var body = string.Format(messageBuilder.ToString(), secret);
+            var body = messageBuilder.ToString();
 
             var message = new MailMessage
             {
@@ -62,7 +59,7 @@ public void SendForgotPasswordEmail(string emailAddress, string secret)
             messageBuilder.AppendLine(@"In order to reset your password, please follow this link:");
             messageBuilder.AppendLine(_routeService.GetRouteForPasswordReset(emailAddress, secret));
 
-            var body = string.Format(messageBuilder.ToString(), secret);
+            var body = messageBuilder.ToString();
 
             var message = new MailMessage
             {

Application/EdFi.Ods.SandboxAdmin.Services/PostgresTemplateDatabaseLeaQuery.cs

@@ -15,7 +15,13 @@ public class PostgresTemplateDatabaseLeaQuery : TemplateDatabaseLeaQueryBase
         public PostgresTemplateDatabaseLeaQuery(IConfigConnectionStringsProvider configConnectionStringsProvider, IDatabaseNameBuilder databaseNameBuilder)
             : base(configConnectionStringsProvider, databaseNameBuilder) { }
 
-        protected override DbConnection CreateConnection(string templateDatabaseName)
-            => new NpgsqlConnection(string.Format(_connectionStringTemplate, templateDatabaseName));
+        protected override DbConnection CreateConnection(string templateDatabaseName)
+        {
+            var builder = new NpgsqlConnectionStringBuilder(_connectionStringTemplate);
+            var database = (string)builder["database"];
+            builder["database"] = string.Format(database, templateDatabaseName);
+
+            return new NpgsqlConnection(builder.ConnectionString);
+        }
     }
 }

Application/EdFi.Ods.SandboxAdmin.Services/SqlServerTemplateDatabaseLeaQuery.cs

@@ -15,7 +15,13 @@ public class SqlServerTemplateDatabaseLeaQuery : TemplateDatabaseLeaQueryBase
         public SqlServerTemplateDatabaseLeaQuery(IConfigConnectionStringsProvider configConnectionStringsProvider, IDatabaseNameBuilder databaseNameBuilder)
             : base(configConnectionStringsProvider, databaseNameBuilder) { }
 
-        protected override DbConnection CreateConnection(string templateDatabaseName)
-            => new SqlConnection(string.Format(_connectionStringTemplate, templateDatabaseName));
+        protected override DbConnection CreateConnection(string templateDatabaseName)
+        {
+            var builder = new SqlConnectionStringBuilder(_connectionStringTemplate);
+            var database = (string)builder["database"];
+            builder["database"] = string.Format(database, templateDatabaseName);
+
+            return new SqlConnection(builder.ConnectionString);
+        }
     }
 }

Application/EdFi.Ods.SandboxAdmin.Services/UserAccountManager.cs

@@ -6,24 +6,13 @@
 using System.Linq.Expressions;
 using EdFi.Admin.DataAccess.Models;
 using EdFi.Admin.DataAccess.Repositories;
-using EdFi.Ods.SandboxAdmin.Services.Models;
-using EdFi.Ods.SandboxAdmin.Services.Models.Results;
-using log4net;
-using EdFi.Ods.SandboxAdmin.Services.Security;
-using EdFi.Ods.SandboxAdmin.Services.Extensions;
-using EdFi.Ods.SandboxAdmin.Services.Models.Account;
-using System;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-using EdFi.Admin.DataAccess.Models;
-using EdFi.Admin.DataAccess.Repositories;
 using EdFi.Ods.SandboxAdmin.Services.Extensions;
 using EdFi.Ods.SandboxAdmin.Services.Models;
+using EdFi.Ods.SandboxAdmin.Services.Models.Account;
 using EdFi.Ods.SandboxAdmin.Services.Models.Results;
 using EdFi.Ods.SandboxAdmin.Services.Security;
 using log4net;
 
-
 namespace EdFi.Ods.SandboxAdmin.Services
 {
     public class UserAccountManager : IUserAccountManager