ripple_token 0.2.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80df9846c357f7f07f1d79aa2f4d1e4f4521e5adde474ef6798f67204a05c443
-  data.tar.gz: e0f9a30cf3dfe32a2c40909340fde9a27a3253450a969342960fe60fd609a145
+  metadata.gz: 9340efe777dcdb596e731768b6ca0d0781db3d74e162a1bc138b8d1d555c26ed
+  data.tar.gz: 33f413b201c9fc280d4a773f819374121b57b6591f7d347619e263f46278d785
 SHA512:
-  metadata.gz: 0bbf3b3f2c4aea7aa04275cd197e440d1a2b95b6d6d0a89750ecae01789aac7e7d7ef4b0554a5476e9515e8ad629b3be511fb95efb97ffc58d8d21195136d759
-  data.tar.gz: 13c81c3248f66c23b3cc29a20d11e8cd4f129e4f6ab65a3b97bcf7bea4533c82ccc288e4d85fd2437117481535635ed6c809c7c7442f74db09ee1c9f7b44e73e
+  metadata.gz: 01f1df20b2e3830a7462f1e416548abd4c6890be3755e1399092676917ea133d8cc832685214d980c01f1f2be0daaee1874d57414aa3c7ccbf895f99bfd4a54e
+  data.tar.gz: 7e612334e9b018e567f085586f1290a2c316d0636b3e7a55f7c4e6759d39892a5bb11dc3135996eeb20ddacda6c26a5e9983fe4167911d9942bfc8e10487f402

data/lib/ripple_token/client.rb

@@ -11,7 +11,7 @@ module RippleToken
     include HTTParty
 
     class << self
-      delegate :public_paths, to: :configuration
+      delegate :public_paths, :logger, to: :configuration
 
       def configure
         @configuration = Configuration.new

data/lib/ripple_token/configuration.rb

@@ -5,6 +5,7 @@ module RippleToken
     attr_accessor :base_url,
                   :realm,
                   :public_key_ttl,
-                  :public_paths
+                  :public_paths,
+                  :logger
   end
 end

data/lib/ripple_token/middleware.rb

@@ -15,19 +15,25 @@ module RippleToken
       path = env['PATH_INFO']
 
       encoded_token = env['HTTP_AUTHORIZATION']&.gsub(/^Bearer /, '') || ''
-      unless token.public_path? method, path
-        raise MissingTokenError if encoded_token.nil? || encoded_token&.empty?
-      end
-      decoded_token = token.decode(encoded_token)
 
-      store_user_details(decoded_token, env)
+      Client.logger.debug("Received #{encoded_token} token")
+
+      if encoded_token.nil? || encoded_token&.empty?
+        Client.logger.info('No token provided in request')
+        raise MissingTokenError unless token.public_path? method, path
+      else
+        store_user_details(encoded_token, env)
+      end
 
       @app.call(env)
     end
 
     private
 
-    def store_user_details(decoded_token, env)
+    def store_user_details(encoded_token, env)
+      env['keycloak.raw_token'] = encoded_token
+      decoded_token = token.decode(encoded_token)
+
       env['keycloak.token'] = decoded_token
       env['keycloak.user_id'] = decoded_token['sub']
       env['keycloak.user_roles'] = decoded_token['realm_access']['roles']

data/lib/ripple_token/token.rb

@@ -7,22 +7,20 @@ module RippleToken
     end
 
     def decode(token)
-      begin
-        decoded_token = JWT.decode(token, public_key, true, { algorithm: 'RS256' })[0]
-        raise ExpiredTokenError if expired? decoded_token
-
-        decoded_token
-      rescue JWT::DecodeError => e
-        raise TokenDecodeError, e.message
-      rescue JWT::ExpiredSignature => e
-        raise ExpiredTokenError, e.message
-      end
+      decoded_token = JWT.decode(token, public_key, true, { algorithm: 'RS256' })[0]
+      raise ExpiredTokenError if expired? decoded_token
+
+      decoded_token
+    rescue JWT::DecodeError => e
+      raise TokenDecodeError, e.message
+    rescue JWT::ExpiredSignature => e
+      raise ExpiredTokenError, e.message
     end
 
     def public_path?(method, path)
       return false if Client.public_paths.nil? || Client.public_paths.empty?
 
-      return true if Client.public_paths[method]&.include? path
+      return true if Client.public_paths[method]&.select { |p| path[p] }&.any?
 
       false
     end

data/lib/ripple_token/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RippleToken
-  VERSION = '0.2.1'
+  VERSION = '0.5.1'
 end

data/ripple_token.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency('activesupport', '6.0.3.1')
+  spec.add_dependency('activesupport', '~>6.0')
   spec.add_dependency('httparty', '0.18.1')
   spec.add_dependency('jwt', '2.2.1')
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ripple_token
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Hex Event Solutions Limited
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement