Commit Graph

7898 Commits

Author SHA1 Message Date
Chris Hill-Scott
a6c2b5a99c Merge pull request #3000 from alphagov/gaap-rip
Update blog link in light of ‘Government as a Platform’ being retired
2019-06-04 13:03:29 +01:00
Chris Hill-Scott
99f917896a Update blog link in light of ‘Government as a Platform’ being retired
> we will be closing this blog and putting all future Government as a Platform (GaaP) news on the GDS blog.

– https://governmentasaplatform.blog.gov.uk/2019/04/18/this-blog-is-now-closed/
2019-06-04 11:35:14 +01:00
Chris Hill-Scott
efb5b16948 Merge pull request #2997 from alphagov/org-settings-platform-admin-only
Make organisation settings platform admin only
2019-06-04 11:25:56 +01:00
Chris Hill-Scott
5e9f70c62c Merge pull request #2999 from alphagov/bump-utils
Bump utils to 32.0.1
2019-06-04 09:39:54 +01:00
Katie Smith
53fb9197e3 Bump utils to 32.0.1
This updates requirements and brings in the change to preserve trailing semicolons
on URLs.
2019-06-03 16:14:46 +01:00
Chris Hill-Scott
6d03bfee96 Merge pull request #2992 from alphagov/extend-whitelist-to-organisations
Look in organisation for whitelisted domains
2019-06-03 14:16:47 +01:00
Chris Hill-Scott
ee5212941c Add back links to organisation settings pages
They’re nice.
2019-06-03 14:12:12 +01:00
Chris Hill-Scott
6fc1635266 Rename some of the settings
This reflects the language we use for these things when talking about
them amongst ourselves.
2019-06-03 14:12:12 +01:00
Chris Hill-Scott
80e6c1654b Make organisation settings one table
There’s no longer a difference between regular settings and platform
admin settings – it’s all platform admin.
2019-06-03 14:12:12 +01:00
Chris Hill-Scott
3b22216a68 Remove redundant decorators
`@user_has_permissions` is overridden by @user_is_platform_admin – it
doesn’t make sense to have them used together.
2019-06-03 14:12:12 +01:00
Chris Hill-Scott
647daa6ca4 Make organisation settings platform admin only
At the moment the only setting that a normal organisation team member
can change is the name of the organisation is its name. And we don’t
even want them to be able to change this. So this commit hides the
settings page entirely for non-platform-admin users.
2019-06-03 14:12:11 +01:00
Chris Hill-Scott
34f0c83690 Don’t bother with YAML syntax
Since this file doesn’t have any complicated data types, plain text with
one line per domain is fine.
2019-06-03 13:21:29 +01:00
Chris Hill-Scott
d9f885344c Remove domains that belong to an organisation
If a domain is already in our organisation list then we no longer need
to manually update it here. As part of this process I went and
proactively added some organisations, so I could remove more of them
from this file. I only did this where I could clearly determine from the
domain or a suppot ticket what the organisation was.
2019-06-03 13:21:29 +01:00
Chris Hill-Scott
5e76dbb6a7 Cache known domains in Redis
The domains lookup is a bit slow because it’s serialising all the
organisations in the database. Since we’re putting this in the sign up
flow it should feel snappy, so lets cache just the domain bit of it in
Redis.
2019-06-03 11:41:14 +01:00
Chris Hill-Scott
8835486d4e Look in organisation for whitelisted domains
At the moment we have to update a YAML file and deploy the change to get
a new domain whitelisted.

We already have a thing for adding new domains – the organisation stuff.

This commit extends the validation to look in the `domains` table on the
API if it can’t find anything in the YAML whitelist.

This has the advantage of:
- not having to deploy code to whitelist a new domain
- forcing us to create new organisations as they come along, so that
  users’ services automatically get allocated to the organisation once
  their domain is whitelisted
2019-06-03 11:41:13 +01:00
Pea (Malgorzata Tyczynska)
c55c2a2f56 Merge pull request #2993 from alphagov/fix_test_send_placeholders
Fix error where sending test message flow skipped first placeholder
2019-05-30 15:57:13 +01:00
Pea Tyczynska
bafa4e345b Change assertion for consistency 2019-05-30 15:45:17 +01:00
Chris Hill-Scott
3deff78a75 Merge pull request #2988 from alphagov/loading-spacing
Remove spacing tweak on loading indicator
2019-05-30 13:54:32 +01:00
Leo Hemsted
3a1282d03f Merge pull request #2987 from alphagov/org-trial-services
move trial mode services from org dashboard to separate page
2019-05-30 11:19:17 +01:00
Pea Tyczynska
8286e86a9e Harmonise behaviour of Change reply-to email address
So it acts the same on inital edit and after verification failed.
And also so it does not allow to untick default address in the
latter situation.
2019-05-29 17:02:57 +01:00
Pea Tyczynska
4905be510f Update tests so they work with the fix 2019-05-29 16:56:55 +01:00
Pea Tyczynska
21ab8638b9 Fix error where sending test message flow skipped first placeholder
first way round and then collected placeholders again. Now the flow
collects all placeholders in one round.

Also fix the back link for step-1 for test flow so it goes back
to choosing recipient number

