Skip to content

APIS-7515: Organisation Admins/RI Get Confirmation Email When New Admin/Team Member Is Added or Removed #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kskourtis1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

APIS-7515: Organisation Admins/RI Get Confirmation Email When New Admin/Team Member Is Added or Removed #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/uk/gov/hmrc/hmrcemailrenderer/templates/api/ApiTemplates.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ object ApiTemplates {
templateId = "apiAddedMemberToOrganisationNotification",
fromAddress = extractFromAddress,
service = ApiDeveloperHub,
subject = "User added to your organisation in the HMRC Developer Hub",
subject = "A user has been added to your organisation in the HMRC Developer Hub",
plainTemplate = txt.apiAddedMemberToOrganisationNotification.f,
htmlTemplate = html.apiAddedMemberToOrganisationNotification.f,
priority = Some(MessagePriority.Urgent)
Expand All @@ -276,7 +276,7 @@ object ApiTemplates {
templateId = "apiRemovedMemberFromOrganisationNotification",
fromAddress = extractFromAddress,
service = ApiDeveloperHub,
subject = "User removed from your organisation in the HMRC Developer Hub",
subject = "A user has been removed from your organisation in the HMRC Developer Hub",
plainTemplate = txt.apiRemovedMemberFromOrganisationNotification.f,
htmlTemplate = html.apiRemovedMemberFromOrganisationNotification.f,
priority = Some(MessagePriority.Urgent)
Expand Down
9 changes: 5 additions & 4 deletions .../hmrc/hmrcemailrenderer/templates/api/apiAddedMemberToOrganisationNotification.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
*@

@(params: Map[String, Any])
@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "User added to your organisation in the HMRC Developer Hub") {
<p style="margin: 0 0 30px; font-size: 19px;">This user has been added to the @{params("organisationName")} organisation.</p>
<p style="margin: 0 0 30px; font-size: 19px;">Email address: @{params("emailAddress")}</p>
<p style="margin: 0 0 30px; font-size: 19px;">Role: @{params("role")}</p>
@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "A user has been added to your organisation in the HMRC Developer Hub") {
<p style="margin: 0 0 30px; font-size: 19px;">A user has been added to @{params("organisationName")} organisation.</p>
<h3>Details</h3>
<p style="margin: 0 0 30px; font-size: 19px;"><strong>Email address:</strong> @{params("emailAddress")}</p>
<p style="margin: 0 0 30px; font-size: 19px;"><strong>Role:</strong> @{params("role")}</p>
<p style="margin: 0 0 30px; font-size: 19px;">HMRC Developer Hub</p>
}
6 changes: 4 additions & 2 deletions ...v/hmrc/hmrcemailrenderer/templates/api/apiAddedMemberToOrganisationNotification.scala.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@(params: Map[String, Any])User added to your organisation in the HMRC Developer Hub
@(params: Map[String, Any])A user has been added to your organisation in the HMRC Developer Hub

This user has been added to the @{params("organisationName")} organisation.
A user has been added to @{params("organisationName")} organisation.

Details

Email address: @{params("emailAddress")}

Expand Down
7 changes: 3 additions & 4 deletions ...emailrenderer/templates/api/apiAddedRegisteredMemberToOrganisationConfirmation.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
@(params: Map[String, Any])
@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You've been added to an organisation in the HMRC Developer Hub") {
<p style="margin: 0 0 30px; font-size: 19px;">@{params("organisationName")} has added you to their organisation.</p>
<p style="margin: 0 0 30px; font-size: 19px;">Sign in to the HMRC Developer Hub for access.</p>
<h2>How to get help</h2>
<p style="margin: 0 0 30px; font-size: 19px;">Contact an admin at @{params("organisationName")} if you have questions about your access.</p>
<p style="margin: 0 0 30px; font-size: 19px;">Or create a support request on the Developer Hub if you need help signing in.</p>
<p style="margin: 0 0 30px; font-size: 19px;">Sign in to the HMRC Developer Hub to access your organisation’s applications.</p>
<h2>Get help and support</h2>
<p style="margin: 0 0 30px; font-size: 19px;">Contact an admin at @{params("organisationName")} if you have questions about your access. If you need help signing in, create a support request on the Developer Hub.</p>
<p style="margin: 0 0 30px; font-size: 19px;">HMRC Developer Hub</p>
}
8 changes: 3 additions & 5 deletions ...cemailrenderer/templates/api/apiAddedRegisteredMemberToOrganisationConfirmation.scala.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

