omniauth-bike-index 0.1.0 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: df30b257d96047b03e1d60869233c69ee293bbb0
-  data.tar.gz: ff7734850c1f426614774c7d798a7e54dde7d1c3
+SHA256:
+  metadata.gz: ed476813826660c5afabb02e43fc77d9a423ed63dd9eeeb0864c2fd256876a46
+  data.tar.gz: 161e4b546c49eaa0e54728593d3d597e1ec0372374615d9a9fed19e5d4256083
 SHA512:
-  metadata.gz: 747feadbb1ed8d937b44f583119d338186e66f4182d319b32691ecc28d67ca8eb3b9e8c0d14d93dc9a5a71ee8a279f4202ecf0c903c1c84c460d11069108d6cd
-  data.tar.gz: 7693d9b2c71430dee0dde1c7ea011c1d21f7751be888acaf62052ba7439f79416307f629e619b7245f4cad1133d70839b69deccb120b74d7851d4780c02ea365
+  metadata.gz: b19d2b3b2d040381ddba62e61ce7db388f54396958353f8c48f07597864fcf35c446aaf3948f83a48769910add600f91186f67c9a28322a62e576e0fd43a8742
+  data.tar.gz: 990b71281d87975209be63f652e261fb24d2ec304c3b0217e1dc98ef1f7604a1f0f48bfd2ce177bc6f14b98fa90fc45a89106ebe6917080f642aa29029377f00

data/.travis.yml

@@ -2,16 +2,13 @@ bundler_args: --without development
 gemfile:
   - Gemfile
 language: ruby
+before_install:
+  - gem install bundler 
+  - gem update bundler
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - rbx-2
-  - ruby-head
-  - jruby-19mode
+  - 2.3.0
+  - 2.5.8
   - jruby-head
 matrix:
   allow_failures:
     - rvm: jruby-head
-    - rvm: ruby-head

data/Gemfile

@@ -1,12 +1,10 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :test do
-  gem 'rspec', '~> 2.7'
-  gem 'guard'
-  gem 'guard-rspec', '4.2.8'
-  gem 'guard-livereload'
+  gem "standard"
+  gem "rspec"
 end
 
 gemspec

data/README.md

@@ -1,11 +1,9 @@
-OmniAuth::BikeIndex
-==============
+# 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,8 +12,7 @@ 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 **[API V2 Documentation](https://bikeindex.org/documentation/api_v2)** to see what can be done with authenticated users.
+Check out the **[Bike Index API Documentation](https://bikeindex.org/documentation)** to see what can be done with authenticated users.
 
 ## Usage
 
@@ -36,17 +33,16 @@ Your `BIKEINDEX_APP_ID` and your `BIKEINDEX_APP_SECRET` are both application spe
 
 Edit your routes.rb file to have:
 
-`devise_for :users, :controllers => { :omniauth_callbacks => "omniauth_callbacks" }`
+`devise_for :users, controllers: { omniauth_callbacks: 'omniauth_callbacks' }`
 
 And create a file called `omniauth_callbacks_controller.rb` which should have this inside:
 
 ```ruby
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
-
   def bike_index
     # Delete the code inside of this method and write your own.
     # The code below is to show you where to access the data.
-    raise request.env["omniauth.auth"].to_json
+    raise request.env['omniauth.auth'].to_json
   end
 end
 ```
@@ -63,20 +59,17 @@ 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.
 
 If you include the `read_bikes` scope, the response will include an array of the ids the user has registered on the Index `bike_ids: [3414, 29367]`
 
-You can use these IDs to access information about the bikes - e.g. [BikeIndex.org/api/v1/bikes/3414](https://bikeindex.org/api/v1/bikes/3414) & [/api/v1/bikes/29367](https://bikeindex.org/api/v1/bikes/29367)
+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/v2/users/current?access_token=<OAUTH_ACCESS_TOKEN>`
-
+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,4 +1,7 @@
 #!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
+
+task test: :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 = '0.1.0'
+    VERSION = "1.0.4"
   end
 end

data/lib/omniauth/strategies/bike_index.rb

@@ -1,45 +1,51 @@
-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/v2/me').parsed || {}
+        @raw_info ||= access_token.get("/api/v3/me").parsed || {}
       end
 
       def request_phase
         options[:authorize_params] = {
-          :scope          => (options['scope'] || DEFAULT_SCOPE)
+          scope: (options["scope"] || DEFAULT_SCOPE),
+          partner: options["partner"],
+          unauthenticated_redirect: options["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|
@@ -47,7 +53,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/venmo'>Sign in with Bike Index</a>
+  <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,34 +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: 0.1.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Seth Herr
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -76,7 +76,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Guardfile
 - README.md
 - Rakefile
 - lib/omniauth-bike-index.rb
@@ -90,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
@@ -105,9 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Bike Index strategy for OmniAuth
 test_files:

data/Guardfile

@@ -1,8 +0,0 @@
-rspec_opts = {
-  failed_mode: :focus
-}
-
-guard :rspec, cmd: "bundle exec rspec" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-end