Skip to content

Commit 5415ade

Browse files
committed
fix(auth): Attempt env vars during interactive auth if empty conf is passed.
Signed-off-by: spbsoluble <1661003+spbsoluble@users.noreply.github.com>
1 parent bcf53b2 commit 5415ade

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

cmd/login.go

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,23 @@ func authInteractive(
437437
return auth_providers.Config{}, fmt.Errorf("no-prompt flag is set, cannot run interactive login")
438438
}
439439
if serverConf == nil {
440-
serverConf = &auth_providers.Server{}
440+
serverConf = &auth_providers.Server{
441+
Host: os.Getenv(auth_providers.EnvKeyfactorHostName),
442+
APIPath: os.Getenv(auth_providers.EnvKeyfactorAPIPath),
443+
Username: os.Getenv(auth_providers.EnvKeyfactorUsername),
444+
Password: os.Getenv(auth_providers.EnvKeyfactorPassword),
445+
Domain: os.Getenv(auth_providers.EnvKeyfactorDomain),
446+
OAuthTokenUrl: os.Getenv(auth_providers.EnvKeyfactorAuthTokenURL),
447+
ClientID: os.Getenv(auth_providers.EnvKeyfactorClientID),
448+
ClientSecret: os.Getenv(auth_providers.EnvKeyfactorClientSecret),
449+
AccessToken: os.Getenv(auth_providers.EnvKeyfactorAccessToken),
450+
Audience: os.Getenv(auth_providers.EnvKeyfactorAuthAudience),
451+
CACertPath: os.Getenv(auth_providers.EnvAuthCACert),
452+
//SkipTLSVerify: skipVerifyFlag,
453+
//AuthType: os.Getenv(auth_providers.EnvKeyfactorAuthType),
454+
//AuthProvider: os.Getenv(auth_providers.EnvKeyfactorAuthProvider),
455+
//Scopes: os.Getenv(auth_providers.EnvKeyfactorAuthScopes),
456+
}
441457
}
442458

443459
if serverConf.Host == "" || forcePrompt {
@@ -457,7 +473,6 @@ func authInteractive(
457473
}
458474
}
459475
if serverConf.AuthType == "basic" {
460-
461476
if serverConf.Username == "" || forcePrompt {
462477
serverConf.Username = promptForInteractiveParameter("Keyfactor Command Username", serverConf.Username)
463478
}

0 commit comments

Comments
 (0)