openproject-token 6.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77fc561da569bc057220c91166f038cd49f8e645d5b9dde533aceb1c80bce8ea
-  data.tar.gz: c9c2a688b6bf1d1f9ab2547e8b19ce42c45e1dc7f0f7500210a99be3d767786f
+  metadata.gz: 63665d957815aafd0308a5628591c5ac6cd840c9f12e6464a20dfd76f27dd259
+  data.tar.gz: b53da714e6cdbfcd18dae002131654ab2e796e2e7d81714b9b167525a9da108c
 SHA512:
-  metadata.gz: 9d992f97a309f26e11cba8cb5e85fb739f5a31d3efd5278e05c967033ca29cf400c7d8cbb49875ff952f359328c312310a6d842aed5c7526d7be27bfc5077d1e
-  data.tar.gz: 3d752d3adafa60f6c6af059e5b06ffa1cc0a955e72b55d77440d4e3fac443b1a72b48e0420eaa0cfb0acdec9c52eb242b41988cb437eeaf6eba7f1dc7fb979d7
+  metadata.gz: d80260f9e40dfac79c368f4efebe814dc225d47a6605a163d34b2a02072ecfac769f77e76587fcd5f67a673ed669e360b3dc8fa213e02b0f71cf0c199bcd0348
+  data.tar.gz: 4f92593ff133135690a016f6b80e1103f23a72b514d02cc27890eb2f5a66d9fb4496b861830758254601f3f86a02704ee8354c9396d70854615d83e518fa22e9

data/lib/open_project/token/version.rb

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

data/lib/open_project/token.rb

@@ -60,7 +60,7 @@ module OpenProject
     attr_reader :version, :plan
     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
+                  :notify_users_at, :block_changes_at, :trial, :restrictions, :features
 
     validates_presence_of :subscriber
     validates_presence_of :mail
@@ -76,6 +76,7 @@ module OpenProject
     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)
@@ -101,6 +102,10 @@ module OpenProject
       block_changes_at
     end
 
+    def trial?
+      trial
+    end
+
     def has_feature?(name)
       available_features.include?(name.to_sym)
     end
@@ -196,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?
@@ -272,6 +279,8 @@ module OpenProject
       end
 
       @plan = attributes["plan"].presence&.to_sym || OpenProject::Token::DEFAULT_PLAN
+
+      @trial = !!attributes["trial"]
     end
 
     ##
@@ -292,19 +301,12 @@ module OpenProject
     # @param attr [Hash] Parsed token attributes.
     def read_version(attr)
       value = attr.include?("version") ? attr["version"] : current_gem_version.to_s
-      version = nil
 
       if value.to_s == "1"
-        version = 1
+        1
       elsif value.present? && value.to_s != "-1"
-        version = Gem::Version.new value
-
-        if version > current_gem_version
-          raise ArgumentError, "Version is too new"
-        end
+        Gem::Version.new value
       end
-
-      version
     end
 
     def read_domain!(input)
@@ -341,5 +343,12 @@ module OpenProject
         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: 6.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - OpenProject GmbH
 bindir: bin
 cert_chain: []
-date: 2025-05-07 00:00:00.000000000 Z
+date: 2025-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel