googleauth 0.5.1 → 0.11.0

data/spec/googleauth/web_user_authorizer_spec.rb

@@ -27,133 +27,146 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__)))
-$LOAD_PATH.unshift(spec_dir)
+spec_dir = File.expand_path File.join(File.dirname(__FILE__))
+$LOAD_PATH.unshift spec_dir
 $LOAD_PATH.uniq!
 
-require 'googleauth'
-require 'googleauth/web_user_authorizer'
-require 'uri'
-require 'multi_json'
-require 'spec_helper'
-require 'rack'
+require "googleauth"
+require "googleauth/web_user_authorizer"
+require "uri"
+require "multi_json"
+require "spec_helper"
+require "rack"
 
 describe Google::Auth::WebUserAuthorizer do
   include TestHelpers
 
-  let(:client_id) { Google::Auth::ClientId.new('testclient', 'notasecret') }
-  let(:scope) { %w(email profile) }
+  let(:client_id) { Google::Auth::ClientId.new "testclient", "notasecret" }
+  let(:scope) { %w[email profile] }
   let(:token_store) { DummyTokenStore.new }
-  let(:authorizer) do
-    Google::Auth::WebUserAuthorizer.new(client_id, scope, token_store)
+  let :authorizer do
+    Google::Auth::WebUserAuthorizer.new client_id, scope, token_store
   end
 
-  describe '#get_authorization_url' do
-    let(:env) do
+  describe "#get_authorization_url" do
+    let :env do
       Rack::MockRequest.env_for(
-        'http://example.com:8080/test',
-        'REMOTE_ADDR' => '10.10.10.10')
+        "http://example.com:8080/test",
+        "REMOTE_ADDR" => "10.10.10.10"
+      )
     end
-    let(:request) { Rack::Request.new(env) }
-    it 'should include current url in state' do
-      url = authorizer.get_authorization_url(request: request)
+    let(:request) { Rack::Request.new env }
+    it "should include current url in state" do
+      url = authorizer.get_authorization_url request: request
       expect(url).to match(
-        %r{%22current_uri%22:%22http://example.com:8080/test%22})
+        %r{%22current_uri%22:%22http://example.com:8080/test%22}
+      )
     end
 
-    it 'should include request forgery token in state' do
-      expect(SecureRandom).to receive(:base64).and_return('aGVsbG8=')
-      url = authorizer.get_authorization_url(request: request)
+    it "should allow adding custom state key-value pairs" do
+      url = authorizer.get_authorization_url request: request, state: { james: "bond", kind: 1 }
+      expect(url).to match(%r{%22james%22:%22bond%22})
+      expect(url).to match(%r{%22kind%22:1})
+    end
+
+    it "should include request forgery token in state" do
+      expect(SecureRandom).to receive(:base64).and_return("aGVsbG8=")
+      url = authorizer.get_authorization_url request: request
       expect(url).to match(/%22session_id%22:%22aGVsbG8=%22/)
     end
 
-    it 'should include request forgery token in session' do
-      expect(SecureRandom).to receive(:base64).and_return('aGVsbG8=')
-      authorizer.get_authorization_url(request: request)
-      expect(request.session['g-xsrf-token']).to eq 'aGVsbG8='
+    it "should include request forgery token in session" do
+      expect(SecureRandom).to receive(:base64).and_return("aGVsbG8=")
+      authorizer.get_authorization_url request: request
+      expect(request.session["g-xsrf-token"]).to eq "aGVsbG8="
     end
 
-    it 'should resolve callback against base URL' do
-      url = authorizer.get_authorization_url(request: request)
+    it "should resolve callback against base URL" do
+      url = authorizer.get_authorization_url request: request
       expect(url).to match(
-        %r{redirect_uri=http://example.com:8080/oauth2callback})
+        %r{redirect_uri=http://example.com:8080/oauth2callback}
+      )
     end
 
-    it 'should allow overriding the current URL' do
+    it "should allow overriding the current URL" do
       url = authorizer.get_authorization_url(
-        request: request,
-        redirect_to: '/foo')
+        request:     request,
+        redirect_to: "/foo"
+      )
       expect(url).to match %r{%22current_uri%22:%22/foo%22}
     end
 
-    it 'should pass through login hint' do
+    it "should pass through login hint" do
       url = authorizer.get_authorization_url(
-        request: request,
-        login_hint: 'user@example.com')
+        request:    request,
+        login_hint: "user@example.com"
+      )
       expect(url).to match(/login_hint=user@example.com/)
     end
   end
 
-  shared_examples 'handles callback' do
-    let(:token_json) do
-      MultiJson.dump('access_token' => '1/abc123',
-                     'token_type' => 'Bearer',
-                     'expires_in' => 3600)
+  shared_examples "handles callback" do
+    let :token_json do
+      MultiJson.dump("access_token" => "1/abc123",
+                     "token_type"   => "Bearer",
+                     "expires_in"   => 3600)
     end
 
-    before(:example) do
-      stub_request(:post, 'https://www.googleapis.com/oauth2/v3/token')
-        .to_return(body: token_json,
-                   status: 200,
-                   headers: { 'Content-Type' => 'application/json' })
+    before :example do
+      stub_request(:post, "https://oauth2.googleapis.com/token")
+        .to_return(body:    token_json,
+                   status:  200,
+                   headers: { "Content-Type" => "application/json" })
     end
 
-    let(:env) do
+    let :env do
       Rack::MockRequest.env_for(
-        'http://example.com:8080/oauth2callback?code=authcode&'\
-        'state=%7B%22current_uri%22%3A%22%2Ffoo%22%2C%22'\
-        'session_id%22%3A%22abc%22%7D',
-        'REMOTE_ADDR' => '10.10.10.10')
+        "http://example.com:8080/oauth2callback?code=authcode&"\
+        "state=%7B%22current_uri%22%3A%22%2Ffoo%22%2C%22"\
+        "session_id%22%3A%22abc%22%7D",
+        "REMOTE_ADDR" => "10.10.10.10"
+      )
     end
-    let(:request) { Rack::Request.new(env) }
+    let(:request) { Rack::Request.new env }
 
-    before(:example) do
-      request.session['g-xsrf-token'] = 'abc'
+    before :example do
+      request.session["g-xsrf-token"] = "abc"
     end
 
-    it 'should return credentials when valid code present' do
+    it "should return credentials when valid code present" do
       expect(credentials).to be_instance_of(
-        Google::Auth::UserRefreshCredentials)
+        Google::Auth::UserRefreshCredentials
+      )
     end
 
