morpheus-cli 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78556645853b91d56091042831cc0f167eca3120fe58f5e062b24fe90d14475b
-  data.tar.gz: 49ad49192a9fc8fd645e63912d932b1fe5a8978c6c11984b5d93fd27281e72ec
+  metadata.gz: 7753eaeda16637f0e5dc4789805e09872fa92cc7bd487f6abebdbc30f021211c
+  data.tar.gz: 44b028c23aa86ca2bf4a4d648930985fd55c7050713ad483ea0ae9f1419b4283
 SHA512:
-  metadata.gz: fa95516c8ce7fa863fec5172fc9979545a4ecd29a809801f5d8fd22a5550ad74ce51bdaacd411e3bde4033908c968fa03d61294850b87212c4b94777e6bc39c6
-  data.tar.gz: 411ae02f4371da4f90cbb902cb1aca02ad4a7ca1a8d0e6a11b65d8484310e29ee1c1764a9d47f378b32281d7526107611a80a8936a08a8fe525dfd040dd3cca8
+  metadata.gz: 577cd169ab4f3235e536d46603f744b39c233a09664fbe4b81294c662ffbeceb5f4402c763b3653446e17ad021b31ac0bc58c96232fe2b27ce17c6d0dd5f03f4
+  data.tar.gz: 0e185c2007c4f5c7ca8c7158f0ecc872faeecdc34773e19bb61983c45238a798038652df07a0ea3dfde0c75bf5dfae4c2c04347841b1d730f70524aa664373e5

data/lib/morpheus/api/api_client.rb

@@ -3,17 +3,48 @@ require 'uri'
 require 'rest-client'
 
 class Morpheus::APIClient
+  # Initialize a new APIClient
+  #   client = APIClient.new(url:"https://morpheus.yourcompany.com", verify_ssl:false)
+  # This old method signature is being deprecated:
+  #   client = APIClient.new(access_token, refresh_token, expires_in, base_url, verify_ssl, options={})
+  #
   def initialize(access_token, refresh_token=nil,expires_in = nil, base_url=nil, verify_ssl=true, options={})
+    if access_token.is_a?(Hash)
+      client_opts = access_token.clone()
+      access_token = client_opts[:access_token]
+      refresh_token = client_opts[:refresh_token]
+      base_url = client_opts[:url] || client_opts[:base_url]
+      expires_in = client_opts[:expires_in]
+      verify_ssl = client_opts.key?(:verify_ssl) ? client_opts[:verify_ssl] : true
+      options = refresh_token.is_a?(Hash) ? refresh_token.clone() : {}
+    end
     @access_token = access_token
     @refresh_token = refresh_token
     @base_url = base_url
+    if @base_url.to_s.empty?
+      raise "#{self.class} requires option :url"
+    end
+    @base_url = @base_url.chomp("/")
+    # todo: validate URI
     if expires_in != nil
-      @expires_at = DateTime.now + expires_in.seconds
+      @expires_at = Time.now + expires_in
     end
     set_ssl_verification_enabled(verify_ssl)
     setopts(options)
   end
 
+  def url
+    @base_url
+  end
+
+  def to_s
+    "<##{self.class}:#{self.object_id.to_s(8)} @url=#{@base_url} @verify_ssl=#{@verify_ssl} @access_token=#{@access_token ? '************' : nil} @refresh_token=#{@access_token ? '************' : nil} @expires_at=#{@expires_at} @options=#{@options}>"
+  end
+
+  def inspect
+    to_s
+  end
+  
   def dry_run(val=true)
     @dry_run = !!val
     self
@@ -184,6 +215,44 @@ class Morpheus::APIClient
     end
   end
 
+  def logged_in?
+    !!@access_token
+  end
+
+  def login(username, password)
+    @access_token, @refresh_token, @expires_at = nil, nil, nil
+    response = auth.login(username, password)
+    @access_token = response['access_token']
+    @refresh_token = response['refresh_token']
+    if response['expires_in'] != nil
+      @expires_at = Time.now + response['expires_in']
+    end
+    # return response
+    return self
+  end
+
+  def refresh_token()
+    if @refresh_token.nil?
+      raise "#{self.class} does not currently have a refresh_token"
+    end
+    response = auth.use_refresh_token(@refresh_token)
+    @access_token = response['access_token']
+    @refresh_token = response['refresh_token']
+    if response['expires_in'] != nil
+      @expires_at = Time.now + response['expires_in']
+    end
+    @access_token = response['access_token']
+    # return response
+    return self
+  end
+
+  def logout
+    @access_token = nil
+    @refresh_token = nil
+    @expires_at = nil
+    return self
+  end
+
   def auth
     Morpheus::AuthInterface.new(@base_url, @access_token).setopts(@options)
   end

data/lib/morpheus/api/auth_interface.rb

@@ -2,7 +2,7 @@ require 'morpheus/api/api_client'
 
 class Morpheus::AuthInterface < Morpheus::APIClient
 
-  attr_reader :access_token
+  #attr_reader :access_token, :refresh_token, :expires_at
 
   def initialize(base_url, access_token=nil)
     @base_url = base_url
@@ -10,7 +10,7 @@ class Morpheus::AuthInterface < Morpheus::APIClient
   end
 
   def login(username, password)
-    @access_token = nil
+    @access_token, @refresh_token, @expires_at = nil, nil, nil
     url = "#{@base_url}/oauth/token"
     params = {grant_type: 'password', scope:'write', client_id: 'morph-cli', username: username}
     payload = {password: password}
@@ -18,6 +18,10 @@ class Morpheus::AuthInterface < Morpheus::APIClient
     response = execute(opts)
     return response if @dry_run
     @access_token = response['access_token']
+    @refresh_token = response['refresh_token']
+    if response['expires_in'] != nil
+      @expires_at = Time.now + response['expires_in']
+    end
     return response
   end
 
@@ -31,10 +35,15 @@ class Morpheus::AuthInterface < Morpheus::APIClient
     response = execute(opts)
     return response if @dry_run
     @access_token = response['access_token']
+    @refresh_token = response['refresh_token']
+    if response['expires_in'] != nil
+      @expires_at = Time.now + response['expires_in']
+    end
     return response
   end
 
   def logout()
+    # super.logout()
     if @access_token
       # todo: expire the token
     end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.1.1"
+    VERSION = "4.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - David Estes