Merge branch 'develop' into chore/fix-dialogflow-language-selection-and-retries-ic7wc9

config/app.yml

@@ -1,5 +1,5 @@
 shared: &shared
-  version: '4.1.0'
+  version: '4.2.0'
 
 development:
   <<: *shared

config/initializers/01_redis.rb

@@ -1,3 +1,7 @@
+# TODO: Phase out the custom ConnectionPool wrappers ($alfred / $velma),
+# switch to plain Redis clients here and let Rails 7.1+ handle pooling
+# via `pool:` in RedisCacheStore (see rack_attack initializer).
+
 # Alfred
 # Add here as you use it for more features
 # Used for Round Robin, Conversation Emails & Online Presence

config/initializers/cors.rb

@@ -14,6 +14,10 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do
     if ActiveModel::Type::Boolean.new.cast(ENV.fetch('CW_API_ONLY_SERVER', false)) || Rails.env.development?
       resource '*', headers: :any, methods: :any, expose: %w[access-token client uid expiry]
     end
+
+    if ActiveModel::Type::Boolean.new.cast(ENV.fetch('ENABLE_API_CORS', false))
+      resource '/api/*', headers: :any, methods: :any, expose: %w[access-token client uid expiry]
+    end
   end
 end
 

config/initializers/rack_attack.rb

@@ -11,7 +11,12 @@ class Rack::Attack
   # Rack::Attack.cache.store = ActiveSupport::Cache::MemoryStore.new
 
   # https://github.com/rack/rack-attack/issues/102
-  Rack::Attack.cache.store = ActiveSupport::Cache::RedisCacheStore.new(redis: $velma)
+  # Rails 7.1 automatically adds its own ConnectionPool around RedisCacheStore.
+  # Because `$velma` is *already* a ConnectionPool, double-wrapping causes
+  # Redis calls like `get` to hit the outer wrapper and explode.
+  # `pool: false` tells Rails to skip its internal pool and use ours directly.
+  # TODO: We can use build in connection pool in future upgrade
+  Rack::Attack.cache.store = ActiveSupport::Cache::RedisCacheStore.new(redis: $velma, pool: false)
 
   class Request < ::Rack::Request
     # You many need to specify a method to fetch the correct remote IP address

config/routes.rb

@@ -396,6 +396,7 @@ Rails.application.routes.draw do
         resources :users, only: [:create, :show, :update, :destroy] do
           member do
             get :login
+            post :token
           end
         end
         resources :agent_bots, only: [:index, :create, :show, :update, :destroy] do