-    it 'should return next URL to redirect to' do
-      expect(next_url).to eq '/foo'
+    it "should return next URL to redirect to" do
+      expect(next_url).to eq "/foo"
     end
 
-    it 'should fail if xrsf token in session and does not match request' do
-      request.session['g-xsrf-token'] = '123'
+    it "should fail if xrsf token in session and does not match request" do
+      request.session["g-xsrf-token"] = "123"
       expect { credentials }.to raise_error(Signet::AuthorizationError)
     end
   end
 
-  describe '#handle_auth_callback' do
-    let(:result) { authorizer.handle_auth_callback('user1', request) }
+  describe "#handle_auth_callback" do
+    let(:result) { authorizer.handle_auth_callback "user1", request }
     let(:credentials) { result[0] }
     let(:next_url) { result[1] }
 
-    it_behaves_like 'handles callback'
+    it_behaves_like "handles callback"
   end
 
-  describe '#handle_auth_callback_deferred and #get_credentials' do
-    let(:next_url) do
-      Google::Auth::WebUserAuthorizer.handle_auth_callback_deferred(request)
+  describe "#handle_auth_callback_deferred and #get_credentials" do
+    let :next_url do
+      Google::Auth::WebUserAuthorizer.handle_auth_callback_deferred request
     end
 
-    let(:credentials) do
+    let :credentials do
       next_url
-      authorizer.get_credentials('user1', request)
+      authorizer.get_credentials "user1", request
     end
 
-    it_behaves_like 'handles callback'
+    it_behaves_like "handles callback"
   end
 end

data/spec/spec_helper.rb

@@ -27,17 +27,17 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-spec_dir = File.expand_path(File.dirname(__FILE__))
-root_dir = File.expand_path(File.join(spec_dir, '..'))
-lib_dir = File.expand_path(File.join(root_dir, 'lib'))
+spec_dir = __dir__
+root_dir = File.expand_path File.join(spec_dir, "..")
+lib_dir = File.expand_path File.join(root_dir, "lib")
 
-$LOAD_PATH.unshift(spec_dir)
-$LOAD_PATH.unshift(lib_dir)
+$LOAD_PATH.unshift spec_dir
+$LOAD_PATH.unshift lib_dir
 $LOAD_PATH.uniq!
 
 # set up coverage
