openproject-token 7.3.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e0816b909165646bbe42b7254dab89bb0169999474ad6fb84b005d5163ae561
-  data.tar.gz: 79c926e4432ad8d6a8f21a1d5b8fc1e7933b8a7b72d1a60a6c0cb047e093c2ae
+  metadata.gz: 3f48b64629de53c6fda9d9e9521c405dceb616e918943c1ea0ba63643641526c
+  data.tar.gz: 2d836191f2c4056e4bb15ababa929c6d8be0d8ee89a56d6e9a52bea3ce399daa
 SHA512:
-  metadata.gz: 1dbc63100150b1d9124ba96aa7878baacf06a8394d84be7641e55103b4f79eafca193931636077bfdb76577996eacda4ff723bb9505f7b085d385863fe390b07
-  data.tar.gz: 84d1d38f62f5e26a3a192eb963dc9bf2ad066559f0933da86756b08f51ae2bfe0f088bd9056dec07858d56935bcece8a6540e8fe2ef6b0f1717faf21e679b8f0
+  metadata.gz: 8126b0cf871408bd4ef7660904292b38605de41c0458bc404f28b9b1a77dfbce84696802ed6726ade0ed0c014f122cead3afe9c1ea405dd41a245bbbc9a003de
+  data.tar.gz: 96f52b9e421ca374d3cda809c79470bb9118f040497c73e743f63eb167f4525fea631a4afc7f69e0fecaea80c251fd47b2b7715f40079710f073248111ffc2e7

data/lib/open_project/token/extractor.rb

@@ -13,7 +13,7 @@ module OpenProject
         @key = key
       end
 
-      def read(data)
+      def read(data) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
         unless key.public?
           raise KeyError, "Provided key is not a public key."
         end

data/lib/open_project/token/plans.rb

@@ -50,6 +50,7 @@ module OpenProject
     ].freeze
 
     PREMIUM_PLAN_FEATURES = %i[
+      calculated_values
       customize_life_cycle
       ldap_groups
       project_list_sharing
@@ -66,15 +67,15 @@ module OpenProject
       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,
+      legacy_enterprise_professional: LEGACY_ENTERPRISE_PLAN_FEATURES | PROFESSIONAL_PLAN_FEATURES,
+      legacy_enterprise_premium: LEGACY_ENTERPRISE_PLAN_FEATURES | PREMIUM_PLAN_FEATURES | PROFESSIONAL_PLAN_FEATURES,
 
       # new plans
       basic: BASIC_PLAN_FEATURES,
-      professional: PROFESSIONAL_PLAN_FEATURES + BASIC_PLAN_FEATURES,
-      premium: PREMIUM_PLAN_FEATURES + PROFESSIONAL_PLAN_FEATURES + BASIC_PLAN_FEATURES,
-      corporate: CORPORATE_PLAN_FEATURES + PREMIUM_PLAN_FEATURES + PROFESSIONAL_PLAN_FEATURES + BASIC_PLAN_FEATURES
-    }.freeze
+      professional: PROFESSIONAL_PLAN_FEATURES | BASIC_PLAN_FEATURES,
+      premium: PREMIUM_PLAN_FEATURES | PROFESSIONAL_PLAN_FEATURES | BASIC_PLAN_FEATURES,
+      corporate: CORPORATE_PLAN_FEATURES | PREMIUM_PLAN_FEATURES | PROFESSIONAL_PLAN_FEATURES | BASIC_PLAN_FEATURES
+    }.transform_values(&:to_set).freeze
 
     # Current plan names, sorted by inheritance
     ACTIVE_PLAN_NAMES = %i[basic professional premium corporate].freeze
@@ -85,6 +86,13 @@ module OpenProject
     # All available plan names
     AVAILABLE_PLAN_NAMES = LEGACY_PLAN_NAMES + ACTIVE_PLAN_NAMES
 
+    # Mapping of every feature to first active plan having it
+    LOWEST_PLAN_FOR_FEATURE = ACTIVE_PLAN_NAMES.each_with_object({}) do |name, map|
+      FEATURES_PER_PLAN[name].each do |feature|
+        map[feature] ||= name
+      end
+    end
+
     # default plan that is assigned to a token if no plan is given (especially legacy tokens)
     DEFAULT_PLAN = :legacy_enterprise
   end

data/lib/open_project/token/version.rb

@@ -2,6 +2,6 @@
 
 module OpenProject
   class Token
-    VERSION = "7.3.0"
+    VERSION = "8.0.0"
   end
 end

data/lib/open_project/token.rb

@@ -49,9 +49,7 @@ module OpenProject
       end
 
       def lowest_plan_for(feature)
-        OpenProject::Token::ACTIVE_PLAN_NAMES.detect do |plan|
-          OpenProject::Token::FEATURES_PER_PLAN[plan].include?(feature)
-        end
+        LOWEST_PLAN_FOR_FEATURE[feature]
       end
     end
 
@@ -115,12 +113,12 @@ module OpenProject
     end
 
     def available_features
-      return @available_features if defined?(@available_features)
-
-      relevant_features = OpenProject::Token::FEATURES_PER_PLAN[plan] || []
-      additional_features = features || []
+      @available_features ||= begin
+        relevant_features = OpenProject::Token::FEATURES_PER_PLAN[plan] || []
+        additional_features = features || []
 
-      @available_features = (relevant_features + additional_features).uniq
+        relevant_features | additional_features
+      end
     end
 
     ##
@@ -205,30 +203,31 @@ module OpenProject
       end
     end
 
-    def attributes
-      hash = {}
-
-      hash["version"]          = version
-      hash["subscriber"]       = subscriber
-      hash["mail"]             = mail
-      hash["company"]          = company
-      hash["domain"]           = domain
-      hash["validate_domain"]  = validate_domain
-      hash["plan"]             = plan
+    def attributes # rubocop:disable Metrics/AbcSize
+      hash = {
+        "version" => version,
+        "subscriber" => subscriber,
+        "mail" => mail,
+        "company" => company,
+        "domain" => domain,
+        "validate_domain" => validate_domain,
+        "plan" => plan,
+        "issued_at" => issued_at,
+        "starts_at" => starts_at,
+        "trial" => trial,
+        "features" => features
+      }
 
-      hash["issued_at"]        = issued_at
-      hash["starts_at"]        = starts_at
-      hash["expires_at"]       = expires_at       if will_expire?
-      hash["reprieve_days"]    = reprieve_days    if will_expire?
-
-      hash["trial"]            = trial
+      if will_expire?
+        hash["expires_at"]       = expires_at
+        hash["reprieve_days"]    = reprieve_days
+      end
 
       hash["notify_admins_at"] = notify_admins_at if will_notify_admins?
       hash["notify_users_at"]  = notify_users_at  if will_notify_users?
       hash["block_changes_at"] = block_changes_at if will_block_changes?
 
       hash["restrictions"]     = restrictions     if restricted?
-      hash["features"]         = features
 
       hash
     end
@@ -251,7 +250,7 @@ module OpenProject
 
     private
 
-    def load_attributes(attributes)
+    def load_attributes(attributes) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
       attributes = attributes.transform_keys(&:to_s)
 
       @version = read_version attributes

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: openproject-token
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 8.0.0
 platform: ruby
 authors:
 - OpenProject GmbH
 bindir: bin
 cert_chain: []
-date: 2025-07-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -48,14 +48,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.4.2
+      version: 3.4.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: OpenProject EE token reader
 test_files: []