Skip to content

Commit

Permalink
fix keycloak sso and remove old oauth2 code
Browse files Browse the repository at this point in the history
  • Loading branch information
syphax-bouazzouni committed Nov 12, 2024
1 parent 0497bc5 commit 81e13ec
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 207 deletions.
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ gem 'string-similarity'
gem 'inline_svg'

# ISO language codes and flags
gem 'countries', '~> 5.7'
gem 'flag-icons-rails', '~> 3.4'
gem 'iso-639', '~> 0.3.6'
gem 'countries', '~> 5.7'

# Custom API client
gem 'ontologies_api_client', git: 'https://github.com/lifewatch-eric/ontologies_api_ruby_client.git', branch: 'master'
Expand All @@ -108,14 +108,14 @@ gem 'net-http', '~> 0.3.2'

# Multi-Provider Authentication
gem 'omniauth'
gem 'omniauth-rails_csrf_protection'
gem 'omniauth-github'
gem 'omniauth-google-oauth2'
gem 'omniauth-keycloak'
gem 'omniauth-keycloak', '~> 1.4'
gem 'omniauth-orcid'
gem 'omniauth-rails_csrf_protection', '~> 1.0', '>= 1.0.1'

# Used to generate colors randomly
gem "color", "~> 1.8"
gem 'color', '~> 1.8'

group :staging, :production, :appliance do
# Application performance monitoring
Expand Down Expand Up @@ -157,9 +157,9 @@ group :development do

# Internationalization tasks
# gem 'i18n-debug'
gem 'deepl-rb'
gem 'i18n-tasks'
gem 'i18n-tasks-csv', '~> 1.1'
gem 'deepl-rb'

# Email preview in the browser
gem 'letter_opener_web', '~> 2.0'
Expand All @@ -184,4 +184,4 @@ group :test do
gem 'rspec-rails'
end

gem 'openid_connect', '~> 2.2.0'
gem 'openid_connect', '~> 2.2.0'
52 changes: 26 additions & 26 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ GEM
bugsnag (6.27.1)
concurrent-ruby (~> 1.0)
builder (3.3.0)
capistrano (3.19.1)
capistrano (3.19.2)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
Expand Down Expand Up @@ -151,7 +151,7 @@ GEM
addressable
csv (3.3.0)
dalli (3.2.8)
date (3.3.4)
date (3.4.0)
debug (1.9.2)
irb (~> 1.10)
reline (>= 0.3.8)
Expand All @@ -162,7 +162,7 @@ GEM
ed25519 (1.3.0)
erubi (1.13.0)
erubis (2.7.0)
excon (0.112.0)
excon (1.2.0)
execjs (2.10.0)
faraday (2.0.1)
faraday-net_http (~> 2.0)
Expand All @@ -181,7 +181,7 @@ GEM
sass-rails
globalid (1.2.1)
activesupport (>= 6.1)
graphql (2.3.19)
graphql (2.4.3)
base64
fiber-storage
graphql-client (0.23.0)
Expand All @@ -195,7 +195,7 @@ GEM
activesupport (>= 5.1)
haml (>= 4.0.6)
railties (>= 5.1)
hashdiff (1.1.1)
hashdiff (1.1.2)
hashie (5.0.0)
highline (2.1.0)
html2haml (2.3.0)
Expand Down Expand Up @@ -243,7 +243,7 @@ GEM
railties (>= 3.2.16)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
json (2.7.4)
json (2.8.1)
json-jwt (1.16.7)
activesupport (>= 4.2)
aes_key_wrap
Expand Down Expand Up @@ -296,10 +296,10 @@ GEM
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1001)
mime-types-data (3.2024.1105)
mini_mime (1.1.5)
minitest (5.25.1)
msgpack (1.7.3)
msgpack (1.7.5)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.4.1)
Expand All @@ -309,7 +309,7 @@ GEM
time
net-http (0.3.2)
uri
net-imap (0.4.17)
net-imap (0.4.18)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -324,7 +324,7 @@ GEM
net-protocol
net-ssh (7.3.0)
netrc (0.11.0)
newrelic_rpm (9.14.0)
newrelic_rpm (9.15.0)
nio4r (2.7.4)
nokogiri (1.15.6-x86_64-darwin)
racc (~> 1.4)
Expand All @@ -337,7 +337,7 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
oj (3.16.6)
oj (3.16.7)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
omniauth (2.1.2)
Expand Down Expand Up @@ -378,16 +378,16 @@ GEM
validate_email
validate_url
webfinger (~> 2.0)
ostruct (0.6.0)
ostruct (0.6.1)
parallel (1.26.3)
parser (3.3.5.0)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
popper_js (1.16.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.1.2)
psych (5.2.0)
stringio
public_suffix (5.1.1)
puma (5.6.9)
Expand Down Expand Up @@ -448,7 +448,7 @@ GEM
json
redcarpet (3.6.0)
regexp_parser (2.9.2)
reline (0.5.10)
reline (0.5.11)
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
Expand All @@ -458,7 +458,7 @@ GEM
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.9)
rouge (4.4.0)
rouge (4.5.1)
rspec-core (3.13.2)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
Expand All @@ -467,7 +467,7 @@ GEM
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (7.0.1)
rspec-rails (7.1.0)
actionpack (>= 7.0)
activesupport (>= 7.0)
railties (>= 7.0)
Expand All @@ -476,7 +476,7 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rubocop (1.67.0)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -486,7 +486,7 @@ GEM
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.3)
rubocop-ast (1.35.0)
parser (>= 3.3.1.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
Expand All @@ -509,7 +509,7 @@ GEM
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sexp_processor (4.17.2)
sexp_processor (4.17.3)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down Expand Up @@ -539,7 +539,7 @@ GEM
stimulus-rails (1.3.4)
railties (>= 6.0.0)
string-similarity (2.1.0)
stringio (3.1.1)
stringio (3.1.2)
swd (2.0.3)
activesupport (>= 3)
attr_required (>= 0.0.5)
Expand All @@ -552,17 +552,17 @@ GEM
execjs (>= 0.3.0, < 3)
thor (1.3.2)
tilt (2.4.0)
time (0.4.0)
time (0.4.1)
date
timeout (0.4.1)
timeout (0.4.2)
turbo-rails (2.0.11)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unaccent (0.4.0)
unicode-display_width (2.6.0)
uri (0.13.1)
uri (1.0.1)
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
Expand Down Expand Up @@ -648,9 +648,9 @@ DEPENDENCIES
omniauth
omniauth-github
omniauth-google-oauth2
omniauth-keycloak
omniauth-keycloak (~> 1.4)
omniauth-orcid
omniauth-rails_csrf_protection
omniauth-rails_csrf_protection (~> 1.0, >= 1.0.1)
ontologies_api_client!
openid_connect (~> 2.2.0)
pry
Expand Down
3 changes: 2 additions & 1 deletion app/assets/stylesheets/login.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.login-form{
margin-top: 10px;
margin-bottom: 40px;
padding: 37px 41px;
box-shadow: rgba(0, 0, 0, 0.08) 0px 20px 50px;
border-radius: 14px;
Expand Down Expand Up @@ -60,4 +61,4 @@
}
.login-active-sso path{
fill: var(--primary-color)
}
}
Loading

0 comments on commit 81e13ec

Please sign in to comment.