omniauth-fishbrain 0.9.0 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b08b84c82f3c10704e309debd002b2a05bfba8c3f9392028325339fdab0f61
-  data.tar.gz: fc941f8c41c630491831e79f828f07621be3e1fc80ca91a7f7fe93f64cad926a
+  metadata.gz: 815a9d4e769ec9b9d05bb7cd0314395df844c3190b148960403207030b4b5cfc
+  data.tar.gz: 29f2f2cde590788567aedfbb85ff569943f77a8068a3d78590a35876e2d762f6
 SHA512:
-  metadata.gz: 1ad8cff223e86137c99d924b0bdd8cf2146393738419b13163d2ae5dd69b3678967e71ce96f9cd8422b77080eaf6186edd9c1064ab9c4870e8d99dca5ff31848
-  data.tar.gz: cc450625016d5ee861732382fdf868ec42c4291f453358729f1d28c530978bd0d5bffd6e41a9e35b8c0b8fedade712a902c1f96ab4f06423f1f81c7f9a16e99d
+  metadata.gz: 174826683c500756bc406c58e0bca176d9e43ded8eb65eaf4c445981e702dd6de42cf43a8e0a86bc64a29ba8b5d4ca621e9f6ccaf6524904b5acdef8054c3552
+  data.tar.gz: c93625fad9bcc3ce07f51191992cc89cee90eef27b2593003ae807141a285c0ae963a40902bfdf2dbd006325af0c22edd75d63745782155d07432542a2788376

data/README.markdown

@@ -0,0 +1,55 @@
+# 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.
+2. The `fishbrain_id` strategy is intended for sharing identities between
+   services.
+
+## Installation
+
+```ruby
+gem 'omniauth-fishbrain'
+```
+
+## Usage
+
+In production environments:
+
+```ruby
+use OmniAuth::Builder do
+  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['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_WlBhbuD6e'
+end
+```
+
+`path_prefix` is supported too:
+
+```ruby
+use OmniAuth::Builder do
+  ...
+
+  configure { |c| c.path_prefix = '/client/auth' }
+end
+```
+
+See [`/examples`](examples) for full example using Sinatra.
+
+## License
+
+[MIT](LICENSE)

data/lib/omniauth-fishbrain.rb

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

data/lib/{omniauth/fishbrain → omniauth-fishbrain}/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Fishbrain
-    VERSION = '0.9.0'
+    VERSION = '0.11.3'
   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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'jwt'
+
+module OmniAuth
+  module Fishbrain
+    module VerifiesIdToken
+      def id_token
+        @_id_token ||= if raw_id_token&.strip&.empty?
+                         {}
+                       else
+                         JWT.decode(raw_id_token, nil, true, decode_options).first
+                       end
+      end
+
+      def decode_options
+        {
+          iss: iss,
+          aud: options[:client_id],
+          verify_aud: true,
+          verify_expiration: true,
+          verify_iat: true,
+          verify_iss: true,
+          verify_not_before: true,
+          leeway: options[:jwt_leeway],
+          algorithm: 'RS256',
+          jwks: jwks,
+        }
+      end
+
+      def iss
+        "https://cognito-idp.#{options[:aws_region]}.amazonaws.com/#{options[: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/strategies/fishbrain.rb

@@ -1,84 +1,64 @@
 # frozen_string_literal: true
 
 require 'omniauth-oauth2'
-require 'jwt'
+require 'omniauth/fishbrain/verifies_id_token'
+require 'omniauth/fishbrain/premium_status'
 
 module OmniAuth
   module Strategies
-    # OmniAuth Strategy for Fishbrain
     class Fishbrain < OmniAuth::Strategies::OAuth2
+      include OmniAuth::Fishbrain::VerifiesIdToken
+      include OmniAuth::Fishbrain::PremiumStatus
+
       option :name, 'fishbrain'
-      option :client_options,
-             site: 'https://accounts.fishbrain.com',
-             authorize_url: '/oauth2/authorize',
-             token_url: '/oauth2/token',
-             auth_scheme: :basic_auth
+      option :client_options, site: 'https://accounts.fishbrain.com',
+                              authorize_url: '/oauth2/authorize',
+                              token_url: '/oauth2/token',
+                              auth_scheme: :basic_auth
       option :scope, 'email openid profile'
-      option :jwt_leeway, 60
-      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
 
       uid do
