omniauth-fishbrain 0.10.0 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70b077fd97606f323245d0180a5a66e5ddb0dc92ec0670147242884bdc930319
-  data.tar.gz: e483cf58669ab9991b5f59fb5c89c918cebae4572eacec67fcf1b0a145eda569
+  metadata.gz: 58b986c338209b8d0078fe1575f66ebac4af360a662db67d0bfff5f3ee6a9dae
+  data.tar.gz: d111c45ee3100e0232bf0d5993b80430990bc39c20a7bc0cf7d97c33ec91de44
 SHA512:
-  metadata.gz: 4062fe761e149af6926a3757405da9769e86be530ad68f97f8b26343a518872bff85c36ca771bb0c3b9da40b67816b24e3ef1225bf3bc0e02c51bc943400dc09
-  data.tar.gz: b284b8dba51dc78102513bc6d3746c0ffac410a174f2a7700c00280610067ac6cc272edeb644e6e0500c789e3e6da88b0c696e26d5127cd4736296ea2ba11de7
+  metadata.gz: 99441c0a1cf973b4a8a1ed557a3cf361ebbf54695f864bdcf0ad98ebc63d3798c70111a71dd77f262f1a64cd6743cad3ec5c65d544bd156c45a4eccb53e30c1e
+  data.tar.gz: e282f4cd037715c4e826938e33305f7d5b9a07784170fbb3d510599338683f2807aad4f6ad60307035e44000f37bebb6f6defd034f4534598b7fe316da04228f

data/README.markdown

@@ -1,10 +1,12 @@
 # OmniAuth Fishbrain
 
