doorkeeper-jwt 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92e4e37830ecbed4396d8d8aca91898759e15de9
-  data.tar.gz: ac9fb57d4e5f11f02c6e483437f96b95e6c3c1bd
+  metadata.gz: f9ccfe46d3353aab84a2a11554970f4c8d784824
+  data.tar.gz: a674ffb947b6df31dcf1dd1fdefc660530a9d3b6
 SHA512:
-  metadata.gz: b5a613775e07bdf7436ade61979910550e98c2527d117ffefc2f0a0ef7ec40ebe2a74fb1a68b500e04065129f4f56e9ff49f21e6604b34a0d668bfed7818ecd8
-  data.tar.gz: d6ea6b6b2a0caa80e29288f12814251da78bbfade9a4fd51fc4a91188e76ed0549c4168443c3654b1d86c643fa21ea911cabd31b8259375d8ca269f5e0642c66
+  metadata.gz: 598c6248361ad6cf25e1bd5df14720696a1e671d13c808ad06217e3f54b3aa1ae01e8664bebef975bb225bea6837bcd7db67d6aa7c58c88a4f518c372ac5dab2
+  data.tar.gz: 5103722a7035d3b494a5b2ee79f61559980d2b4b5234a2269ddc206bb9eea8689146e6da13a5e1cbde01fdec5c64ecca3e0ab377e6bc27c31d8617b160f800d0

data/README.md

@@ -4,10 +4,10 @@
 
 # Doorkeeper::JWT
 
-Doorkeeper JWT adds JWT token support to the Doorkeeper OAuth library. Requires Doorkeeper 2.2.0 or newer. Until it is released (expected mid-April, 2015), you can load the necessary commit that addis custom token support in your gemfile.
+Doorkeeper JWT adds JWT token support to the Doorkeeper OAuth library. Requires Doorkeeper 2.2.0 or newer.
 
 ```ruby
-gem 'doorkeeper', git: "git://github.com/doorkeeper/doorkeeper-gem", ref: '910112'
+gem 'doorkeeper'
 ```
 
 ## Installation

data/lib/doorkeeper-jwt.rb

@@ -45,9 +45,18 @@ module Doorkeeper
       end
 
       def application_secret(opts)
-        opts = { application: {} }.merge(opts)
-        return opts[:application][:secret] if opts[:application][:secret]
-        fail "JWT `use_application_secret` config set, but no app secret set."
+        if opts[:application].nil?
+          fail "JWT `use_application_secret` is enabled but application is " \
+            "nil. This can happen if `client_id` was absent in the request " \
+            "params."
+        end
+
+        if opts[:application][:secret].nil?
+          fail "JWT `use_application_secret` is enabled but the application " \
+            "secret is nil."
+        end
+
+        opts[:application][:secret]
       end
 
       def rsa_encryption?
@@ -67,15 +76,15 @@ module Doorkeeper
       end
 
       def rsa_key_file
-        OpenSSL::PKey::RSA.new(secret_key_file_open)
+        secret_key_file_open { |f| OpenSSL::PKey::RSA.new(f) }
       end
 
       def ecdsa_key_file
-        OpenSSL::PKey::EC.new(secret_key_file_open)
+        secret_key_file_open { |f| OpenSSL::PKey::EC.new(f) }
       end
 
-      def secret_key_file_open
-        File.open(Doorkeeper::JWT.configuration.secret_key_path)
+      def secret_key_file_open(&block)
+        File.open(Doorkeeper::JWT.configuration.secret_key_path, &block)
       end
     end
   end

data/lib/doorkeeper-jwt/version.rb

@@ -1,5 +1,5 @@
 module Doorkeeper
   module JWT
-    VERSION = "0.1.7".freeze
+    VERSION = "0.1.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-jwt
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Chris Warren
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: JWT token generator for Doorkeeper