-        parsed_id_token['sub'] if parsed_id_token
+        id_token['sub']
       end
 
       info do
-        if parsed_id_token
-          {
-            name: parsed_id_token['name'],
-            email: parsed_id_token['email'],
-            phone: parsed_id_token['phone_number']
-          }
-        end
+        {
+          given_name: id_token['given_name'],
+          email: id_token['email'],
+          phone: id_token['phone_number'],
+        }
       end
 
       credentials do
-        { token: access_token.token }.tap do |hash|
-          hash[:refresh_token] = access_token.refresh_token if access_token.expires? && access_token.refresh_token
-          hash[:expires_at] = access_token.expires_at if access_token.expires?
-          hash[:expires] = access_token.expires?
-          hash[:id_token] = id_token if id_token
+        hash = { token: access_token.token }
+        if access_token.expires?
+          hash[:refresh_token] = access_token.refresh_token if access_token.refresh_token
+          hash[:expires_at] = access_token.expires_at
         end
+        hash[:expires] = access_token.expires?
+        hash[:id_token] = access_token['id_token'] if access_token['id_token']
+        hash
       end
 
       extra do
-        { raw_info: parsed_id_token.reject { |key| %w[iss aud exp iat token_use nbf].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
 
-      # Override this method to remove the query string from the callback_url because Cognito
-      # requires an exact match
-      def build_access_token
-        client.auth_code.get_token(
-          request.params['code'],
-          { redirect_uri: callback_url.split('?').first }.merge(token_params.to_hash(symbolize_keys: true)),
-          deep_symbolize(options.auth_token_params)
-        )
+      def callback_url
+        full_host + script_name + callback_path
       end
 
-      def id_token
-        access_token && access_token['id_token']
-      end
-
-      def parsed_id_token
-        return nil unless id_token
-
-        @parsed_id_token ||= JWT.decode(
-          id_token,
-          nil,
-          false,
-          verify_iss: options[:aws_region] && options[:user_pool_id],
-          iss: "https://cognito-idp.#{options[:aws_region]}.amazonaws.com/#{options[:user_pool_id]}",
-          verify_aud: true,
-          aud: options[:client_id],
-          verify_sub: true,
-          verify_expiration: true,
-          verify_not_before: true,
-          verify_iat: true,
-          verify_jti: false,
-          leeway: options[:jwt_leeway]
-        ).first
+      def raw_id_token
+        access_token['id_token']
       end
     end
   end

data/lib/omniauth/strategies/fishbrain_id.rb

@@ -0,0 +1,60 @@
+# 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_TKWveIcYu'
+      option :client_id, nil
+      option :aws_region, 'eu-west-1'
+      option :jwt_leeway, 60
+
+      uid do
+        id_token['sub']
+      end
+
+      info do
+        {
+          given_name: id_token['given_name'],
+          email: id_token['email'],
+          phone: id_token['phone_number'],
+        }
+      end
+
+      extra do
+        {
+          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 id_token.empty?
+          fail! :missing_id_token
+        else
+          super
+        end
+      rescue JWT::ExpiredSignature
+        fail! :invalid_id_token
+      end
+
+      def request_phase
+        redirect callback_url
+      end
+
+      private
+
+      def raw_id_token
+        request.params['id_token']
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-fishbrain
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.3
 platform: ruby
 authors:
 - Erik Dalen
+- Fishbrain AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -38,27 +39,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: A Fishbrain strategy for OmniAuth 1.x. This allows you to login to Fishbrain
-  with your ruby app.
+description: 
 email:
 - erik.dalen@fishbrain.com
+- developer@fishbrain.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - LICENSE
-- README.md
-- examples/sinatra/Gemfile
-- examples/sinatra/fishbrain_example.rb
-- examples/sinatra/views/auth_failure.haml
-- examples/sinatra/views/callback.haml
-- examples/sinatra/views/index.haml
+- README.markdown
 - lib/omniauth-fishbrain.rb
-- lib/omniauth/fishbrain.rb
-- lib/omniauth/fishbrain/version.rb
+- lib/omniauth-fishbrain/version.rb
+- lib/omniauth/fishbrain/premium_status.rb
+- lib/omniauth/fishbrain/verifies_id_token.rb
 - lib/omniauth/strategies/fishbrain.rb
-- omniauth-fishbrain.gemspec
+- lib/omniauth/strategies/fishbrain_id.rb
 homepage: https://github.com/fishbrain/omniauth-fishbrain
 licenses:
 - MIT
@@ -71,16 +67,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: A Fishbrain strategy for OmniAuth 1.x
+summary: OmniAuth strategy for Fishbrain
 test_files: []

data/.gitignore

@@ -1,56 +0,0 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-# Ignore Byebug command history file.
-.byebug_history
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# Used by RuboCop. Remote config files pulled in from inherit_from directive.
-# .rubocop-https?--*

data/README.md

@@ -1,25 +0,0 @@
-# omniauth-fishbrain
-
-OmniAuth strategy for authenticating with Fishbrain
-
-## Installation
-
-Add to your `Gemfile`:
-
-```ruby
-gem 'omniauth-google-oauth2'
-```
-
-Then `bundle install`.
-
-## Usage
-
-Add something like the following to add the fishbrain authentication stategy.
-
-```
-  use OmniAuth::Builder do
-    provider :fishbrain, ENV.fetch('FISHBRAIN_CLIENT_ID'), ENV.fetch('FISHBRAIN_CLIENT_SECRET')
-  end
-```
-
-See `/examples` for a full example using Sinatra & Omniauth.

data/examples/sinatra/Gemfile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-git_source(:github) {|repo_name| 'https://github.com/#{repo_name}' }
-
-gem 'sinatra'
-gem 'omniauth'
-gem 'haml'
-gem 'omniauth-fishbrain'

data/examples/sinatra/fishbrain_example.rb

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'sinatra/base'
-require 'omniauth'
-require 'omniauth-fishbrain'
-require 'pp'
-
-# Example Sinatra+Omniauth+Fishbrain app
-class FishbrainExample < Sinatra::Application
-  configure do
-    set :sessions, true
-    set :haml, format: :html5
-  end
-  use OmniAuth::Builder do
-    provider :fishbrain,
-             ENV.fetch('FISHBRAIN_CLIENT_ID'),
-             ENV.fetch('FISHBRAIN_CLIENT_SECRET')
-  end
-
-  get '/' do
-    haml :index
-  end
-
-  get '/auth/failure' do
-    haml :auth_failure
-  end
-
-  get '/auth/:provider/callback' do
-    haml :callback
-  end
-
-  run! if app_file == $PROGRAM_NAME
-end

data/examples/sinatra/views/auth_failure.haml

@@ -1,10 +0,0 @@
-!!!
-%html
-  %head
-    %title
-      Cognito auth example
-  %body
-    %h1
-      Authentication failure
-
-    %pre= params['message']

data/examples/sinatra/views/callback.haml

@@ -1,9 +0,0 @@
-!!!
-%html
-  %head
-    %title
-      Cognito auth example
-  %body
-    %h1= params[:provider]
-
-    %pre= request.env['omniauth.auth'].pretty_inspect

data/examples/sinatra/views/index.haml

@@ -1,14 +0,0 @@
-!!!
-%html
-  %head
-    %title
-      Cognito auth example
-  %body
-    %h1
-      Welcome
-
-    %a{ href: "/auth/fishbrain" }
-      Log in with Fishbrain
-
-    %a{ href: "/auth/cognito-idp" }
-      Log in with Cognito

data/lib/omniauth/fishbrain.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require 'omniauth/strategies/fishbrain'

data/omniauth-fishbrain.gemspec

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require File.expand_path(
-  File.join('..', 'lib', 'omniauth', 'fishbrain', 'version'),
-  __FILE__
-)
-
-Gem::Specification.new do |gem|
-  gem.name          = 'omniauth-fishbrain'
-  gem.version       = OmniAuth::Fishbrain::VERSION
-  gem.license       = 'MIT'
-  gem.summary       = %(A Fishbrain strategy for OmniAuth 1.x)
-  gem.description   = %(A Fishbrain strategy for OmniAuth 1.x. This allows you to login to Fishbrain with your ruby app.)
-  gem.authors       = ['Erik Dalen']
-  gem.email         = ['erik.dalen@fishbrain.com']
-  gem.homepage      = 'https://github.com/fishbrain/omniauth-fishbrain'
-
-  gem.files         = `git ls-files`.split("\n")
-  gem.require_paths = ['lib']
-
-  gem.required_ruby_version = '>= 2.2'
-
-  gem.add_runtime_dependency 'jwt', '~> 2.0'
-  gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.6'
-end