diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e2a18dd9..ae2529d1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,6 +73,7 @@ jobs: POSTGRES_PORT: '5432' REDIS_URL: redis://127.0.0.1:6379/1 HOSTNAME: 127.0.0.1 + HOST_URL: http://127.0.0.1:3000 ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: primary-key ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: derivation-salt EDITOR_ENCRYPTION_KEY: a1b2c3d4e5f67890123456789abcdef0123456789abcdef0123456789abcdef0 diff --git a/Gemfile.lock b/Gemfile.lock index 6fb77666b..e19552554 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -226,7 +226,7 @@ GEM activesupport (>= 3.0) graphql (>= 1.13.0) hashdiff (1.2.1) - hashie (5.1.0) + hashie (5.2.0) logger i18n (1.15.2) concurrent-ruby (~> 1.0) @@ -310,11 +310,11 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0, >= 2.0.5) version_gem (~> 1.1, >= 1.1.11) - omniauth (2.1.4) - hashie (>= 3.4.6) + omniauth (2.2.0) + hashie (>= 3.5.2) logger - rack (>= 2.2.3) - rack-protection + rack (>= 2.2.8) + rack-protection (>= 2.2.0) omniauth-oauth2 (1.9.0) oauth2 (>= 2.0.2, < 3) omniauth (~> 2.0) @@ -363,7 +363,7 @@ GEM nio4r (~> 2.0) raabro (1.5.0) racc (1.8.1) - rack (3.2.7) + rack (3.2.8) rack-cors (3.0.0) logger rack (>= 3.0.14) diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 87d82bb2d..4e288fde1 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true OmniAuth.config.logger = Rails.logger +OmniAuth.config.full_host = ENV.fetch('HOST_URL') if ENV['BYPASS_OAUTH'].present? using RpiAuthBypass