+![](https://github.com/omniauth/omniauth-github/workflows/Ruby/badge.svg?branch=master)
+
 This gem provides two OmniAuth strategies for Fishbrain.
 
-1. The `fishbrain` strategy is a standard Omniauth OAuth2 strategy for signing up and signing in
-2. The `fishbrain_id` strategy is intended for sharing a user's identity between services, typically from mobile app to 
-   server
+1. The `fishbrain` strategy is a standard OmniAuth OAuth2 strategy.
+2. The `fishbrain_id` strategy is intended for sharing identities between
+   services.
 
 ## Installation
 
@@ -16,29 +18,29 @@ gem 'omniauth-fishbrain'
 
 In production environments:
 
-```
+```ruby
 use OmniAuth::Builder do
-  provider :fishbrain, ENV.fetch('FISHBRAIN_CLIENT_ID'), ENV.fetch('FISHBRAIN_CLIENT_SECRET')
+  provider :fishbrain, ENV['FISHBRAIN_CLIENT_ID'], ENV['FISHBRAIN_CLIENT_SECRET']
   provider :fishbrain_id
 end
 ```
 
 In development/test/staging environments:
 
-```
+```ruby
 use OmniAuth::Builder do
-  provider :fishbrain, ENV.fetch('FISHBRAIN_CLIENT_ID'), ENV.fetch('FISHBRAIN_CLIENT_SECRET'), 
-                       user_pool_id: 'eu-west-1_K2uP41DlP',
+  provider :fishbrain, ENV['FISHBRAIN_CLIENT_ID'], ENV['FISHBRAIN_CLIENT_SECRET'],
+                       user_pool_id: 'eu-west-1_WlBhbuD6e',
                        client_options: {
                          site: 'https://accounts-staging.fishbrain.com',
                        }
-  provider :fishbrain_id, user_pool_id: 'eu-west-1_K2uP41DlP'
+  provider :fishbrain_id, user_pool_id: 'eu-west-1_WlBhbuD6e'
 end
 ```
 
 `path_prefix` is supported too:
 
-```
+```ruby
 use OmniAuth::Builder do
   ...
 
@@ -46,9 +48,8 @@ use OmniAuth::Builder do
 end
 ```
 
-
 See [`/examples`](examples) for full example using Sinatra.
 
-## LICENSE
+## License
 
 [MIT](LICENSE)

data/lib/omniauth-fishbrain/version.rb

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

data/lib/omniauth/fishbrain/decode_id_token.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'jwt'
+
+module OmniAuth
+  module Fishbrain
+    class DecodeIdToken
+      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: true,
+          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
+        @_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) }
+      end
+    end
+  end
+end

data/lib/omniauth/fishbrain/premium_status.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module OmniAuth
+  module Fishbrain
+    module PremiumStatus
+      def premium_status
+        return {} unless id_token['premium_status']
+
+        JSON.parse(id_token['premium_status'])
+      rescue JSON::ParserError
+        {}
+      end
+
+      def premium?
+        Time.xmlschema(premium_status['end_date']) > Time.new.utc
+      rescue ArgumentError
+        false
+      end
+    end
+  end
+end

data/lib/omniauth/fishbrain/verifies_id_token.rb

@@ -7,11 +7,11 @@ module OmniAuth
   module Fishbrain
     module VerifiesIdToken
       def id_token
-        @_id_token ||= begin
-          return {} unless raw_id_token
-
-          JWT.decode(raw_id_token, nil, true, decode_options).first
-        end
+        @_id_token ||= if raw_id_token&.strip&.empty?
+                         {}
+                       else
+                         JWT.decode(raw_id_token, nil, true, decode_options).first
+                       end
       end
 
       def decode_options

data/lib/omniauth/strategies/fishbrain.rb

@@ -2,11 +2,13 @@
 
 require 'omniauth-oauth2'
 require 'omniauth/fishbrain/verifies_id_token'
+require 'omniauth/fishbrain/premium_status'
 
 module OmniAuth
   module Strategies
     class Fishbrain < OmniAuth::Strategies::OAuth2
       include OmniAuth::Fishbrain::VerifiesIdToken
+      include OmniAuth::Fishbrain::PremiumStatus
 
       option :name, 'fishbrain'
       option :client_options, site: 'https://accounts.fishbrain.com',
@@ -14,7 +16,7 @@ module OmniAuth
                               token_url: '/oauth2/token',
                               auth_scheme: :basic_auth
       option :scope, 'email openid profile'
-      option :user_pool_id, 'eu-west-1_5r0WbR8OH'
+      option :user_pool_id, 'eu-west-1_TKWveIcYu'
       option :aws_region, 'eu-west-1'
       option :jwt_leeway, 60
 
@@ -42,7 +44,11 @@ module OmniAuth
       end
 
       extra do
-        { raw_info: id_token.reject { |key| %w[iss aud exp iat token_use].include?(key) } }
+        {
+          raw_info: id_token.reject { |key| %w[iss aud exp iat token_use].include?(key) },
+          premium_status: premium_status,
+          is_premium: premium?,
+        }
       end
 
       private

data/lib/omniauth/strategies/fishbrain_id.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal:true
 
 require 'omniauth/fishbrain/verifies_id_token'
+require 'omniauth/fishbrain/premium_status'
 
 module OmniAuth
   module Strategies
     class FishbrainId
       include OmniAuth::Strategy
       include OmniAuth::Fishbrain::VerifiesIdToken
+      include OmniAuth::Fishbrain::PremiumStatus
 
       option :name, 'fishbrain_id'
-      option :user_pool_id, 'eu-west-1_5r0WbR8OH'
+      option :user_pool_id, 'eu-west-1_TKWveIcYu'
       option :client_id, nil
       option :aws_region, 'eu-west-1'
       option :jwt_leeway, 60
@@ -27,15 +29,18 @@ module OmniAuth
       end
 
       extra do
-        { raw_info: id_token.reject { |key| %w[iss aud exp iat token_use].include?(key) } }
+        {
+          raw_info: id_token.reject { |key| %w[iss aud exp iat token_use].include?(key) },
+          premium_status: premium_status,
+          is_premium: premium?,
+        }
       end
 
       def callback_phase
-        if raw_id_token
-          id_token
-          super
-        else
+        if id_token.empty?
           fail! :missing_id_token
+        else
+          super
         end
       rescue JWT::ExpiredSignature
         fail! :invalid_id_token

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-fishbrain
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.4
 platform: ruby
 authors:
 - Erik Dalen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -51,6 +51,8 @@ files:
 - README.markdown
 - lib/omniauth-fishbrain.rb
 - lib/omniauth-fishbrain/version.rb
+- lib/omniauth/fishbrain/decode_id_token.rb
+- lib/omniauth/fishbrain/premium_status.rb
 - lib/omniauth/fishbrain/verifies_id_token.rb
 - lib/omniauth/strategies/fishbrain.rb
 - lib/omniauth/strategies/fishbrain_id.rb