From a5a31a135b432d40fe69dca93542ce0580a1a400 Mon Sep 17 00:00:00 2001 From: Michael Collins <15347726+michaeljcollinsuk@users.noreply.github.com> Date: Tue, 9 Apr 2024 15:54:40 +0100 Subject: [PATCH 1/5] Update homepage messaging about authenticating with justice identity --- controlpanel/frontend/jinja2/justice_email.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/controlpanel/frontend/jinja2/justice_email.html b/controlpanel/frontend/jinja2/justice_email.html index 0135fa676..63cf4a2f0 100644 --- a/controlpanel/frontend/jinja2/justice_email.html +++ b/controlpanel/frontend/jinja2/justice_email.html @@ -9,18 +9,22 @@

Authenticate with your Justice identity

-

As part of upcoming work to offer new tools and services, all Analytical Platform will need to authenticate with their Justice identity so that we can store your @justice.gov.uk email address.

-

You will need to complete authentication by 30th April 2024. If you do not currently have a @justice.gov.uk email address, see our guidance on requesting one.

+

We're planning some changes to how you log into the Analytical Platform. We are transitioning from using GitHub to Microsoft 365 (i.e. your @justice.gov.uk email address & password).

+

For now all you need to do is click the button below to authenticate via Microsoft 365. This is a one-time operation which will link your current Analytical Platform account information to your @justice.gov.uk email address. This means you'll keep all your current permissions, and there's nothing extra you need to do.

+

You will then continue to log in to the Control Panel via your GitHub account as usual. You can read further information about these changes in the #analytical-platform-support Slack channel.

+

{{ csrf_input }} - - Skip for now -
+
+

If you don't have a @justice.govuk account don't worry

+

You can request one here. Please raise a request for an account as soon as you can. It can take a week or more to get fully set up with the correct access.

+

Click here to access the Control Panel while you wait for your account. +

From b6723c592f4dc91e6ccbdb5240455474a9d7f07f Mon Sep 17 00:00:00 2001 From: Michael Collins <15347726+michaeljcollinsuk@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:18:44 +0100 Subject: [PATCH 2/5] Add additional email domains --- controlpanel/frontend/jinja2/justice_email.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controlpanel/frontend/jinja2/justice_email.html b/controlpanel/frontend/jinja2/justice_email.html index 63cf4a2f0..cc72398c0 100644 --- a/controlpanel/frontend/jinja2/justice_email.html +++ b/controlpanel/frontend/jinja2/justice_email.html @@ -9,9 +9,9 @@

Authenticate with your Justice identity

-

We're planning some changes to how you log into the Analytical Platform. We are transitioning from using GitHub to Microsoft 365 (i.e. your @justice.gov.uk email address & password).

-

For now all you need to do is click the button below to authenticate via Microsoft 365. This is a one-time operation which will link your current Analytical Platform account information to your @justice.gov.uk email address. This means you'll keep all your current permissions, and there's nothing extra you need to do.

-

You will then continue to log in to the Control Panel via your GitHub account as usual. You can read further information about these changes in the #analytical-platform-support Slack channel.

+

We're planning some changes to how you log into the Analytical Platform. We are transitioning from using GitHub to your Microsoft email (@justice.gov.uk, @publicguardian.gov.uk, etc).

+

For now all you need to do is click the button below to authenticate via Microsoft 365. This is a one-time operation which will link your current Analytical Platform account information to your Microsoft email address. This means you'll keep all your current permissions, and there's nothing extra you need to do.

+

You will continue to log in to the Control Panel via your GitHub account as usual for now. You can read further information about these changes in the #analytical-platform-support Slack channel.

From de6cf49c5851506f7a740dd165a1f24f3cb347ee Mon Sep 17 00:00:00 2001 From: Michael Collins <15347726+michaeljcollinsuk@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:24:04 +0100 Subject: [PATCH 3/5] Update the help section --- controlpanel/frontend/jinja2/justice_email.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/controlpanel/frontend/jinja2/justice_email.html b/controlpanel/frontend/jinja2/justice_email.html index cc72398c0..8a328a2c5 100644 --- a/controlpanel/frontend/jinja2/justice_email.html +++ b/controlpanel/frontend/jinja2/justice_email.html @@ -21,10 +21,11 @@

Authenticate with your Justice identity

-

If you don't have a @justice.govuk account don't worry

+

If you don't have a Microsoft 365 account

You can request one here. Please raise a request for an account as soon as you can. It can take a week or more to get fully set up with the correct access.

-

Click here to access the Control Panel while you wait for your account. -

+

Click here to access the Control Panel while you wait for your account.

+
+

If you have any questions or need assistance, please reach out to us on #analytical-platform-github-identity-migration Slack channel.

From 265498941e040392d945f9c5ace200415088585f Mon Sep 17 00:00:00 2001 From: Michael Collins <15347726+michaeljcollinsuk@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:39:01 +0100 Subject: [PATCH 4/5] Add justice_email to admin panel, and add filter in order to count number of users that have completed --- controlpanel/api/admin.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/controlpanel/api/admin.py b/controlpanel/api/admin.py index 22d6bcf05..bb13b4a2a 100644 --- a/controlpanel/api/admin.py +++ b/controlpanel/api/admin.py @@ -34,13 +34,17 @@ class UserAdmin(admin.ModelAdmin): "username", "auth0_id", "email", + "justice_email", "is_superuser", "migration_state", "last_login", ) actions = [make_migration_pending] exclude = ("password",) - list_filter = ("migration_state",) + list_filter = [ + "migration_state", + ("justice_email", admin.EmptyFieldListFilter), + ] search_fields = ( "username", "email", From d93250f1b9ca3ec49ed84565cf6eccc21f501861 Mon Sep 17 00:00:00 2001 From: Michael Collins <15347726+michaeljcollinsuk@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:59:13 +0100 Subject: [PATCH 5/5] Remove usage --- controlpanel/frontend/jinja2/justice_email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controlpanel/frontend/jinja2/justice_email.html b/controlpanel/frontend/jinja2/justice_email.html index 8a328a2c5..8e4ccc086 100644 --- a/controlpanel/frontend/jinja2/justice_email.html +++ b/controlpanel/frontend/jinja2/justice_email.html @@ -9,7 +9,7 @@

Authenticate with your Justice identity

-

We're planning some changes to how you log into the Analytical Platform. We are transitioning from using GitHub to your Microsoft email (@justice.gov.uk, @publicguardian.gov.uk, etc).

+

We're planning some changes to how you log into the Analytical Platform. We are transitioning from using GitHub to your Microsoft email (@justice.gov.uk, @publicguardian.gov.uk, etc).

For now all you need to do is click the button below to authenticate via Microsoft 365. This is a one-time operation which will link your current Analytical Platform account information to your Microsoft email address. This means you'll keep all your current permissions, and there's nothing extra you need to do.

You will continue to log in to the Control Panel via your GitHub account as usual for now. You can read further information about these changes in the #analytical-platform-support Slack channel.