cf 4.1.5.rc7 → 4.2.0

data/lib/cf/cli/start/login.rb

@@ -16,16 +16,27 @@ module CF::Start
           :from_given => by_name(:organization)
     input :space, :desc => "Space", :alias => "-s",
           :from_given => by_name(:space)
+    input :sso, :desc => "Log in via SSO",
+          :alias => "--sso", :default => false
     def login
       show_context
 
-      credentials = { :username => input[:username], :password => input[:password] }
+      expected_prompts = if input[:sso]
+        [:username, :passcode]
+      else
+        [:username, :password]
+      end
+
+      credentials = {
+        :username => input[:username],
+        :password => input[:password]
+      }
 
       prompts = client.login_prompts
 
       # ask username first
-      if prompts.key? :username
-        type, label = prompts.delete :username
+      if prompts.key?(:username)
+        type, label = prompts.delete(:username)
         credentials[:username] ||= ask_prompt(type, label)
       end
 
@@ -41,19 +52,18 @@ module CF::Start
         failed = false
 
         unless force?
-          ask_prompts(credentials, prompts)
+          ask_prompts(credentials, prompts.slice(*expected_prompts))
         end
 
         with_progress("Authenticating") do |s|
           begin
-            auth_token = client.login(credentials[:username], credentials[:password])
+            auth_token = client.login(credentials.slice(*expected_prompts))
             authenticated = true
           rescue CFoundry::Denied
             return if force?
-
             s.fail do
               failed = true
-              credentials.delete(:password)
+              credentials = credentials.slice(:username)
             end
           end
         end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.1.5.rc7".freeze
+  VERSION = "4.2.0".freeze
 end

data/spec/cf/cli/start/login_spec.rb

@@ -28,74 +28,115 @@ describe CF::Start::Login do
     end
 
     describe "arguments" do
-      subject(:arguments) { command.arguments }
+      subject { command.arguments }
+
       it "have the correct commands" do
-        expect(arguments).to eq [{:type => :optional, :value => :email, :name => :username}]
+        expect(subject).to eq [{
+          :type => :optional,
+          :value => :email,
+          :name => :username
+        }]
       end
     end
   end
 
   describe "running the command" do
-    before do
-      stub_client
-    end
+    before { stub_client }
 
     stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
 
-    let(:auth_token) { CFoundry::AuthToken.new("bearer some-new-access-token", "some-new-refresh-token") }
-    let(:tokens_yaml) { YAML.load_file(File.expand_path(tokens_file_path)) }
-    let(:tokens_file_path) { "~/.cf/tokens.yml" }
-
     before do
-      client.stub(:login).with("my-username", "my-password") { auth_token }
       client.stub(:login_prompts).and_return(
-      {
-        :username => ["text", "Username"],
-        :password => ["password", "8-digit PIN"]
-      })
-
-      stub_ask("Username", {}) { "my-username" }
-      stub_ask("8-digit PIN", {:echo => "*", :forget => true}) { "my-password" }
+        :username => ["text",     "username-prompt"],
+        :password => ["password", "password-prompt"],
+        :passcode => ["password", "passcode-prompt"]
+      )
     end
 
-    subject { cf ["login"] }
-
-    context "when there is a target" do
-      before do
-        CF::Populators::Target.any_instance.stub(:populate_and_save!)
-        stub_precondition
-      end
-
-      it "logs in with the provided credentials and saves the token data to the YAML file" do
-        subject
+    def self.it_logs_in_user_with_credentials(expected_credentials)
+      context "when there is a target" do
+        before { stub_precondition }
+
+        context "when user is successfully authenticated" do
+          before { client.stub(:login).with(expected_credentials) { auth_token } }
+          before { CF::Populators::Target.any_instance.stub(:populate_and_save!) }
+          let(:auth_token) { CFoundry::AuthToken.new("bearer some-new-access-token", "some-new-refresh-token") }
+
+          it "logs in with the provided credentials and saves the token data to the YAML file" do
+            subject
+            expect(tokens_yaml["https://api.some-domain.com"][:token]).to eq("bearer some-new-access-token")
+            expect(tokens_yaml["https://api.some-domain.com"][:refresh_token]).to eq("some-new-refresh-token")
+          end
+
+          it "calls use a PopulateTarget to ensure that an organization and space is set" do
+            CF::Populators::Target.should_receive(:new) { double(:target, :populate_and_save! => true) }
+            subject
+          end
+        end
 
