vmware-vra 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3671834fbc97510772f7d42d524f2775789c7ac0fe7f29c80dad8c64effe3b6
-  data.tar.gz: 394929c607677c9c2341e9a6060e9341810f2a8941111247e2fe1e1f71ce5afb
+  metadata.gz: 95e805c8c8d6fd5228962ffa907ce07409b60022e29166ba970194e0aa61cc42
+  data.tar.gz: 49beb545bf435a61aefccf06daa25629ccd991363dc9ca7546e3a15996cca362
 SHA512:
-  metadata.gz: a04bbf0434372a58119367bb5f3d9f35c10fff450263e14f92fac6bc78082a74d0ca8fbca713b4ae7a1c0fdc1e1a40a953b321b21be32bfd0996db3cf107d776
-  data.tar.gz: 3f3646d1aa4fb7d15fd451fce246ab9ccb1e4828dfd4e13110abdb5ce552a3c4a158fb3ff8ab6a6139154af6fec3c57646566876ae4af2c6414bd6f5fb5284b7
+  metadata.gz: de450415be0060fb3aef5d796e407bf9fedfb79b0f83a003d702073ee7aaa06508a5758191916d4c522c42348d166c01c23f8671221c2b8cd66b5e4b839177e7
+  data.tar.gz: ade68fa3e927d199c2c263bd1fcc918c21ea8c9aa52703ab74092461e9719c442294064c1410fc890c27d90908be089d21340141c11814db04cbccf3d1e4710a

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 # Change Log
+## [3.0.1](https://github.com/chef-partners/vmware-vra-gem/tree/v3.0.1) (2022-01-25)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v3.0.0...v3.0.1)
+
+- Fix access token workflow to work with VRA8
 
 ## [3.0.0](https://github.com/chef-partners/vmware-vra-gem/tree/v3.0.0) (2022-01-18)
 [Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.7.2...v3.0.0)

data/lib/vra/client.rb

@@ -23,7 +23,8 @@ require 'vra/http'
 
 module Vra
   class Client
-    ACCESS_TOKEN_URL = '/csp/gateway/am/api/login?access_token'
+    REFRESH_TOKEN_URL = '/csp/gateway/am/api/login?access_token'
+    ACCESS_TOKEN_URL = '/iaas/api/login'
     ROLES_URL = '/csp/gateway/am/api/loggedin/user/orgs'
 
     attr_accessor :page_size
@@ -106,17 +107,26 @@ module Vra
     end
 
     def generate_access_token
+      @refresh_token.value = nil
       @access_token.value = nil
       validate_client_options!
 
-      response = http_post(ACCESS_TOKEN_URL,
+      # VRA 8 has a two-step authentication process - This probably breaks VRA7, who knows?!?
+      # First step: Sending Username/Password to get a Refresh Token
+      refresh_response = http_post(REFRESH_TOKEN_URL,
                            FFI_Yajl::Encoder.encode(token_params),
                            :skip_auth)
-      raise Vra::Exception::Unauthorized, "Unable to get the access token: #{response.body}" unless response.success_ok?
+      raise Vra::Exception::Unauthorized, "Unable to get the refresh token: #{refresh_response.body}" unless refresh_response.success_ok?
 
-      response_body = FFI_Yajl::Parser.parse(response.body)
-      @access_token.value = response_body['access_token']
-      @refresh_token.value = response_body['refresh_token']
+      refresh_response_body = FFI_Yajl::Parser.parse(refresh_response.body)
+      @refresh_token.value = refresh_response_body['refresh_token']
+
+      # Second Step: Sending the refresh token to a separate endpoint to get an Access Token
+      access_response = http_post(ACCESS_TOKEN_URL, "{ \"refreshToken\": \"#{@refresh_token.value}\" }", :skip_auth)
+      raise Vra::Exception::Unauthorized, "Unable to get the access token: #{access_response.body}" unless access_response.success_ok?
+
+      access_response_body = FFI_Yajl::Parser.parse(access_response.body)
+      @access_token.value = access_response_body['token']
     end
 
     def full_url(path)

data/lib/vra/version.rb

@@ -18,5 +18,5 @@
 #
 
 module Vra
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/spec/client_spec.rb

@@ -54,7 +54,7 @@ describe Vra::Client do
   end
 
   describe '#request_headers' do
-    context 'when bearer token exists' do
+    context 'when access token exists' do
       it 'has an Authorization header' do
         client.access_token = '12345'
         expect(client.request_headers.key?('csp-auth-token')).to be true
@@ -131,7 +131,7 @@ describe Vra::Client do
     end
   end
 
-  describe '#generate_bearer_token' do
+  describe '#generate_access_token' do
     let(:payload) do
       {
         username: 'user@corp.local',
@@ -148,23 +148,37 @@ describe Vra::Client do
       }.to_json
     end
 
+    let(:refresh_response_body) { { token: '123456' }.to_json }
+
     it 'posts to the tokens API endpoint' do
       response = double('response', code: 200, body: success_response, success_ok?: true)
+      refresh_response = double('response', code: 200, body: refresh_response_body, success_ok?: true)
+      # First request to generate the refresh token
       expect(Vra::Http).to receive(:execute)
         .with(method: :post,
-              url: client.full_url(described_class::ACCESS_TOKEN_URL),
+              url: client.full_url(described_class::REFRESH_TOKEN_URL),
               payload: payload,
               headers: anything,
               verify_ssl: true)
         .and_return(response)
 
+      # Second request to generate access token
+      expect(Vra::Http).to receive(:execute)
+        .with(method: :post,
+              url: client.full_url(described_class::ACCESS_TOKEN_URL),
+              payload: "{ \"refreshToken\": \"654321\" }",
+              headers: anything,
+              verify_ssl: true)
+        .and_return(refresh_response)
+
       client.generate_access_token
     end
 
     context 'when token is generated successfully' do
       it 'sets the token' do
         response = double('response', code: 200, body: success_response, success_ok?: true)
-        allow(Vra::Http).to receive(:execute).and_return(response)
+        refresh_response = double('response', code: 200, body: refresh_response_body, success_ok?: true)
+        allow(Vra::Http).to receive(:execute).twice.and_return(response, refresh_response)
 
         client.generate_access_token
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Adam Leff
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl