Add :max_age to AgeAuthorizationHandle

config/initializers/decidim.rb

@@ -14,6 +14,7 @@
     auth.action_authorizer = 'Decidim::AgeActionAuthorization::Authorizer'
     auth.options do |options|
       options.attribute :age, type: :string, required: false
+      options.attribute :max_age, type: :string, required: false
     end
   end
 

config/locales/ca.yml

@@ -21,6 +21,7 @@ ca:
         fields:
           birthdate: Data de naixement
           age: 'Edat mínima'
+          max_age: 'Edat màxima'
     features:
       proposals:
         actions:

config/locales/en.yml

@@ -21,6 +21,7 @@ en:
         fields:
           birthdate: Date of birth
           age: Minimum age
+          max_age: Maximum age
     features:
       proposals:
         actions:

config/locales/es.yml

@@ -21,6 +21,7 @@ es:
         fields:
           birthdate: Fecha de nacimiento
           age: Edad mínima
+          max_age: Edad máxima
     features:
       proposals:
         actions:

decidim-age_action_authorization/lib/decidim/age_action_authorization/authorizer.rb

@@ -19,7 +19,14 @@ def valid_metadata?
       end
 
       def valid_age?
-        (birthdate + minimum_age.years) <= Date.current
+        min_date = birthdate + minimum_age.years
+        max_date = (birthdate + options['max_age'].to_i.years if options.key?('max_age'))
+
+        if max_date
+          (min_date..max_date).cover?(Date.current)
+        else
+          min_date <= Date.current
+        end
       end
 
       def birthdate

decidim-age_action_authorization/spec/decidim/age_action_authorization/authorizer_spec.rb

@@ -26,6 +26,32 @@
     expect(authorizer_without_authorization.authorize).to include(:missing)
   end
 
+  describe 'when max_age is pressent' do
+    it 'authorizes if is older that :age and yonger that :max_age' do
+      birthdate = 21.years.ago.strftime('%Y/%m/%d')
+      authorizer = authorizer_class.new(authorization_for(birthdate), { 'age' => '20', 'max_age' => '22' }, component, resource)
+      expect(authorizer.authorize).to include(:ok)
+    end
+
+    it 'authorizes if is older that :age and equal that :max_age' do
+      birthdate = 22.years.ago.strftime('%Y/%m/%d')
+      authorizer = authorizer_class.new(authorization_for(birthdate), { 'age' => '20', 'max_age' => '22' }, component, resource)
+      expect(authorizer.authorize).to include(:ok)
+    end
+
+    it 'not authorizes if is older of :max_age' do
+      birthdate = 23.years.ago.strftime('%Y/%m/%d')
+      authorizer = authorizer_class.new(authorization_for(birthdate), { 'age' => '20', 'max_age' => '22' }, component, resource)
+      expect(authorizer.authorize).to include(:unauthorized)
+    end
+
+    it 'not authorizes if is younger of :age' do
+      birthdate = 19.years.ago.strftime('%Y/%m/%d')
+      authorizer = authorizer_class.new(authorization_for(birthdate), { 'age' => '20', 'max_age' => '22' }, component, resource)
+      expect(authorizer.authorize).to include(:unauthorized)
+    end
+  end
+
   def authorization_for(date)
     OpenStruct.new(metadata: { 'birthdate' => date },
                    granted?: true)

decidim-census/config/locales/ca.yml

@@ -19,6 +19,7 @@ ca:
         fields:
           birthdate: Data de naixement
           age: 'Edat mínima'
+          max_age: 'Edat máxima'
     census:
       errors:
         messages:

decidim-census/config/locales/en.yml

@@ -19,6 +19,7 @@ en:
         fields:
           birthdate: Birthdate
           age: 'Minimum age'
+          age: 'Maximum age'
     census:
       errors:
         messages:

decidim-census/config/locales/es.yml

@@ -19,6 +19,7 @@ es:
         fields:
           birthdate: Fecha de nacimiento
           age: 'Edad mínima'
+          max_age: 'Edad máxima'
     census:
       errors:
         messages:

decidim-census/lib/decidim/census/engine.rb

@@ -19,6 +19,7 @@ class Engine < ::Rails::Engine
           auth.action_authorizer = 'Decidim::AgeActionAuthorization::Authorizer'
           auth.options do |options|
             options.attribute :age, type: :string, required: false
+            options.attribute :max_age, type: :string, required: false
           end
         end
       end

decidim-diba_census_api/lib/decidim/diba_census_api/engine.rb

@@ -19,6 +19,7 @@ class Engine < ::Rails::Engine
           auth.action_authorizer = 'Decidim::AgeActionAuthorization::Authorizer'
           auth.options do |options|
             options.attribute :age, type: :string, required: false
+            options.attribute :max_age, type: :string, required: false
           end
         end
       end