Merge pull request #28 from devdanielsun/developer

Update Database connection string
devdanielsun · Jan 10, 2024 · 097d622 · 097d622
2 parents aa97016 + f2e00bd
commit 097d622
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/pollor.Server/.env.example b/pollor.Server/.env.example
@@ -3,5 +3,4 @@ DB_SERVER=localhost\MSSQLSERVERx
 DB_NAME=name
 DB_UID=
 DB_PASSWORD=
-DB_INTEGRATEDSECURITY=True
-DB_TRUSTSERVERCERT=True
+ASPNETCORE_ENVIRONMENT=Development
diff --git a/pollor.Server/Services/DBConnection.cs b/pollor.Server/Services/DBConnection.cs
@@ -1,4 +1,5 @@
 using Dapper;
+using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.Data.SqlClient;
 using static Dapper.SqlMapper;
 
@@ -15,11 +16,14 @@ private DBConnection()
             string dbName = Environment.GetEnvironmentVariable("DB_NAME")!;
             string dbUID = Environment.GetEnvironmentVariable("DB_UID")!;
             string dbPassword = Environment.GetEnvironmentVariable("DB_PASSWORD")!;
-            string dbIntegratedSecurity = Environment.GetEnvironmentVariable("DB_INTEGRATEDSECURITY")!;
-            string dbTrustServerCertificate = Environment.GetEnvironmentVariable("DB_TRUSTSERVERCERT")!;
 
-            //connectionString = string.Format("Server={0};Initial Catalog={1};Integrated Security={2};TrustServerCertificate={3}", dbServer, dbName, dbIntegratedSecurity, dbTrustServerCertificate);
-            connectionString = string.Format("Server={0};Database={1};UID={2};PWD={3};Integrated Security={4};TrustServerCertificate={5}", dbServer, dbName, dbUID, dbPassword, dbIntegratedSecurity, dbTrustServerCertificate);
+            bool isDevelopment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == "Development";
+            if (isDevelopment) {
+                connectionString = string.Format("Server={0};Initial Catalog={1};Integrated Security={2};TrustServerCertificate={3}", dbServer, dbName, true, true);
+            } else { // Production
+                connectionString = string.Format("Server={0};Initial Catalog={1};User ID={2};Password={3};Persist Security Info={4};TrustServerCertificate={5};MultipleActiveResultSets={6};Encrypt={7};Connection Timeout={8}",
+                    dbServer, dbName, dbUID, dbPassword, false, false, false, true, 30);
+            }
         }
 
         public static DBConnection Instance()