@{params("organisationName")} has added you to their organisation.

Sign in to the HMRC Developer Hub for access.
Sign in to the HMRC Developer Hub to access your organisation’s applications.

How to get help
Get help and support

Contact an admin at @{params("organisationName")} if you have questions about your access.

Or create a support request on the Developer Hub if you need help signing in.
Contact an admin at @{params("organisationName")} if you have questions about your access. If you need help signing in, create a support request on the Developer Hub.

HMRC Developer Hub

Expand Down
12 changes: 6 additions & 6 deletions ...ailrenderer/templates/api/apiAddedUnregisteredMemberToOrganisationConfirmation.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
@(params: Map[String, Any])
@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You've been added to an organisation in the HMRC Developer Hub") {
<p style="margin: 0 0 30px; font-size: 19px;">@{params("organisationName")} has added you to their organisation.</p>
<p style="margin: 0 0 30px; font-size: 19px;">Follow these steps to register for a Developer Hub account and access the organisation.</p>
<p style="margin: 0 0 30px; font-size: 19px;">Complete the steps below to register for a Developer Hub account and access your organisation’s applications.</p>
<ol>
<li style="margin: 0 0 30px; font-size: 19px;">Open a browser and search for 'HMRC Developer Hub'.</li>
<li style="margin: 0 0 30px; font-size: 19px;">On the homepage select 'Get an account' to register.</li>
<li style="margin: 0 0 30px; font-size: 19px;">Search online for ‘HMRC Developer Hub’.</li>
<li style="margin: 0 0 30px; font-size: 19px;">Click the <strong>Get an account</strong> button to register for a developer account.</li>
<li style="margin: 0 0 30px; font-size: 19px;">Complete the form and click the <strong>Register</strong> button.</li>
</ol>
<h2>How to get help</h2>
<p style="margin: 0 0 30px; font-size: 19px;">Contact an admin at @{params("organisationName")} if you have questions about your access.</p>
<p style="margin: 0 0 30px; font-size: 19px;">Or create a support request on the Developer Hub if you need help signing in.</p>
<h2>Get help and support</h2>
<p style="margin: 0 0 30px; font-size: 19px;">Contact an admin at @{params("organisationName")} if you have questions about your access. If you need help signing in, create a support request on the Developer Hub.</p>
<p style="margin: 0 0 30px; font-size: 19px;">HMRC Developer Hub</p>
}
12 changes: 6 additions & 6 deletions ...mailrenderer/templates/api/apiAddedUnregisteredMemberToOrganisationConfirmation.scala.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

@{params("organisationName")} has added you to their organisation.

Follow these steps to register for a Developer Hub account and access the organisation.
Complete the steps below to register for a Developer Hub account and access your organisation’s applications.

1. Open a browser and search for 'HMRC Developer Hub'.
1. Search online for ‘HMRC Developer Hub’.

2. On the homepage select 'Get an account' to register.
2. Click the Get an account button to register for a developer account.

How to get help
3. Complete the form and click the Register button.

Contact an admin at @{params("organisationName")} if you have questions about your access.
Get help and support

Or create a support request on the Developer Hub if you need help signing in.
Contact an admin at @{params("organisationName")} if you have questions about your access. If you need help signing in, create a support request on the Developer Hub.

HMRC Developer Hub

