omniauth-bike-index 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1c9a5e41e30b52036f65770a0890439ad29b4fe
-  data.tar.gz: 0e557a7f410e21be8f3cabea92ac204acfa3737b
+SHA256:
+  metadata.gz: 01d745f15c082b6b8906b5643f130d20f39bbc66b7425b563a2b12b3f85f17d1
+  data.tar.gz: 39c97a47c2950793af76588ad1697b49ae653fdd08714198162a7f97b4e8f6a2
 SHA512:
-  metadata.gz: e83173b9ff0486ff302aef7069ef7314658e1dd94b2c7ca24954eb25ad5ca01d84d84813abc0c9f042bca123fccc80266b81b8c537a477ed1f53b68dea13400d
-  data.tar.gz: 0fa877dfc49dee02e22b4fa77b4d55c1c9b6c70d3c7d71125628d6fc8cc97118f5ce6b76e5aeaa5f1f00fad96f4e6aa0522b78ae058789214f5b77f558af4964
+  metadata.gz: 6dfcab4f77621d617a78870bd923379fdc2f311b33dab85549f8fc8df08668876d1d9d78671fbc4f2aeb4a42b52774e0826788a54acbca66b08630ea1d165b37
+  data.tar.gz: 4b53ab68270c7c2634bafecedc156314cc1023036e44e83a94b578f49a87eda4393ca15464983bd6490b251665a8d6128023fcc0be2324963ebb583a6ffc1608

data/.gitignore

@@ -19,4 +19,7 @@ tmp
 .rspec
 .ruby-*
 
+# ASDF ruby versions
+.tool-versions
+
 info.markdown

data/.travis.yml

@@ -3,11 +3,11 @@ gemfile:
   - Gemfile
 language: ruby
 before_install:
-  - gem install bundler
+  - gem install bundler 
   - gem update bundler
 rvm:
-  - 2.2.4
   - 2.3.0
+  - 2.5.8
   - jruby-head
 matrix:
   allow_failures:

data/Gemfile

@@ -1,9 +1,10 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'rspec'
+  gem "standard"
+  gem "rspec"
 end
 
 gemspec

data/README.md

@@ -1,11 +1,9 @@
 # OmniAuth::BikeIndex [![Build Status](https://travis-ci.org/bikeindex/omniauth-bike-index.svg?branch=master)](https://travis-ci.org/bikeindex/omniauth-bike-index)
-==============
 
 Bike Index OAuth2 Strategy for OmniAuth 1.0.
 
 Supports the OAuth 2.0 server-side and client-side flows.
 
