Commit graph

13991 commits

Author SHA1 Message Date
mfo
ae88a36902
Merge pull request #6653 from betagouv/6580/etq-utilisateur-j-aimerais-fusionner-mes-comptes-fc-ds-avec-un-mail-de-confirmation
6580 ETQ Utilisateur, j'aimerais fusionner mes comptes FC/DS avec un mail de confirmation
2021-11-25 17:41:28 +01:00
Martin
fdf0f18fda fix(i18n): wrap text under i18n.t
i18n(france_connect/*): replace wording with i18n

fix(lint): i18n key issue

secu(views/france_connect/particulier/merge.html.haml): sanitize france_connect_email just in case

fix(brakeman): sanitize FCI.email_france_connect when used with html_safe via an I18n.t, also add exception to brakeman
2021-11-25 17:34:37 +01:00
Martin
febe890d28 fixup! Add confirmation by email when merging DC/FC accounts 2021-11-25 17:34:37 +01:00
Martin
8a315a4ac1 feat(UserMailer.france_connect_merge_confirmation): in addition to distance_of_time_in_words, add exact expiration date 2021-11-25 17:34:37 +01:00
Martin
21894d0a0a feat(france_connect/particulier#callback): in case the FC email exists as an DC account which is an instructor or and administrator, returns early to new_session_path so he can connect with this existing account 2021-11-25 17:34:36 +01:00
Martin
ff073f8884 Add confirmation by email when merging DC/FC accounts
feat(fci.confirmation_code): add confirmation code to france_connect_informations

feat(user_mailer.france_connect_confirmation_code): add confirmation by email mail method/preview/spec, pointing to merge_mail_with_existing_account (reuse existing method)

feat(mail_merge): mail merge

feat(merge.cannot_use_france_connect): same behaviour as callback

clean(fci.confirmation_code): use same token for mail validation as merge

feat(resend_france_connect/particulier/merge_confirmation): resend email with link. also enhance some trads, cleanup halfy finished refacto

clean(tech): finalize story by plugging merge_with_new_account to email validation

fix(deadspec): was removed

fix(spec): broken after last refactoring

lint(rubocop): space before parenthesis

lint(haml-lint): yoohoooo space before =

fix(lint): scss now :D

Update app/assets/stylesheets/buttons.scss

cleanup

feat(france_connect): re-add confirm by email, with an option for confirmation by email instead of only confirmation by email

fixup! Add confirmation by email when merging DC/FC accounts

fix(lint): haml_spec failure
2021-11-25 17:34:34 +01:00
Paul Chavard
f86e202738
Merge pull request #6677 from tchak/fix-commune-select
fix(commune): do not display foreign departement when selecting commune
2021-11-25 14:35:43 +03:00
Paul Chavard
faeb75ffb1
Merge pull request #6678 from betagouv/main
2021-11-25-01
2021-11-25 14:08:54 +03:00
Paul Chavard
7d189575af fix(commune): do not display foreign departement when selecting commune 2021-11-25 13:49:57 +03:00
Paul Chavard
58474beba5
Merge pull request #6676 from betagouv/fix-typo-communes
fix(ComboCOmmunesSearch.typo): fix combo communes search typo
2021-11-25 13:49:17 +03:00
mfo
91c3a8be19 fix(eslint): max columns 2021-11-25 13:43:28 +03:00
Martin
0d486981a6 fix(ComboCOmmunesSearch.typo): fix combo communes search typo 2021-11-25 13:43:28 +03:00
Paul Chavard
7970de640f
Merge pull request #6669 from tchak/fix-add-depose-at-to-dossiers
Fix add depose_at to dossiers
2021-11-25 13:30:32 +03:00
Paul Chavard
68f6c01548 task(traitements): add depose_at to existing dossiers 2021-11-25 12:57:55 +03:00
Paul Chavard
d847775c68 feat(traitements): add depose_at to dossiers 2021-11-25 12:57:55 +03:00
Paul Chavard
1f1dd9fce5 fix(traitements): add missing traitements to dossiers when reverting a decision 2021-11-25 12:57:55 +03:00
Pierre de La Morinerie
4ba7f43354
Merge pull request #6664 from betagouv/save-new-procedure-revision 2021-11-25 08:53:03 +01:00
Pierre de La Morinerie
e5f5440663 models: explicitely save procedure's new revision
Deep-cloned objects have all their relationships stale. Thus, for a
newly deep-cloned revision, `revision.types_de_champs` returns `[]`,
even when it actually has associated types de champ.

This causes consecutive champs creations and re-ordering to fail in
subtle ways, like:

```
procedure.draft_revision.add_type_de_champ(…)
procedure.publish_revision!
procedure.draft_revision.add_type_de_champ(…)
procedure.draft_revision.move_type_de_champ(…) # this will fail
```

As `publish_revision!` created a new stale revision, moving the type
de champ fails because not all existing champs are found until the
object is refreshed.

We don't hit this path in production, because usually only a single
operation is made in a request.

To fix this, save the new revision before associating it as the draft
procedure.

(Another option would be to `reload` the revision after creation, but
this seems better contained and matches the name of the method.)
2021-11-25 08:49:17 +01:00
mfo
73faa569e8
Merge pull request #6656 from betagouv/6649-etq-usager-instructeur-rendre-la-suppression-plus-visible
6649 ETQ usager instructeur rendre la suppression plus visible
2021-11-24 14:24:24 +01:00
mfo
e7d9d047fe
Merge branch 'main' into 6649-etq-usager-instructeur-rendre-la-suppression-plus-visible 2021-11-24 14:07:32 +01:00
LeSim
618fec575f
Merge pull request #6670 from betagouv/nicer_agent_connect
Ajoute une variable d'env manquante a AgentConnect
2021-11-24 13:28:13 +01:00
simon lehericey
6e7d2e057a typo 2021-11-24 12:50:52 +01:00
simon lehericey
bd4a5c419b add title to agentconnect page 2021-11-24 12:50:47 +01:00
simon lehericey
f60055637a add missing redirect_uri env 2021-11-24 12:47:01 +01:00
Paul Chavard
bf66346f6a
Merge pull request #6631 from tchak/fix-graphql-log-parse
fix(graphql): fix and improve query parsing for logs
2021-11-24 13:27:59 +03:00
Paul Chavard
758e7d68e6 fix(graphql): fix and improuve query parsing for logs 2021-11-24 13:23:05 +03:00
Paul Chavard
71c54a226d
Merge pull request #6667 from betagouv/active-storage-validations-max-size
Simplification des messages d’erreur en cas de fichier trop volumineux
2021-11-24 13:10:14 +03:00
Pierre de La Morinerie
60c2718f29 models: remove custom code for file size validation message
With active_storage_validations 0.9.6, we can use the %{max_size}
variable directly in the error message.
2021-11-24 10:06:45 +01:00
Pierre de La Morinerie
4b557a4f18 gems: update active_storage_validation to 0.9.6
This allows us to have the %{file_max_size} variable defined in the
error message.

See https://github.com/igorkasyanchuk/active_storage_validations/pull/134
2021-11-24 08:18:18 +01:00
LeSim
d4cbcaf768
Merge pull request #6663 from betagouv/remove-procedure-autocomplete-leftovers
Suppression du code obsolète pour l'auto-validation du chemin des démarches
2021-11-23 17:44:31 +01:00
Martin
0fd9e15cc1 i18n(expiration_banner): extract test in i18n files 2021-11-23 15:23:22 +01:00
Pierre de La Morinerie
2227dcc1e7 app: remove leftovers of procedure path autocomplete
We used to pre-validate the procedure, to display in advance if the path
could be used.

Now that the path autocomplete is long gone, we can remove this kludgy
code.
2021-11-23 14:30:21 +01:00
LeSim
4fc224490e
Merge pull request #6660 from betagouv/agent_connect
Prise en charge d'agent connect (#6027)
2021-11-23 14:26:05 +01:00
simon lehericey
4efd15377c spec 2021-11-23 14:17:59 +01:00
simon lehericey
c5097451ef add redirect 2021-11-23 14:17:59 +01:00
simon lehericey
5234a1854c manage AgentConnect callback 2021-11-23 14:17:59 +01:00
simon lehericey
1926a630f9 add agent_connect_id to instructeur 2021-11-23 14:17:59 +01:00
simon lehericey
3316dfc866 reopen openid_connect gem to support AC encrypted jwt response 2021-11-23 14:17:59 +01:00
simon lehericey
898df449d4 redirect to AgentConnect 2021-11-23 14:17:59 +01:00
simon lehericey
45ce274721 add agent connect secrets 2021-11-23 14:17:59 +01:00
simon lehericey
d2432e34eb AgentConnect UI 2021-11-23 14:17:59 +01:00
simon lehericey
ed7d776727 Bump jwt dep to decrypt ES256 FCA response 2021-11-23 14:17:59 +01:00
simon lehericey
91109dc944 bump openid connect (mandatory to avoid lets encrypt certs pb) 2021-11-23 14:17:59 +01:00
Pierre de La Morinerie
a82ce9a13c
Merge pull request #6633 from betagouv/improve-procedure-factory 2021-11-23 14:04:15 +01:00
mfo
49bb12a70e
Merge branch 'main' into 6649-etq-usager-instructeur-rendre-la-suppression-plus-visible 2021-11-23 11:05:51 +01:00
Pierre de La Morinerie
997c197980 specs: simplify the syntax of some factories 2021-11-23 08:07:07 +01:00
Pierre de La Morinerie
2203a7762f specs: create dossier revision and individual declaratively 2021-11-23 08:07:07 +01:00
Pierre de La Morinerie
f2233300b6 specs: assign the default groupe instructeur declaratively 2021-11-23 08:07:07 +01:00
Pierre de La Morinerie
0e809ac1a2 specs: build the default groupe instructeur before the create callback
This allows for better ergonomics, by having the default groupe
instructeur available even before the procedure is saved.
2021-11-23 08:07:07 +01:00
Pierre de La Morinerie
032e3e2cb1 specs: create the procedure administrateur declaratively
It seems better to create associations in an declarative fashion, rather
than using imperative code. This also makes the attribute compatible
with build_stubbed.
2021-11-23 08:07:07 +01:00