Fix a bug where KC would fail to login if config file was empty

RiotGames · Feb 7, 2025 · 07515ad · 07515ad
1 parent 0fe05af
commit 07515ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/command/accounts.go b/command/accounts.go
@@ -57,8 +57,7 @@ var accountsCmd = &cobra.Command{
 		if HasTokenExpired(config.Tokens) {
 			return ErrTokensExpiredOrAbsent
 		}
-
-		accounts, err := refreshAccounts(cmd.Context(), serverAddrURI, config.Tokens)
+		accounts, err := refreshAccounts(cmd.Context(), serverAddrURI, config)
 		if err != nil {
 			return fmt.Errorf("error refreshing accounts: %w", err)
 		}

diff --git a/command/config.go b/command/config.go
@@ -219,6 +219,13 @@ func (c Config) GetOAuthToken() (*TokenSet, bool) {
 	return c.Tokens, c.Tokens != nil
 }
 
+func (c Config) Token() (*oauth2.Token, error) {
+	if c.Tokens == nil {
+		return nil, nil
+	}
+	return c.Tokens.Token()
+}
+
 func HasTokenExpired(tok *TokenSet) bool {
 	if tok == nil {
 		return true

diff --git a/command/roles.go b/command/roles.go
@@ -27,7 +27,7 @@ var rolesCmd = cobra.Command{
 			applicationID = account.ID
 		}
 
-		samlResponse, _, err := oauth2cli.DiscoverConfigAndExchangeTokenForAssertion(cmd.Context(), config.Tokens, oidcDomain, clientID, applicationID)
+		samlResponse, _, err := oauth2cli.DiscoverConfigAndExchangeTokenForAssertion(cmd.Context(), config, oidcDomain, clientID, applicationID)
 		if err != nil {
 			return err
 		}