omniauth-fishbrain 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70b077fd97606f323245d0180a5a66e5ddb0dc92ec0670147242884bdc930319
-  data.tar.gz: e483cf58669ab9991b5f59fb5c89c918cebae4572eacec67fcf1b0a145eda569
+  metadata.gz: aeee9cc6e162c2f7af87e9e888e5ee6512e3b0733db7e2ea62b36edc3e18f355
+  data.tar.gz: c7e1e870026535bab621a989e3108065b87361b700b819117fc43422f247407b
 SHA512:
-  metadata.gz: 4062fe761e149af6926a3757405da9769e86be530ad68f97f8b26343a518872bff85c36ca771bb0c3b9da40b67816b24e3ef1225bf3bc0e02c51bc943400dc09
-  data.tar.gz: b284b8dba51dc78102513bc6d3746c0ffac410a174f2a7700c00280610067ac6cc272edeb644e6e0500c789e3e6da88b0c696e26d5127cd4736296ea2ba11de7
+  metadata.gz: 1581f15f1c259c32b65918776be71fecb61d8a301684168c6c203671f19fb36f13f246135e940b733412eec27afeb9cb065c70412323505792cd1dd8f1848bf8
+  data.tar.gz: f2cb803f3e831ee2607c7ba93ac089d48fdfe3d5a3ec39c17bbfa46b5904862dc5d82c75984a6fcac60cd17569cb485a5206706348285133f1046fb88974dd24

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,18 +18,18 @@ 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'), 
+  provider :fishbrain, ENV['FISHBRAIN_CLIENT_ID'], ENV['FISHBRAIN_CLIENT_SECRET'],
                        user_pool_id: 'eu-west-1_K2uP41DlP',
                        client_options: {
                          site: 'https://accounts-staging.fishbrain.com',
@@ -38,7 +40,7 @@ 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.0'
   end
 end

data/lib/omniauth/fishbrain/premium_status.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'date'
+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?
+        DateTime.rfc3339(premium_status['premium_end_date']) > DateTime.now
+      rescue ArgumentError
+        # if format was wrong
+        false
+      end
+    end
+  end
+end

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',
@@ -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,12 +1,14 @@
 # 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'
@@ -27,7 +29,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
 
       def callback_phase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-fishbrain
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 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-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -51,6 +51,7 @@ files:
 - README.markdown
 - lib/omniauth-fishbrain.rb
 - lib/omniauth-fishbrain/version.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
@@ -73,7 +74,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Fishbrain