TD-4632 Using of AppRootPath to replace the url of the email invite

Author: sherif-olaboye

DigitalLearningSolutions.Data/Extensions/ConfigurationExtensions.cs

@@ -60,7 +60,6 @@ public static class ConfigurationExtensions
         private const string TableauViewName = "ViewName";
         private const string TableauSiteName = "SiteName";
         private const string TableauAuthApi = "AuthApiPath";
-        private const string EmailInvite = "EmailInvite";
         public static string GetAppRootPath(this IConfiguration config)
         {
             return config[AppRootPathName]!;
@@ -269,9 +268,5 @@ public static string GetTableauViewName(this IConfiguration config)
         {
             return config[$"{TableauSectionKey}:{TableauViewName}"]!;
         }
-        public static string GetEmailInvite(this IConfiguration config)
-        {
-            return config[EmailInvite]!;
-        }
     }
 }

DigitalLearningSolutions.Web/Controllers/SuperAdmin/Centres/CentresController.cs

@@ -138,9 +138,9 @@ public IActionResult Index(
                 var centreEntity = this.centresService.UpdateCentreWithCounts(item);
                 if (centreEntity.Centre.RegisterUser == 0 && centreEntity.Centre.AutoRegisterManagerEmail != null)
                 {
-                    var baseUrl = config.GetEmailInvite();
+                    var baseUrl = config.GetAppRootPath();
                     var supportEmail = this.configService.GetConfigValue("SupportEmail");
-                    baseUrl = baseUrl.Replace("{centreId}", item.Centre.CentreId.ToString());
+                    baseUrl = baseUrl+"/RegisterAdmin?centreId={centreId}".Replace("{centreId}", item.Centre.CentreId.ToString());
                     Email welcomeEmail = this.passwordResetService.GenerateEmailInviteForCentreManager(centreEntity.Centre.CentreName, centreEntity.Centre.AutoRegisterManagerEmail, baseUrl, supportEmail);
                     centreEntity.Centre.EmailInvite = "mailto:" + string.Join(",", welcomeEmail.To) + "?subject=" + welcomeEmail.Subject + "&body=" + welcomeEmail.Body.TextBody.Replace("&", "%26");
                 }

DigitalLearningSolutions.Web/appSettings.UAT.json

@@ -28,6 +28,5 @@
   "FreshdeskAPIConfig": {
     "GroupId": "80000650208",
     "ProductId": "80000003097"
-  },
-  "EmailInvite": "https://www.dls.nhs.uk/dls-uar-uat/RegisterAdmin?centreId={centreId}"
+  }
 }

DigitalLearningSolutions.Web/appsettings.Development.json

@@ -69,6 +69,5 @@
   },
   "LearningHubUserApi": {
     "UserApiUrl": "https://lh-userapi.dev.local/api/"
-  },
-  "EmailInvite": "https://www.dls.nhs.uk/dls-uar-uat/RegisterAdmin?centreId={centreId}"
+  }
 }

DigitalLearningSolutions.Web/appsettings.Production.json

@@ -29,6 +29,5 @@
   "LearningHubReportAPIConfig": {
     "BaseUrl": "https://reportapi.learninghub.nhs.uk",
     "ClientId": "BCDE972F-E007-4DFF-B233-8870474AEEAA"
-  },
-  "EmailInvite": "https://www.dls.nhs.uk/dls-uar-uat/RegisterAdmin?centreId={centreId}"
+  }
 }

DigitalLearningSolutions.Web/appsettings.SIT.json

@@ -40,6 +40,5 @@
     "LinkingEndpoint": "/create-user",
     "ClientCode": "DigitalLearningSolutions",
     "ClientCodeSso": "DigitalLearningSolutionsSso"
-  },
-  "EmailInvite": "https://www.dls.nhs.uk/dls-uar-uat/RegisterAdmin?centreId={centreId}"
+  }
 }

DigitalLearningSolutions.Web/appsettings.Test.json

@@ -23,6 +23,5 @@
     "MaxBulkUploadRows": 200,
     "LoginWithLearningHub": true
   },
-  "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net",
-  "EmailInvite": "https://www.dls.nhs.uk/dls-uar-uat/RegisterAdmin?centreId={centreId}"
+  "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net"
 }

DigitalLearningSolutions.Web/appsettings.UarTest.json

@@ -24,6 +24,5 @@
     "MaxBulkUploadRows": 200,
     "LoginWithLearningHub": true
   },
-  "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net",
-  "EmailInvite": "https://www.dls.nhs.uk/dls-uar-uat/RegisterAdmin?centreId={centreId}"
+  "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net"
 }

DigitalLearningSolutions.Web/appsettings.json

@@ -92,6 +92,5 @@
     "ClientSecretId": "38b99058-a806-4ee2-bf7a-ad1933a81ae5",
     "ClientSecret": ""
   },
-  "UserResearchUrl": "https://forms.office.com/e/nKcK8AdHRX",
-  "EmailInvite": "https://www.dls.nhs.uk/dls-uar-uat/RegisterAdmin?centreId={centreId}"
+  "UserResearchUrl": "https://forms.office.com/e/nKcK8AdHRX"
 }