Merge pull request #507 from bcgov/1.0.5

bcgov-brwang · web-flow · commit 5f6ab937bef7 · 2023-05-18T12:05:25.000-07:00
Add date to timestamp for logging
diff --git a/.pipeline/lib/deploy.js b/.pipeline/lib/deploy.js
@@ -3,7 +3,6 @@ const { OpenShiftClientX } = require("@bcgov/pipeline-cli");
 const path = require("path");
 
 const util = require("./utils");
-const KeyCloakClient = require("./keycloak");
 
 module.exports = (settings) => {
   const phases = settings.phases;
@@ -17,15 +16,12 @@ module.exports = (settings) => {
     path.resolve(__dirname, "../../openshift")
   );
   var objects = [];
-  const kc = new KeyCloakClient(settings, oc);
   const logDbSecret = util.getSecret(
     oc,
     phases[phase].namespace,
     `${phases[phase].name}-logdb${phases[phase].suffix}`
   );
 
-  kc.addUris();
-
   // The deployment of your cool app goes here ▼▼▼
   objects.push(
     ...oc.processDeploymentTemplate(
diff --git a/api/Crt.Api/Middlewares/ReverseProxyMiddleware.cs b/api/Crt.Api/Middlewares/ReverseProxyMiddleware.cs
@@ -6,17 +6,21 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 
 namespace Crt.Api.Middlewares
 {
     public class ReverseProxyMiddleware
     {
         private HttpClient _httpClient;
         private readonly RequestDelegate _nextMiddleware;
+        private readonly ILogger _logger;
 
-        public ReverseProxyMiddleware(RequestDelegate nextMiddleware)
+        public ReverseProxyMiddleware(RequestDelegate nextMiddleware, ILogger<ReverseProxyMiddleware> logger)
         {
             _nextMiddleware = nextMiddleware;
+            _logger = logger;
+
         }
 
         public async Task Invoke(HttpContext context, IGeoServerApi geoServerApi)
@@ -27,7 +31,7 @@ public async Task Invoke(HttpContext context, IGeoServerApi geoServerApi)
 
             if (targetUri != null)
             {
-                Console.WriteLine($"Proxy - {targetUri}");
+                _logger.LogInformation($"Proxy - {targetUri}");
 
                 var targetRequestMessage = CreateTargetMessage(context, targetUri);
 
diff --git a/api/Crt.Api/appsettings.json b/api/Crt.Api/appsettings.json
@@ -1,7 +1,7 @@
 {
   "AllowedHosts": "*",
   "Constants": {
-    "Version": "1.0.4.0",
+    "Version": "1.0.5.0",
     "SwaggerApiUrl": "/swagger/v1/swagger.json"
   },
   "Serilog": {
@@ -16,7 +16,14 @@
       {
         "Name": "Async",
         "Args": {
-          "configure": [ { "Name": "Console" } ]
+          "configure": [
+            {
+              "Name": "Console",
+              "Args": {
+                "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+              }
+            }
+          ]
         }
       }
     ],
diff --git a/api/Crt.Data/Database/Entities/AppDbContextPartial.cs b/api/Crt.Data/Database/Entities/AppDbContextPartial.cs
@@ -2,6 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,12 +21,14 @@ public partial class AppDbContext
 
         public readonly CrtCurrentUser _currentUser;
         private readonly IConfiguration _config;
+        private readonly ILogger<AppDbContext> _logger;
 
-        public AppDbContext(DbContextOptions<AppDbContext> options, CrtCurrentUser currentUser, IConfiguration config)
+        public AppDbContext(DbContextOptions<AppDbContext> options, CrtCurrentUser currentUser, IConfiguration config, ILogger<AppDbContext> logger)
             : base(options)
         {
             _currentUser = currentUser;
             _config = config;
+            _logger = logger;
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -47,7 +50,8 @@ public override int SaveChanges()
             }
             catch (Exception e)
             {
-                Console.WriteLine(e);
+                string exceptionMessage = e.ToString();
+                _logger.LogError($"AppDbContext exception: {exceptionMessage}");
                 throw;
             }
 
diff --git a/api/Crt.Hangfire/appsettings.json b/api/Crt.Hangfire/appsettings.json
@@ -16,11 +16,21 @@
       {
         "Name": "Async",
         "Args": {
-          "configure": [{ "Name": "Console" }]
+          "configure": [
+            {
+              "Name": "Console",
+              "Args": {
+                "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+              }
+            }
+          ]
         }
       }
     ],
-    "Enrich": ["FromLogContext", "WithMachineName"]
+    "Enrich": [
+      "FromLogContext",
+      "WithMachineName"
+    ]
   },
   "ConnectionStrings": {
     "CRT": "Server=(localdb)\\mssqllocaldb;Database=CMR_DEV;Trusted_Connection=True;MultipleActiveResultSets=true"
@@ -30,8 +40,8 @@
     "WorkerCount": 1
   },
   "JWT": {
-    "Authority": "https://dev.oidc.gov.bc.ca/auth/realms/kmas316h",
-    "Audience": "moti-idir-dev"
+    "Authority": "https://dev.loginproxy.gov.bc.ca/auth/realms/moti-custom",
+    "Audience": "account"
   },
   "ServiceAccount": {
     "User": "<ServiceAccount:User>",
@@ -43,4 +53,4 @@
     "ServiceClientId": "<service-client-id>",
     "ServiceClientSecret": "<service-client-secret>"
   }
-}
+}
diff --git a/api/Crt.HttpClients/HttpClientsServiceCollectionExtensions.cs b/api/Crt.HttpClients/HttpClientsServiceCollectionExtensions.cs
@@ -46,7 +46,6 @@ private static TimeSpan GetTimeout(IConfiguration config, string section)
             var seconds = config.GetValue<int>(section);
             if (seconds <= 0)
             {
-                Console.WriteLine($"Config - Invalid {section} value: {seconds}");
                 seconds = 90;
             }
 
diff --git a/client/.env.development b/client/.env.development
@@ -1,8 +1,8 @@
 BROWSER=none
 REACT_APP_API_HOST=http://localhost:27238
-REACT_APP_SSO_CLIENT=moti-idir-dev
-REACT_APP_SSO_REALM=kmas316h
-REACT_APP_SSO_HOST=https://dev.oidc.gov.bc.ca/auth
+REACT_APP_SSO_CLIENT=crt-ui
+REACT_APP_SSO_REALM=moti-custom
+REACT_APP_SSO_HOST=https://dev.loginproxy.gov.bc.ca/auth
 REACT_APP_DEFAULT_PAGE_SIZE_OPTIONS=2,4,16,200
 REACT_APP_DEFAULT_PAGE_SIZE=15
 REACT_APP_DWPBI_URL=https://dev-dwpbi.th.gov.bc.ca/reports/browse/CRT
diff --git a/openshift/configmaps/api-appsettings.yaml b/openshift/configmaps/api-appsettings.yaml
@@ -25,7 +25,12 @@ objects:
                     "Name": "Async",
                     "Args": {
                         "configure": [
-                            { "Name": "Console" }
+                            { 
+                              "Name": "Console",
+                              "Args": {
+                                "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+                              } 
+                            }
                         ]
                     }
                 },
@@ -51,7 +56,7 @@ objects:
               "WorkerCount": 1
           },
           "JWT": {
-              "Authority": "https://dev.oidc.gov.bc.ca/auth/realms/<realmid>",
+              "Authority": "https://dev.loginproxy.gov.bc.ca/auth/realms/<realmid>",
               "Audience": "<app-id>"
           },
           "ServiceAccount": {

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,21 @@`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Net.Http;`
`8`	`8`	`using System.Threading.Tasks;`
	`9`	`+using Microsoft.Extensions.Logging;`
`9`	`10`
`10`	`11`	`namespace Crt.Api.Middlewares`
`11`	`12`	`{`
`12`	`13`	`public class ReverseProxyMiddleware`
`13`	`14`	`{`
`14`	`15`	`private HttpClient _httpClient;`
`15`	`16`	`private readonly RequestDelegate _nextMiddleware;`
	`17`	`+ private readonly ILogger _logger;`
`16`	`18`
`17`		`- public ReverseProxyMiddleware(RequestDelegate nextMiddleware)`
	`19`	`+ public ReverseProxyMiddleware(RequestDelegate nextMiddleware, ILogger<ReverseProxyMiddleware> logger)`
`18`	`20`	`{`
`19`	`21`	`_nextMiddleware = nextMiddleware;`
	`22`	`+ _logger = logger;`
	`23`	`+`
`20`	`24`	`}`
`21`	`25`
`22`	`26`	`public async Task Invoke(HttpContext context, IGeoServerApi geoServerApi)`
`@@ -27,7 +31,7 @@ public async Task Invoke(HttpContext context, IGeoServerApi geoServerApi)`
`27`	`31`
`28`	`32`	`if (targetUri != null)`
`29`	`33`	`{`
`30`		`- Console.WriteLine($"Proxy - {targetUri}");`
	`34`	`+ _logger.LogInformation($"Proxy - {targetUri}");`
`31`	`35`
`32`	`36`	`var targetRequestMessage = CreateTargetMessage(context, targetUri);`
`33`	`37`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"AllowedHosts": "*",`
`3`	`3`	`"Constants": {`
`4`		`- "Version": "1.0.4.0",`
	`4`	`+ "Version": "1.0.5.0",`
`5`	`5`	`"SwaggerApiUrl": "/swagger/v1/swagger.json"`
`6`	`6`	`},`
`7`	`7`	`"Serilog": {`
`@@ -16,7 +16,14 @@`
`16`	`16`	`{`
`17`	`17`	`"Name": "Async",`
`18`	`18`	`"Args": {`
`19`		`- "configure": [ { "Name": "Console" } ]`
	`19`	`+ "configure": [`
	`20`	`+ {`
	`21`	`+ "Name": "Console",`
	`22`	`+ "Args": {`
	`23`	`+ "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"`
	`24`	`+ }`
	`25`	`+ }`
	`26`	`+ ]`
`20`	`27`	`}`
`21`	`28`	`}`
`22`	`29`	`],`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Microsoft.EntityFrameworkCore;`
`3`	`3`	`using Microsoft.EntityFrameworkCore.ChangeTracking;`
`4`	`4`	`using Microsoft.Extensions.Configuration;`
	`5`	`+using Microsoft.Extensions.Logging;`
`5`	`6`	`using System;`
`6`	`7`	`using System.Collections.Generic;`
`7`	`8`	`using System.Linq;`
`@@ -20,12 +21,14 @@ public partial class AppDbContext`
`20`	`21`
`21`	`22`	`public readonly CrtCurrentUser _currentUser;`
`22`	`23`	`private readonly IConfiguration _config;`
	`24`	`+ private readonly ILogger<AppDbContext> _logger;`
`23`	`25`
`24`		`- public AppDbContext(DbContextOptions<AppDbContext> options, CrtCurrentUser currentUser, IConfiguration config)`
	`26`	`+ public AppDbContext(DbContextOptions<AppDbContext> options, CrtCurrentUser currentUser, IConfiguration config, ILogger<AppDbContext> logger)`
`25`	`27`	`: base(options)`
`26`	`28`	`{`
`27`	`29`	`_currentUser = currentUser;`
`28`	`30`	`_config = config;`
	`31`	`+ _logger = logger;`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`@@ -47,7 +50,8 @@ public override int SaveChanges()`
`47`	`50`	`}`
`48`	`51`	`catch (Exception e)`
`49`	`52`	`{`
`50`		`- Console.WriteLine(e);`
	`53`	`+ string exceptionMessage = e.ToString();`
	`54`	`+ _logger.LogError($"AppDbContext exception: {exceptionMessage}");`
`51`	`55`	`throw;`
`52`	`56`	`}`
`53`	`57`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ private static TimeSpan GetTimeout(IConfiguration config, string section)`
`46`	`46`	`var seconds = config.GetValue<int>(section);`
`47`	`47`	`if (seconds <= 0)`
`48`	`48`	`{`
`49`		`- Console.WriteLine($"Config - Invalid {section} value: {seconds}");`
`50`	`49`	`seconds = 90;`
`51`	`50`	`}`
`52`	`51`