Preserve encoded commas in feature keys

Author: jnunemaker

lib/flipper/api/v1/actions/features.rb

@@ -52,10 +52,15 @@ def requested_feature_names
             return keys.map(&:to_s) if keys.is_a?(Array)
 
             raw_keys = raw_query_values("keys")
-            return decoded_feature_names if raw_keys.empty? || raw_keys.none? { |key| key.include?(',') }
+            return decoded_feature_names if raw_keys.empty?
 
             raw_keys.flat_map do |keys|
-              keys.split(',').map { |key| Rack::Utils.unescape(key) }
+              if keys.include?(',')
+                keys.split(',').map { |key| Rack::Utils.unescape(key) }
+              else
+                decoded_keys = Rack::Utils.unescape(keys)
+                feature_exists?(decoded_keys) ? decoded_keys : decoded_keys.split(',')
+              end
             end
           end
 

spec/flipper/api/v1/actions/features_spec.rb

@@ -111,6 +111,19 @@
       end
     end
 
+    context 'with a single encoded key containing a comma' do
+      before do
+        flipper["audit,log"].enable
+        get '/features?keys=audit%2Clog'
+      end
+
+      it 'treats the escaped comma as part of the feature key' do
+        expect(last_response.status).to eq(200)
+        keys = json_response.fetch('features').map { |feature| feature.fetch('key') }
+        expect(keys).to eq(["audit,log"])
+      end
+    end
+
     context 'with keys that are not existing features' do
       before do
         flipper[:search].disable