simon lehericey
f7299da1e7
launch merge process if an unlinked DS account with the same email exists
2021-10-14 14:47:50 +02:00
simon lehericey
f6879eba60
associate_user take a target email
2021-10-14 14:47:50 +02:00
simon lehericey
09f828a6a2
create_merge_token!
2021-10-14 14:47:50 +02:00
simon lehericey
34862f41e0
Add fci valid_for_merge
2021-10-14 14:47:50 +02:00
simon lehericey
2e118a8f5b
allow unattached fci
2021-10-14 14:47:50 +02:00
simon lehericey
461b774188
a password input must not be that wide
2021-10-14 14:47:50 +02:00
simon lehericey
6e6635560f
Add merge token to FCI
2021-10-14 14:47:50 +02:00
simon lehericey
6826bf03b0
Sign in with a user linked by france connect sub (openid)
...
instead of looking linked user by email because :
- follows FC recommendation to fetch ds account by openid
- the email is not a valid key as many user can share the same FCI email.
The following scenario is now working
A user A (email: 1@mail.com ) uses FC to connect to DS
=> It is connected as 1@mail.com
Another user B (email: generic@mail.com ) uses FC to connect
=> It is connected as generic@mail.com
The first user A change its FC email to generic@mail.com and connect to DS
=> It is still connected as 1@mail.com
2021-10-14 14:47:50 +02:00
simon lehericey
06dee2e023
refactor controller to avoid return
2021-10-14 14:47:50 +02:00
simon lehericey
5aaf46258a
remove obsolete devise scope
2021-10-14 14:47:50 +02:00
simon lehericey
2f470b25aa
spec cleaning
2021-10-14 14:47:50 +02:00
LeSim
750b2b4f58
Merge pull request #6545 from tchak/fix-remove-redundant-description
...
fix(champs): remove redundant description
2021-10-14 12:13:00 +02:00
Paul Chavard
4caf2f9592
fix(champs): remove redundant description
2021-10-13 13:55:09 +02:00
Paul Chavard
4002e1157d
Merge pull request #6532 from tchak/fix-add-foreign-key-to-avis-dossier_id
...
fix(avis): add foreign key to avis dossier_id
2021-10-13 09:51:20 +02:00
Paul Chavard
288ea82286
fix(avis): add foreign key to avis dossier_id
2021-10-13 09:28:11 +02:00
Pierre de La Morinerie
42203501c9
Merge pull request #6540 from betagouv/dependabot/bundler/puma-5.5.1
2021-10-12 20:39:14 +02:00
dependabot[bot]
f9003872e7
build(deps): bump puma from 5.3.1 to 5.5.1
...
Bumps [puma](https://github.com/puma/puma ) from 5.3.1 to 5.5.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v5.3.1...v5.5.1 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-12 18:15:29 +00:00
Pierre de La Morinerie
0f60749ade
Merge pull request #6538 from betagouv/reduce-fc-infos
...
Usager : les informations FranceConnect sont maintenant plus discrètes dans le formulaire (#6538 )
2021-10-12 16:37:04 +02:00
Pierre de La Morinerie
9be16a1208
views: rename the procedure_publish_label helper
...
The new text makes more sense.
2021-10-12 16:25:11 +02:00
Pierre de La Morinerie
50b1d4ce28
views: make france-connect-information more compact
...
Otherwise it takes a lot of space in the form.
2021-10-12 16:25:01 +02:00
LeSim
b8946137c7
Merge pull request #6488 from betagouv/add_cnaf_champ
...
Ajoute le champ CNAF
2021-10-12 14:37:35 +02:00
simon lehericey
87de9e38c6
allow draft to be saved with invalid cnaf champ
2021-10-12 14:27:20 +02:00
simon lehericey
cd7bafaa0d
clean log_out spec helper
2021-10-12 14:27:20 +02:00
simon lehericey
35c7f05a0a
source service supports unknown scope
2021-10-12 14:27:20 +02:00
simon lehericey
ac60d6c5a1
homogennize api particulier endpoint test url
2021-10-12 14:27:20 +02:00
simon lehericey
ecc26897e2
add end to end spec
2021-10-12 14:27:20 +02:00
simon lehericey
7aee944daa
show cnaf tdc when procedure is compatible
2021-10-12 14:27:20 +02:00
simon lehericey
7072993721
a form can upload numero_allocataire and code_postal
2021-10-12 14:27:20 +02:00
simon lehericey
8c81558e56
english locales
2021-10-12 14:27:20 +02:00
simon lehericey
57a7f82a8f
add cnaf ui
2021-10-12 14:27:20 +02:00
simon lehericey
40d0cfcdc4
add champ validation
2021-10-12 14:27:20 +02:00
simon lehericey
c76d1043fa
add cnaf champ
2021-10-12 14:27:20 +02:00
simon lehericey
354735ace4
add champ value_json jsonb column
2021-10-12 14:27:20 +02:00
simon lehericey
d68129b34d
add cnaf type de champ
2021-10-12 14:26:40 +02:00
simon lehericey
b69dafc3d4
CNAF in lowercase
2021-10-12 14:26:40 +02:00
simon lehericey
17a2b5dc53
fix a strange encoding error
2021-10-12 14:26:40 +02:00
simon lehericey
05e127af4b
corrige une locale
2021-10-12 14:26:40 +02:00
Pierre de La Morinerie
d1035c05b6
Merge pull request #6533 from betagouv/move-logging-class
...
Nettoyage : déplacement de la classe ActiveJobLogSubscriber en dehors des initializers (#6533 )
2021-10-12 11:51:35 +02:00
Pierre de La Morinerie
0b02fce5e4
jobs: move ActiveJobLogSubscriber out of initializers
...
This is a class of its own, it doesn't need to be in the initializers.
2021-10-12 11:40:19 +02:00
LeSim
8179c609e0
Merge pull request #6535 from betagouv/fix_merge
...
Corrige une erreur lors de la fusion de compte dans le manager
2021-10-12 11:39:17 +02:00
simon lehericey
7c65571fca
add case when the old_expert or old_instructeur is nil
2021-10-12 11:04:06 +02:00
simon lehericey
ec8ccad465
typo
2021-10-12 11:03:34 +02:00
LeSim
d3f8ba2516
Merge pull request #6534 from betagouv/main
...
2021-10-11-01
2021-10-11 10:20:46 +02:00
LeSim
ba7f75bcac
Merge pull request #6519 from betagouv/super_admin_change_instructeur_email
...
ETQ Super Admin je veux changer le mail d'un instructeur (#6515 )
2021-10-07 16:01:39 +02:00
simon lehericey
d7e621d167
beef up the merge methods
2021-10-07 15:51:31 +02:00
simon lehericey
77d14d4a60
forbid admin merge yet
2021-10-07 15:51:31 +02:00
simon lehericey
5009c583ea
Add notice when merging account
2021-10-07 15:51:31 +02:00
simon lehericey
a480b31eb5
merge expert
2021-10-07 15:51:31 +02:00
simon lehericey
136f29524e
merge instructeur
2021-10-07 15:51:31 +02:00
simon lehericey
9a6a53349f
simple cases when the preexisting targeted account does not have instructeur or profile profile
2021-10-07 15:51:31 +02:00