Expand Down
6 changes: 3 additions & 3 deletions ...c/hmrcemailrenderer/templates/api/apiRemovedMemberFromOrganisationConfirmation.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
@(params: Map[String, Any])
@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You've been removed from an organisation in the HMRC Developer Hub") {
<p style="margin: 0 0 30px; font-size: 19px;">@{params("organisationName")} has removed you from their organisation.</p>
<p style="margin: 0 0 30px; font-size: 19px;">You no longer have access to their Production applications.</p>
<h2>How to get help</h2>
<p style="margin: 0 0 30px; font-size: 19px;">Contact an admin at @{params("organisationName")} if you have questions about being removed from this organisation.</p>
<p style="margin: 0 0 30px; font-size: 19px;">You no longer have access to the Production applications.</p>
<h2>Get help and support</h2>
<p style="margin: 0 0 30px; font-size: 19px;">Contact an admin at @{params("organisationName")} if you have questions about this change.</p>
<p style="margin: 0 0 30px; font-size: 19px;">HMRC Developer Hub</p>
}
6 changes: 3 additions & 3 deletions ...rc/hmrcemailrenderer/templates/api/apiRemovedMemberFromOrganisationConfirmation.scala.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

@{params("organisationName")} has removed you from their organisation.

You no longer have access to their Production applications.
You no longer have access to the Production applications.

How to get help
Get help and support

Contact an admin at @{params("organisationName")} if you have questions about being removed from this organisation.
Contact an admin at @{params("organisationName")} if you have questions about this change.

HMRC Developer Hub

Expand Down
9 changes: 5 additions & 4 deletions ...c/hmrcemailrenderer/templates/api/apiRemovedMemberFromOrganisationNotification.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
*@

@(params: Map[String, Any])
@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "User removed from your organisation in the HMRC Developer Hub") {
<p style="margin: 0 0 30px; font-size: 19px;">This user has been removed from the @{params("organisationName")} organisation.</p>
<p style="margin: 0 0 30px; font-size: 19px;">Email address: @{params("emailAddress")}</p>
<p style="margin: 0 0 30px; font-size: 19px;">Role: @{params("role")}</p>
@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "A user has been removed from your organisation in the HMRC Developer Hub") {
<p style="margin: 0 0 30px; font-size: 19px;">A user has been removed from @{params("organisationName")} organisation.</p>
<h3>Details</h3>
<p style="margin: 0 0 30px; font-size: 19px;"><strong>Email address:</strong> @{params("emailAddress")}</p>
<p style="margin: 0 0 30px; font-size: 19px;"><strong>Role:</strong> @{params("role")}</p>
<p style="margin: 0 0 30px; font-size: 19px;">They no longer have access to your organisation's Production applications.</p>
<p style="margin: 0 0 30px; font-size: 19px;">HMRC Developer Hub</p>
}
6 changes: 4 additions & 2 deletions ...rc/hmrcemailrenderer/templates/api/apiRemovedMemberFromOrganisationNotification.scala.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
@(params: Map[String, Any])User removed from your organisation in the HMRC Developer Hub
@(params: Map[String, Any])A user has been removed from your organisation in the HMRC Developer Hub

This user has been removed from the @{params("organisationName")} organisation.
A user has been removed from @{params("organisationName")} organisation.

Email address: @{params("emailAddress")}

Details:

Role: @{params("role")}

They no longer have access to your organisation's Production applications.
Expand Down
14 changes: 8 additions & 6 deletions ...v/hmrc/hmrcemailrenderer/templates/api/ApiAddedMemberToOrganisationNotificationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,25 @@ class apiAddedMemberToOrganisationNotificationSpec extends AnyWordSpec with Matc
"render as" in new TestCase {
val renderedHtml = api.html.apiAddedMemberToOrganisationNotification.render(templateParams)
renderedHtml.contentType should include("text/html")
renderedHtml.body should include("User added to your organisation in the HMRC Developer Hub")
renderedHtml.body should include("A user has been added to your organisation in the HMRC Developer Hub")
renderedHtml.body should include(
s"<p style=\"margin: 0 0 30px; font-size: 19px;\">This user has been added to the $organisationName organisation.</p>"
s"<p style=\"margin: 0 0 30px; font-size: 19px;\">A user has been added to $organisationName organisation.</p>"
)
renderedHtml.body should include(
s"<p style=\"margin: 0 0 30px; font-size: 19px;\">Email address: $emailAddress</p>"
s"<p style=\"margin: 0 0 30px; font-size: 19px;\"><strong>Email address:</strong> $emailAddress</p>"
)
renderedHtml.body should include(
s"<p style=\"margin: 0 0 30px; font-size: 19px;\"><strong>Role:</strong> $role</p>"
)
renderedHtml.body should include(s"<p style=\"margin: 0 0 30px; font-size: 19px;\">Role: $role</p>")
}
}

