omniauth-uaa-oauth2 0.0.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca254fbc2a4e6c9c7a4c954a9ea26f101d20a24ad0e5d036675d45e73ddd12e
-  data.tar.gz: 9ef68fb73b96b82a8d36aa1e80bbb3569e361a91ca8e04cfe0118e793ba7a5bd
+  metadata.gz: 9e8de9c63b6c5f6302ff2188fcb99045128f8af146d6014c8a0e26403e23e7b0
+  data.tar.gz: 995fc9391a8e7c91d6464adc34565a825f7c6853877e4b1467326043e38aeb21
 SHA512:
-  metadata.gz: 5d7aa40472f14f9ddef7dce728c1f07218ee7a275c118ce101ff0c4d98f59ecdfefa64480b930d026f6b67e441d81b2b3501026c3e4b591b1cef36859804938e
-  data.tar.gz: 46abec421931388b7dba1d8ce92fa47869c05073ba190c5d9829cf0d295e66de269a011998e43917f5001471595f48df6915651c2b58330a5f89ca1fc39071c6
+  metadata.gz: 85a906769d31270b17cf11c0ee1c9f2f905ff7fe2d36d7024a522ffb3d2da756714854f8e3ff71b237944ab11794dbf60161ca44d115986c8c05732a57a3ae0c
+  data.tar.gz: 88982fdba7d3fc827a892bf0fc3317e8261ce7fd1b2d0cd94c9c7730d8d6c9b157bbe6d2f88b1c2d1e82f99dc52fad7c67d0ae0d5767c0689e60162a2633a1b6

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/README.md

@@ -3,28 +3,18 @@ CloudFoundry 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/
-
-Build and install the cf-uaa-lib gem located at https://github.com/cloudfoundry/cf-uaa-lib
-
-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.

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
 
@@ -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.0.0"
   end
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-uaa-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Joel D'sa