omniauth-fishbrain 0.11.2 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bedfbaf6891f13e4fde627ca255cd69bd2fd662a68fcc0bdc929a81886cd33f6
-  data.tar.gz: c92b9f4458eda83cd28c7b30dbff8c59576584a9ec159963a9d9ea04b23a4a37
+  metadata.gz: 5f50dfb6ad611857363bafd7f98dfd8a26c6241e021b285358a838bdf735e6b5
+  data.tar.gz: 64886edd7b774f99c6a58d989471c7c374fa98fb8c087cd8d0fd97cfc19b2dc0
 SHA512:
-  metadata.gz: 2a61f6e3c4a649bb40e03b992335191e742bd760f5a372f72711ed09ac58da1fa53116424e9f3ed75a869de4bb1210ea1a5f97626f14c4107ec62c5c0e41bc7c
-  data.tar.gz: bb2cfe13d12b9706b18739dfd967f63f770a68228bb12148285a26173383bd132660668d4fdd94ac9a3a6ec9daf25701a2cedbda30681f75730a79f2d30edf6a
+  metadata.gz: b07f0d861cc9d6cab95ee3e76d44c88d2a7d353de04d29f25c56b15b89b75ecc44515dabeeb382a966b727bde429e319a3ceeb58ebd436f7c9b110c77dc93b1f
+  data.tar.gz: 360bd6039fd1c0cc7039c4851997884f9d6c05e81cb594f36b058dd7909b08674307caab358739539498145aaaae957f4a7d32eeaf454009de431f00c5786b0f

data/lib/omniauth/fishbrain/decode_id_token.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+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'
+
+      attr_reader :client_id, :aws_region, :user_pool_id, :jwt_leeway
+
+      def initialize(client_id, user_pool_id = USER_POOL_ID, aws_region = AWS_REGION)
+        @client_id = client_id
+        @user_pool_id = user_pool_id
+        @aws_region = aws_region
+        @jwt_leeway = 60
+      end
+
+      def decode(raw_id_token)
+        JWT.decode(raw_id_token, nil, true, decode_options).first
+      end
+
+      private
+
+      def decode_options
+        {
+          iss: iss,
+          aud: client_id,
+          verify_aud: false,
+          verify_expiration: true,
+          verify_iat: true,
+          verify_iss: true,
+          verify_not_before: true,
+          leeway: jwt_leeway,
+          algorithm: 'RS256',
+          jwks: jwks,
+        }
+      end
+
+      def iss
+        "https://cognito-idp.#{aws_region}.amazonaws.com/#{user_pool_id}"
+      end
+
+      def jwks
+        get_json("#{iss}/.well-known/jwks.json")
+      end
+    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) 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/premium_status.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'date'
 require 'json'
 
 module OmniAuth
@@ -9,15 +8,14 @@ module OmniAuth
       def premium_status
         return {} unless id_token['premium_status']
 
-        JSON.parse id_token['premium_status']
+        JSON.parse(id_token['premium_status'])
       rescue JSON::ParserError
         {}
       end
 
       def premium?
-        DateTime.rfc3339(premium_status['premium_end_date']) > DateTime.now
+        Time.xmlschema(premium_status['end_date']) > Time.new.utc
       rescue ArgumentError
-        # if format was wrong
         false
       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.2'
+    VERSION = '0.11.6'
   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.2
+  version: 0.11.6
 platform: ruby
 authors:
 - Erik Dalen
 - Fishbrain AB
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2021-08-30 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
@@ -51,6 +65,8 @@ files:
 - README.markdown
 - 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
@@ -59,7 +75,7 @@ homepage: https://github.com/fishbrain/omniauth-fishbrain
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,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.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: OmniAuth strategy for Fishbrain
 test_files: []