-require 'simplecov'
-require 'coveralls'
+require "simplecov"
+require "coveralls"
 
 SimpleCov.formatters = [
   Coveralls::SimpleCov::Formatter,
@@ -45,18 +45,18 @@ SimpleCov.formatters = [
 ]
 SimpleCov.start
 
-require 'faraday'
-require 'rspec'
-require 'logging'
-require 'rspec/logging_helper'
-require 'webmock/rspec'
-require 'multi_json'
+require "faraday"
+require "rspec"
+require "logging"
+require "rspec/logging_helper"
+require "webmock/rspec"
+require "multi_json"
 
 # Preload adapter to work around Rubinius error with FakeFS
-MultiJson.use(:json_gem)
+MultiJson.use :json_gem
 
 # Allow Faraday to support test stubs
-Faraday::Adapter.load_middleware(:test)
+Faraday::Adapter.load_middleware :test
 
 # Configure RSpec to capture log messages for each test. The output from the
 # logs will be stored in the @log_output variable. It is a StringIO instance.
@@ -64,6 +64,8 @@ RSpec.configure do |config|
   include RSpec::LoggingHelper
   config.capture_log_messages
   config.include WebMock::API
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
 end
 
 module TestHelpers
@@ -76,15 +78,15 @@ class DummyTokenStore
     @tokens = {}
   end
 
-  def load(id)
+  def load id
     @tokens[id]
   end
 
-  def store(id, token)
+  def store id, token
     @tokens[id] = token
   end
 
-  def delete(id)
-    @tokens.delete(id)
+  def delete id
+    @tokens.delete id
   end
 end

metadata

@@ -1,71 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: googleauth
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Tim Emiola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 0.17.3
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.3
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +82,50 @@ dependencies:
   name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: signet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: |2
      Allows simple authorization for accessing Google APIs.
      Provide support for Application Default Credentials, as described at
@@ -117,23 +135,45 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CONTRIBUTING.md"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/ISSUE_TEMPLATE/support_request.md"
 - ".gitignore"
+- ".kokoro/build.bat"
+- ".kokoro/build.sh"
+- ".kokoro/continuous/common.cfg"
+- ".kokoro/continuous/linux.cfg"
+- ".kokoro/continuous/osx.cfg"
+- ".kokoro/continuous/post.cfg"
+- ".kokoro/continuous/windows.cfg"
+- ".kokoro/osx.sh"
+- ".kokoro/presubmit/common.cfg"
+- ".kokoro/presubmit/linux.cfg"
+- ".kokoro/presubmit/osx.cfg"
+- ".kokoro/presubmit/windows.cfg"
+- ".kokoro/release.cfg"
+- ".kokoro/trampoline.bat"
+- ".kokoro/trampoline.sh"
+- ".repo-metadata.json"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
+- CODE_OF_CONDUCT.md
 - COPYING
 - Gemfile
 - README.md
 - Rakefile
 - googleauth.gemspec
 - lib/googleauth.rb
+- lib/googleauth/application_default.rb
 - lib/googleauth/client_id.rb
 - lib/googleauth/compute_engine.rb
+- lib/googleauth/credentials.rb
 - lib/googleauth/credentials_loader.rb
+- lib/googleauth/default_credentials.rb
 - lib/googleauth/iam.rb
+- lib/googleauth/json_key_reader.rb
 - lib/googleauth/scope_util.rb
 - lib/googleauth/service_account.rb
 - lib/googleauth/signet.rb
@@ -144,9 +184,13 @@ files:
 - lib/googleauth/user_refresh.rb
 - lib/googleauth/version.rb
 - lib/googleauth/web_user_authorizer.rb
+- rakelib/devsite_builder.rb
+- rakelib/link_checker.rb
+- rakelib/repo_metadata.rb
 - spec/googleauth/apply_auth_examples.rb
 - spec/googleauth/client_id_spec.rb
 - spec/googleauth/compute_engine_spec.rb
+- spec/googleauth/credentials_spec.rb
 - spec/googleauth/get_application_default_spec.rb
 - spec/googleauth/iam_spec.rb
 - spec/googleauth/scope_util_spec.rb
@@ -171,15 +215,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Google Auth Library for Ruby
@@ -187,6 +230,7 @@ test_files:
 - spec/googleauth/apply_auth_examples.rb
 - spec/googleauth/client_id_spec.rb
 - spec/googleauth/compute_engine_spec.rb
+- spec/googleauth/credentials_spec.rb
 - spec/googleauth/get_application_default_spec.rb
 - spec/googleauth/iam_spec.rb
 - spec/googleauth/scope_util_spec.rb
@@ -199,4 +243,3 @@ test_files:
 - spec/googleauth/user_refresh_spec.rb
 - spec/googleauth/web_user_authorizer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/.rubocop_todo.yml

@@ -1,32 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-10-14 13:50:41 -0700 using RuboCop version 0.34.2.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 4
-Metrics/AbcSize:
-  Max: 27
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 109
-
-# Offense count: 1
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-# Offense count: 16
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 22
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/FormatString:
-  Exclude:
-    - 'lib/googleauth/user_authorizer.rb'
-    - 'lib/googleauth/web_user_authorizer.rb'

data/.travis.yml

@@ -1,37 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2
-  - 2.0.0
-  - 2.1
-  - 1.9.3
-  - rbx-2
-  - jruby
-matrix:
-  allow_failures:
-    - rvm: rbx-2 # See rubinius/rubinius#3485 - rubocop segfaults
-script: "bundle exec rake"
-addons:
-  apt:
-    packages:
-    - idn
-    - build-essential  # this and below attempt allow rubinius to be setup ok
-    - bison
-    - ruby-dev
-    - rake zlib1g-dev
-    - libyaml-dev
-    - libssl-dev
-    - libreadline-dev
-    - libncurses5-dev
-    - llvm
-    - llvm-dev
-    - libeditline-dev
-    - libedit-dev
-before_install:
- - gem update bundler
-notifications:
-  email:
-    recipients:
-      - temiola@google.com
-    on_success: change
-    on_failure: change