-        expect(tokens_yaml["https://api.some-domain.com"][:token]).to eq("bearer some-new-access-token")
-        expect(tokens_yaml["https://api.some-domain.com"][:refresh_token]).to eq("some-new-refresh-token")
-      end
+        context "when the user logs in with invalid credentials" do
+          before do
+            client
+              .should_receive(:login)
+              .with(expected_credentials)
+              .exactly(3).times
+              .and_raise(CFoundry::Denied)
+          end
+
+          it "informs the user gracefully about authentication failure" do
+            subject
+            expect(output).to say("Authenticating... FAILED")
+          end
+
+          it "does not save token data" do
+            expect {
+              subject
+            }.to_not change { tokens_yaml["https://api.some-domain.com"] }
+          end
+
+          it "does not call PopulateTarget" do
+            CF::Populators::Target.should_not_receive(:new)
+            subject
+          end
+        end
 
-      it "calls use a PopulateTarget to ensure that an organization and space is set" do
-        CF::Populators::Target.should_receive(:new) { double(:target, :populate_and_save! => true) }
-        subject
+        def tokens_yaml
+          YAML.load_file(File.expand_path("~/.cf/tokens.yml"))
+        end
       end
 
-      context "when the user logs in with invalid credentials" do
-        before do
-          client.should_receive(:login).with("my-username", "my-password").and_raise(CFoundry::Denied)
-        end
+      context "when there is no target" do
+        before { client.stub(:target) { nil } }
 
-        it "informs the user gracefully" do
+        it "tells the user to select a target" do
           subject
-          expect(output).to say("Authenticating... FAILED")
+          expect(error_output).to say("Please select a target with 'cf target'.")
         end
       end
     end
 
-    context "when there is no target" do
-      it "tells the user to select a target" do
-        client.stub(:target) { nil }
-        subject
-        expect(error_output).to say("Please select a target with 'cf target'.")
+    context "when user is trying to log in with username/password" do
+      subject { cf ["login"] }
+
+      before do
+        stub_ask("username-prompt", {}) { "my-username" }
+        stub_ask("password-prompt", {:echo => "*", :forget => true}) { "my-password" }
       end
+
+      it_logs_in_user_with_credentials(
+        :username => "my-username", :password => "my-password")
+    end
+
+    context "when user is trying to log in via sso" do
+      subject { cf ["login", "--sso"] }
+
+      before do
+        stub_ask("username-prompt", {}) { "my-username" }
+        stub_ask("passcode-prompt", {:echo => "*", :forget => true}) { "my-passcode" }
+      end
+
+      it_logs_in_user_with_credentials(
+        :username => "my-username", :passcode => "my-passcode")
     end
   end
 end

data/spec/features/account_lifecycle_spec.rb

@@ -46,10 +46,10 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
       # TODO: not this.
       client = CFoundry::V2::Client.new("https://#{target}")
-      client.login(email, password)
+      client.login(:username => email, :password => password)
       user = client.current_user
       guid = user.guid
-      client.login(username, password)
+      client.login(:username => username, :password => password)
       user.delete!
 
       BlueShell::Runner.run("#{cf_bin} login #{email} --password #{password}") do |runner|

data/spec/features/create_user_spec.rb

@@ -19,7 +19,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     let(:client) do
       client = CFoundry::V2::Client.new("https://#{target}")
-      client.login(username, password)
+      client.login(:username => username, :password => password)
       client
     end
 
@@ -39,10 +39,10 @@ if ENV['CF_V2_RUN_INTEGRATION']
       #end
 
       # TODO: not this.
-      client.login(new_user, password)
+      client.login(:username => new_user, :password => password)
       user = client.current_user
       guid = user.guid
-      client.login(username, password)
+      client.login(:username => username, :password => password)
       user.delete!
 
       logout

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.1.5.rc7
-  prerelease: 6
+  version: 4.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.7.rc1
+        version: 2.4.0
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.7.rc1
+        version: 2.4.0
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -287,7 +287,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -295,7 +295,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
@@ -621,13 +621,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2597973038898250794
+      hash: -3067736144323404377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3067736144323404377
 requirements: []
 rubyforge_project: cf
 rubygems_version: 1.8.25