Skip to content

Commit 65b6018

Browse files
committed
feat: migrate to FranceConnect v2 API
1 parent 95fb9cd commit 65b6018

40 files changed

+736
-138
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ gem "decidim-term_customizer", git: "https://github.com/armandfardeau/decidim-mo
2323
gem "decidim-transparent_trash", git: "https://github.com/OpenSourcePolitics/decidim-module-transparent_trash.git", branch: "master"
2424

2525
# Omniauth gems
26-
gem "omniauth-france_connect", git: "https://github.com/OpenSourcePolitics/omniauth-france_connect"
26+
gem "omniauth_openid_connect"
2727

2828
# Default
2929
gem "activejob-uniqueness", require: "active_job/uniqueness/sidekiq_patch"
@@ -34,6 +34,7 @@ gem "deface"
3434
gem "faker", "~> 2.14"
3535
gem "fog-aws"
3636
gem "foundation_rails_helper", git: "https://github.com/sgruhier/foundation_rails_helper.git"
37+
gem "html_tokenizer", "~> 0.0.8"
3738
gem "letter_opener_web", "~> 2.0"
3839
gem "omniauth-rails_csrf_protection", "~> 1.0"
3940
gem "puma", ">= 5.6.2"

Gemfile.lock

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ GIT
2121
specs:
2222
decidim-transparent_trash (0.0.2)
2323

