.

Author: irby

internal/command/command.go

@@ -165,42 +165,39 @@ func newServerConfig(ctx context.Context, config *Config) (*auth_providers.Serve
 
 	nonAmbientCredentialsConfigured := false
 
-	// TODO: Uncomment the below section
-	/*
-		if config.BasicAuth != nil {
-			basicAuthConfig := auth_providers.NewBasicAuthAuthenticatorBuilder().
-				WithUsername(config.BasicAuth.Username).
-				WithPassword(config.BasicAuth.Password)
-			basicAuthConfig.CommandAuthConfig = authConfig
-			server = basicAuthConfig.GetServerConfig()
-
-			nonAmbientCredentialsConfigured = true
-		}
-
-		if config.OAuth != nil {
-			oauthConfig := auth_providers.NewOAuthAuthenticatorBuilder().
-				WithTokenUrl(config.OAuth.TokenURL).
-				WithClientId(config.OAuth.ClientID).
-				WithClientSecret(config.OAuth.ClientSecret)
+	if config.BasicAuth != nil {
+		basicAuthConfig := auth_providers.NewBasicAuthAuthenticatorBuilder().
+			WithUsername(config.BasicAuth.Username).
+			WithPassword(config.BasicAuth.Password)
+		basicAuthConfig.CommandAuthConfig = authConfig
+		server = basicAuthConfig.GetServerConfig()
 
-			if len(config.OAuth.Scopes) > 0 {
-				oauthConfig.WithScopes(config.OAuth.Scopes)
-			}
-			if config.OAuth.Audience != "" {
-				oauthConfig.WithAudience(config.OAuth.Audience)
-			}
+		nonAmbientCredentialsConfigured = true
+	}
 
-			oauthConfig.CommandAuthConfig = authConfig
-			server = oauthConfig.GetServerConfig()
+	if config.OAuth != nil {
+		oauthConfig := auth_providers.NewOAuthAuthenticatorBuilder().
+			WithTokenUrl(config.OAuth.TokenURL).
+			WithClientId(config.OAuth.ClientID).
+			WithClientSecret(config.OAuth.ClientSecret)
 
-			nonAmbientCredentialsConfigured = true
+		if len(config.OAuth.Scopes) > 0 {
+			oauthConfig.WithScopes(config.OAuth.Scopes)
 		}
-	*/
+		if config.OAuth.Audience != "" {
+			oauthConfig.WithAudience(config.OAuth.Audience)
+		}
+
+		oauthConfig.CommandAuthConfig = authConfig
+		server = oauthConfig.GetServerConfig()
+
+		nonAmbientCredentialsConfigured = true
+	}
 
 	// If direct basic-auth/OAuth credentials were configured, continue. Otherwise,
 	// we look for ambient credentials configured on the environment where we're running.
 	if !nonAmbientCredentialsConfigured {
-		log.Info("Using ambient credentails")
+		log.Info("Using ambient credentails!")
 		source := getAmbientTokenCredentialSource()
 		if source == nil {
 			log.Info("no direct credentials provided; attempting to use ambient credentials. trying Azure DefaultAzureCredential first")