Merge pull request #1652 from raphaelcosta/feature/add-custom-attribu…

…tes-to-token-generator

Add custom attributes support to token generator

CHANGELOG.md

@@ -8,6 +8,7 @@ User-visible changes worth mentioning.
 ## main
 
 - [#ID] Add your PR description here.
+- [#1652] Add custom attributes support to token generator
 
 ## 5.6.6
 

lib/doorkeeper/models/access_token_mixin.rb

@@ -435,6 +435,10 @@ def attributes_for_token_generator
         if Doorkeeper.config.polymorphic_resource_owner?
           attributes[:resource_owner] = resource_owner
         end
+
+        Doorkeeper.config.custom_access_token_attributes.each do |attribute_name|
+          attributes[attribute_name] = public_send(attribute_name)
+        end
       end
     end
 

spec/models/doorkeeper/access_token_spec.rb

@@ -206,6 +206,23 @@ def self.generate(opts = {})
       expect(token.token).to eq "custom_generator_token_#{created_at.to_i}"
     end
 
+    it "allows the custom generator to access the custom attributes" do
+      module CustomGeneratorArgs
+        def self.generate(opts = {})
+          "custom_generator_token_#{opts[:tenant_name]}"
+        end
+      end
+
+      Doorkeeper.configure do
+        orm DOORKEEPER_ORM
+        access_token_generator "CustomGeneratorArgs"
+        custom_access_token_attributes [:tenant_name]
+      end
+
+      token = FactoryBot.create :access_token, tenant_name: "Tenant 1"
+      expect(token.token).to eq "custom_generator_token_Tenant 1"
+    end
+
     it "raises an error if the custom object does not support generate" do
       module NoGenerate
       end