24-
GIT
25-
remote: https://github.com/OpenSourcePolitics/omniauth-france_connect
26-
revision: 14a53ad31928c8a83742360cfbdb90938d0a057e
27-
specs:
28-
omniauth-france_connect (0.1.0)
29-
omniauth_openid_connect (~> 0.4.0)
30-
3124
GIT
3225
remote: https://github.com/armandfardeau/decidim-module-term_customizer.git
3326
revision: 41f6c0fa95cc26c7f0dbe317d48e83723cb08b1b
@@ -137,7 +130,7 @@ GEM
137130
public_suffix (>= 2.0.2, < 6.0)
138131
aes_key_wrap (1.1.0)
139132
ast (2.4.2)
140-
attr_required (1.0.1)
133+
attr_required (1.0.2)
141134
aws-eventstream (1.2.0)
142135
aws-partitions (1.772.0)
143136
aws-sdk-core (3.174.0)
@@ -165,6 +158,7 @@ GEM
165158
descendants_tracker (~> 0.0.4)
166159
ice_nine (~> 0.11.0)
167160
thread_safe (~> 0.3, >= 0.3.1)
161+
base64 (0.3.0)
168162
batch-loader (1.5.0)
169163
bcrypt (3.1.19)
170164
better_html (1.0.16)
@@ -175,7 +169,7 @@ GEM
175169
html_tokenizer (~> 0.0.6)
176170
parser (>= 2.4)
177171
smart_properties
178-
bindata (2.4.15)
172+
bindata (2.5.1)
179173
bindex (0.8.1)
180174
bootsnap (1.16.0)
181175
msgpack (~> 1.2)
@@ -457,6 +451,8 @@ GEM
457451
dotenv (= 2.8.1)
458452
railties (>= 3.2)
459453
dumb_delegator (1.0.0)
454+
email_validator (2.2.4)
455+
activemodel
460456
erb_lint (0.0.37)
461457
activesupport
462458
better_html (~> 1.0.7)
@@ -485,7 +481,7 @@ GEM
485481
faraday (2.7.10)
486482
faraday-net_http (>= 2.0, < 3.1)
487483
ruby2_keywords (>= 0.0.4)
488-
faraday-follow_redirects (0.3.0)
484+
faraday-follow_redirects (0.4.0)
489485
faraday (>= 1, < 3)
490486
faraday-net_http (3.0.2)
491487
ffi (1.15.5)
@@ -535,9 +531,8 @@ GEM
535531
html-pipeline (2.14.3)
536532
activesupport (>= 2)
537533
nokogiri (>= 1.4)
538-
html_tokenizer (0.0.7)
534+
html_tokenizer (0.0.8)
539535
htmlentities (4.3.4)
540-
httpclient (2.8.3)
541536
i18n (1.14.1)
542537
concurrent-ruby (~> 1.0)
543538
i18n-tasks (0.9.37)
@@ -561,9 +556,10 @@ GEM
561556
rails (>= 3.2.0)
562557
jmespath (1.6.2)
563558
json (2.6.3)
564-
json-jwt (1.16.3)
559+
json-jwt (1.17.0)
565560
activesupport (>= 4.2)
566561
aes_key_wrap
562+
base64
567563
bindata
568564
faraday (~> 2.0)
569565
faraday-follow_redirects
@@ -687,21 +683,22 @@ GEM
687683
omniauth-twitter (1.4.0)
688684
omniauth-oauth (~> 1.1)
689685
rack
690-
omniauth_openid_connect (0.4.0)
691-
addressable (~> 2.5)
686+
omniauth_openid_connect (0.8.0)
692687
omniauth (>= 1.9, < 3)
693-
openid_connect (~> 1.1)
694-
openid_connect (1.4.2)
688+
openid_connect (~> 2.2)
689+
openid_connect (2.3.1)
695690
activemodel
696691
attr_required (>= 1.0.0)
697-
json-jwt (>= 1.15.0)
698-
net-smtp
699-
rack-oauth2 (~> 1.21)
700-
swd (~> 1.3)
692+
email_validator
693+
faraday (~> 2.0)
694+
faraday-follow_redirects
695+
json-jwt (>= 1.16)
696+
mail
697+
rack-oauth2 (~> 2.2)
698+
swd (~> 2.0)
701699
tzinfo
702-
validate_email
703700
validate_url
704-
webfinger (~> 1.2)
701+
webfinger (~> 2.0)
705702
origami (2.1.0)
706703
colorize (~> 0.7)
707704
orm_adapter (0.5.0)
@@ -736,10 +733,11 @@ GEM
736733
rack (>= 1.0, < 3)
737734
rack-cors (1.1.1)
738735
rack (>= 2.0.0)
739-
rack-oauth2 (1.21.3)
736+
rack-oauth2 (2.2.1)
740737
activesupport
741738
attr_required
742-
httpclient
739+
faraday (~> 2.0)
740+
faraday-follow_redirects
743741
json-jwt (>= 1.11.0)
744742
rack (>= 2.1.0)
745743
rack-protection (3.0.6)
@@ -926,10 +924,11 @@ GEM
926924
activesupport (>= 5.2)
927925
sprockets (>= 3.0.0)
928926
ssrf_filter (1.1.1)
929-
swd (1.3.0)
927+
swd (2.0.3)
930928
activesupport (>= 3)
931929
attr_required (>= 0.0.5)
932-
httpclient (>= 2.4)
930+
faraday (~> 2.0)
931+
faraday-follow_redirects
933932
sys-filesystem (1.4.3)
934933
ffi (~> 1.1)
935934
temple (0.10.2)
@@ -947,9 +946,6 @@ GEM
947946
valid_email2 (2.3.1)
948947
activemodel (>= 3.2)
949948
mail (~> 2.5)
950-
validate_email (0.1.6)
951-
activemodel (>= 3.0)
952-
mail (>= 2.2.5)
953949
validate_url (1.0.15)
954950
activemodel (>= 3.0.0)
955951
public_suffix
@@ -973,9 +969,10 @@ GEM
973969
activemodel (>= 6.0.0)
974970
bindex (>= 0.4.0)
975971
railties (>= 6.0.0)
976-
webfinger (1.2.0)
972+
webfinger (2.1.3)
977973
activesupport
978-
httpclient (>= 2.4)
974+
faraday (~> 2.0)
975+
faraday-follow_redirects
979976
webmock (3.18.1)
980977
addressable (>= 2.8.0)
981978
crack (>= 0.3.2)
@@ -1035,11 +1032,12 @@ DEPENDENCIES
10351032
fog-aws
10361033
foundation_rails_helper!
10371034
health_check (~> 3.1)
1035+
html_tokenizer (~> 0.0.8)
10381036
letter_opener_web (~> 2.0)
10391037
listen (~> 3.1)
10401038
lograge
1041-
omniauth-france_connect!
10421039
omniauth-rails_csrf_protection (~> 1.0)
1040+
omniauth_openid_connect
10431041
parallel_tests (~> 3.7)
10441042
puma (>= 5.6.2)
10451043
rack-attack
4.67 KB
Loading
9.2 KB
Loading
4.97 KB
Loading
9.57 KB
Loading

0 commit comments

Comments
 (0)