jekyll-indico 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dcfd6b6c484e7b1733fa6ac09b3b1835c64127f
-  data.tar.gz: 71a26d70ac96e8a8c0b1d6110af6c9b24373680d
+  metadata.gz: 3ba6c0b97ed60402adc30d9f4d0c0077b7c7293b
+  data.tar.gz: '0322806b14154b9d0da3441ed64ff0931276736e'
 SHA512:
-  metadata.gz: 22be7365dca3c8491af78d56164cc4b5eeffa4e969d2436792cd30ae3b2a2b79ed474198d00b9636b9fa2b9fa9bbf37b3e989b96b5026dc11faaeed010508b89
-  data.tar.gz: eaa61758e36bf45ffd78ed807bd1acdd4e1d678a41d4c88765f057bf622391ec7bc4b90e41f5c2c72fc97637cba2581749304b59da78c76f6840b4715d0d80ea
+  metadata.gz: 60013b3c444d121db0b865797eb9353b47220f2b6b186f5d949aa27b7426976ad3d7914624b9cb4578a5c397a08847907b0637dd531fc47a121ef005f279061e
+  data.tar.gz: 82c1b136bec61c8fe09011e3a62376c39981e1195febcd70e5ae4f30e9bbc7dcaf6f77626129e2782e0f0831707231b68d6a4c84063439a21b1a0a8f0a17305d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.4.2
+
+Remove broken support for classic tokens. Modern `INDICO_TOKEN` required.
+
 # Version 0.4.1
 
 Fix a few issues in Jekyll generator.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-indico (0.4.1)
+    jekyll-indico (0.4.2)
       jekyll (>= 3.8, < 5.0)
 
 GEM

data/README.md

@@ -20,9 +20,9 @@ indico:
 ```
 
 This plugin will automatically use an API token if your environment contains
-`INDICO_TOKEN`. If you use the deprecated API, this plugin will automatically
-sign your requests if your environment contains `INDICO_API` and
-`INDICO_SECRET_KEY`.
+`INDICO_TOKEN`. You should generate this and replace `INDICO_API` and
+`INDICO_SECRET_KEY` with it. You'll want the "Classic API" read permissions set
+on it.
 
 #### Usage: installing
 

data/lib/jekyll-indico/core.rb

@@ -63,13 +63,17 @@ module JekyllIndico
     private
 
     # Run a block over each item in the downloaded results
-    def download_and_iterate(base_url, indico_id, **kargs, &block)
+    def download_and_iterate(base_url, indico_id, **params, &block)
+      params[:pretty] = 'no'
       uri = URI.join(base_url, "/export/categ/#{indico_id}.json")
-      params = build_params(**kargs)
       uri.query = URI.encode_www_form(params)
 
       req = Net::HTTP::Get.new(uri)
-      req['Authorization'] = "Bearer #{ENV['INDICO_TOKEN']}" if ENV['INDICO_TOKEN']
+      if ENV['INDICO_TOKEN']
+        req['Authorization'] = "Bearer #{ENV['INDICO_TOKEN']}"
+      elsif ENV['INDICO_SECRET_KEY'] || ENV['INDICO_API']
+        raise Error, 'Use INDICO_TOKEN with a new-style token'
+      end
 
       response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) { |http| http.request(req) }
 
@@ -78,21 +82,5 @@ module JekyllIndico
 
       parsed['results'].each(&block)
     end
-
-    # Automatically signs request if environment has INDICO_API/SECRET_KEY
-    def build_params(**kargs)
-      kargs[:pretty] = 'no'
-
-      if ENV['INDICO_API_KEY'] && !ENV['INDICO_TOKEN']
-        kargs[:ak] = ENV['INDICO_API_KEY']
-        if ENV['INDICO_SECRET_KEY']
-          kargs[:timestamp] = Time.new.to_i.to_s
-          requeststr = join_url(indico_id, kargs)
-          kargs[:signature] = OpenSSL::HMAC.hexdigest('SHA1', ENV['INDICO_SECRET_KEY'], requeststr)
-        end
-      end
-
-      kargs
-    end
   end
 end

data/lib/jekyll-indico/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllIndico
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-indico
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Henry Schreiner