openproject-token 2.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5da90cc05359f099b94484c379973b4c4464b8f9ef7f6d20bdefba2b4fc61537
-  data.tar.gz: 5f87461bbf02ecf0d8c5663b4dba13ea9c511dbd807d8c3e15e4adfe5c040f57
+  metadata.gz: d622e466da4e5bf9dab90d1ee1fcfac8757ce2a24fdc19a9c4b4be954081eaa1
+  data.tar.gz: 7ddbec23cf11fb83e1177abf33a942418e009f45567c0015c56fb20b9cea1225
 SHA512:
-  metadata.gz: dd82c0f1815535f7e568d969a1c4e469beaf4d5470014c59496c12e2cd82edf0b9c6e6d9267cfa4b97ef9b6408a737f41fb1d8ae3cdb70c7353ae29f4e7cb940
-  data.tar.gz: ec350f3838ec36b45fb6d0671bac492abd0bf7b5975ced83f2c430b6148274e34d93907525830aa4c5dc44fc2e2182f4092d7bc818d11bfdcd906a77a5411eda
+  metadata.gz: 87d2219c37f2574e9c7651241e2c49af4f4928b7b84278bc1f92f97c8651142e414a68bdc3e2ce79e57b78df58b82d0c1b6fe6c2719b8889ae1374a5eadd29d3
+  data.tar.gz: 4505d7dca7305c46cd76a7afa3435615f78413d89f60ed28f566c65acb0376fec0bc2adc95c43af09d4f3a73f42656fc6bd6ebbdbd3d08ae728ca31d3932c0d2

data/lib/open_project/token.rb

@@ -155,13 +155,8 @@ module OpenProject
 
     def load_attributes(attributes)
       attributes = Hash[attributes.map { |k, v| [k.to_s, v] }]
-      version = attributes["version"].then { |v| v && Gem::Version.new(v) } || current_gem_version
 
-      if version > current_gem_version
-        raise ArgumentError, "Version is too new"
-      end
-
-      @version = version.to_s
+      @version = read_version attributes
       @subscriber = attributes["subscriber"]
       @mail = attributes["mail"]
       @company = attributes["company"]
@@ -184,6 +179,37 @@ module OpenProject
       end
     end
 
+    ##
+    # Reads the version from the given attributes hash.
+    # Besides the usual values it allows for a special value `-1`.
+    # This is then results in the version being `nil` specifically rather than
+    # the current gem version by default.
+    #
+    # This way the generated token will get what ever version the importing party
+    # has. This is important due to a bug in openproject-token 1.x where any version
+    # other than `nil` (or the integer literal 1) results in a "Version is too new" error.
+    # This affects all OpenProject installations with a version older than 10.6
+    # which will run into internal server errors trying to activate their Enterprise
+    # tokens due to this.
+    #
+    # Generating tokens with version `-1` prevents that.
+    #
+    # @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.present? && value.to_s != "-1"
+        version = Gem::Version.new value
+
+        if version > current_gem_version
+          raise ArgumentError, "Version is too new"
+        end
+      end
+
+      version
+    end
+
     def date_attribute_keys
       %w(starts_at issued_at expires_at notify_admins_at notify_users_at block_changes_at)
     end

data/lib/open_project/token/version.rb

@@ -1,5 +1,5 @@
 module OpenProject
   class Token
-    VERSION = "2.0"
+    VERSION = "2.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openproject-token
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.1.3
 platform: ruby
 authors:
 - OpenProject GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: OpenProject EE token reader