From 9527d54ce8cfe8e73096d92f2d2f9305f885e5f4 Mon Sep 17 00:00:00 2001
From: Derek Collison <derek@nats.io>
Date: Thu, 22 Nov 2018 05:05:41 -0800
Subject: [PATCH] UserCredentials

Signed-off-by: Derek Collison <derek@nats.io>
---
 nats.go      |  4 ++--
 nats_test.go | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/nats.go b/nats.go
index e57ee14a5..ab964dca9 100644
--- a/nats.go
+++ b/nats.go
@@ -739,9 +739,9 @@ func TokenHandler(cb AuthTokenHandler) Option {
 	}
 }
 
-// UserAndNkey is a convenience function that takes a filename
+// UserCredentials is a convenience function that takes a filename
 // for a user's JWT and a filename for the user's private Nkey seed.
-func UserAndNkeyFiles(userJWTFile, seedFile string) Option {
+func UserCredentials(userJWTFile, seedFile string) Option {
 	userCB := func() (string, error) {
 		return userFromFile(userJWTFile)
 	}
diff --git a/nats_test.go b/nats_test.go
index 59a979ff7..7fce475c6 100644
--- a/nats_test.go
+++ b/nats_test.go
@@ -1346,6 +1346,26 @@ func TestBasicUserJWTAuth(t *testing.T) {
 	nc.Close()
 }
 
+func TestUserCredentials(t *testing.T) {
+	if server.VERSION[0] == '1' {
+		t.Skip()
+	}
+	ts := runTrustServer()
+	defer ts.Shutdown()
+
+	userJWTFile := createTmpFile(t, []byte(uJWT))
+	defer os.Remove(userJWTFile)
+	userSeedFile := createTmpFile(t, uSeed)
+	defer os.Remove(userSeedFile)
+
+	url := fmt.Sprintf("nats://127.0.0.1:%d", TEST_PORT)
+	nc, err := Connect(url, UserCredentials(userJWTFile, userSeedFile))
+	if err != nil {
+		t.Fatalf("Expected to connect, got %v", err)
+	}
+	nc.Close()
+}
+
 func TestNkeyAuth(t *testing.T) {
 	if server.VERSION[0] == '1' {
 		t.Skip()