openproject-token 5.6.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36aeb4422e747d1b83436aa76276aa14096e3a3ca202cae90d5b3a3a8bfd4b81
-  data.tar.gz: ab34247624cc0385b4ea80ba9b5598a734dcab4373cd1d10574b2ad08aad3e53
+  metadata.gz: f6ac0004df7e78a0a684a2f03f3ea6ef7b2c17412fc3733715b184975d70cfed
+  data.tar.gz: 0405bb6c40b5644554552743acac9e7af7882cc7a8a489ed3e6b98f01db29bca
 SHA512:
-  metadata.gz: 5f1382852ff0802b7c420a189dc6b814edcbdc2477f499dbb52a2ebba56e7cdb4a5ede694cc30bd3f2888d3bddbe34a57205739fbf8869b055d162eecda4282d
-  data.tar.gz: 3b68c01e6543e188373cb4116ad341402ba44608c09d8565ed28f1d79100d36f216146e649c21b39e3bc132de12ac28b002453d4a9b7ff796acf50399589ed33
+  metadata.gz: 9a438c178966e9a0036c411848d183cba6479607dede79b80802b4f01e0631375c7f08035bf63c6fa06e265b166ef3942fc84fb10f13f7bcc4e9ece4e5eff59c
+  data.tar.gz: 00d0bbb67969aff8a5a45b9be94232f314ecd461d221561ef5164a546016b514fd6ab4b080e54a8fa4dcf969110206169f521d0d47952dafe85e1f1d9f36fce3

data/lib/open_project/token/version.rb

@@ -2,6 +2,6 @@
 
 module OpenProject
   class Token
-    VERSION = "5.6.0"
+    VERSION = "7.0.0"
   end
 end

data/lib/open_project/token.rb

@@ -58,8 +58,9 @@ 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,
-                  :notify_users_at, :block_changes_at, :restrictions, :features
+    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, :trial, :restrictions, :features
 
     validates_presence_of :subscriber
     validates_presence_of :mail
@@ -74,6 +75,9 @@ module OpenProject
       record.errors.add attr, "is not a date" if !value.is_a?(Date)
     end
 
+    validate :expires_at_set_when_domain_opted_out
+    validate :expires_at_set_when_trial
+
     validates_each :restrictions, allow_nil: true do |record, attr, value|
       record.errors.add attr, :invalid if !value.is_a?(Hash)
     end
@@ -98,6 +102,10 @@ module OpenProject
       block_changes_at
     end
 
+    def trial?
+      trial
+    end
+
     def has_feature?(name)
       available_features.include?(name.to_sym)
     end
@@ -154,6 +162,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 +193,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
@@ -190,6 +201,8 @@ module OpenProject
       hash["expires_at"]       = expires_at       if will_expire?
       hash["reprieve_days"]    = reprieve_days    if will_expire?
 
+      hash["trial"]            = trial
+
       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?
@@ -226,6 +239,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]
@@ -265,6 +279,8 @@ module OpenProject
       end
 
       @plan = attributes["plan"].presence&.to_sym || OpenProject::Token::DEFAULT_PLAN
+
+      @trial = !!attributes["trial"]
     end
 
     ##
@@ -326,5 +342,20 @@ 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
+
+    # We want to ensure an expires_at is set when the token is a trial token
+    def expires_at_set_when_trial
+      if trial? && expires_at.nil?
+        errors.add(:expires_at, "must be present for a trial")
+      end
+    end
   end
 end

metadata

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