-
 ## Creating an application
 
 To be able to use OAuth on the Bike Index, you have to create an application. Go to [BikeIndex.org/oauth/applications](https://bikeindex.org/oauth/applications) to add your application.
@@ -14,7 +12,6 @@ Once you've added your application and your routes, you'll be able to see your A
 
 **Note**: Callback url has to be an exact match - if your url is `http://localhost:3001/users/auth/bike_index/callback` you _must_ enter that exactly - `http://localhost:3001/users/auth/` will not work.
 
-
 Check out the **[Bike Index API Documentation](https://bikeindex.org/documentation)** to see what can be done with authenticated users.
 
 ## Usage
@@ -62,7 +59,6 @@ end
 
 Available scopes: `read_user`, `write_user`, `read_bikes`, `write_bikes`
 
-
 ## Credentials
 
 If you don't include a scope, the response will include a `uid` from Bike Index for the user and nothing else.
@@ -71,11 +67,9 @@ If you include the `read_bikes` scope, the response will include an array of the
 
 You can use these IDs to access information about the bikes - e.g. [api/v3/bikes/3414](https://bikeindex.org/api/v3/bikes/3414) & [api/v3/bikes/29367](https://bikeindex.org/api/v3/bikes/29367)
 
-If you include the `read_user` scope, the response will include the user's nickname, email and name. You will also see their twitter handle and avatar if they have added them. The keys for these items - 
+If you include the `read_user` scope, the response will include the user's nickname, email and name. You will also see their twitter handle and avatar if they have added them. The keys for these items -
 `nickname`, `email`, `name`, `twitter` & `image` - all accessible in the `request.env['omniauth.auth']`, e.g. `request.env['omniauth.auth'].info.email`
 
-
 ## Auth Hash
 
 You can also see the authetication hash (in JSON format) by going to the authentication url on the Bike Index with the user's access token - `https://bikeindex.org/api/v3/me?access_token=<OAUTH_ACCESS_TOKEN>`
-

data/Rakefile

@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task test: :spec
-task default: :spec
+task default: :spec

data/lib/omniauth-bike-index.rb

@@ -1,2 +1,2 @@
-require 'omniauth/bike_index/version'
-require 'omniauth/strategies/bike_index'
+require "omniauth/bike_index/version"
+require "omniauth/strategies/bike_index"

data/lib/omniauth/bike_index/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module BikeIndex
-    VERSION = '1.0.0'
+    VERSION = "1.0.5"
   end
 end

data/lib/omniauth/strategies/bike_index.rb

@@ -1,41 +1,60 @@
-require 'omniauth-oauth2'
+require "omniauth-oauth2"
 
 module OmniAuth
   module Strategies
     class BikeIndex < OmniAuth::Strategies::OAuth2
       option :name, :bike_index
-      DEFAULT_SCOPE = 'public'
-      option :client_options, site: 'https://bikeindex.org', authorize_url: '/oauth/authorize'
+      DEFAULT_SCOPE = "public"
+      option :client_options, site: "https://bikeindex.org", authorize_url: "/oauth/authorize"
 
-      uid { raw_info['id'] }
+      uid { raw_info["id"] }
 
       info do
         prune!(
-          'nickname'    => raw_info['user']['username'],
-          'bike_ids'    => raw_info['bike_ids'],
-          'email'       => raw_info['user']['email'],
-          'name'        => raw_info['user']['name'],
-          'twitter'     => raw_info['user']['twitter'],
-          'image'       => raw_info['user']['image'],
+          "nickname" => raw_info["user"]["username"],
+          "bike_ids" => raw_info["bike_ids"],
+          "email" => raw_info["user"]["email"],
+          "secondary_emails" => raw_info["user"]["secondary_emails"],
+          "name" => raw_info["user"]["name"],
+          "twitter" => raw_info["user"]["twitter"],
+          "image" => raw_info["user"]["image"]
         )
       end
 
       extra do
         hash = {}
-        hash['raw_info'] = raw_info unless skip_info?
+        hash["raw_info"] = raw_info unless skip_info?
         prune! hash
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/api/v3/me').parsed || {}
+        @raw_info ||= access_token.get("/api/v3/me").parsed || {}
+      end
+
+      def param_or_option(key)
+        # omniauth.params are the parameters passed in to the URL
+        # (e.g. company in /users/auth/bike_index?company=Metro)
+        # So for partner, company and unauthenticated_redirect it tries those params, then goes from settings
+         session["omniauth.params"] && session["omniauth.params"][key] ||
+          option[key]
       end
 
       def request_phase
-        options[:authorize_params] = { scope: (options['scope'] || DEFAULT_SCOPE) }
+        options[:authorize_params] = {
+          scope: (options["scope"] || DEFAULT_SCOPE),
+          partner: param_or_option("partner"),
+          company: param_or_option("company"),
+          unauthenticated_redirect: param_or_option("unauthenticated_redirect")
+        }
         super
       end
 
-    private
+      # https://github.com/omniauth/omniauth-oauth2/issues/81
+      def callback_url
+        full_host + script_name + callback_path
+      end
+
+      private
 
       def prune!(hash)
         hash.delete_if do |_, value|
@@ -43,7 +62,6 @@ module OmniAuth
           value.nil? || (value.respond_to?(:empty?) && value.empty?)
         end
       end
-
     end
   end
-end
+end

data/omniauth-bike-index.gemspec

@@ -1,25 +1,24 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require 'omniauth/bike_index/version'
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+require "omniauth/bike_index/version"
 
 Gem::Specification.new do |s|
-  s.name          = 'omniauth-bike-index'
-  s.version       = OmniAuth::BikeIndex::VERSION
-  s.authors       = ['Seth Herr']
-  s.email         = ['seth@bikeidnex.org']
-  s.summary       = 'Bike Index strategy for OmniAuth'
-  s.description   = 'Bike Index strategy for OmniAuth v1.2'
-  s.homepage      = 'https://github.com/bikeindex/omniauth-bike-index'
-  s.license       = 'MIT'
+  s.name = "omniauth-bike-index"
+  s.version = OmniAuth::BikeIndex::VERSION
+  s.authors = ["Seth Herr"]
+  s.email = ["seth@bikeidnex.org"]
+  s.summary = "Bike Index strategy for OmniAuth"
+  s.description = "Bike Index strategy for OmniAuth v1.2"
+  s.homepage = "https://github.com/bikeindex/omniauth-bike-index"
+  s.license = "MIT"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").collect { |f| File.basename(f) }
-  s.require_paths = ['lib']
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").collect { |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'omniauth', '~> 1.2'
-  s.add_runtime_dependency 'omniauth-oauth2', '~> 1.1'
+  s.add_runtime_dependency "omniauth", "~> 1.2"
+  s.add_runtime_dependency "omniauth-oauth2", "~> 1.1"
 
-  s.add_development_dependency 'dotenv', '~> 0'
-  s.add_development_dependency 'sinatra', '~> 0'
+  s.add_development_dependency "dotenv", "~> 0"
+  s.add_development_dependency "sinatra", "~> 0"
 end

data/spec/app.rb

@@ -1,37 +1,37 @@
-$LOAD_PATH.unshift File.expand_path('..', __FILE__)
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path("..", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 
-require 'dotenv'
-require 'sinatra'
-require 'omniauth'
-require 'omniauth-bike-index'
+require "dotenv"
+require "sinatra"
+require "omniauth"
+require "omniauth-bike-index"
 
 Dotenv.load
 
-use Rack::Session::Cookie, :key => 'key',
-                           :domain => 'localhost',
-                           :path => '/',
-                           :expire_after => 14_400,
-                           :secret => 'secret'
+use Rack::Session::Cookie, key: "key",
+                           domain: "localhost",
+                           path: "/",
+                           expire_after: 14_400,
+                           secret: "secret"
 
 use OmniAuth::Builder do
-  provider :bike_index, ENV['CLIENT_ID'], ENV['CLIENT_SECRET'], :scope => 'access_profile'
+  provider :bike_index, ENV["CLIENT_ID"], ENV["CLIENT_SECRET"], scope: "access_profile"
 end
 
-get '/' do
+get "/" do
   <<-HTML
   <a href='/auth/bikeindex'>Sign in with Bike Index</a>
   HTML
 end
 
-get '/auth/failure' do
-  env['omniauth.error'].to_s
+get "/auth/failure" do
+  env["omniauth.error"].to_s
 end
 
-get '/auth/:name/callback' do
-  auth = request.env['omniauth.auth']
+get "/auth/:name/callback" do
+  auth = request.env["omniauth.auth"]
 
-  puts %Q(
+  puts %(
     >> UID
       #{auth.uid.inspect}
 
@@ -45,5 +45,5 @@ get '/auth/:name/callback' do
       #{auth.extra.inspect}
   )
 
-  'Check logs for user information.'
+  "Check logs for user information."
 end

data/spec/omniauth/strategies/bike_index_spec.rb

@@ -1,33 +1,32 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe OmniAuth::Strategies::BikeIndex do
   subject do
     @subject ||= begin
-      args = ['client_id', 'client_secret', @options || {}].compact
+      args = ["client_id", "client_secret", @options || {}].compact
       OmniAuth::Strategies::BikeIndex.new(*args)
     end
   end
 
-  context 'client options' do
-    it 'has correct name' do
+  context "client options" do
+    it "has correct name" do
       expect(subject.options.name).to eq(:bike_index)
     end
 
-    it 'has correct site' do
-      expect(subject.options.client_options.site).to eq('https://bikeindex.org')
+    it "has correct site" do
+      expect(subject.options.client_options.site).to eq("https://bikeindex.org")
     end
 
-    it 'has correct authorize url' do
-      expect(subject.options.client_options.authorize_url).to eq('/oauth/authorize')
+    it "has correct authorize url" do
+      expect(subject.options.client_options.authorize_url).to eq("/oauth/authorize")
     end
-
   end
 
-  context 'figuring stuff out' do 
-    it "gets log in" do 
-      app = lambda{|env| [200, {}, ["Hello World."]]}
-      OmniAuth::Strategies::Developer.new(app).options.uid_field                      # => :email
-      OmniAuth::Strategies::Developer.new(app, :uid_field => :name).options.uid_field # => :name
+  context "figuring stuff out" do
+    it "gets log in" do
+      app = lambda { |env| [200, {}, ["Hello World."]] }
+      OmniAuth::Strategies::Developer.new(app).options.uid_field # => :email
+      OmniAuth::Strategies::Developer.new(app, uid_field: :name).options.uid_field # => :name
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
-$LOAD_PATH.unshift File.expand_path('..', __FILE__)
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path("..", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 
-require 'rspec'
-require 'omniauth'
-require 'omniauth-bike-index'
+require "rspec"
+require "omniauth"
+require "omniauth-bike-index"
 
 RSpec.configure do |config|
-  config.extend OmniAuth::Test::StrategyMacros, :type => :strategy
+  config.extend OmniAuth::Test::StrategyMacros, type: :strategy
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-bike-index
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Seth Herr
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -89,7 +89,7 @@ homepage: https://github.com/bikeindex/omniauth-bike-index
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,9 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Bike Index strategy for OmniAuth
 test_files: