doorkeeper-jwt 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a943aa0b9dc65189852d3ab4584371c3254c2ee1
-  data.tar.gz: 2a4f967cbef940a5d3fb5248b419d48adcdb324c
+  metadata.gz: 1ff009a39cd26ca42d11020a59e90af650018533
+  data.tar.gz: f0ee2214976c6101c39c8da3f14a50e2a5e3001c
 SHA512:
-  metadata.gz: c15efeba186db245f32174ba86e8eec0e8939f7534d42e19cc05230a20ba9269994c17ecaab588d33cd32a6c77bab5386ec5146111d48430aa1443ce190403c8
-  data.tar.gz: bb1c0da134318b6787b6571ec9c34b269095c0a9f5421d3186ed24ce3ba6c27e6f6494be83dbcca8d90632bcafea06db852ae80311c863e252aa8141bbb6c5d9
+  metadata.gz: 39a38a9e249066e0aad3ce653c94051b3ef9febb47207b9f5dd2bd2e1f090165c3b04ed5372f55fd9a357290e3c61f92d6c5f45aba460e1476859186ba1bf370
+  data.tar.gz: e12b95128803fe60e577537ba93e3fc810003491c34e2f84a8ed7ccc59aa360e8168592f9f2228560305f809e2a322e33b535708c6396d6d4065ce6f9e351634

data/README.md

@@ -53,6 +53,11 @@ Doorkeeper::JWT.configure do
     }
   end
 
+  # Use the application secret specified in the Access Grant token
+  # Defaults to false
+  # If you specify `use_application_secret true`, both secret_key and secret_key_path will be ignored
+  use_application_secret false
+
   # Set the encryption secret. This would be shared with any other applications
   # that should be able to read the payload of the token.
   # Defaults to "secret"

data/lib/doorkeeper-jwt.rb

@@ -8,7 +8,7 @@ module Doorkeeper
       def generate(opts = {})
         ::JWT.encode(
           token_payload(opts),
-          secret_key,
+          secret_key(opts),
           encryption_method
         )
       end
@@ -19,7 +19,10 @@ module Doorkeeper
         Doorkeeper::JWT.configuration.token_payload.call opts
       end
 
-      def secret_key
+      def secret_key(opts)
+        opts = { application: {} }.merge(opts)
+
+        return application_secret(opts) if use_application_secret?
         return secret_key_file unless secret_key_file.nil?
         return rsa_key if rsa_encryption?
         return ecdsa_key if ecdsa_encryption?
@@ -37,6 +40,16 @@ module Doorkeeper
         Doorkeeper::JWT.configuration.encryption_method.to_s.upcase
       end
 
+      def use_application_secret?
+        return false unless Doorkeeper::JWT.configuration.use_application_secret
+      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."
+      end
+
       def rsa_encryption?
         /RS\d{3}/ =~ encryption_method
       end

data/lib/doorkeeper-jwt/config.rb

@@ -25,6 +25,13 @@ module Doorkeeper
           @config
         end
 
+        def use_application_secret(use_application_secret)
+          @config.instance_variable_set(
+            "@use_application_secret",
+            use_application_secret
+          )
+        end
+
         def secret_key(secret_key)
           @config.instance_variable_set('@secret_key', secret_key)
         end
@@ -104,10 +111,15 @@ module Doorkeeper
 
       option :token_payload,
         default: proc{ { token: SecureRandom.method(:hex) } }
+      option :use_application_secret, default: false
       option :secret_key, default: nil
       option :secret_key_path, default: nil
       option :encryption_method, default: nil
 
+      def use_application_secret
+        @use_application_secret ||= false
+      end
+
       def secret_key
         @secret_key ||= nil
       end

data/lib/doorkeeper-jwt/version.rb

@@ -1,5 +1,5 @@
 module Doorkeeper
   module JWT
-    VERSION = "0.1.5"
+    VERSION = "0.1.6".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-jwt
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Chris Warren