omniauth-uaa-oauth2 0.0.8 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca254fbc2a4e6c9c7a4c954a9ea26f101d20a24ad0e5d036675d45e73ddd12e
-  data.tar.gz: 9ef68fb73b96b82a8d36aa1e80bbb3569e361a91ca8e04cfe0118e793ba7a5bd
+  metadata.gz: 9d52b2174a96317fc6070f2b6056b9ad3574b7cd50d2c1af315b7655e986d782
+  data.tar.gz: a5b184719b7d83ceee0a7958cd15775134825a0ad705402f883e561922ba284a
 SHA512:
-  metadata.gz: 5d7aa40472f14f9ddef7dce728c1f07218ee7a275c118ce101ff0c4d98f59ecdfefa64480b930d026f6b67e441d81b2b3501026c3e4b591b1cef36859804938e
-  data.tar.gz: 46abec421931388b7dba1d8ce92fa47869c05073ba190c5d9829cf0d295e66de269a011998e43917f5001471595f48df6915651c2b58330a5f89ca1fc39071c6
+  metadata.gz: 90cab4e75cda93e21e3bde285cd50cf2e7ae8c85a9ca9f8e3180fe2d709ce9343a25e3254058a612dae28a9f4cb2358428101f47fb2225f2da8ae5d47ebcb7d2
+  data.tar.gz: 471be4941b7a15a084a7d3b6facc044b8bb332f31525d69712f0d1a04ca67e58f920799abfd1cd3c5fa635e5a4a3a0dcd0fe0e9deae0e35feb20ef759a5945ee

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 10
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 10
+  allow:
+  - dependency-type: direct
+  - dependency-type: indirect

data/.github/workflows/gem-push.yml

@@ -0,0 +1,41 @@
+name: Ruby Gem
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 2.6
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '2.6'
+
+    - name: Publish to GPR
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+      env:
+        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+        OWNER: ${{ github.repository_owner }}
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.github/workflows/ruby.yml

@@ -0,0 +1,37 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.0', '3.1', '3.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.travis.yml

@@ -1,7 +1,12 @@
 language: ruby
 
-rvm:
-  - 1.9.3
+before_install:
+  - gem update
+  - gem install bundler
 
+rvm:
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 
 

data/Gemfile

@@ -13,8 +13,6 @@
 
 source 'http://rubygems.org'
 
-gem 'rake', '< 11.0'
-
 gemspec
 
 group :example do

data/README.md

@@ -1,30 +1,28 @@
-CloudFoundry UAA OmniAuth Strategy
+Cloud Foundry UAA OmniAuth Strategy
 ==================================
 
 OmniAuth strategy for authenticating users using the CloudFoundry UAA server.
 
-Set up a local ruby environment (so sudo not required):
+Add the following to your `Gemfile`:
 
-    $ rvm use 1.9.2
+```text
+gem 'omniauth-uaa-oauth2'
+```
 
-or
+For example usage see:
 
-    $ rbenv global 1.9.2-p180
+* the `examples/config.ru` sample code
+* https://github.com/starkandwayne/ultimate-guide-to-uaa-examples/tree/master/ruby/omniauth-login-only
+* https://github.com/starkandwayne/ultimate-guide-to-uaa-examples/tree/master/ruby/omniauth-login-and-uaa-api-calls
+* https://github.com/starkandwayne/ultimate-guide-to-uaa-examples/tree/master/ruby/resource-server-wrapper-ui
 
-see: https://rvm.io/ or http://rbenv.org/
+Warning: Unlike the `omniauth-oauth2` gem, this gem does not support the oauth2 'state' security parameter.
 
-Build and install the cf-uaa-lib gem located at https://github.com/cloudfoundry/cf-uaa-lib
+Your `omniauth-uaa-oauth2` client application will need a corresponding UAA client registered that includes the `authorization_code` authorization grant type, and redirect URIs back to the full URL to your application's `/auth/cloudfoundry/callback` endpoint. For example:
 
-Build the gem
-
-      $ bundle install
-      $ bundle exec gem build omniauth-uaa-oauth2.gemspec
-
-Install it
-
-      $ gem install omniauth-uaa-oauth2-*.gem
-
-
-See the examples folder for details on how to use it.
-
-Warning: Unlike the omniauth-oauth2 gem, this gem does not support the oauth2 'state' security parameter.
+```text
+uaa create-client omniauth-login-only -s omniauth-login-only \
+  --authorized_grant_types authorization_code,refresh_token \
+  --scope openid \
+  --redirect_uri http://localhost:9292/auth/cloudfoundry/callback,http://127.0.0.1:9292/auth/cloudfoundry/callback
+```