Also move operators around following flake8's advice :)
2019-05-29 16:56:55 +01:00
Pea (Malgorzata Tyczynska)
378fec281a Merge pull request #2974 from alphagov/check_reply_to_address
Verify email reply-to address
2019-05-29 10:36:18 +01:00
Pea (Malgorzata Tyczynska)
a0c21baca9 Apply suggestions from code review
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-05-28 17:20:30 +01:00
Leo Hemsted
4375c3d151 move to model based code layout 2019-05-28 16:46:12 +01:00
Leo Hemsted
9795f2b838 move trial mode services from org dashboard to separate page
the new page is platform admin only, and also has search built in
also, split test_organisation_invites into two files
2019-05-28 16:17:29 +01:00
Chris Hill-Scott
a65450b118 Merge pull request #2990 from alphagov/fidejoseph-patch-1
Update email_domains.yml
2019-05-28 15:37:17 +01:00
fidejoseph
39271d9e6a Update email_domains.yml
Adding Scottish Qualifications Authority
2019-05-28 10:31:30 +01:00
Pea Tyczynska
4fd9e91993 Do not verify email when updated email address did not change 2019-05-24 11:22:20 +01:00
Pea Tyczynska
934bcb919f Reduce timeout to 45 seconds following analysis by Chris H-S:
"Failure is slower than success. So the longer a notification
takes to get a status, the more likely it is for that status
to be a failure anyway. This increases dramatically after 45 seconds.
The percentage of emails that go to delivered in less than 90 seconds
is 98.92%. To get to 99% we’d need to increase the timeout
to 178 seconds (3 minutes). We could still get 98.7% of notifications
by dropping the timeout to 45 seconds, and improve the experience
for notifications that are likely to fail by returning an error more quickly."
2019-05-23 15:34:25 +01:00
Pea (Malgorzata Tyczynska)
44ddd287b5 Code refactor, details below:
Apply suggestions from code review

Reduce max verification waiting time to 90 seconds

Also minor changes following peer review

Co-Authored-By: Chris Hill-Scott <me@quis.cc>

Use constants for notification status collections on verify reply-to

email address

Use a cleaner way of adding request arguments to url_for()
2019-05-23 15:34:25 +01:00
Pea Tyczynska
200fff6c66 Different back links and form actions on verify page depending if add or change 2019-05-23 15:34:25 +01:00
Pea Tyczynska
e406be3f80 Ensure that when updating reply-to email address old address is replaced
Also fix tests
2019-05-23 15:34:25 +01:00
Pea Tyczynska
6cf9959058 Stop AJAX when success or failure and show form on failure
AJAX requests stop on success or failure, as the waiting page
does not have to referesh any longer.

Also on failure a form that allows user to try again
is shown.
2019-05-23 15:34:25 +01:00
Pea Tyczynska
06ab7a5b1f Add continue button to success page and edit back link destination 2019-05-23 15:34:24 +01:00
Pea Tyczynska
3251fc4e00 Change content for email reply-to verification journey
Earlier commits used placeholder content while awaiting official
content.
2019-05-23 15:34:24 +01:00
Pea Tyczynska
441c1f441b Verify email address when editing reply-to address
Also fix the tests
2019-05-23 15:34:24 +01:00
Pea Tyczynska
431d2162c0 Fail reply-to email verification if no delivery within 5 minutes 2019-05-23 15:34:24 +01:00
Pea Tyczynska
ea314ad75f Deal with duplicate reply-to email addresses 2019-05-23 15:34:24 +01:00
Pea Tyczynska
8f3b560a4e Use ajax to auto-refresh reply-to email verifiaction page 2019-05-23 15:34:24 +01:00
Pea Tyczynska
9d2b60b56b Show try again link when email verification fails 2019-05-23 15:34:24 +01:00
Pea Tyczynska
ed599f0c03 Save new reply-to email if test notification delivered
Also check if it should be a default reply-to email address
2019-05-23 15:34:24 +01:00
Pea Tyczynska
45ac0d7812 Waiting page shows correct messages 2019-05-23 15:34:23 +01:00
Pea Tyczynska
d70afddf51 Send request to api to check if reply-to address is working 2019-05-23 15:34:23 +01:00
Chris Hill-Scott
3137c5acf6 Remove spacing tweak on loading indicator
It’s not needed when there’s no whitespace around the text.
2019-05-23 11:34:34 +01:00
Chris Hill-Scott
238c56faec Merge pull request #2984 from alphagov/fix-double-heading-letter-branding
Fix duplicated H1 on ‘New letter branding’ page
2019-05-23 10:36:08 +01:00
Chris Hill-Scott
741114a9fd Merge pull request #2986 from alphagov/fidejoseph-patch-1
Update email_domains.yml
2019-05-22 16:07:32 +01:00
fidejoseph
efbb700cc2 Update email_domains.yml
Adding suttonmail.org (domain provided by London Grid for Learning) - a network of state-funded schools in Sutton
2019-05-22 15:54:47 +01:00
Chris Hill-Scott
9d1a7904a8 Fix duplicated H1 on ‘New letter branding’ page
For accessibility reasons a page should have one (and only one) H1. This
commit fixes an instance where the H1 was duplicated as a result of the
work done to componentize our page headings.

It also adds an extra check to `client_request` so that we don’t
introduce pages with multiple or no H1s in the future.
2019-05-21 16:09:00 +01:00
Chris Hill-Scott
0609229466 Merge pull request #2982 from alphagov/terse-org-set-text
Make ‘you must set organisation’ text shorter
2019-05-21 15:24:27 +01:00