omniauth-fishbrain 0.11.4 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58b986c338209b8d0078fe1575f66ebac4af360a662db67d0bfff5f3ee6a9dae
-  data.tar.gz: d111c45ee3100e0232bf0d5993b80430990bc39c20a7bc0cf7d97c33ec91de44
+  metadata.gz: d4b3c0a2abc25300f40434bb973195ee9ea875d5f767732280ee4988627378e3
+  data.tar.gz: 90dcb4f7dee77f1433db50ba6141c9424db423827f745cb63ff6e6848fdd1f09
 SHA512:
-  metadata.gz: 99441c0a1cf973b4a8a1ed557a3cf361ebbf54695f864bdcf0ad98ebc63d3798c70111a71dd77f262f1a64cd6743cad3ec5c65d544bd156c45a4eccb53e30c1e
-  data.tar.gz: e282f4cd037715c4e826938e33305f7d5b9a07784170fbb3d510599338683f2807aad4f6ad60307035e44000f37bebb6f6defd034f4534598b7fe316da04228f
+  metadata.gz: f2ee202dc71c22553a1c7e4b164256530aa75f0543ddf8335ed7085366a14662017994b4abe6ecfea6ec6a00fb2880f0e97947df6b78150e224f18916533e30d
+  data.tar.gz: b559dcea451bb280efb92ec2d6f6215bea30a56d3f077b03aefb7a9d011fdafe116433c23c42376df31a60afff644b4ee6cc1665c7128d2a8f5805fab1a148df

data/lib/omniauth/fishbrain/decode_id_token.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require 'net/http'
+require 'omniauth/fishbrain/jwks'
 require 'jwt'
 
 module OmniAuth
   module Fishbrain
     class DecodeIdToken
+      include Jwks
+
       AWS_REGION = 'eu-west-1'
       USER_POOL_ID = 'eu-west-1_TKWveIcYu'
 
@@ -28,7 +30,7 @@ module OmniAuth
         {
           iss: iss,
           aud: client_id,
-          verify_aud: true,
+          verify_aud: false,
           verify_expiration: true,
           verify_iat: true,
           verify_iss: true,
@@ -44,10 +46,7 @@ module OmniAuth
       end
 
       def jwks
-        @_jwks ||= "#{iss}/.well-known/jwks.json"
-          .yield_self(&URI.method(:parse))
-          .yield_self(&Net::HTTP.method(:get))
-          .yield_self { |it| JSON.parse(it, symbolize_names: true) }
+        get_json("#{iss}/.well-known/jwks.json")
       end
     end
   end

data/lib/omniauth/fishbrain/jwks.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'api_cache'
+
+module OmniAuth
+  module Fishbrain
+    module Jwks
+      def get_json(uri)
+        APICache.get('fishbrain_jwks', cache: 86_400, period: 0) do # 24 hours
+          uri
+            .yield_self(&URI.method(:parse))
+            .yield_self(&Net::HTTP.method(:get))
+            .yield_self { |it| JSON.parse(it, symbolize_names: true) }
+        end
+      end
+    end
+  end
+end

data/lib/omniauth/fishbrain/verifies_id_token.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'net/http'
+require 'omniauth/fishbrain/jwks'
 require 'jwt'
 
 module OmniAuth
@@ -34,11 +34,7 @@ module OmniAuth
       end
 
       def jwks
-        @_jwks ||= \
-          "#{iss}/.well-known/jwks.json"
-            .yield_self(&URI.method(:parse))
-            .yield_self(&Net::HTTP.method(:get))
-            .yield_self { |it| JSON.parse(it, symbolize_names: true) }
+        get_json("#{iss}/.well-known/jwks.json")
       end
     end
   end

data/lib/omniauth-fishbrain/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Fishbrain
-    VERSION = '0.11.4'
+    VERSION = '0.12.1'
   end
 end

data/lib/omniauth-fishbrain.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'omniauth/fishbrain/jwks'
 require 'omniauth-fishbrain/version'
 require 'omniauth/strategies/fishbrain'
 require 'omniauth/strategies/fishbrain_id'

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-fishbrain
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.1
 platform: ruby
 authors:
 - Erik Dalen
 - Fishbrain AB
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: api_cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: 
+description:
 email:
 - erik.dalen@fishbrain.com
 - developer@fishbrain.com
@@ -52,6 +66,7 @@ files:
 - lib/omniauth-fishbrain.rb
 - lib/omniauth-fishbrain/version.rb
 - lib/omniauth/fishbrain/decode_id_token.rb
+- lib/omniauth/fishbrain/jwks.rb
 - lib/omniauth/fishbrain/premium_status.rb
 - lib/omniauth/fishbrain/verifies_id_token.rb
 - lib/omniauth/strategies/fishbrain.rb
@@ -60,7 +75,7 @@ homepage: https://github.com/fishbrain/omniauth-fishbrain
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,15 +83,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: OmniAuth strategy for Fishbrain
 test_files: []