data/examples/config.ru

@@ -19,7 +19,7 @@ class App < Sinatra::Base
     content_type 'application/json'
     request.env['omniauth.auth'].to_hash.to_json rescue "No Data"
   end
-  
+
   get '/auth/failure' do
     content_type 'text/plain'
     request.env['omniauth.auth'].to_hash.inspect rescue "No Data"

data/lib/omniauth/strategies/cloudfoundry.rb

@@ -35,6 +35,8 @@ module OmniAuth
       option :scope, nil
       option :async_calls, false
       option :skip_ssl_validation, false
+      option :ssl_ca_file, nil
+      option :ssl_cert_store, nil
 
       attr_accessor :access_token
       attr_reader :token_issuer
@@ -65,8 +67,10 @@ module OmniAuth
               options.client_id,
               options.client_secret,
               {
-                 :token_target => @token_server_url,
-                 :skip_ssl_validation => options.skip_ssl_validation
+                 token_target: @token_server_url,
+                 ssl_ca_file: options.ssl_ca_file,
+                 ssl_cert_store: options.ssl_cert_store,
+                 skip_ssl_validation: options.skip_ssl_validation
               })
           log :info, "Client: #{options.client_id} auth_server: #{@auth_server_url} token_server: #{@token_server_url}"
           @token_issuer.logger = OmniAuth.logger
@@ -78,7 +82,9 @@ module OmniAuth
       def uaa_info
         @uaa_info ||= CF::UAA::Info.new(
             @token_server_url,
-            :skip_ssl_validation => options.skip_ssl_validation
+            ssl_ca_file: options.ssl_ca_file,
+            ssl_cert_store: options.ssl_cert_store,
+            skip_ssl_validation: options.skip_ssl_validation
         )
       end
 
@@ -113,7 +119,7 @@ module OmniAuth
           log :info, "In callback phase #{request.query_string}"
           self.access_token = build_access_token(request.query_string)
           self.access_token = refresh(access_token) if !access_token.empty? && expired?(access_token)
-          log :info, "Got access token #{access_token.inspect}"
+          log :debug, "Got access token #{access_token.inspect}"
 
           super
         end
@@ -131,10 +137,10 @@ module OmniAuth
 
       info do
         prune!({
-          :name       => raw_info["name"],
-          :email      => raw_info["email"],
-          :first_name => raw_info["given_name"],
-          :last_name  => raw_info["family_name"]
+          name:       raw_info["name"],
+          email:      raw_info["email"],
+          first_name: raw_info["given_name"],
+          last_name:  raw_info["family_name"]
         })
       end
 

data/lib/omniauth/uaa_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Cloudfoundry
-    VERSION = "0.0.8"
+    VERSION = "1.1.1"
   end
 end

data/omniauth-uaa-oauth2.gemspec