"textView" should {
"render as" in new TestCase {
val renderedTxt = api.txt.apiAddedMemberToOrganisationNotification.render(templateParams)
renderedTxt.contentType should include("text/plain")
renderedTxt.body should include("User added to your organisation in the HMRC Developer Hub")
renderedTxt.body should include(s"This user has been added to the $organisationName organisation.")
renderedTxt.body should include("A user has been added to your organisation in the HMRC Developer Hub")
renderedTxt.body should include(s"A user has been added to $organisationName organisation.")
renderedTxt.body should include(s"Email address: $emailAddress")
renderedTxt.body should include(s"Role: $role")
}
Expand Down
4 changes: 0 additions & 4 deletions ...cemailrenderer/templates/api/ApiAddedRegisteredMemberToOrganisationConfirmationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ class apiAddedRegisteredMemberToOrganisationConfirmationSpec extends AnyWordSpec
renderedHtml.body should include(
s"<p style=\"margin: 0 0 30px; font-size: 19px;\">$organisationName has added you to their organisation.</p>"
)
renderedHtml.body should include(
"<p style=\"margin: 0 0 30px; font-size: 19px;\">Sign in to the HMRC Developer Hub for access.</p>"
)
renderedHtml.body should include("<p style=\"margin: 0 0 30px; font-size: 19px;\">HMRC Developer Hub</p>")
}
}
Expand All @@ -51,7 +48,6 @@ class apiAddedRegisteredMemberToOrganisationConfirmationSpec extends AnyWordSpec
val renderedTxt = api.txt.apiAddedRegisteredMemberToOrganisationConfirmation.render(templateParams)
renderedTxt.contentType should include("text/plain")
renderedTxt.body should include(s"$organisationName has added you to their organisation.")
renderedTxt.body should include("Sign in to the HMRC Developer Hub for access.")
renderedTxt.body should include("HMRC Developer Hub")
}
}
Expand Down
12 changes: 6 additions & 6 deletions ...mailrenderer/templates/api/ApiAddedUnregisteredMemberToOrganisationConfirmationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ class apiAddedUnregisteredMemberToOrganisationConfirmationSpec extends AnyWordSp
s"<p style=\"margin: 0 0 30px; font-size: 19px;\">$organisationName has added you to their organisation.</p>"
)
renderedHtml.body should include(
"<p style=\"margin: 0 0 30px; font-size: 19px;\">Follow these steps to register for a Developer Hub account and access the organisation.</p>"
"<p style=\"margin: 0 0 30px; font-size: 19px;\">Complete the steps below to register for a Developer Hub account and access your organisation’s applications.</p>"
)
renderedHtml.body should include(
s"<li style=\"margin: 0 0 30px; font-size: 19px;\">Open a browser and search for 'HMRC Developer Hub'.</li>"
s"<li style=\"margin: 0 0 30px; font-size: 19px;\">Search online for ‘HMRC Developer Hub’.</li>"
)
renderedHtml.body should include(
s"<li style=\"margin: 0 0 30px; font-size: 19px;\">On the homepage select 'Get an account' to register.</li>"
s"<li style=\"margin: 0 0 30px; font-size: 19px;\">Click the <strong>Get an account</strong> button to register for a developer account.</li>"
)
renderedHtml.body should include("<p style=\"margin: 0 0 30px; font-size: 19px;\">HMRC Developer Hub</p>")
}
Expand All @@ -58,10 +58,10 @@ class apiAddedUnregisteredMemberToOrganisationConfirmationSpec extends AnyWordSp
renderedTxt.contentType should include("text/plain")
renderedTxt.body should include(s"$organisationName has added you to their organisation.")
renderedTxt.body should include(
"Follow these steps to register for a Developer Hub account and access the organisation."
"Complete the steps below to register for a Developer Hub account and access your organisation’s applications."
)
renderedTxt.body should include("1. Open a browser and search for 'HMRC Developer Hub'.")
renderedTxt.body should include("2. On the homepage select 'Get an account' to register.")
renderedTxt.body should include("1. Search online for ‘HMRC Developer Hub’.")
renderedTxt.body should include("2. Click the Get an account button to register for a developer account.")
renderedTxt.body should include("HMRC Developer Hub")
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...rc/hmrcemailrenderer/templates/api/ApiRemovedMemberFromOrganisationConfirmationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ApiRemovedMemberFromOrganisationConfirmationSpec extends AnyWordSpecLike w
s"<p style=\"margin: 0 0 30px; font-size: 19px;\">$organisationName has removed you from their organisation.</p>"
)
renderedHtml.body should include(
"<p style=\"margin: 0 0 30px; font-size: 19px;\">You no longer have access to their Production applications.</p>"
"<p style=\"margin: 0 0 30px; font-size: 19px;\">You no longer have access to the Production applications.</p>"
)
renderedHtml.body should include("<p style=\"margin: 0 0 30px; font-size: 19px;\">HMRC Developer Hub</p>")
}
Expand All @@ -54,7 +54,7 @@ class ApiRemovedMemberFromOrganisationConfirmationSpec extends AnyWordSpecLike w
renderedTxt.contentType should include("text/plain")
renderedTxt.body should include("You've been removed from an organisation in the HMRC Developer Hub")
renderedTxt.body should include(s"$organisationName has removed you from their organisation.")
renderedTxt.body should include("You no longer have access to their Production applications.")
renderedTxt.body should include("You no longer have access to the Production applications.")
renderedTxt.body should include("HMRC Developer Hub")
}
}
Expand Down
14 changes: 8 additions & 6 deletions ...rc/hmrcemailrenderer/templates/api/ApiRemovedMemberFromOrganisationNotificationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,16 @@ class ApiRemovedMemberFromOrganisationNotificationSpec extends AnyWordSpecLike w
"render as" in new TestCase {
val renderedHtml = api.html.apiRemovedMemberFromOrganisationNotification.render(templateParams)
renderedHtml.contentType should include("text/html")
renderedHtml.body should include("User removed from your organisation in the HMRC Developer Hub")
renderedHtml.body should include("A user has been removed from your organisation in the HMRC Developer Hub")
renderedHtml.body should include(
s"<p style=\"margin: 0 0 30px; font-size: 19px;\">This user has been removed from the $organisationName organisation.</p>"
s"<p style=\"margin: 0 0 30px; font-size: 19px;\">A user has been removed from $organisationName organisation.</p>"
)
renderedHtml.body should include(
s"<p style=\"margin: 0 0 30px; font-size: 19px;\">Email address: $emailAddress</p>"
s"<p style=\"margin: 0 0 30px; font-size: 19px;\"><strong>Email address:</strong> $emailAddress</p>"
)
renderedHtml.body should include(
s"<p style=\"margin: 0 0 30px; font-size: 19px;\"><strong>Role:</strong> $role</p>"
)
renderedHtml.body should include(s"<p style=\"margin: 0 0 30px; font-size: 19px;\">Role: $role</p>")
renderedHtml.body should include(
"<p style=\"margin: 0 0 30px; font-size: 19px;\">They no longer have access to your organisation's Production applications.</p>"
)
Expand All @@ -59,8 +61,8 @@ class ApiRemovedMemberFromOrganisationNotificationSpec extends AnyWordSpecLike w
"render as" in new TestCase {
val renderedTxt = api.txt.apiRemovedMemberFromOrganisationNotification.render(templateParams)
renderedTxt.contentType should include("text/plain")
renderedTxt.body should include("User removed from your organisation in the HMRC Developer Hub")
renderedTxt.body should include(s"This user has been removed from the $organisationName organisation.")
renderedTxt.body should include("A user has been removed from your organisation in the HMRC Developer Hub")
renderedTxt.body should include(s"A user has been removed from $organisationName organisation.")
renderedTxt.body should include(s"Email address: $emailAddress")
renderedTxt.body should include(s"Role: $role")
renderedTxt.body should include("They no longer have access to your organisation's Production applications.")
Expand Down
Loading