feat(gateway): multiple authentication methods

cli/packages/cmd/gateway.go

@@ -43,7 +43,8 @@ func getInfisicalSdkInstance(cmd *cobra.Command) (infisicalSdk.InfisicalClientIn
 	}
 
 	// if the --token param is not set, we use the auth-method flag to determine the authentication method, and perform the appropriate login flow based on that
-	authMethod, err := cmd.Flags().GetString("auth-method")
+	authMethod, err := util.GetCmdFlagOrEnv(cmd, "auth-method", []string{util.INFISICAL_AUTH_METHOD_NAME})
+
 	if err != nil {
 		cancel()
 		return nil, nil, err

cli/packages/cmd/login.go

@@ -243,6 +243,7 @@ var loginCmd = &cobra.Command{
 				util.AuthStrategy.GCP_IAM_AUTH:      sdkAuthenticator.HandleGcpIamAuthLogin,
 				util.AuthStrategy.AWS_IAM_AUTH:      sdkAuthenticator.HandleAwsIamAuthLogin,
 				util.AuthStrategy.OIDC_AUTH:         sdkAuthenticator.HandleOidcAuthLogin,
+				util.AuthStrategy.JWT_AUTH:          sdkAuthenticator.HandleJwtAuthLogin,
 			}
 
 			credential, err := authStrategies[strategy]()

cli/packages/util/constants.go

@@ -13,6 +13,8 @@ const (
 	VAULT_BACKEND_AUTO_MODE = "auto"
 	VAULT_BACKEND_FILE_MODE = "file"
 
+	INFISICAL_AUTH_METHOD_NAME = "INFISICAL_AUTH_METHOD"
+
 	// Universal Auth
 	INFISICAL_UNIVERSAL_AUTH_CLIENT_ID_NAME     = "INFISICAL_UNIVERSAL_AUTH_CLIENT_ID"
 	INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET_NAME = "INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET"
@@ -29,6 +31,8 @@ const (
 	// JWT AUTH
 	INFISICAL_JWT_NAME = "INFISICAL_JWT"
 
+	INFISICAL_GATEWAY_TOKEN_NAME_LEGACY = "TOKEN" // backwards compatibility with gateway helm chart, where token was the only supported auth method
+
 	// Generic env variable used for auth methods that require a machine identity ID
 	INFISICAL_MACHINE_IDENTITY_ID_NAME = "INFISICAL_MACHINE_IDENTITY_ID"
 

cli/packages/util/helper.go

@@ -96,6 +96,11 @@ func GetInfisicalToken(cmd *cobra.Command) (token *models.TokenDetails, err erro
 			infisicalToken = os.Getenv(INFISICAL_TOKEN_NAME)
 			source = fmt.Sprintf("%s environment variable", INFISICAL_TOKEN_NAME)
 		}
+
+		if infisicalToken == "" { // if its still empty, check for the `TOKEN` environment variable (for gateway helm)
+			infisicalToken = os.Getenv(INFISICAL_GATEWAY_TOKEN_NAME_LEGACY)
+			source = fmt.Sprintf("%s environment variable", INFISICAL_GATEWAY_TOKEN_NAME_LEGACY)
+		}
 	}
 
 	if infisicalToken == "" { // If it's empty, we return nothing at all.