Merge pull request #482 from DFE-Digital/117187/access-denied-page

117187/access denied page
DFE-Digital · Jan 13, 2023 · f532cb0 · f532cb0
2 parents a5adf16 + d00b601
commit f532cb0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -151,6 +151,7 @@ jobs:
           TF_VAR_app_azuread_groupid: ${{ secrets.AZUREAD_GROUPID }}
           TF_VAR_app_cypresstest_secret : ${{ secrets.CYPRESS_TEST_SECRET }}
           TF_VAR_app_support_email: ${{ secrets.SUPPORT_EMAIL }}
+          TF_VAR_app_accessrequest: ${{ secrets.ACCESSREQUEST }}
           TF_VAR_app_templatefeedback: ${{ secrets.TEMPLATEFEEDBACK }}
 
   create-tag:

diff --git a/.github/workflows/tf-apply.yml b/.github/workflows/tf-apply.yml
@@ -81,6 +81,7 @@ jobs:
           TF_VAR_app_azuread_groupid: ${{ secrets.AZUREAD_GROUPID }}
           TF_VAR_app_cypresstest_secret : ${{ secrets.CYPRESS_TEST_SECRET }}
           TF_VAR_app_support_email: ${{ secrets.SUPPORT_EMAIL }}
+          TF_VAR_app_accessrequest: ${{ secrets.ACCESSREQUEST }}
           TF_VAR_app_templatefeedback: ${{ secrets.TEMPLATEFEEDBACK }}
 
   run_tests:

diff --git a/Frontend/Areas/MicrosoftIdentity/Pages/Account/AccessDenied.cshtml b/Frontend/Areas/MicrosoftIdentity/Pages/Account/AccessDenied.cshtml
@@ -1,10 +1,10 @@
 @page "/access-denied"
+@inject Microsoft.Extensions.Configuration.IConfiguration _configuration
 @model Microsoft.Identity.Web.UI.Areas.MicrosoftIdentity.Pages.Account.AccessDeniedModel
 @{
     Layout = "_Layout";
     ViewData["Title"] = "Access denied";
-    const string serviceDeskRequestLink = "https://dfe.service-now.com/serviceportal?id=sc_cat_item&sys_id=59d68b331bd13050199d6397b04bcb23";
 }
 
 <h1 class="govuk-heading-l">You do not have access to this service</h1>
-<p class="govuk-body">If you think you need access, submit a <a href="@serviceDeskRequestLink" class="govuk-link">Service Portal request</a>.</p>
+<p class="govuk-body">If you think you need access, <a href="@_configuration["AccessRequest"]" class="govuk-link">request access to this service</a>.</p>
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -29,6 +29,7 @@ resource cloudfoundry_app worker_app {
 		"AzureAd__GroupId"         = var.app_azuread_groupid
 		"CypressTestSecret"        = var.app_cypresstest_secret
 		"SupportEmail"             = var.app_support_email
+      "AccessRequest"            = var.app_accessrequest
       "TemplateFeedback"         = var.app_templatefeedback
 	}
 }

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -93,6 +93,11 @@ variable app_support_email {
 	description = "email address for support"
 }
 
+variable app_accessrequest {
+   type = string
+   description = "URL to the form used to request access to the service"
+}
+
 variable app_templatefeedback {
    type = string
    description = "Feedback form URL displayed on download template page"