Merge branch 'develop' into dependabot/bundler/multi-5c113cbb90

Author: reemi1510

Gemfile

@@ -8,7 +8,7 @@ gem 'rails', '~> 8.1', '>= 8.1.2.1'
 # Use postgresql as the database for Active Record
 gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
-gem 'puma', '~> 6.4', '>= 6.4.3'
+gem 'puma', '~> 7.2'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 6.0', '>= 6.0.0'
 # Use Uglifier as compressor for JavaScript assets

Gemfile.lock

@@ -136,7 +136,7 @@ GEM
     climate_control (1.0.0)
     cliver (0.3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.7)
     connection_pool (3.0.2)
     crack (1.0.0)
       bigdecimal
@@ -287,7 +287,7 @@ GEM
       bigdecimal (>= 3.1, < 5)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
-    net-imap (0.5.12)
+    net-imap (0.5.15)
       date
       net-protocol
     net-pop (0.1.2)
@@ -297,8 +297,8 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
-    nio4r (2.7.4)
-    nokogiri (1.19.1)
+    nio4r (2.7.5)
+    nokogiri (1.19.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (2.0.18)
@@ -348,7 +348,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (6.4.3)
+    puma (7.2.1)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.2.6)
@@ -496,7 +496,7 @@ GEM
     temple (0.10.4)
     thor (1.5.0)
     tilt (2.6.1)
-    timeout (0.4.3)
+    timeout (0.6.1)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -564,7 +564,7 @@ DEPENDENCIES
   poltergeist (>= 1.18.1)
   prism (~> 1.4)
   pry-rails
-  puma (~> 6.4, >= 6.4.3)
+  puma (~> 7.2)
   rack-maintenance (~> 3.0)
   rails (~> 8.1, >= 8.1.2.1)
   rollbar

config/initializers/omniauth.rb

@@ -3,15 +3,18 @@
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :developer unless Rails.env.production?
 
+  auth0_domain = ENV['AUTH0_DOMAIN']
+  auth0_user_info_domain = ENV.fetch('AUTH0_USER_INFO_DOMAIN', auth0_domain)
+
   provider(
     :auth0,
     ENV['AUTH0_CLIENT_ID'],
     ENV['AUTH0_CLIENT_SECRET'],
-    ENV['AUTH0_DOMAIN'],
+    auth0_domain,
     callback_path: '/auth/auth0/callback',
     authorize_params: {
       scope: 'openid profile',
-      audience: "https://#{ENV['AUTH0_DOMAIN']}/userinfo"
+      audience: "https://#{auth0_user_info_domain}/userinfo"
     }
   )
 end