update oauth logic

Author: ckoegel

lib/bandwidth-sdk/api_client.rb

@@ -322,9 +322,13 @@ def convert_to_type(data, return_type)
           data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
         end
       else
-        # models (e.g. Pet) or oneOf
+        # models (e.g. Pet) or oneOf/anyOf
         klass = Bandwidth.const_get(return_type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data)
+        if klass.respond_to?(:openapi_one_of) || klass.respond_to?(:openapi_any_of)
+          klass.build(data)
+        else
+          klass.build_from_hash(data)
+        end
       end
     end
 
@@ -352,9 +356,10 @@ def update_params_for_auth!(header_params, query_params, auth_names)
       Array(auth_names).each do |auth_name|
         auth_setting = @config.auth_settings[auth_name]
         next unless auth_setting
+        puts auth_setting
         case auth_setting[:in]
-        when 'header' then header_params[auth_setting[:key]] = auth_setting[:value]
-        when 'query'  then query_params[auth_setting[:key]] = auth_setting[:value]
+        when 'header' then header_params[auth_setting[:key]] = auth_setting[:value] unless auth_setting[:value].nil?
+        when 'query'  then query_params[auth_setting[:key]] = auth_setting[:value] unless auth_setting[:value].nil?
         else fail ArgumentError, 'Authentication token must be in `query` or `header`'
         end
       end

lib/bandwidth-sdk/configuration.rb

@@ -59,6 +59,16 @@ class Configuration
     # @return [String]
     attr_accessor :password
 
+    # Defines the client ID used with OAuth2.
+    # 
+    # @return [String]
+    attr_accessor :client_id
+
+    # Defines the client secret used with OAuth2.
+    # 
+    # @return [String]
+    attr_accessor :client_secret
+
     # Defines the access token (Bearer) used with OAuth2.
     attr_accessor :access_token
 
@@ -182,6 +192,31 @@ def initialize
       @inject_format = false
       @force_ending_format = false
       @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+      @access_token_expires_at = nil
+      @access_token_getter = Proc.new {
+        access_token_valid = @access_token && @access_token_expires_at > Time.now + 60
+        next @access_token if access_token_valid
+
+        puts "Refreshing access token..." if @debugging
+        # obtain new access token using client credentials
+        token_url = 'https://api.bandwidth.com/api/v1/oauth2/token'
+        auth_header = 'Basic ' + ["#{@client_id}:#{@client_secret}"].pack('m').delete("\r\n")
+        conn = Faraday.new(url: token_url) do |faraday|
+          faraday.request :url_encoded
+          faraday.adapter Faraday.default_adapter
+        end
+        response = conn.post do |req|
+          req.headers['Authorization'] = auth_header
+          req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+          req.body = 'grant_type=client_credentials'
+        end
+        if response.status != 200
+          raise "Failed to obtain access token: #{response.status} #{response.body}"
+        end
+        body = JSON.parse(response.body)
+        @access_token = body['access_token']
+        @access_token_expires_at = Time.now + body['expires_in']
+      }
 
       yield(self) if block_given?
     end
@@ -237,6 +272,7 @@ def api_key_with_prefix(param_name, param_alias = nil)
     # Gets access_token using access_token_getter or uses the static access_token
     def access_token_with_refresh
       return access_token if access_token_getter.nil?
+      return unless @client_id && @client_secret
       access_token_getter.call
     end
 
@@ -245,6 +281,12 @@ def basic_auth_token
       'Basic ' + ["#{username}:#{password}"].pack('m').delete("\r\n")
     end
 
+    # Gets Bearer auth token string
+    def oauth_bearer_token
+      "Bearer #{access_token_with_refresh}" unless access_token_with_refresh.nil?
+    end
+
+
     # Returns Auth Settings hash for api client.
     def auth_settings
       {
@@ -260,7 +302,7 @@ def auth_settings
             type: 'oauth2',
             in: 'header',
             key: 'Authorization',
-            value: "Bearer #{access_token_with_refresh}"
+            value: oauth_bearer_token
           },
       }
     end