@@ -2,10 +2,10 @@
 require File.expand_path('../lib/omniauth/uaa_oauth2/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Joel D'sa", "Dave Syer", "Dale Olds", "Vidya Valmikinathan", "Luke Taylor"]
-  gem.email         = ["jdsa@vmware.com", "olds@vmware.com", "dsyer@vmware.com", "vidya@vmware.com", "ltaylor@vmware.com"]
-  gem.description   = %q{An OmniAuth strategy for the Cloudfoundry UAA}
-  gem.summary       = %q{An OmniAuth strategy for the Cloudfoundry UAA}
+  gem.authors       = ["Dr Nic Williams", "Joel D'sa", "Dave Syer", "Dale Olds", "Vidya Valmikinathan", "Luke Taylor"]
+  gem.email         = ["drnicwilliams@gmail.com", "jdsa@vmware.com", "olds@vmware.com", "dsyer@vmware.com", "vidya@vmware.com", "ltaylor@vmware.com"]
+  gem.description   = %q{An OmniAuth strategy for the Cloud Foundry UAA}
+  gem.summary       = %q{An OmniAuth strategy for the Cloud Foundry UAA}
   gem.homepage      = ""
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OmniAuth::Cloudfoundry::VERSION
 
-  gem.add_runtime_dependency 'omniauth', '~> 1.0'
-  gem.add_runtime_dependency 'cf-uaa-lib', ['>= 3.2', '< 4.0']
+  gem.add_runtime_dependency 'omniauth', '>= 1', '< 3'
+  gem.add_runtime_dependency 'cf-uaa-lib', ['>= 3.2', '< 5.0']
 
-  gem.add_development_dependency 'rspec', '~> 2.6.0'
+  gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
 end

data/spec/omniauth/strategies/uaa_oauth2_spec.rb

@@ -31,21 +31,21 @@ describe OmniAuth::Strategies::Cloudfoundry do
 
   describe 'set auth and token server' do
     it 'should set the right auth and token server' do
-      @options = {:auth_server_url => 'https://login.cloudfoundry.com'}
+      @options = {auth_server_url: 'https://login.cloudfoundry.com'}
       subject.client
       subject.auth_server_url.should eq('https://login.cloudfoundry.com')
       subject.token_server_url.should eq('https://login.cloudfoundry.com')
     end
 
     it 'should set the right auth and token server if independently set' do
-      @options = {:auth_server_url => 'https://login.cloudfoundry.com', :token_server_url => 'https://uaa.cloudfoundry.com'}
+      @options = {auth_server_url: 'https://login.cloudfoundry.com', token_server_url: 'https://uaa.cloudfoundry.com'}
       subject.client
       subject.auth_server_url.should eq('https://login.cloudfoundry.com')
       subject.token_server_url.should eq('https://uaa.cloudfoundry.com')
     end
 
     it 'should set the right auth and token server' do
-      @options = {:auth_server_url => 'login.cloudfoundry.com'}
+      @options = {auth_server_url: 'login.cloudfoundry.com'}
       subject.client
       subject.auth_server_url.should eq('https://login.cloudfoundry.com')
       subject.token_server_url.should eq('https://login.cloudfoundry.com')
@@ -111,13 +111,13 @@ describe OmniAuth::Strategies::Cloudfoundry do
 
   describe 'set scopes' do
     it 'should set the right scopes if requested' do
-      @options = {:auth_server_url => 'https://login.cloudfoundry.com', :token_server_url => 'https://uaa.cloudfoundry.com', :scope => "openid cloud_controller.read"}
+      @options = {auth_server_url: 'https://login.cloudfoundry.com', token_server_url: 'https://uaa.cloudfoundry.com', :scope => "openid cloud_controller.read"}
       subject.client
       subject.options[:scope].should eq("openid cloud_controller.read")
     end
 
     it 'should not set any scopes if not requested' do
-      @options = {:auth_server_url => 'https://login.cloudfoundry.com', :token_server_url => 'https://uaa.cloudfoundry.com'}
+      @options = {auth_server_url: 'https://login.cloudfoundry.com', token_server_url: 'https://uaa.cloudfoundry.com'}
       subject.client
       subject.options[:scope].should eq(nil)
     end
@@ -126,14 +126,14 @@ describe OmniAuth::Strategies::Cloudfoundry do
   describe 'empty?' do
     it 'is empty when initialized without info' do
       token = OmniAuth::Strategies::CFAccessToken.new
-      token.empty?.should be_true
+      token.should be_empty
     end
 
     it 'is not empty when initialized with info' do
       token = OmniAuth::Strategies::CFAccessToken.new({
         'access_token' => 'some-token',
       })
-      token.empty?.should be_false
+      token.should_not be_empty
     end
   end
 

metadata

@@ -1,9 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-uaa-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.1.1
 platform: ruby
 authors:
+- Dr Nic Williams
 - Joel D'sa
 - Dave Syer
 - Dale Olds
@@ -12,22 +13,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-22 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -37,7 +44,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,21 +54,21 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,8 +83,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: An OmniAuth strategy for the Cloudfoundry UAA
+description: An OmniAuth strategy for the Cloud Foundry UAA
 email:
+- drnicwilliams@gmail.com
 - jdsa@vmware.com
 - olds@vmware.com
 - dsyer@vmware.com
@@ -87,6 +95,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -120,11 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
-summary: An OmniAuth strategy for the Cloudfoundry UAA
-test_files:
-- spec/omniauth/strategies/uaa_oauth2_spec.rb
-- spec/spec_helper.rb
+summary: An OmniAuth strategy for the Cloud Foundry UAA
+test_files: []