🐛 Fix handle non-symbol keys for old Ruby

Author: pboling

.rubocop_gradual.lock

@@ -31,7 +31,7 @@
     [130, 3, 52, "Gemspec/DependencyVersion: Dependency version specification is required.", 3163430777],
     [131, 3, 48, "Gemspec/DependencyVersion: Dependency version specification is required.", 425065368]
   ],
-  "spec/oauth2/access_token_spec.rb:759866110": [
+  "spec/oauth2/access_token_spec.rb:388877639": [
     [3, 1, 34, "RSpec/SpecFilePathFormat: Spec path should end with `o_auth2/access_token*_spec.rb`.", 1972107547],
     [594, 13, 25, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 770233088],
     [664, 9, 101, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3022740639],

lib/oauth2/access_token.rb

@@ -188,7 +188,6 @@ def refresh(params = {}, access_token_opts = {})
     # @return [Hash] a hash of AccessToken property values
     def to_hash
       hsh = {
-        **params,
         access_token: token,
         refresh_token: refresh_token,
         expires_at: expires_at,
@@ -197,7 +196,13 @@ def to_hash
         param_name: options[:param_name],
       }
       hsh[:token_name] = options[:token_name] if options.key?(:token_name)
-      hsh
+      # TODO: Switch when dropping Ruby < 2.5 support
+      # params.transform_keys(&:to_sym) # Ruby 2.5 only
+      # Old Ruby transform_keys alternative:
+      sheesh = @params.each_with_object({}) { |(k, v), memo|
+        memo[k.to_sym] = v
+      }
+      sheesh.merge(hsh)
     end
 
     # Make a request with the Access Token

spec/oauth2/access_token_spec.rb

@@ -28,14 +28,14 @@
 
     let(:hash) do
       {
-        :access_token => token,
-        :id_token => "confusing bug here",
-        :refresh_token => "foobar",
-        :expires_at => Time.now.to_i + 200,
-        "foo" => "bar",
-        :header_format => "Bearer %",
-        :mode => :header,
-        :param_name => "access_token",
+        access_token: token,
+        id_token: "confusing bug here",
+        refresh_token: "foobar",
+        expires_at: Time.now.to_i + 200,
+        foo: "bar",
+        header_format: "Bearer %",
+        mode: :header,
+        param_name: "access_token",
       }
     end
 
@@ -749,13 +749,13 @@ def self.contains_token?(hash)
   describe "#to_hash" do
     it "return a hash equal to the hash used to initialize access token" do
       hash = {
-        :access_token => token,
-        :refresh_token => "foobar",
-        :expires_at => Time.now.to_i + 200,
-        :header_format => "Bearer %",
-        :mode => :header,
-        :param_name => "access_token",
-        "foo" => "bar",
+        access_token: token,
+        refresh_token: "foobar",
+        expires_at: Time.now.to_i + 200,
+        header_format: "Bearer %",
+        mode: :header,
+        param_name: "access_token",
+        foo: "bar",
       }
       access_token = described_class.from_hash(client, hash.clone)
       expect(access_token.to_hash).to eq(hash)
@@ -764,14 +764,14 @@ def self.contains_token?(hash)
     context "with token_name" do
       it "return a hash equal to the hash used to initialize access token" do
         hash = {
-          :access_token => "",
-          :refresh_token => "foobar",
-          :expires_at => Time.now.to_i + 200,
-          :header_format => "Bearer %",
-          :mode => :header,
-          :param_name => "access_token",
-          :token_name => "banana_face",
-          "foo" => "bar",
+          access_token: "",
+          refresh_token: "foobar",
+          expires_at: Time.now.to_i + 200,
+          header_format: "Bearer %",
+          mode: :header,
+          param_name: "access_token",
+          token_name: "banana_face",
+          foo: "bar",
         }
         access_token = described_class.from_hash(client, hash.clone)
         expect(access_token.to_hash).to eq(hash)