openproject-token 5.5.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '029a0fc631ddb3a164158ebe3496bf254109593d16c5b51675015d9f134b176e'
-  data.tar.gz: '00092d97245d5a5ec0c5c1eb98a07ff463bcd064054ee193e69919878748474b'
+  metadata.gz: 77fc561da569bc057220c91166f038cd49f8e645d5b9dde533aceb1c80bce8ea
+  data.tar.gz: c9c2a688b6bf1d1f9ab2547e8b19ce42c45e1dc7f0f7500210a99be3d767786f
 SHA512:
-  metadata.gz: 98c4762ca638c91a277cdcb3245751988ced10cfee5b79fa444aad20c119b47665ea6c573b66404876e841b382ed7a365bd346bdc6762a8be9f75418d4e3f9f1
-  data.tar.gz: f03496cc55d5e7cf0dca28011eb130b08a375d49e0f3f4923fb095ff74107c1eafcaeeb5756373c7d90dd7ce1a14e46f6f95dd96e2f642840e614b228f30eca6
+  metadata.gz: 9d992f97a309f26e11cba8cb5e85fb739f5a31d3efd5278e05c967033ca29cf400c7d8cbb49875ff952f359328c312310a6d842aed5c7526d7be27bfc5077d1e
+  data.tar.gz: 3d752d3adafa60f6c6af059e5b06ffa1cc0a955e72b55d77440d4e3fac443b1a72b48e0420eaa0cfb0acdec9c52eb242b41988cb437eeaf6eba7f1dc7fb979d7

data/lib/open_project/token/plans.rb

@@ -8,7 +8,6 @@ module OpenProject
       conditional_highlighting
       custom_actions
       custom_field_hierarchies
-      customize_life_cycle
       date_alerts
       define_custom_style
       edit_attribute_groups
@@ -65,6 +64,10 @@ module OpenProject
       # old plan that is used for all plans that do not have a plan set
       legacy_enterprise: LEGACY_ENTERPRISE_PLAN_FEATURES,
 
+      # old plan that receives new features from the given new plan name
+      legacy_enterprise_professional: (LEGACY_ENTERPRISE_PLAN_FEATURES + PROFESSIONAL_PLAN_FEATURES).uniq,
+      legacy_enterprise_premium: (LEGACY_ENTERPRISE_PLAN_FEATURES + PREMIUM_PLAN_FEATURES + PROFESSIONAL_PLAN_FEATURES).uniq,
+
       # new plans
       basic: BASIC_PLAN_FEATURES,
       professional: PROFESSIONAL_PLAN_FEATURES + BASIC_PLAN_FEATURES,
@@ -75,8 +78,11 @@ module OpenProject
     # Current plan names, sorted by inheritance
     ACTIVE_PLAN_NAMES = %i[basic professional premium corporate].freeze
 
+    LEGACY_PLAN_NAMES = %i[legacy_enterprise legacy_enterprise_professional
+                           legacy_enterprise_premium legacy_enterprise_corporate].freeze
+
     # All available plan names
-    AVAILABLE_PLAN_NAMES = %i[legacy_enterprise] + ACTIVE_PLAN_NAMES
+    AVAILABLE_PLAN_NAMES = LEGACY_PLAN_NAMES + ACTIVE_PLAN_NAMES
 
     # default plan that is assigned to a token if no plan is given (especially legacy tokens)
     DEFAULT_PLAN = :legacy_enterprise

data/lib/open_project/token/version.rb

@@ -2,6 +2,6 @@
 
 module OpenProject
   class Token
-    VERSION = "5.5.0"
+    VERSION = "6.0.0"
   end
 end

data/lib/open_project/token.rb

@@ -58,7 +58,8 @@ module OpenProject
     include ActiveModel::Validations
 
     attr_reader :version, :plan
-    attr_accessor :subscriber, :mail, :company, :domain, :starts_at, :issued_at, :expires_at, :reprieve_days, :notify_admins_at,
+    attr_accessor :subscriber, :mail, :company, :domain, :validate_domain,
+                  :starts_at, :issued_at, :expires_at, :reprieve_days, :notify_admins_at,
                   :notify_users_at, :block_changes_at, :restrictions, :features
 
     validates_presence_of :subscriber
@@ -74,6 +75,8 @@ module OpenProject
       record.errors.add attr, "is not a date" if !value.is_a?(Date)
     end
 
+    validate :expires_at_set_when_domain_opted_out
+
     validates_each :restrictions, allow_nil: true do |record, attr, value|
       record.errors.add attr, :invalid if !value.is_a?(Hash)
     end
@@ -154,6 +157,8 @@ module OpenProject
 
     # tokens with no version or a version lower than 2.0 don't have the attributes company or domain
     def validate_domain?
+      return validate_domain unless validate_domain.nil?
+
       version && Gem::Version.new(version) >= domain_required_from_version
     end
 
@@ -183,6 +188,7 @@ module OpenProject
       hash["mail"]             = mail
       hash["company"]          = company
       hash["domain"]           = domain
+      hash["validate_domain"]  = validate_domain
       hash["plan"]             = plan
 
       hash["issued_at"]        = issued_at
@@ -226,6 +232,7 @@ module OpenProject
       @mail = attributes["mail"]
       @company = attributes["company"]
       @domain = attributes["domain"]
+      @validate_domain = attributes["validate_domain"]
 
       date_attribute_keys.each do |attr|
         value = attributes[attr]
@@ -326,5 +333,13 @@ module OpenProject
     def apply_default_reprieve?(version)
       Gem::Version.new(version) < Gem::Version.new("2.2.0")
     end
+
+    # We want to ensure an expires_at is set
+    # when there is no domain present
+    def expires_at_set_when_domain_opted_out
+      if validate_domain == false && expires_at.nil?
+        errors.add(:expires_at, "must be present when domain is opted out")
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: openproject-token
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 6.0.0
 platform: ruby
 authors:
 - OpenProject GmbH
 bindir: bin
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel