Fix error when creating service without a valid client

Author: Renier Morales

lib/softlayer/Client.rb

@@ -102,10 +102,10 @@ def initialize(options = {})
       settings = Config.client_settings(options)
 
       # pick up the username from the options, the global, or assume no username
-      @username = settings[:username] || ""
+      @username = settings[:username]
 
       # do a similar thing for the api key
-      @api_key = settings[:api_key] || ""
+      @api_key = settings[:api_key]
 
       # grab token pair
       @userId = settings[:userId]
@@ -120,11 +120,6 @@ def initialize(options = {})
       # and assign a time out if the settings offer one
       @network_timeout = settings[:timeout] if settings.has_key?(:timeout)
 
-      unless token_based?
-        raise "A SoftLayer Client requires a username" if !@username || @username.empty?
-        raise "A SoftLayer Client requires an api_key" if !@api_key || @api_key.empty?
-      end
-
       raise "A SoftLayer Client requires an endpoint URL" if !@endpoint_url || @endpoint_url.empty?
     end
 
@@ -133,6 +128,11 @@ def token_based?
       @userId && @authToken && !@authToken.empty?
     end
 
+    # return whether this client is using api_key-based authentication
+    def key_based?
+      @username && !@username.empty? && @api_key && !@api_key.empty?
+    end
+
     # return a hash of the authentication headers for the client
     def authentication_headers
       if token_based?
@@ -143,13 +143,15 @@ def authentication_headers
             'authToken' => @authToken
           }
         }
-      else
+      elsif key_based?
         {
           'authenticate' => {
             'username' => @username,
             'apiKey' => @api_key
           }
         }
+      else
+        {}
       end
     end