cfoundry 2.3.7.rc1 → 2.4.0

data/lib/cfoundry/client.rb

@@ -19,11 +19,12 @@ require "cfoundry/v2/app_event"
 
 require "cfoundry/v2/base"
 require "cfoundry/v2/client"
+#require "cfoundry/v2/fake_client"
 
 module CFoundry
   class Client < BaseClient
     def self.new(*args)
-      puts "DEPRECATION WARNING: Please use CFoundry::Client.get instead of CFoundry::Client.new"
+      warn "DEPRECATION WARNING: Please use CFoundry::Client.get instead of CFoundry::Client.new"
       get(*args)
     end
 

data/lib/cfoundry/concerns/login_helpers.rb

@@ -6,8 +6,9 @@ module CFoundry
       @base.uaa.prompts
     end
 
-    def login(username, password)
-      @base.token = AuthToken.from_uaa_token_info(@base.uaa.authorize(username, password))
+    def login(credentials)
+      token_info = @base.uaa.authorize(credentials)
+      @base.token = AuthToken.from_uaa_token_info(token_info)
     end
   end
-end
+end

data/lib/cfoundry/uaaclient.rb

@@ -1,5 +1,5 @@
 require "cfoundry/baseclient"
-require 'uaa'
+require "uaa"
 
 module CFoundry
   class UAAClient
@@ -17,12 +17,10 @@ module CFoundry
       end
     end
 
-    def authorize(username, password)
-      @username = username
-      @password = password
-
+    def authorize(credentials)
       wrap_uaa_errors do
-        authenticate_with_password_grant || authenticate_with_implicit_grant
+        authenticate_with_password_grant(credentials) ||
+          authenticate_with_implicit_grant(credentials)
       end
     end
 
@@ -103,9 +101,12 @@ module CFoundry
       @uaa_url ||= CF::UAA::Misc.discover_uaa(target)
     end
 
-    def authenticate_with_password_grant
+    def authenticate_with_password_grant(credentials)
       begin
-        token_issuer.owner_password_grant(@username, @password)
+        # Currently owner_password_grant method does not allow
+        # non-password based authenticate; so we have cheat a little bit.
+        token_issuer.send(:request_token,
+          {:grant_type => "password", :scope => nil}.merge(credentials))
       rescue CF::UAA::BadResponse => e
         status_code = e.message[/\d+/] || 400
         raise CFoundry::Denied.new("Authorization failed", status_code)
@@ -114,9 +115,9 @@ module CFoundry
       end
     end
 
-    def authenticate_with_implicit_grant
+    def authenticate_with_implicit_grant(credentials)
       begin
-        token_issuer.implicit_grant_with_creds(:username => @username, :password => @password)
+        token_issuer.implicit_grant_with_creds(credentials)
       rescue CF::UAA::BadResponse => e
         status_code = e.message[/\d+/] || 400
         raise CFoundry::Denied.new("Authorization failed", status_code)

data/lib/cfoundry/v2/client.rb

@@ -44,7 +44,7 @@ module CFoundry::V2
       end
     end
 
-    def login(username, password)
+    def login(credentials)
       @current_organization = nil
       @current_space = nil
       super

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "2.3.7.rc1".freeze
+  VERSION = "2.4.0".freeze
 end

data/spec/cfoundry/uaaclient_spec.rb

@@ -72,24 +72,29 @@ EOF
     let(:auth) { Object.new }
     let(:issuer) { Object.new }
 
-    subject { uaa.authorize(username, password) }
+    subject { uaa.authorize(creds) }
 
     before do
-      issuer.stub(:owner_password_grant) { auth }
+      issuer.stub(:request_token) { auth }
       uaa.stub(:token_issuer) { issuer }
     end
 
     include_examples "UAA wrapper"
 
     it 'returns the token on successful authentication' do
-      issuer.should_receive(:owner_password_grant).with(username, password) { auth }
+      issuer
+        .should_receive(:request_token)
+        .with(:grant_type => "password",
+              :scope => nil,
+              :username => username,
+              :password => password) { auth }
       expect(subject).to eq auth
     end
 
     context 'when authorization fails' do
       context 'in the expected way' do
         it 'raises a CFoundry::Denied error' do
-          issuer.should_receive(:owner_password_grant) { raise CF::UAA::BadResponse.new("401: FooBar") }
+          issuer.should_receive(:request_token) { raise CF::UAA::BadResponse.new("401: FooBar") }
           expect { subject }.to raise_error(CFoundry::Denied, "401: Authorization failed")
         end
       end
@@ -97,15 +102,13 @@ EOF
 
       context 'in an unexpected way' do
         it 'raises a CFoundry::Denied error' do
-          issuer.should_receive(:owner_password_grant) { raise CF::UAA::BadResponse.new("no_status_code") }
+          issuer.should_receive(:request_token) { raise CF::UAA::BadResponse.new("no_status_code") }
           expect { subject }.to raise_error(CFoundry::Denied, "400: Authorization failed")
         end
       end
 
       context "with a CF::UAA::TargetError" do
-        before do
-          issuer.stub(:owner_password_grant) { raise CF::UAA::TargetError.new("useless info") }
-        end
+        before { issuer.stub(:request_token) { raise CF::UAA::TargetError.new("useless info") } }
 
         it "retries with implicit grant" do
           issuer.should_receive(:implicit_grant_with_creds).with(:username => username, :password => password)

data/spec/support/shared_examples/client_login_examples.rb

@@ -28,10 +28,10 @@ shared_examples_for 'client login' do
 
   before do
     client.base.stub(:uaa) { uaa }
-    uaa.stub(:authorize).with(email, password) { token_info }
+    uaa.stub(:authorize).with(:username => email, :password => password) { token_info }
   end
 
-  subject { client.login(email, password) }
+  subject { client.login(:username => email, :password => password) }
 
   it 'returns a UAA token' do
     expect(subject).to be_a(CFoundry::AuthToken)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 2.3.7.rc1
-  prerelease: 6
+  version: 2.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -416,13 +416,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3694164670967481672
+      hash: -3185654219291849147
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3185654219291849147
 requirements: []
 rubyforge_project: cfoundry
 rubygems_version: 1.8.25